diff --git a/Cargo.lock b/Cargo.lock index d780911c11..cec8e7aef7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1001,7 +1001,7 @@ dependencies = [ [[package]] name = "craft-affinity" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=a499742a9389f47d10cdc61e4cdbf4e5f07f48cd#a499742a9389f47d10cdc61e4cdbf4e5f07f48cd" +source = "git+https://github.com/storytold/craft-libs?rev=64b181977a0488e4d1e167bc5cc8cfededc2ed4b#64b181977a0488e4d1e167bc5cc8cfededc2ed4b" dependencies = [ "crc32fast", "flate2", @@ -1012,17 +1012,25 @@ dependencies = [ [[package]] name = "craft-codepage" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=a499742a9389f47d10cdc61e4cdbf4e5f07f48cd#a499742a9389f47d10cdc61e4cdbf4e5f07f48cd" +source = "git+https://github.com/storytold/craft-libs?rev=64b181977a0488e4d1e167bc5cc8cfededc2ed4b#64b181977a0488e4d1e167bc5cc8cfededc2ed4b" + +[[package]] +name = "craft-dds" +version = "0.1.0" +source = "git+https://github.com/storytold/craft-libs?rev=64b181977a0488e4d1e167bc5cc8cfededc2ed4b#64b181977a0488e4d1e167bc5cc8cfededc2ed4b" +dependencies = [ + "rayon", +] [[package]] name = "craft-docpath" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=a499742a9389f47d10cdc61e4cdbf4e5f07f48cd#a499742a9389f47d10cdc61e4cdbf4e5f07f48cd" +source = "git+https://github.com/storytold/craft-libs?rev=64b181977a0488e4d1e167bc5cc8cfededc2ed4b#64b181977a0488e4d1e167bc5cc8cfededc2ed4b" [[package]] name = "craft-dxf" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=a499742a9389f47d10cdc61e4cdbf4e5f07f48cd#a499742a9389f47d10cdc61e4cdbf4e5f07f48cd" +source = "git+https://github.com/storytold/craft-libs?rev=64b181977a0488e4d1e167bc5cc8cfededc2ed4b#64b181977a0488e4d1e167bc5cc8cfededc2ed4b" dependencies = [ "craft-codepage", "encoding_rs", @@ -1034,17 +1042,17 @@ dependencies = [ [[package]] name = "craft-eps" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=a499742a9389f47d10cdc61e4cdbf4e5f07f48cd#a499742a9389f47d10cdc61e4cdbf4e5f07f48cd" +source = "git+https://github.com/storytold/craft-libs?rev=64b181977a0488e4d1e167bc5cc8cfededc2ed4b#64b181977a0488e4d1e167bc5cc8cfededc2ed4b" [[package]] name = "craft-fonts-build" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=a499742a9389f47d10cdc61e4cdbf4e5f07f48cd#a499742a9389f47d10cdc61e4cdbf4e5f07f48cd" +source = "git+https://github.com/storytold/craft-libs?rev=64b181977a0488e4d1e167bc5cc8cfededc2ed4b#64b181977a0488e4d1e167bc5cc8cfededc2ed4b" [[package]] name = "craft-gif" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=a499742a9389f47d10cdc61e4cdbf4e5f07f48cd#a499742a9389f47d10cdc61e4cdbf4e5f07f48cd" +source = "git+https://github.com/storytold/craft-libs?rev=64b181977a0488e4d1e167bc5cc8cfededc2ed4b#64b181977a0488e4d1e167bc5cc8cfededc2ed4b" dependencies = [ "gif", ] @@ -1052,7 +1060,7 @@ dependencies = [ [[package]] name = "craft-gzip" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=a499742a9389f47d10cdc61e4cdbf4e5f07f48cd#a499742a9389f47d10cdc61e4cdbf4e5f07f48cd" +source = "git+https://github.com/storytold/craft-libs?rev=64b181977a0488e4d1e167bc5cc8cfededc2ed4b#64b181977a0488e4d1e167bc5cc8cfededc2ed4b" dependencies = [ "flate2", ] @@ -1060,7 +1068,7 @@ dependencies = [ [[package]] name = "craft-i18n" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=a499742a9389f47d10cdc61e4cdbf4e5f07f48cd#a499742a9389f47d10cdc61e4cdbf4e5f07f48cd" +source = "git+https://github.com/storytold/craft-libs?rev=64b181977a0488e4d1e167bc5cc8cfededc2ed4b#64b181977a0488e4d1e167bc5cc8cfededc2ed4b" dependencies = [ "fixed_decimal", "icu_decimal", @@ -1083,37 +1091,12 @@ dependencies = [ [[package]] name = "craft-image-codecs" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=431f704478962677ec47e512754464d372901830#431f704478962677ec47e512754464d372901830" +source = "git+https://github.com/storytold/craft-libs?rev=64b181977a0488e4d1e167bc5cc8cfededc2ed4b#64b181977a0488e4d1e167bc5cc8cfededc2ed4b" dependencies = [ - "craft-jpeg 0.1.0 (git+https://github.com/storytold/craft-libs?rev=431f704478962677ec47e512754464d372901830)", - "craft-metadata 0.1.0 (git+https://github.com/storytold/craft-libs?rev=431f704478962677ec47e512754464d372901830)", - "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=431f704478962677ec47e512754464d372901830)", - "crc32fast", - "exr", - "flate2", - "half", - "hayro-jpeg2000", - "image", - "image-webp", - "jpeg-encoder", - "png 0.18.1", - "rayon", - "serde_json", - "thiserror 2.0.21", - "tiff", - "zune-core", - "zune-jpeg", - "zune-jpegxl", -] - -[[package]] -name = "craft-image-codecs" -version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=a499742a9389f47d10cdc61e4cdbf4e5f07f48cd#a499742a9389f47d10cdc61e4cdbf4e5f07f48cd" -dependencies = [ - "craft-jpeg 0.1.0 (git+https://github.com/storytold/craft-libs?rev=a499742a9389f47d10cdc61e4cdbf4e5f07f48cd)", - "craft-metadata 0.1.0 (git+https://github.com/storytold/craft-libs?rev=a499742a9389f47d10cdc61e4cdbf4e5f07f48cd)", - "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=a499742a9389f47d10cdc61e4cdbf4e5f07f48cd)", + "craft-dds", + "craft-jpeg", + "craft-metadata", + "craft-tiff", "crc32fast", "exr", "flate2", @@ -1135,15 +1118,7 @@ dependencies = [ [[package]] name = "craft-jpeg" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=431f704478962677ec47e512754464d372901830#431f704478962677ec47e512754464d372901830" -dependencies = [ - "thiserror 2.0.21", -] - -[[package]] -name = "craft-jpeg" -version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=a499742a9389f47d10cdc61e4cdbf4e5f07f48cd#a499742a9389f47d10cdc61e4cdbf4e5f07f48cd" +source = "git+https://github.com/storytold/craft-libs?rev=64b181977a0488e4d1e167bc5cc8cfededc2ed4b#64b181977a0488e4d1e167bc5cc8cfededc2ed4b" dependencies = [ "thiserror 2.0.21", ] @@ -1151,7 +1126,7 @@ dependencies = [ [[package]] name = "craft-jxl" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=a499742a9389f47d10cdc61e4cdbf4e5f07f48cd#a499742a9389f47d10cdc61e4cdbf4e5f07f48cd" +source = "git+https://github.com/storytold/craft-libs?rev=64b181977a0488e4d1e167bc5cc8cfededc2ed4b#64b181977a0488e4d1e167bc5cc8cfededc2ed4b" dependencies = [ "jixel", "jxl-oxide", @@ -1161,7 +1136,7 @@ dependencies = [ [[package]] name = "craft-keymap" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=a499742a9389f47d10cdc61e4cdbf4e5f07f48cd#a499742a9389f47d10cdc61e4cdbf4e5f07f48cd" +source = "git+https://github.com/storytold/craft-libs?rev=64b181977a0488e4d1e167bc5cc8cfededc2ed4b#64b181977a0488e4d1e167bc5cc8cfededc2ed4b" dependencies = [ "egui", "serde", @@ -1171,23 +1146,11 @@ dependencies = [ [[package]] name = "craft-metadata" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=431f704478962677ec47e512754464d372901830#431f704478962677ec47e512754464d372901830" +source = "git+https://github.com/storytold/craft-libs?rev=64b181977a0488e4d1e167bc5cc8cfededc2ed4b#64b181977a0488e4d1e167bc5cc8cfededc2ed4b" dependencies = [ "brotli-decompressor 6.3.2", "chrono", - "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=431f704478962677ec47e512754464d372901830)", - "quick-xml 0.41.0", - "serde", -] - -[[package]] -name = "craft-metadata" -version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=a499742a9389f47d10cdc61e4cdbf4e5f07f48cd#a499742a9389f47d10cdc61e4cdbf4e5f07f48cd" -dependencies = [ - "brotli-decompressor 6.3.2", - "chrono", - "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=a499742a9389f47d10cdc61e4cdbf4e5f07f48cd)", + "craft-tiff", "quick-xml 0.41.0", "serde", ] @@ -1195,7 +1158,7 @@ dependencies = [ [[package]] name = "craft-metafile" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=a499742a9389f47d10cdc61e4cdbf4e5f07f48cd#a499742a9389f47d10cdc61e4cdbf4e5f07f48cd" +source = "git+https://github.com/storytold/craft-libs?rev=64b181977a0488e4d1e167bc5cc8cfededc2ed4b#64b181977a0488e4d1e167bc5cc8cfededc2ed4b" dependencies = [ "encoding_rs", "image", @@ -1206,7 +1169,7 @@ dependencies = [ [[package]] name = "craft-mime" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=a499742a9389f47d10cdc61e4cdbf4e5f07f48cd#a499742a9389f47d10cdc61e4cdbf4e5f07f48cd" +source = "git+https://github.com/storytold/craft-libs?rev=64b181977a0488e4d1e167bc5cc8cfededc2ed4b#64b181977a0488e4d1e167bc5cc8cfededc2ed4b" dependencies = [ "chrono", "craft-codepage", @@ -1216,7 +1179,7 @@ dependencies = [ [[package]] name = "craft-pdf" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=0cca4ac66f9f4576b3acc5f84d7a2a2ae9fb943e#0cca4ac66f9f4576b3acc5f84d7a2a2ae9fb943e" +source = "git+https://github.com/storytold/craft-libs?rev=64b181977a0488e4d1e167bc5cc8cfededc2ed4b#64b181977a0488e4d1e167bc5cc8cfededc2ed4b" dependencies = [ "hayro-interpret", "hayro-syntax", @@ -1227,7 +1190,7 @@ dependencies = [ [[package]] name = "craft-plotter" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=9101c4fc226f5f111b5a890a6c5c19bf3991fd76#9101c4fc226f5f111b5a890a6c5c19bf3991fd76" +source = "git+https://github.com/storytold/craft-libs?rev=a7fb55eaf9a15c21e8ce0b13cf605dc54fd15f57#a7fb55eaf9a15c21e8ce0b13cf605dc54fd15f57" dependencies = [ "thiserror 2.0.21", ] @@ -1235,7 +1198,7 @@ dependencies = [ [[package]] name = "craft-print" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=a499742a9389f47d10cdc61e4cdbf4e5f07f48cd#a499742a9389f47d10cdc61e4cdbf4e5f07f48cd" +source = "git+https://github.com/storytold/craft-libs?rev=64b181977a0488e4d1e167bc5cc8cfededc2ed4b#64b181977a0488e4d1e167bc5cc8cfededc2ed4b" dependencies = [ "craft-winprint-gdi", "log", @@ -1249,7 +1212,7 @@ dependencies = [ [[package]] name = "craft-proof" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=a499742a9389f47d10cdc61e4cdbf4e5f07f48cd#a499742a9389f47d10cdc61e4cdbf4e5f07f48cd" +source = "git+https://github.com/storytold/craft-libs?rev=64b181977a0488e4d1e167bc5cc8cfededc2ed4b#64b181977a0488e4d1e167bc5cc8cfededc2ed4b" dependencies = [ "log", "miniz_oxide 0.9.1", @@ -1260,7 +1223,7 @@ dependencies = [ [[package]] name = "craft-ps" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=a80c0f25f1c4767374a27a444fbf95e3e8162e14#a80c0f25f1c4767374a27a444fbf95e3e8162e14" +source = "git+https://github.com/storytold/craft-libs?rev=64b181977a0488e4d1e167bc5cc8cfededc2ed4b#64b181977a0488e4d1e167bc5cc8cfededc2ed4b" dependencies = [ "flate2", "kurbo 0.13.1", @@ -1269,7 +1232,7 @@ dependencies = [ [[package]] name = "craft-psd" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=a499742a9389f47d10cdc61e4cdbf4e5f07f48cd#a499742a9389f47d10cdc61e4cdbf4e5f07f48cd" +source = "git+https://github.com/storytold/craft-libs?rev=64b181977a0488e4d1e167bc5cc8cfededc2ed4b#64b181977a0488e4d1e167bc5cc8cfededc2ed4b" dependencies = [ "encoding_rs", "flate2", @@ -1280,7 +1243,7 @@ dependencies = [ [[package]] name = "craft-stream-codecs" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=0cca4ac66f9f4576b3acc5f84d7a2a2ae9fb943e#0cca4ac66f9f4576b3acc5f84d7a2a2ae9fb943e" +source = "git+https://github.com/storytold/craft-libs?rev=64b181977a0488e4d1e167bc5cc8cfededc2ed4b#64b181977a0488e4d1e167bc5cc8cfededc2ed4b" dependencies = [ "fax", "hayro-ccitt", @@ -1291,10 +1254,10 @@ dependencies = [ [[package]] name = "craft-svg" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=431f704478962677ec47e512754464d372901830#431f704478962677ec47e512754464d372901830" +source = "git+https://github.com/storytold/craft-libs?rev=64b181977a0488e4d1e167bc5cc8cfededc2ed4b#64b181977a0488e4d1e167bc5cc8cfededc2ed4b" dependencies = [ - "craft-image-codecs 0.1.0 (git+https://github.com/storytold/craft-libs?rev=431f704478962677ec47e512754464d372901830)", - "craft-xml 0.1.0 (git+https://github.com/storytold/craft-libs?rev=431f704478962677ec47e512754464d372901830)", + "craft-image-codecs", + "craft-xml", "data-url", "flate2", "kurbo 0.13.1", @@ -1310,16 +1273,7 @@ dependencies = [ [[package]] name = "craft-tiff" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=431f704478962677ec47e512754464d372901830#431f704478962677ec47e512754464d372901830" -dependencies = [ - "serde", - "thiserror 2.0.21", -] - -[[package]] -name = "craft-tiff" -version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=a499742a9389f47d10cdc61e4cdbf4e5f07f48cd#a499742a9389f47d10cdc61e4cdbf4e5f07f48cd" +source = "git+https://github.com/storytold/craft-libs?rev=64b181977a0488e4d1e167bc5cc8cfededc2ed4b#64b181977a0488e4d1e167bc5cc8cfededc2ed4b" dependencies = [ "serde", "thiserror 2.0.21", @@ -1328,7 +1282,7 @@ dependencies = [ [[package]] name = "craft-ui" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=a499742a9389f47d10cdc61e4cdbf4e5f07f48cd#a499742a9389f47d10cdc61e4cdbf4e5f07f48cd" +source = "git+https://github.com/storytold/craft-libs?rev=64b181977a0488e4d1e167bc5cc8cfededc2ed4b#64b181977a0488e4d1e167bc5cc8cfededc2ed4b" dependencies = [ "craft-fonts-build", "craft-i18n", @@ -1349,7 +1303,7 @@ dependencies = [ [[package]] name = "craft-update" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=a499742a9389f47d10cdc61e4cdbf4e5f07f48cd#a499742a9389f47d10cdc61e4cdbf4e5f07f48cd" +source = "git+https://github.com/storytold/craft-libs?rev=64b181977a0488e4d1e167bc5cc8cfededc2ed4b#64b181977a0488e4d1e167bc5cc8cfededc2ed4b" dependencies = [ "chrono", "dunce", @@ -1376,7 +1330,7 @@ dependencies = [ [[package]] name = "craft-vectorcraft-format" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=a499742a9389f47d10cdc61e4cdbf4e5f07f48cd#a499742a9389f47d10cdc61e4cdbf4e5f07f48cd" +source = "git+https://github.com/storytold/craft-libs?rev=64b181977a0488e4d1e167bc5cc8cfededc2ed4b#64b181977a0488e4d1e167bc5cc8cfededc2ed4b" dependencies = [ "flate2", "serde", @@ -1387,7 +1341,7 @@ dependencies = [ [[package]] name = "craft-web-api" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=fd5e2feff6ea25bed371a99cc732b3968d621505#fd5e2feff6ea25bed371a99cc732b3968d621505" +source = "git+https://github.com/storytold/craft-libs?rev=64b181977a0488e4d1e167bc5cc8cfededc2ed4b#64b181977a0488e4d1e167bc5cc8cfededc2ed4b" dependencies = [ "js-sys", "serde_json", @@ -1398,7 +1352,7 @@ dependencies = [ [[package]] name = "craft-window" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=a499742a9389f47d10cdc61e4cdbf4e5f07f48cd#a499742a9389f47d10cdc61e4cdbf4e5f07f48cd" +source = "git+https://github.com/storytold/craft-libs?rev=64b181977a0488e4d1e167bc5cc8cfededc2ed4b#64b181977a0488e4d1e167bc5cc8cfededc2ed4b" dependencies = [ "egui", "objc2 0.6.5", @@ -1417,17 +1371,7 @@ dependencies = [ [[package]] name = "craft-xml" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=431f704478962677ec47e512754464d372901830#431f704478962677ec47e512754464d372901830" -dependencies = [ - "quick-xml 0.41.0", - "serde", - "thiserror 2.0.21", -] - -[[package]] -name = "craft-xml" -version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=a499742a9389f47d10cdc61e4cdbf4e5f07f48cd#a499742a9389f47d10cdc61e4cdbf4e5f07f48cd" +source = "git+https://github.com/storytold/craft-libs?rev=64b181977a0488e4d1e167bc5cc8cfededc2ed4b#64b181977a0488e4d1e167bc5cc8cfededc2ed4b" dependencies = [ "quick-xml 0.41.0", "serde", @@ -2534,7 +2478,7 @@ checksum = "9f4d0e94ddd48749f06bbe4e5389fb9799a0c45bcaf00495042076ef05e3241a" [[package]] name = "hayro-cmap" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=0cca4ac66f9f4576b3acc5f84d7a2a2ae9fb943e#0cca4ac66f9f4576b3acc5f84d7a2a2ae9fb943e" +source = "git+https://github.com/storytold/craft-libs?rev=64b181977a0488e4d1e167bc5cc8cfededc2ed4b#64b181977a0488e4d1e167bc5cc8cfededc2ed4b" dependencies = [ "brotli", "hayro-postscript", @@ -2543,7 +2487,7 @@ dependencies = [ [[package]] name = "hayro-interpret" version = "0.7.0" -source = "git+https://github.com/storytold/craft-libs?rev=0cca4ac66f9f4576b3acc5f84d7a2a2ae9fb943e#0cca4ac66f9f4576b3acc5f84d7a2a2ae9fb943e" +source = "git+https://github.com/storytold/craft-libs?rev=64b181977a0488e4d1e167bc5cc8cfededc2ed4b#64b181977a0488e4d1e167bc5cc8cfededc2ed4b" dependencies = [ "bitflags 2.13.2", "hayro-cmap", @@ -2561,7 +2505,7 @@ dependencies = [ [[package]] name = "hayro-jbig2" version = "0.3.0" -source = "git+https://github.com/storytold/craft-libs?rev=0cca4ac66f9f4576b3acc5f84d7a2a2ae9fb943e#0cca4ac66f9f4576b3acc5f84d7a2a2ae9fb943e" +source = "git+https://github.com/storytold/craft-libs?rev=64b181977a0488e4d1e167bc5cc8cfededc2ed4b#64b181977a0488e4d1e167bc5cc8cfededc2ed4b" dependencies = [ "fearless_simd", "hayro-ccitt", @@ -2579,12 +2523,12 @@ dependencies = [ [[package]] name = "hayro-postscript" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=0cca4ac66f9f4576b3acc5f84d7a2a2ae9fb943e#0cca4ac66f9f4576b3acc5f84d7a2a2ae9fb943e" +source = "git+https://github.com/storytold/craft-libs?rev=64b181977a0488e4d1e167bc5cc8cfededc2ed4b#64b181977a0488e4d1e167bc5cc8cfededc2ed4b" [[package]] name = "hayro-syntax" version = "0.7.2" -source = "git+https://github.com/storytold/craft-libs?rev=0cca4ac66f9f4576b3acc5f84d7a2a2ae9fb943e#0cca4ac66f9f4576b3acc5f84d7a2a2ae9fb943e" +source = "git+https://github.com/storytold/craft-libs?rev=64b181977a0488e4d1e167bc5cc8cfededc2ed4b#64b181977a0488e4d1e167bc5cc8cfededc2ed4b" dependencies = [ "flate2", "hayro-ccitt", @@ -3384,7 +3328,7 @@ dependencies = [ [[package]] name = "krilla" version = "0.8.2" -source = "git+https://github.com/storytold/craft-libs?rev=0cca4ac66f9f4576b3acc5f84d7a2a2ae9fb943e#0cca4ac66f9f4576b3acc5f84d7a2a2ae9fb943e" +source = "git+https://github.com/storytold/craft-libs?rev=64b181977a0488e4d1e167bc5cc8cfededc2ed4b#64b181977a0488e4d1e167bc5cc8cfededc2ed4b" dependencies = [ "base64 0.22.1", "bumpalo", @@ -3493,7 +3437,7 @@ checksum = "d4a5ff6bcca6c4867b1c4fd4ef63e4db7436ef363e0ad7531d1558856bae64f4" [[package]] name = "linesweeper" version = "0.5.0" -source = "git+https://github.com/storytold/craft-libs?rev=0cca4ac66f9f4576b3acc5f84d7a2a2ae9fb943e#0cca4ac66f9f4576b3acc5f84d7a2a2ae9fb943e" +source = "git+https://github.com/storytold/craft-libs?rev=64b181977a0488e4d1e167bc5cc8cfededc2ed4b#64b181977a0488e4d1e167bc5cc8cfededc2ed4b" dependencies = [ "arrayvec", "kurbo 0.13.1", @@ -6698,7 +6642,7 @@ name = "vectorcraft-affinity" version = "0.24.1" dependencies = [ "craft-affinity", - "craft-image-codecs 0.1.0 (git+https://github.com/storytold/craft-libs?rev=a499742a9389f47d10cdc61e4cdbf4e5f07f48cd)", + "craft-image-codecs", "crc32fast", "proptest", ] @@ -6727,7 +6671,7 @@ name = "vectorcraft-cad" version = "0.24.1" dependencies = [ "craft-dxf", - "craft-image-codecs 0.1.0 (git+https://github.com/storytold/craft-libs?rev=a499742a9389f47d10cdc61e4cdbf4e5f07f48cd)", + "craft-image-codecs", "craft-plotter", "image", "kurbo 0.13.1", @@ -6781,7 +6725,7 @@ name = "vectorcraft-doc" version = "0.24.1" dependencies = [ "chrono", - "craft-image-codecs 0.1.0 (git+https://github.com/storytold/craft-libs?rev=a499742a9389f47d10cdc61e4cdbf4e5f07f48cd)", + "craft-image-codecs", "craft-stream-codecs", "flate2", "image", @@ -6801,7 +6745,7 @@ dependencies = [ name = "vectorcraft-effects" version = "0.24.1" dependencies = [ - "craft-image-codecs 0.1.0 (git+https://github.com/storytold/craft-libs?rev=a499742a9389f47d10cdc61e4cdbf4e5f07f48cd)", + "craft-image-codecs", "craft-svg", "image", "kurbo 0.13.1", @@ -6825,11 +6769,11 @@ dependencies = [ "cfb", "chrono", "craft-docpath", - "craft-image-codecs 0.1.0 (git+https://github.com/storytold/craft-libs?rev=a499742a9389f47d10cdc61e4cdbf4e5f07f48cd)", + "craft-image-codecs", "craft-jxl", "craft-proof", "craft-stream-codecs", - "craft-xml 0.1.0 (git+https://github.com/storytold/craft-libs?rev=a499742a9389f47d10cdc61e4cdbf4e5f07f48cd)", + "craft-xml", "crc32fast", "flate2", "hayro-ccitt", @@ -6882,7 +6826,7 @@ name = "vectorcraft-eps" version = "0.24.1" dependencies = [ "craft-eps", - "craft-image-codecs 0.1.0 (git+https://github.com/storytold/craft-libs?rev=a499742a9389f47d10cdc61e4cdbf4e5f07f48cd)", + "craft-image-codecs", "craft-pdf", "craft-ps", "craft-stream-codecs", @@ -6962,7 +6906,7 @@ dependencies = [ name = "vectorcraft-mcp" version = "0.24.1" dependencies = [ - "craft-image-codecs 0.1.0 (git+https://github.com/storytold/craft-libs?rev=a499742a9389f47d10cdc61e4cdbf4e5f07f48cd)", + "craft-image-codecs", "image", "log", "proptest", @@ -6982,7 +6926,7 @@ dependencies = [ name = "vectorcraft-metafile" version = "0.24.1" dependencies = [ - "craft-image-codecs 0.1.0 (git+https://github.com/storytold/craft-libs?rev=a499742a9389f47d10cdc61e4cdbf4e5f07f48cd)", + "craft-image-codecs", "craft-metafile", "image", "kurbo 0.13.1", @@ -7023,10 +6967,10 @@ version = "0.24.1" dependencies = [ "aes", "chrono", - "craft-image-codecs 0.1.0 (git+https://github.com/storytold/craft-libs?rev=a499742a9389f47d10cdc61e4cdbf4e5f07f48cd)", + "craft-image-codecs", "craft-pdf", "craft-stream-codecs", - "craft-xml 0.1.0 (git+https://github.com/storytold/craft-libs?rev=a499742a9389f47d10cdc61e4cdbf4e5f07f48cd)", + "craft-xml", "flate2", "getrandom 0.4.3", "image", @@ -7057,7 +7001,7 @@ dependencies = [ name = "vectorcraft-plugins" version = "0.24.1" dependencies = [ - "craft-image-codecs 0.1.0 (git+https://github.com/storytold/craft-libs?rev=a499742a9389f47d10cdc61e4cdbf4e5f07f48cd)", + "craft-image-codecs", "craft-vectorcraft-format", "log", "serde", @@ -7077,10 +7021,10 @@ name = "vectorcraft-render" version = "0.24.1" dependencies = [ "craft-gif", - "craft-image-codecs 0.1.0 (git+https://github.com/storytold/craft-libs?rev=a499742a9389f47d10cdc61e4cdbf4e5f07f48cd)", + "craft-image-codecs", "craft-psd", "craft-stream-codecs", - "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=a499742a9389f47d10cdc61e4cdbf4e5f07f48cd)", + "craft-tiff", "flate2", "image", "jpeg-encoder", @@ -7116,7 +7060,7 @@ name = "vectorcraft-svg" version = "0.24.1" dependencies = [ "craft-docpath", - "craft-image-codecs 0.1.0 (git+https://github.com/storytold/craft-libs?rev=a499742a9389f47d10cdc61e4cdbf4e5f07f48cd)", + "craft-image-codecs", "craft-mime", "craft-svg", "data-url", @@ -7146,7 +7090,7 @@ dependencies = [ name = "vectorcraft-testkit" version = "0.24.1" dependencies = [ - "craft-image-codecs 0.1.0 (git+https://github.com/storytold/craft-libs?rev=a499742a9389f47d10cdc61e4cdbf4e5f07f48cd)", + "craft-image-codecs", "fax", "kurbo 0.13.1", "proptest", @@ -7164,6 +7108,7 @@ dependencies = [ name = "vectorcraft-text" version = "0.24.1" dependencies = [ + "craft-proof", "harfrust 0.13.3", "icu_segmenter", "kurbo 0.13.1", @@ -7172,6 +7117,7 @@ dependencies = [ "subsetter", "unicode-bidi", "unicode-general-category", + "unicode-normalization", "unicode-script", "unicode-segmentation", "vectorcraft-doc", @@ -7194,7 +7140,7 @@ dependencies = [ name = "vectorcraft-tools" version = "0.24.1" dependencies = [ - "craft-image-codecs 0.1.0 (git+https://github.com/storytold/craft-libs?rev=a499742a9389f47d10cdc61e4cdbf4e5f07f48cd)", + "craft-image-codecs", "kurbo 0.13.1", "serde", "serde_json", @@ -7211,7 +7157,7 @@ dependencies = [ name = "vectorcraft-trace" version = "0.24.1" dependencies = [ - "craft-image-codecs 0.1.0 (git+https://github.com/storytold/craft-libs?rev=a499742a9389f47d10cdc61e4cdbf4e5f07f48cd)", + "craft-image-codecs", "image", "kurbo 0.13.1", "serde", @@ -7226,7 +7172,7 @@ version = "0.24.1" dependencies = [ "bytemuck", "chrono", - "craft-image-codecs 0.1.0 (git+https://github.com/storytold/craft-libs?rev=a499742a9389f47d10cdc61e4cdbf4e5f07f48cd)", + "craft-image-codecs", "craft-keymap", "craft-ui", "craft-update", diff --git a/Cargo.toml b/Cargo.toml index 891cce208d..6d2ab9e37b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,40 +11,40 @@ rust-version = "1.95" repository = "https://github.com/storytold/vectorcraft" [workspace.dependencies] -craft-pdf = { git = "https://github.com/storytold/craft-libs", rev = "0cca4ac66f9f4576b3acc5f84d7a2a2ae9fb943e", default-features = false, features = ["interpret", "write"] } -craft-print = { git = "https://github.com/storytold/craft-libs", rev = "a499742a9389f47d10cdc61e4cdbf4e5f07f48cd" } -craft-docpath = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "a499742a9389f47d10cdc61e4cdbf4e5f07f48cd" } -craft-ui = { git = "https://github.com/storytold/craft-libs", rev = "a499742a9389f47d10cdc61e4cdbf4e5f07f48cd", features = ["serde"] } -craft-keymap = { git = "https://github.com/storytold/craft-libs", rev = "a499742a9389f47d10cdc61e4cdbf4e5f07f48cd" } -craft-proof = { git = "https://github.com/storytold/craft-libs", rev = "a499742a9389f47d10cdc61e4cdbf4e5f07f48cd" } +craft-pdf = { git = "https://github.com/storytold/craft-libs", rev = "64b181977a0488e4d1e167bc5cc8cfededc2ed4b", default-features = false, features = ["interpret", "write"] } +craft-print = { git = "https://github.com/storytold/craft-libs", rev = "64b181977a0488e4d1e167bc5cc8cfededc2ed4b" } +craft-docpath = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "64b181977a0488e4d1e167bc5cc8cfededc2ed4b" } +craft-ui = { git = "https://github.com/storytold/craft-libs", rev = "64b181977a0488e4d1e167bc5cc8cfededc2ed4b", features = ["serde"] } +craft-keymap = { git = "https://github.com/storytold/craft-libs", rev = "64b181977a0488e4d1e167bc5cc8cfededc2ed4b" } +craft-proof = { git = "https://github.com/storytold/craft-libs", rev = "64b181977a0488e4d1e167bc5cc8cfededc2ed4b" } # Decides who draws the window frame (desktop vs. app) so the suite shares one native titlebar per # desktop. The `egui` feature adds `craft_window::decorate`. (craft-libs#217.) -craft-window = { git = "https://github.com/storytold/craft-libs", rev = "a499742a9389f47d10cdc61e4cdbf4e5f07f48cd", features = ["egui"] } +craft-window = { git = "https://github.com/storytold/craft-libs", rev = "64b181977a0488e4d1e167bc5cc8cfededc2ed4b", features = ["egui"] } # The `.vectorcraft` envelope: its members, version, embedded images and the data after the JSON. -craft-vectorcraft-format = { git = "https://github.com/storytold/craft-libs", rev = "a499742a9389f47d10cdc61e4cdbf4e5f07f48cd" } -craft-gzip = { git = "https://github.com/storytold/craft-libs", rev = "a499742a9389f47d10cdc61e4cdbf4e5f07f48cd" } +craft-vectorcraft-format = { git = "https://github.com/storytold/craft-libs", rev = "64b181977a0488e4d1e167bc5cc8cfededc2ed4b" } +craft-gzip = { git = "https://github.com/storytold/craft-libs", rev = "64b181977a0488e4d1e167bc5cc8cfededc2ed4b" } # craft-update: app-specific pretend versions apply to startup and manual checks. # Native Affinity documents (craft-libs#914). -craft-affinity = { git = "https://github.com/storytold/craft-libs", rev = "a499742a9389f47d10cdc61e4cdbf4e5f07f48cd" } +craft-affinity = { git = "https://github.com/storytold/craft-libs", rev = "64b181977a0488e4d1e167bc5cc8cfededc2ed4b" } # SVG parsing, limits, SVGZ and writer (craft-libs#778). -craft-svg = { git = "https://github.com/storytold/craft-libs", rev = "431f704478962677ec47e512754464d372901830", features = ["tree"] } -craft-mime = { git = "https://github.com/storytold/craft-libs", rev = "a499742a9389f47d10cdc61e4cdbf4e5f07f48cd" } +craft-svg = { git = "https://github.com/storytold/craft-libs", rev = "64b181977a0488e4d1e167bc5cc8cfededc2ed4b", features = ["tree"] } +craft-mime = { git = "https://github.com/storytold/craft-libs", rev = "64b181977a0488e4d1e167bc5cc8cfededc2ed4b" } # EPS container, previews, ASCII85 and DSC comments (craft-libs#778). -craft-eps = { git = "https://github.com/storytold/craft-libs", rev = "a499742a9389f47d10cdc61e4cdbf4e5f07f48cd" } +craft-eps = { git = "https://github.com/storytold/craft-libs", rev = "64b181977a0488e4d1e167bc5cc8cfededc2ed4b" } # DXF tags, reader and writer (craft-libs#778, #926, #927). -craft-plotter = { git = "https://github.com/storytold/craft-libs", rev = "9101c4fc226f5f111b5a890a6c5c19bf3991fd76" } -craft-dxf = { git = "https://github.com/storytold/craft-libs", rev = "a499742a9389f47d10cdc61e4cdbf4e5f07f48cd" } +craft-plotter = { git = "https://github.com/storytold/craft-libs", rev = "a7fb55eaf9a15c21e8ce0b13cf605dc54fd15f57" } +craft-dxf = { git = "https://github.com/storytold/craft-libs", rev = "64b181977a0488e4d1e167bc5cc8cfededc2ed4b" } # WMF, EMF and EMF+ reader (craft-libs#778). -craft-metafile = { git = "https://github.com/storytold/craft-libs", rev = "a499742a9389f47d10cdc61e4cdbf4e5f07f48cd" } -craft-xml = { git = "https://github.com/storytold/craft-libs", rev = "a499742a9389f47d10cdc61e4cdbf4e5f07f48cd" } -craft-image-codecs = { git = "https://github.com/storytold/craft-libs", rev = "a499742a9389f47d10cdc61e4cdbf4e5f07f48cd" } -craft-gif = { git = "https://github.com/storytold/craft-libs", rev = "a499742a9389f47d10cdc61e4cdbf4e5f07f48cd" } -craft-tiff = { git = "https://github.com/storytold/craft-libs", rev = "a499742a9389f47d10cdc61e4cdbf4e5f07f48cd" } -craft-ps = { git = "https://github.com/storytold/craft-libs", rev = "a80c0f25f1c4767374a27a444fbf95e3e8162e14", default-features = false, features = ["write"] } -craft-psd = { git = "https://github.com/storytold/craft-libs", rev = "a499742a9389f47d10cdc61e4cdbf4e5f07f48cd" } -craft-stream-codecs = { git = "https://github.com/storytold/craft-libs", rev = "0cca4ac66f9f4576b3acc5f84d7a2a2ae9fb943e" } -craft-jxl = { git = "https://github.com/storytold/craft-libs", rev = "a499742a9389f47d10cdc61e4cdbf4e5f07f48cd" } -craft-update = { git = "https://github.com/storytold/craft-libs", version = "=0.1.0", rev = "a499742a9389f47d10cdc61e4cdbf4e5f07f48cd", features = ["egui"] } +craft-metafile = { git = "https://github.com/storytold/craft-libs", rev = "64b181977a0488e4d1e167bc5cc8cfededc2ed4b" } +craft-xml = { git = "https://github.com/storytold/craft-libs", rev = "64b181977a0488e4d1e167bc5cc8cfededc2ed4b" } +craft-image-codecs = { git = "https://github.com/storytold/craft-libs", rev = "64b181977a0488e4d1e167bc5cc8cfededc2ed4b" } +craft-gif = { git = "https://github.com/storytold/craft-libs", rev = "64b181977a0488e4d1e167bc5cc8cfededc2ed4b" } +craft-tiff = { git = "https://github.com/storytold/craft-libs", rev = "64b181977a0488e4d1e167bc5cc8cfededc2ed4b" } +craft-ps = { git = "https://github.com/storytold/craft-libs", rev = "64b181977a0488e4d1e167bc5cc8cfededc2ed4b", default-features = false, features = ["write"] } +craft-psd = { git = "https://github.com/storytold/craft-libs", rev = "64b181977a0488e4d1e167bc5cc8cfededc2ed4b" } +craft-stream-codecs = { git = "https://github.com/storytold/craft-libs", rev = "64b181977a0488e4d1e167bc5cc8cfededc2ed4b" } +craft-jxl = { git = "https://github.com/storytold/craft-libs", rev = "64b181977a0488e4d1e167bc5cc8cfededc2ed4b" } +craft-update = { git = "https://github.com/storytold/craft-libs", version = "=0.1.0", rev = "64b181977a0488e4d1e167bc5cc8cfededc2ed4b", features = ["egui"] } # internal vectorcraft-geom = { path = "crates/geom" } vectorcraft-color = { path = "crates/color" } @@ -184,13 +184,13 @@ lto = "thin" codegen-units = 1 [patch.crates-io] -hayro-syntax = { git = "https://github.com/storytold/craft-libs", rev = "0cca4ac66f9f4576b3acc5f84d7a2a2ae9fb943e" } -hayro-interpret = { git = "https://github.com/storytold/craft-libs", rev = "0cca4ac66f9f4576b3acc5f84d7a2a2ae9fb943e" } -hayro-jbig2 = { git = "https://github.com/storytold/craft-libs", rev = "0cca4ac66f9f4576b3acc5f84d7a2a2ae9fb943e" } -hayro-cmap = { git = "https://github.com/storytold/craft-libs", rev = "0cca4ac66f9f4576b3acc5f84d7a2a2ae9fb943e" } -hayro-postscript = { git = "https://github.com/storytold/craft-libs", rev = "0cca4ac66f9f4576b3acc5f84d7a2a2ae9fb943e" } -krilla = { git = "https://github.com/storytold/craft-libs", rev = "0cca4ac66f9f4576b3acc5f84d7a2a2ae9fb943e" } -linesweeper = { git = "https://github.com/storytold/craft-libs", rev = "0cca4ac66f9f4576b3acc5f84d7a2a2ae9fb943e" } +hayro-syntax = { git = "https://github.com/storytold/craft-libs", rev = "64b181977a0488e4d1e167bc5cc8cfededc2ed4b" } +hayro-interpret = { git = "https://github.com/storytold/craft-libs", rev = "64b181977a0488e4d1e167bc5cc8cfededc2ed4b" } +hayro-jbig2 = { git = "https://github.com/storytold/craft-libs", rev = "64b181977a0488e4d1e167bc5cc8cfededc2ed4b" } +hayro-cmap = { git = "https://github.com/storytold/craft-libs", rev = "64b181977a0488e4d1e167bc5cc8cfededc2ed4b" } +hayro-postscript = { git = "https://github.com/storytold/craft-libs", rev = "64b181977a0488e4d1e167bc5cc8cfededc2ed4b" } +krilla = { git = "https://github.com/storytold/craft-libs", rev = "64b181977a0488e4d1e167bc5cc8cfededc2ed4b" } +linesweeper = { git = "https://github.com/storytold/craft-libs", rev = "64b181977a0488e4d1e167bc5cc8cfededc2ed4b" } ecolor = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" } emath = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" } epaint = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" } diff --git a/apps/vectorcraft-web/Cargo.toml b/apps/vectorcraft-web/Cargo.toml index eb35a110c7..f86996f075 100644 --- a/apps/vectorcraft-web/Cargo.toml +++ b/apps/vectorcraft-web/Cargo.toml @@ -17,7 +17,7 @@ path = "src/main.rs" vectorcraft-engine = { workspace = true, features = ["bundled-fonts", "heif"] } vectorcraft-ui-egui = { workspace = true } # The page command API (storytold/craft-libs#413): the request plumbing behind window.vectorcraft. -craft-web-api = { git = "https://github.com/storytold/craft-libs", rev = "fd5e2feff6ea25bed371a99cc732b3968d621505", version = "0.1.0" } +craft-web-api = { git = "https://github.com/storytold/craft-libs", rev = "64b181977a0488e4d1e167bc5cc8cfededc2ed4b", version = "0.1.0" } vectorcraft-format = { workspace = true } vectorcraft-text = { workspace = true } egui = { workspace = true } diff --git a/apps/vectorcraft/src/main.rs b/apps/vectorcraft/src/main.rs index adc52f9d8c..4f8e326981 100644 --- a/apps/vectorcraft/src/main.rs +++ b/apps/vectorcraft/src/main.rs @@ -591,14 +591,15 @@ fn main() -> std::process::ExitCode { created.created(&cc.egui_ctx); if !gpu::skipped().is_empty() { // A processor chosen in Settings can be the one that can't show the window. - let hint = if chosen_gpu { - " (Settings › Performance › Graphics Processor › Automatic uses the one that drives your display)" + if chosen_gpu { + app.status(format!( + "The graphics processor tried first couldn't show the window, so VectorCraft started again on {summary} (Settings › Performance › Graphics Processor › Automatic uses the one that drives your display)" + )); } else { - "" - }; - app.status(format!( - "The graphics processor tried first couldn't show the window, so VectorCraft started again on {summary}{hint}" - )); + app.status(format!( + "The graphics processor tried first couldn't show the window, so VectorCraft started again on {summary}" + )); + } } else if let Some(crash) = &crash { app.status(match crash { gpu::Crash::Adapter { name, .. } => format!( diff --git a/apps/vectorcraft/src/presentation.rs b/apps/vectorcraft/src/presentation.rs index 3910984c93..7c2f1dc48a 100644 --- a/apps/vectorcraft/src/presentation.rs +++ b/apps/vectorcraft/src/presentation.rs @@ -54,6 +54,7 @@ fn flag_value(flag: &str, arg: &str, args: &mut impl Iterator) -> impl Overrides { /// Whether a flag or a variable set the present mode or the frame latency. + #[cfg_attr(target_os = "macos", allow(dead_code))] // its one caller, in `main`, is not built on macOS pub fn is_set(&self) -> bool { *self != Self::default() } diff --git a/apps/vectorcraft/src/printing.rs b/apps/vectorcraft/src/printing.rs index 74e05e698f..db3518c26e 100644 --- a/apps/vectorcraft/src/printing.rs +++ b/apps/vectorcraft/src/printing.rs @@ -9,9 +9,8 @@ impl PrintService for SystemPrint { system::printers() } fn print(&mut self, job: &PrintJob) -> Result { - let result = system::print(job); - let to = job.printer.unwrap_or("the default printer"); - result.map(|note| format!("Sent “{}” to {to}{note}", job.title)) + let note = system::print(job)?; + Ok(sent(job.title, job.printer, ¬e)) } fn shared_print(&self) -> Option { Some(std::sync::Arc::new(|job| SystemPrint.print(job))) @@ -29,6 +28,15 @@ impl PrintService for SystemPrint { } } +/// The status after the job `title` went to `printer` (the default one without a name), with the +/// spooler's `note` when it gave one. Each message has text between its values, so a catalog can +/// match it and translate it. The note follows as its own sentence: a printer name can end in +/// parentheses ("HP LaserJet (Copy 1)"), and a note in parentheses would match that name. +fn sent(title: &str, printer: Option<&str>, note: &str) -> String { + let to = printer.unwrap_or("the default printer"); + if note.is_empty() { format!("Sent “{title}” to {to}") } else { format!("Sent “{title}” to {to}. The spooler replied: {note}") } +} + mod system { use super::{Command, PrintJob, Printer}; pub fn printers() -> Vec { @@ -38,7 +46,7 @@ mod system { // Copies, layout, marks and colour management are already in the PDF. Preserve its // physical sheet size and the queue's duplex default without printing copies twice. let settings = craft_print::Job { printer: job.printer.map(str::to_string), title: job.title.into(), ..Default::default() }; - craft_print::submit(job.pdf, &settings).map(|note| if note.is_empty() { note } else { format!(" ({note})") }).map_err(|e| e.to_string()) + craft_print::submit(job.pdf, &settings).map_err(|e| e.to_string()) } #[cfg(windows)] pub(crate) fn setup_command(printer: Option<&str>, default_printer: Option<&str>) -> Command { @@ -127,9 +135,28 @@ mod tests { #[cfg(test)] mod turn_tests { - use super::SystemPrint; + use super::{SystemPrint, sent}; use vectorcraft_ui_egui::print::PrintService; + #[test] + fn the_sent_status_names_the_job_the_printer_and_the_note() { + assert_eq!(sent("Poster", None, ""), "Sent “Poster” to the default printer"); + assert_eq!(sent("Poster", Some("Office Laser"), ""), "Sent “Poster” to Office Laser"); + assert_eq!(sent("Poster", Some("Office Laser"), "job 12"), "Sent “Poster” to Office Laser. The spooler replied: job 12"); + } + + #[test] + fn a_printer_name_ending_in_parentheses_stays_whole_in_a_translation() { + use vectorcraft_ui_egui::i18n::{Lang, message}; + let Some(de) = Lang::from_code("de") else { panic!("no German catalog") }; + let printer = Some("HP LaserJet (Copy 1)"); + assert_eq!(message(de, &sent("Poster", printer, "")), "“Poster” an HP LaserJet (Copy 1) gesendet"); + assert_eq!( + message(de, &sent("Poster", printer, "job 12")), + "“Poster” an HP LaserJet (Copy 1) gesendet. Antwort der Druckwarteschlange: job 12" + ); + } + #[test] fn only_macos_queues_need_landscape_pages_turned() { assert_eq!(SystemPrint.turns_landscape(), !cfg!(target_os = "macos")); diff --git a/apps/vectorcraft/src/window.rs b/apps/vectorcraft/src/window.rs index c969e52262..ea10fecad0 100644 --- a/apps/vectorcraft/src/window.rs +++ b/apps/vectorcraft/src/window.rs @@ -78,7 +78,7 @@ impl Monitor { let scale = self.scale * zoom; let [x, y] = self.pos; let [w, h] = self.size; - DockMonitor { name, rect: [x, y, w, h].map(|v| v as f32 / scale), scale } + DockMonitor { name, rect: [x, y, w, h].map(|v| v as f32 / scale), scale, work_area: None } } } @@ -248,13 +248,13 @@ mod tests { fn floating_panels_get_monitors_in_the_points_a_window_on_them_reports() { let dock = |m: Monitor, zoom| m.docking(Some("m".into()), zoom); let plain = dock(monitor(1920, 0, 1920, 1080, 1.0), 1.0); - assert_eq!(plain, DockMonitor { name: Some("m".into()), rect: [1920.0, 0.0, 1920.0, 1080.0], scale: 1.0 }); + assert_eq!(plain, DockMonitor { name: Some("m".into()), rect: [1920.0, 0.0, 1920.0, 1080.0], scale: 1.0, work_area: None }); // A window at (3000, 200) on this monitor reports (1500, 100). let scaled = dock(monitor(1920, -200, 3840, 2160, 2.0), 1.0); - assert_eq!(scaled, DockMonitor { name: Some("m".into()), rect: [960.0, -100.0, 1920.0, 1080.0], scale: 2.0 }); + assert_eq!(scaled, DockMonitor { name: Some("m".into()), rect: [960.0, -100.0, 1920.0, 1080.0], scale: 2.0, work_area: None }); // The UI zoom divides what egui reports as well. let zoomed = dock(monitor(-2560, 0, 2560, 1440, 1.0), 1.25); - assert_eq!(zoomed, DockMonitor { name: Some("m".into()), rect: [-2048.0, 0.0, 2048.0, 1152.0], scale: 1.25 }); + assert_eq!(zoomed, DockMonitor { name: Some("m".into()), rect: [-2048.0, 0.0, 2048.0, 1152.0], scale: 1.25, work_area: None }); } #[test] diff --git a/crates/color/src/harmony.rs b/crates/color/src/harmony.rs index 8bdff7103d..2cca6e264d 100644 --- a/crates/color/src/harmony.rs +++ b/crates/color/src/harmony.rs @@ -294,13 +294,19 @@ impl GuideOptions { } } +/// The share of the way to its target (black or white, cool or warm, gray or full color) that the +/// variation at `step` goes: 0 at the center, the options' reach at the outermost steps. +pub fn step_fraction(opts: &GuideOptions, step: i32) -> f32 { + (step.unsigned_abs() as f32 / opts.steps.max(1) as f32).min(1.0) * opts.reach() +} + /// Variation of `c` at `step` (−steps..=steps: negative towards shades/cool/muted, positive towards /// tints/warm/vivid; 0 is `c` itself), in `c`'s model. pub fn variation(c: Color, opts: &GuideOptions, step: i32) -> Color { if step == 0 { return c; } - let f = (step.unsigned_abs() as f32 / opts.steps.max(1) as f32).min(1.0) * opts.reach(); + let f = step_fraction(opts, step); let v = match opts.variation { Variation::TintsShades => c.lerp(if step < 0 { &Color::BLACK } else { &Color::WHITE }, f), Variation::WarmCool => { diff --git a/crates/doc/Cargo.toml b/crates/doc/Cargo.toml index a7d2850a1e..1280e7d998 100644 --- a/crates/doc/Cargo.toml +++ b/crates/doc/Cargo.toml @@ -11,6 +11,8 @@ workspace = true [features] # `vectorcraft_doc::blend::spines_built` for other crates' tests (dev-dependencies only). spine-count = [] +# `vectorcraft_doc::symbols_read` for other crates' tests (dev-dependencies only). +symbol-read-count = [] [dependencies] vectorcraft-geom = { workspace = true } diff --git a/crates/doc/src/blend.rs b/crates/doc/src/blend.rs index c7c3e408b4..f8b62ac815 100644 --- a/crates/doc/src/blend.rs +++ b/crates/doc/src/blend.rs @@ -2174,6 +2174,70 @@ pub fn blend_steps(keys: &[Arc], spec: &BlendSpec) -> Vec { StepCount::default().blend(keys, spec, Rail::new(keys, spec).as_ref()).0 } +/// Does each pair of `keys` blended with `spec` ask for the same number of steps +/// ([`blend_step_count`]) when each coordinate it counts from moves by up to `length` points and, +/// for Smooth Color, the difference between keys of different colors by up to `color` (0 to 1)? +/// False when a count sits that close to where it changes, and for Smooth Color by distance when +/// the keys are at most `4 × length` wide or high. Specified Steps always asks for the same number. +pub fn blend_steps_settled(keys: &[Arc], spec: &BlendSpec, length: f64, color: f64) -> bool { + let rail = Rail::new(keys, spec); + keys.windows(2).enumerate().all(|(i, w)| { + let [a, b] = w else { return true }; + match spec.spacing { + BlendSpacing::Steps(_) => true, + // The count is `len / d` rounded, which grows with `len`. + BlendSpacing::Distance(d) => { + let len = rail.as_ref().map_or_else(|| center_of(a).distance(center_of(b)), |r| r.len(i)); + let count = |len: f64| blend_step_count(a, b, BlendSpacing::Distance(d), len); + count(len - length) == count(len + length) + } + BlendSpacing::SmoothColor => smooth_color_settled(a, b, length, color), + } + }) +} + +/// [`blend_steps_settled`] for one pair of Smooth Color keys. Each count [`blend_step_count`] +/// takes grows with what it counts from (the color difference, the keys' reach, the distance +/// between their edges in key sizes), so the pair is settled when the least and the most of +/// these ask for the same count. +fn smooth_color_settled(a: &Node, b: &Node, length: f64, color: f64) -> bool { + let bounds = a.visual_bounds().zip(b.visual_bounds()); + let by_level = |d: f64| level_steps(d.max(0.0)) as usize; + match (color_distance(a, b), bounds) { + // Colors that differ, but by too little to count, or by little more: moving them may cross + // where they stop counting as the same. (The same colors stay the same.) + (Some(d), _) if d > 0.0 && d * 255.0 <= 1e-3 + color * 255.0 => false, + (Some(d), Some((ba, bb))) if d * 255.0 > 1e-3 => { + let (ca, cb) = (ba.center(), bb.center()); + let reach = + [(ca.x - cb.x).abs(), (ca.y - cb.y).abs(), ba.width(), ba.height(), bb.width(), bb.height()].into_iter().fold(0.0f64, f64::max); + // The centers and sizes move by up to twice `length`. + let by_density = |r: f64| (8.0 * r.max(0.0) + 0.5).floor().clamp(1.0, 254.0) as usize; + let least = by_level(d - color).min(by_density(reach - 2.0 * length)); + let most = by_level(d + color).min(by_density(reach + 2.0 * length)); + reach.is_finite() && least == most + } + (Some(d), None) if d * 255.0 > 1e-3 => by_level(d - color) == by_level(d + color), + (_, Some((ba, bb))) => { + let (w, h) = ((ba.width() + bb.width()) / 2.0, (ba.height() + bb.height()) / 2.0); + if w <= 4.0 * length || h <= 4.0 * length { + return false; + } + let dx = (ba.x0 - bb.x0).abs().max((ba.x1 - bb.x1).abs()); + let dy = (ba.y0 - bb.y0).abs().max((ba.y1 - bb.y1).abs()); + // Each edge moves by up to `length`: the distances between them by up to twice that, + // and the mean sizes too. + let q = |dx: f64, dy: f64, w: f64, h: f64| (dx.max(0.0) / w).max(dy.max(0.0) / h); + let count = |q: f64| ((q + 0.5).floor() - 1.0).clamp(1.0, 1000.0) as usize; + let m = 2.0 * length; + let least = q(dx - m, dy - m, w + m, h + m); + let most = q(dx + m, dy + m, w - m, h - m); + least.is_finite() && most.is_finite() && count(least) == count(most) + } + (_, None) => true, + } +} + /// Evaluate a blend: the keys and generated steps in paint order. The steps keep to /// [`MAX_BLEND_STEPS`] in all ([`blend_steps`]). pub fn blend_expand(keys: &[Arc], spec: &BlendSpec) -> Vec { @@ -3535,4 +3599,46 @@ mod tests { let (keys, spec) = blend_parts(&outer).unwrap(); assert_eq!(blend_steps(keys, spec), vec![99]); } + + /// A count is settled when moving the lengths by 0.01 pt and the colors by 0.001 can't change + /// it: Specified Steps always; Specified Distance unless the spine's length is a half step from + /// where its count changes; Smooth Color unless the colors differ by too little to count, the + /// color difference or the keys' reach sits where its count changes, or keys of the same color + /// are at most four times 0.01 pt wide. + #[test] + fn steps_settle_unless_rounding_can_change_their_count() { + let (length, color) = (0.01, 0.001); + let settled = |a: Node, b: Node, spacing: BlendSpacing| { + let spec = BlendSpec { spacing, ..Default::default() }; + blend_steps_settled(&[Arc::new(a), Arc::new(b)], &spec, length, color) + }; + let filled = |x: f64, size: f64, c: Color| smooth_key((x, 0.0), (size, size), Paint::solid(c), Paint::None, 0.0); + let gray = |x: f64| filled(x, 10.0, Color::rgb(0.5, 0.5, 0.5)); + + // The keys' centers are 100 pt apart: 100 / 25 is 4, and 100 / (100 / 3.5) is 3.5. + assert!(settled(gray(0.0), gray(100.0), BlendSpacing::Steps(3))); + assert!(settled(gray(0.0), gray(100.0), BlendSpacing::Distance(25.0))); + assert!(!settled(gray(0.0), gray(100.0), BlendSpacing::Distance(100.0 / 3.5))); + + // Smooth Color between colors that differ: by a 2,000th of a step, by 51 steps of 255 + // (settled) and by 51.5 (where the count changes). + let red = |x: f64, r: f32| filled(x, 10.0, Color::rgb(r, 0.0, 0.0)); + assert!(!settled(red(0.0, 0.0), red(100.0, 0.0005), BlendSpacing::SmoothColor)); + assert!(settled(red(0.0, 0.0), red(100.0, 51.0 / 255.0), BlendSpacing::SmoothColor)); + assert!(!settled(red(0.0, 0.0), red(100.0, 51.5 / 255.0), BlendSpacing::SmoothColor)); + // Black to white is counted by the keys' reach, eight steps a point: 10 pt is settled, + // 10.0625 pt (80.5 steps) is not. + let near = |size: f64| settled(filled(0.0, size, Color::BLACK), filled(5.0, size, Color::WHITE), BlendSpacing::SmoothColor); + assert!(near(10.0)); + assert!(!near(10.0625)); + // Keys without bounds are counted by their colors alone. + let bare = |r: f32| Node::path(NodeId(1), PathData::default(), Appearance::basic(Paint::solid(Color::rgb(r, 0.0, 0.0)), Paint::None, 0.0)); + assert!(settled(bare(0.0), bare(51.0 / 255.0), BlendSpacing::SmoothColor)); + assert!(!settled(bare(0.0), bare(51.5 / 255.0), BlendSpacing::SmoothColor)); + // Keys of the same color are counted by distance in key sizes; keys 0.04 pt wide or less + // are never settled. + assert!(settled(gray(0.0), gray(100.0), BlendSpacing::SmoothColor)); + assert!(!settled(filled(0.0, 0.04, Color::rgb(0.5, 0.5, 0.5)), filled(100.0, 0.04, Color::rgb(0.5, 0.5, 0.5)), BlendSpacing::SmoothColor)); + assert!(settled(filled(0.0, 0.05, Color::rgb(0.5, 0.5, 0.5)), filled(100.0, 0.05, Color::rgb(0.5, 0.5, 0.5)), BlendSpacing::SmoothColor)); + } } diff --git a/crates/doc/src/lib.rs b/crates/doc/src/lib.rs index 11711b3f1d..7f26dc9a50 100644 --- a/crates/doc/src/lib.rs +++ b/crates/doc/src/lib.rs @@ -75,6 +75,9 @@ pub mod style_libs; pub mod swatches; mod symbols; pub use symbols::SymbolBoxes; +#[cfg(any(test, feature = "symbol-read-count"))] +#[doc(hidden)] +pub use symbols::symbols_read; pub mod text; pub mod trace; pub mod twist; diff --git a/crates/doc/src/live.rs b/crates/doc/src/live.rs index 6b16973cf1..28fd1dc632 100644 --- a/crates/doc/src/live.rs +++ b/crates/doc/src/live.rs @@ -65,7 +65,9 @@ pub use expand::{ #[cfg(test)] use mesh::grid_eval; pub use mesh::{Coons, GradientMesh, MeshAppearance, MeshPiece, MeshPoint, MeshQuad, default_fidelity, grid_points, nodes_bounds}; -pub use warp::{WARP_NET, WarpNet, WarpStyle, fit_piece, map_nonlinear, map_nonlinear_within, pieces, uses_net, warp_point, warp_version}; +pub use warp::{ + WARP_NET, WarpNet, WarpStyle, fit_piece, map_nonlinear, map_nonlinear_within, map_smooth_within, pieces, uses_net, warp_point, warp_version, +}; #[cfg(test)] mod tests { @@ -88,6 +90,30 @@ mod tests { } } + /// The smooth map takes each handle along the map's derivative, also far from the origin, + /// where a fixed sampling step would round away (#7069): the identity map keeps a curve's + /// handles there. + #[test] + fn map_smooth_within_keeps_handles_far_from_the_origin() { + for at in [0.0, 1e13] { + let o = Point::new(at, at); + let curve = PathData::single(vectorcraft_geom::SubPath::new( + vec![ + vectorcraft_geom::Anchor::with_handles(o, o, o + vectorcraft_geom::Vec2::new(0.2, 0.0)), + vectorcraft_geom::Anchor::with_handles( + o + vectorcraft_geom::Vec2::new(1.0, 0.5), + o + vectorcraft_geom::Vec2::new(0.8, 0.5), + o + vectorcraft_geom::Vec2::new(1.0, 0.5), + ), + ], + false, + )); + let out = map_smooth_within(&curve, 10.0, usize::MAX, |p| p); + let (a, b) = (&curve.subpaths[0].anchors, &out.subpaths[0].anchors); + assert!(a[0].h_out.distance(b[0].h_out) < 0.01 && a[1].h_in.distance(b[1].h_in) < 0.01, "at {at}: {:?} {:?}", b[0].h_out, b[1].h_in); + } + } + /// #3578: a non-linear map within an anchor budget splits its segments into longer pieces, /// down to one a segment, and matches the plain map where the budget leaves room. #[test] diff --git a/crates/doc/src/live/warp.rs b/crates/doc/src/live/warp.rs index 08bef91140..dd48e8ef65 100644 --- a/crates/doc/src/live/warp.rs +++ b/crates/doc/src/live/warp.rs @@ -497,6 +497,37 @@ pub fn map_nonlinear(path: &PathData, max_piece: f64, f: impl Fn(Point) -> Point /// where pieces of `max_piece` would make more, the pieces grow until they don't ([`fit_piece`]), /// a coarser approximation of the image curve. Geometry effects map within their anchor budget. pub fn map_nonlinear_within(path: &PathData, max_piece: f64, max: usize, f: impl Fn(Point) -> Point) -> PathData { + map_pieces_within(path, max_piece, max, &f, |_, h| f(h)) +} + +/// [`map_nonlinear_within`] with each handle mapped along `f`'s derivative at its point +/// ([`mapped_handle`]) rather than as a point of its own: where `f` turns quickly (Twist), handles +/// mapped as points point different ways on the two sides of a join and the curve kinks there +/// (#7069); along the derivative, the pieces on both sides leave each join in one direction. +pub fn map_smooth_within(path: &PathData, max_piece: f64, max: usize, f: impl Fn(Point) -> Point) -> PathData { + map_pieces_within(path, max_piece, max, &f, |p, h| mapped_handle(&f, p, h)) +} + +/// Handle `h` of point `p` mapped through `f`: `f(p)` plus `f`'s derivative at `p` along `h - p` +/// (a central difference), so the image curve leaves `f(p)` the way `f` takes the curve. +fn mapped_handle(f: &impl Fn(Point) -> Point, p: Point, h: Point) -> Point { + let v = h - p; + let len = v.hypot(); + // A retracted handle stays retracted, and a non-finite one has no direction to follow. + if len.is_nan() || len <= 0.0 || len.is_infinite() { + return f(p); + } + // A thousandth of the handle, or more where the coordinates are so large that so short a + // step would round away (#7069): the samples stay a billionth of the coordinates apart, and + // at most at the handle's own end. + let size = p.x.abs().max(p.y.abs()).max(1.0); + let step = (1e-3f64).max(size * 1e-9 / len).min(1.0); + let d = (f(p + v * step) - f(p - v * step)) / (2.0 * step); + f(p) + d +} + +/// [`map_nonlinear_within`]'s pieces, with `handle(point, handle)` giving each mapped handle. +fn map_pieces_within(path: &PathData, max_piece: f64, max: usize, f: &impl Fn(Point) -> Point, handle: impl Fn(Point, Point) -> Point) -> PathData { let mut max_piece = max_piece.max(1e-3); // Each segment adds one anchor per piece past its first. let room = max.saturating_sub(path.anchor_count()); @@ -516,20 +547,20 @@ pub fn map_nonlinear_within(path: &PathData, max_piece: f64, max: usize, f: impl let mut pending_in: Option = None; for i in 0..n { let a = &sp.anchors[i]; - let h_in = pending_in.take().unwrap_or_else(|| f(a.h_in)); - res.push(Anchor { p: f(a.p), h_in, h_out: f(a.h_out), kind: a.kind }); + let h_in = pending_in.take().unwrap_or_else(|| handle(a.p, a.h_in)); + res.push(Anchor { p: f(a.p), h_in, h_out: handle(a.p, a.h_out), kind: a.kind }); if i < segs { let c = seg_cubic(sp, i); let k = pieces(poly_len(&c), max_piece, MAX_PIECES); for j in 0..k { let sub = c.subsegment((j as f64 / k as f64)..((j + 1) as f64 / k as f64)); if let Some(last) = res.last_mut() { - last.h_out = f(sub.p1); + last.h_out = handle(sub.p0, sub.p1); } if j + 1 < k { - res.push(Anchor { p: f(sub.p3), h_in: f(sub.p2), h_out: f(sub.p3), kind: Default::default() }); + res.push(Anchor { p: f(sub.p3), h_in: handle(sub.p3, sub.p2), h_out: f(sub.p3), kind: Default::default() }); } else { - pending_in = Some(f(sub.p2)); + pending_in = Some(handle(sub.p3, sub.p2)); } } } diff --git a/crates/doc/src/selection.rs b/crates/doc/src/selection.rs index e97a4b0cc1..7fb533769d 100644 --- a/crates/doc/src/selection.rs +++ b/crates/doc/src/selection.rs @@ -183,23 +183,69 @@ impl Selection { self.key_anchor = None; } } + /// [`Self::add`] for each of `ids` in order, going through the selected objects once. + pub fn add_all(&mut self, ids: impl IntoIterator) { + self.each(ids, false); + } + /// [`Self::toggle`] for each of `ids` in order, going through the selected objects once. An id + /// listed twice is removed and then added again at the end. + pub fn toggle_all(&mut self, ids: impl IntoIterator) { + self.each(ids, true); + } + /// [`Self::add_all`], or [`Self::toggle_all`] when `toggle` is set. Each selected object slot + /// carries the number of the activation that made it; an id's slots are kept only when they + /// carry its current activation, so a removal drops every slot of the id at once. + fn each(&mut self, ids: impl IntoIterator, toggle: bool) { + use std::collections::hash_map::{Entry, HashMap}; + let mut ids = ids.into_iter().peekable(); + if ids.peek().is_none() { + return; + } + self.target = None; + self.slices.clear(); + self.symbol_part = None; + self.on_path_member = None; + let mut live: HashMap = self.objects.iter().map(|id| (*id, 0)).collect(); + let mut added: Vec<(NodeId, usize)> = Vec::new(); + let mut removed = false; + for id in ids { + match live.entry(id) { + Entry::Vacant(e) => { + let activation = added.len() + 1; + e.insert(activation); + added.push((id, activation)); + } + Entry::Occupied(e) if toggle => { + e.remove(); + removed = true; + self.anchors.remove(&id); + self.segments.remove(&id); + if self.key == Some(id) { + self.key = None; + } + if self.key_anchor.is_some_and(|(k, _)| k == id) { + self.key_anchor = None; + } + } + Entry::Occupied(_) => {} + } + } + if removed { + self.objects.retain(|id| live.get(id) == Some(&0)); + } + self.objects.extend(added.into_iter().filter(|(id, n)| live.get(id) == Some(n)).map(|(id, _)| id)); + } /// Select slices `ids` (see [`Selection::slices`]) and nothing else. pub fn set_slices(&mut self, ids: impl IntoIterator) { self.clear(); - for id in ids { - if !self.slices.contains(&id) { - self.slices.push(id); - } - } + let mut seen = HashSet::new(); + self.slices.extend(ids.into_iter().filter(|id| seen.insert(*id))); } /// Select ruler guides `ids` (see [`Selection::guides`]) and nothing else. pub fn set_guides(&mut self, ids: impl IntoIterator) { self.clear(); - for i in ids { - if !self.guides.contains(&i) { - self.guides.push(i); - } - } + let mut seen = HashSet::new(); + self.guides.extend(ids.into_iter().filter(|id| seen.insert(*id))); } /// Add ruler guide `i` to the selection, or take it out, keeping the selected objects (a /// Shift-click on a guide). @@ -426,10 +472,11 @@ impl Selection { }; let locks = doc.locked_artboards(); ids.retain(|i| !locks.holds_id(*i)); - if ids.iter().all(|i| self.contains(*i)) { - ids.iter().for_each(|i| self.remove(*i)); + let selected: HashSet = self.objects.iter().copied().collect(); + if ids.iter().all(|i| selected.contains(i)) { + self.remove_all(ids); } else { - ids.into_iter().for_each(|i| self.add(i)); + self.add_all(ids); } self.target = None; } diff --git a/crates/doc/src/selection/tests.rs b/crates/doc/src/selection/tests.rs index db8e6f930c..60ad1b4328 100644 --- a/crates/doc/src/selection/tests.rs +++ b/crates/doc/src/selection/tests.rs @@ -45,6 +45,148 @@ fn remove_all_does_what_removing_each_does() { assert_eq!(none, s); } +/// A selection with every field set: objects 1 to 6 with 3 listed twice, anchors, segments, a key, +/// a key anchor, a target, slices, guides, a key guide, new art, a symbol part and an on-path member. +fn seeded() -> Selection { + let mut s = Selection { objects: [1, 2, 3, 4, 5, 3, 6].map(NodeId).to_vec(), ..Selection::default() }; + for i in [2, 3, 4, 5] { + s.anchors.insert(NodeId(i), BTreeSet::from([(0, 1)])); + s.segments.insert(NodeId(i), BTreeSet::from([(0, 0)])); + } + s.key = Some(NodeId(4)); + s.key_anchor = Some((NodeId(5), (0, 1))); + s.target = Some(NodeId(3)); + s.slices = vec![NodeId(9)]; + s.guides = vec![NodeId(10)]; + s.key_guide = Some(NodeId(10)); + s.new_art = Arc::new(HashSet::from([NodeId(2)])); + s.symbol_part = Some(SymbolPart { instance: NodeId(1), path: vec![0] }); + s.on_path_member = Some(NodeId(11)); + s +} + +/// Id lists with repeats, ids not selected, removals followed by additions, and the empty list. +fn id_streams() -> Vec> { + let mut streams: Vec> = [ + vec![], + vec![4], + vec![7], + vec![3], + vec![4, 1, 4, 7], + vec![7, 8, 7, 7, 3, 3, 5], + vec![1, 2, 3, 4, 5, 6], + vec![6, 5, 4, 3, 2, 1, 1, 2, 3], + vec![8, 2, 8, 2, 9, 9, 9], + ] + .into_iter() + .map(|ids| ids.into_iter().map(NodeId).collect()) + .collect(); + // Deterministic pseudo-random lists over ids 1 to 12, half of them selected to start with. + let mut x: u64 = 0x9e37_79b9_7f4a_7c15; + for len in [5, 17, 40, 120] { + let ids = (0..len) + .map(|_| { + x ^= x << 13; + x ^= x >> 7; + x ^= x << 17; + NodeId(x % 12 + 1) + }) + .collect(); + streams.push(ids); + } + streams +} + +#[test] +fn add_all_does_what_adding_each_does() { + for ids in id_streams() { + let mut one_by_one = seeded(); + for id in &ids { + one_by_one.add(*id); + } + let mut all = seeded(); + all.add_all(ids.iter().copied()); + assert_eq!(all, one_by_one, "add_all({ids:?})"); + } +} + +#[test] +fn toggle_all_does_what_toggling_each_does() { + for ids in id_streams() { + let mut one_by_one = seeded(); + for id in &ids { + one_by_one.toggle(*id); + } + let mut all = seeded(); + all.toggle_all(ids.iter().copied()); + assert_eq!(all, one_by_one, "toggle_all({ids:?})"); + } + // An id toggled twice is selected again, at the end, without the anchors it had. + let mut s = seeded(); + s.toggle_all([NodeId(2), NodeId(2)]); + assert_eq!(s.objects, [1, 3, 4, 5, 3, 6, 2].map(NodeId)); + assert!(!s.anchors.contains_key(&NodeId(2)) && !s.segments.contains_key(&NodeId(2))); + // A removed key and key anchor stay cleared. + let mut s = seeded(); + s.toggle_all([NodeId(4), NodeId(5), NodeId(4), NodeId(5)]); + assert_eq!((s.key, s.key_anchor), (None, None)); +} + +#[test] +fn set_slices_and_set_guides_keep_the_first_of_each_id() { + let mut s = seeded(); + s.set_slices([3, 1, 3, 2, 1].map(NodeId)); + assert_eq!(s.slices, [3, 1, 2].map(NodeId)); + assert!(s.objects.is_empty() && s.guides.is_empty()); + s.set_guides([5, 5, 4, 6, 4].map(NodeId)); + assert_eq!(s.guides, [5, 4, 6].map(NodeId)); + assert!(s.slices.is_empty()); +} + +/// Shift-clicking a target circle does what removing or adding each of its art one by one does, +/// for a layer with art, an empty layer and an object. +#[test] +fn toggle_target_does_what_toggling_its_art_one_by_one_does() { + let rect = || vectorcraft_geom::shapes::rectangle(vectorcraft_geom::Rect::new(0.0, 0.0, 10.0, 10.0)); + let mut d = Document::new(100.0, 100.0); + let l = d.layers[0].id; + let art: Vec = (0..4).map(|_| d.alloc_id()).collect(); + for id in &art { + d.insert(Some(l), usize::MAX, Node::path(*id, rect(), crate::Appearance::default_art())).unwrap(); + } + let empty = d.alloc_id(); + d.insert(None, usize::MAX, Node::layer(empty, "Empty", crate::LayerColor::Preset(2))).unwrap(); + let one_by_one = |s: &Selection, id: NodeId| { + let mut s = s.clone(); + let ids = match d.node(id) { + Some(n) if n.is_layer() => n.layer_art(true), + _ => vec![id], + }; + if ids.iter().all(|i| s.contains(*i)) { + ids.iter().for_each(|i| s.remove(*i)); + } else { + ids.into_iter().for_each(|i| s.add(i)); + } + s.target = None; + s + }; + let mut starts = vec![Selection::default()]; + for objects in [vec![art[1]], vec![art[3], art[0], art[1], art[2]], vec![art[2], art[2], NodeId(99)]] { + let mut s = seeded(); + s.objects = objects; + s.key = s.objects.first().copied(); + s.anchors.insert(art[1], BTreeSet::from([(0, 0)])); + starts.push(s); + } + for start in &starts { + for id in [l, empty, art[2], NodeId(99)] { + let mut s = start.clone(); + s.toggle_target(&d, id); + assert_eq!(s, one_by_one(start, id), "toggle_target({id:?}) on {:?}", start.objects); + } + } +} + #[test] fn remove_all_does_what_removing_each_does_to_a_key_anchor_and_symbol_part() { for kept in [false, true] { diff --git a/crates/doc/src/symbols.rs b/crates/doc/src/symbols.rs index a1d34e6adb..f2b96c4843 100644 --- a/crates/doc/src/symbols.rs +++ b/crates/doc/src/symbols.rs @@ -9,7 +9,7 @@ use std::sync::Arc; use vectorcraft_geom::{Affine, Rect}; use crate::symbol_nine_slice::transformed; -use crate::{AppearanceItem, Document, MAX_SYMBOL_NODES, NineSliceMap, Node, NodeKind, SYMBOL_HALF}; +use crate::{AppearanceItem, Document, MAX_SYMBOL_NODES, NineSliceMap, Node, NodeKind, SYMBOL_HALF, Symbol}; /// The box a symbol instance is measured by when its symbol's art has no box /// ([`SymbolBoxes::art`]), and in [`Node::geometric_bounds`]: the 20 × 20 square around the origin @@ -312,7 +312,7 @@ impl Document { /// Each symbol name of this document → the index of the first symbol of that name (the one a /// name finds). pub(crate) fn symbol_names(&self) -> SymbolNames { - #[cfg(test)] + #[cfg(any(test, feature = "symbol-read-count"))] SYMBOLS_READ.with(|c| c.set(c.get() + self.symbols.len())); let mut names = HashMap::with_capacity(self.symbols.len()); for (i, s) in self.symbols.iter().enumerate() { @@ -322,7 +322,7 @@ impl Document { } } -#[cfg(test)] +#[cfg(any(test, feature = "symbol-read-count"))] thread_local! { /// How many symbols [`Document::symbol_names`] has read on this thread. pub(crate) static SYMBOLS_READ: Cell = const { Cell::new(0) }; @@ -330,12 +330,31 @@ thread_local! { static ART_BOXES_MEASURED: Cell = const { Cell::new(0) }; } +/// How many symbols [`Document::symbol_names`] has read on this thread, for other crates' tests +/// that count how often the symbol list is read to find symbols by name (the `symbol-read-count` +/// feature, dev-dependencies only). +#[cfg(any(test, feature = "symbol-read-count"))] +#[doc(hidden)] +pub fn symbols_read() -> usize { + SYMBOLS_READ.with(Cell::get) +} + impl<'a> SymbolBoxes<'a> { /// The document whose symbols these are. pub fn document(&self) -> &'a Document { self.doc } + /// New boxes for the same document, none measured yet and with none of the options set, that + /// find symbols by name through the same index as these boxes ([`Self::symbol`]). Measuring + /// objects one at a time in boxes of their own made this way measures them as boxes made by + /// [`Document::symbol_boxes`] do, without reading the symbol list again. + pub fn unmeasured(&self) -> SymbolBoxes<'a> { + let doc: &'a Document = self.doc; + let names = self.names.get_or_init(|| Arc::new(doc.symbol_names())); + doc.symbol_boxes().with_names(names) + } + /// Makes these boxes find symbols by `names` ([`Document::symbol_names`]), made from the /// document's symbols while they had the names and order they have now. pub(crate) fn with_names(self, names: &Arc) -> Self { @@ -343,19 +362,24 @@ impl<'a> SymbolBoxes<'a> { self } - /// The art of the first symbol of the document named `name`, found in time independent of the - /// number of symbols after the first lookup. - pub(crate) fn symbol_art(&self, name: &str) -> Option<&'a Arc> { + /// The first symbol of the document named `name`, found in time independent of the number of + /// symbols after the first lookup. + pub fn symbol(&self, name: &str) -> Option<&'a Symbol> { let doc: &'a Document = self.doc; let names = self.names.get_or_init(|| Arc::new(doc.symbol_names())); let i = *names.get(name)?; match doc.symbols.get(i) { - Some(s) if s.name == name => Some(&s.art), + Some(s) if s.name == name => Some(s), // Names that no longer match the symbols: the first symbol of that name. - _ => doc.symbols.iter().find(|s| s.name == name).map(|s| &s.art), + _ => doc.symbols.iter().find(|s| s.name == name), } } + /// The art of the first symbol of the document named `name` ([`Self::symbol`]). + pub(crate) fn symbol_art(&self, name: &str) -> Option<&'a Arc> { + self.symbol(name).map(|s| &s.art) + } + /// Makes these boxes measure every symbol instance as [`Node::reach_bounds_with`] does, by its /// art box alone. An instance that scales or turns stroked art then measures a little larger /// than with [`Node::visual_bounds_with`], and its art is not transformed to measure it. The @@ -904,6 +928,57 @@ mod tests { assert_eq!(s.sliced_placed.get(), 13); } + #[test] + fn symbols_are_found_by_name_reading_the_list_once() { + // 2,000 symbols, then two named "Mark": a name finds the first. + let mut d = Document::new(200.0, 200.0); + for i in 0..2000 { + let r = rect(&mut d, Rect::new(0.0, 0.0, 1.0, 1.0), 0.0); + symbol(&mut d, &format!("Filler {i}"), vec![r]); + } + let (first, second) = (rect(&mut d, Rect::new(0.0, 0.0, 10.0, 10.0), 0.0), rect(&mut d, Rect::new(0.0, 0.0, 20.0, 20.0), 0.0)); + symbol(&mut d, "Mark", vec![first]); + symbol(&mut d, "Mark", vec![second]); + let read = || SYMBOLS_READ.with(Cell::get); + let before = read(); + let s = d.symbol_boxes(); + for _ in 0..1000 { + assert!(s.symbol("Mark").is_some_and(|m| std::ptr::eq(m, &d.symbols[2000]))); + assert!(s.symbol("Filler 7").is_some_and(|m| std::ptr::eq(m, &d.symbols[7]))); + assert!(s.symbol("Nowhere").is_none()); + } + assert_eq!(read() - before, d.symbols.len()); + } + + #[test] + fn unmeasured_boxes_share_the_index_and_nothing_measured() { + // 2,000 symbols, then a 9-slice frame held, scaled, by "Holder", whose instances spend + // the boxes' budget of placed objects. + let mut d = Document::new(200.0, 200.0); + for i in 0..2000 { + let r = rect(&mut d, Rect::new(0.0, 0.0, 1.0, 1.0), 0.0); + symbol(&mut d, &format!("Filler {i}"), vec![r]); + } + let frame = rect(&mut d, Rect::new(0.0, 0.0, 100.0, 100.0), 1.0); + symbol(&mut d, "Panel", vec![frame]); + d.set_symbol_nine_slice("Panel", Some(crate::SymbolNineSlice::default())); + let wide = instance(&mut d, "Panel", Affine::scale_non_uniform(2.0, 1.0)); + symbol(&mut d, "Holder", vec![wide]); + let holder = instance(&mut d, "Holder", Affine::scale_non_uniform(1.5, 1.5)); + let fresh = holder.visual_bounds_with(&d.symbol_boxes().quick()); + let read = || SYMBOLS_READ.with(Cell::get); + let s = d.symbol_boxes().quick(); + assert_eq!(holder.visual_bounds_with(&s), fresh); + assert!(s.sliced_placed.get() > 0); + let before = read(); + let u = s.unmeasured(); + assert_eq!(read(), before, "the index is shared"); + assert!(u.measured.borrow().is_empty() && u.sliced.borrow().is_empty() && u.reaches.borrow().is_empty()); + assert_eq!((u.sliced_placed.get(), u.holders.get(), u.quick.get()), (0, 0, false)); + assert_eq!(holder.visual_bounds_with(&u.quick()), fresh); + assert_eq!(read(), before); + } + #[test] fn measuring_9_slice_instances_reads_the_symbol_list_once() { // 2,000 symbols, then a frame with guides and a symbol with guides holding the frame diff --git a/crates/doc/src/text/object.rs b/crates/doc/src/text/object.rs index 5bd31f7699..c556f2f5b0 100644 --- a/crates/doc/src/text/object.rs +++ b/crates/doc/src/text/object.rs @@ -27,7 +27,11 @@ impl TextObject { /// Character attributes as presented by controls (stored runs stay local for layout /// and rich-text clipboard operations). Explicit vertical character scale stays separate. pub fn effective_char_style(&self, style: &CharStyle) -> Option { - let scale = self.style_scale()?; + Self::scaled_char_style(style, self.style_scale()?) + } + + /// `style` with `scale` taken into its attributes ([`Self::effective_char_style`]). + fn scaled_char_style(style: &CharStyle, scale: TextStyleScale) -> Option { let mut style = style.clone(); style.size *= scale.points; style.leading = style.leading.map(|v| v * scale.points); @@ -57,19 +61,27 @@ impl TextObject { /// scale from `xf`, so panels show document-point sizes without a separate transform factor. /// Returns `false` when there is nothing to bake (identity scale or an unrepresentable /// transform). + /// + /// Type on a path bakes only the uniform part of the scale (the vertical one) and keeps any + /// stretch in `xf`: its brackets and glyphs sit at fractions of the path's length, which a + /// non-uniform scale of the path would move, and a uniform one keeps. pub fn scale_text_attributes(&mut self) -> bool { - let Some(scale) = self.style_scale() else { return false }; - if (scale.points - 1.0).abs() <= 1e-12 && (scale.horizontal - 1.0).abs() <= 1e-12 { + let Some(mut scale) = self.style_scale() else { return false }; + let [a, b, c, d, _, _] = self.xf.as_coeffs(); + let (mut sx, sy) = (a.hypot(b), c.hypot(d)); + if sx <= 1e-12 || sy <= 1e-12 { return false; } - let [a, b, c, d, _, _] = self.xf.as_coeffs(); - let (sx, sy) = (a.hypot(b), c.hypot(d)); - if sx <= 1e-12 || sy <= 1e-12 { + if matches!(self.kind, TextKind::OnPath { .. }) { + scale.horizontal = 1.0; + sx = sy; + } + if (scale.points - 1.0).abs() <= 1e-12 && (scale.horizontal - 1.0).abs() <= 1e-12 { return false; } let mut baked = Vec::with_capacity(self.runs.len()); for run in &self.runs { - let Some(eff) = self.effective_char_style(&run.style) else { return false }; + let Some(eff) = Self::scaled_char_style(&run.style, scale) else { return false }; baked.push(eff); } for (run, style) in self.runs.iter_mut().zip(baked) { @@ -78,6 +90,14 @@ impl TextObject { // Character strokes are drawn in text space: widen them by the vertical scale we remove. self.scale_char_strokes(1.0 / sy); self.xf *= Affine::scale_non_uniform(1.0 / sx, 1.0 / sy); + // An area's frame and a path type's path are drawn through `xf` too: give them the scale + // `xf` loses, so the frame (and so the line breaks) and the path stay where they were. + let grow = Affine::scale_non_uniform(sx, sy); + match &mut self.kind { + TextKind::Area { frame } => frame.transform(grow), + TextKind::OnPath { path, .. } => path.transform(grow), + TextKind::Point => {} + } self.cached_bounds = None; self.cached_baselines.clear(); self.cached_ink = None; diff --git a/crates/effects/src/distort.rs b/crates/effects/src/distort.rs index a5bc941b16..7a03a2f3aa 100644 --- a/crates/effects/src/distort.rs +++ b/crates/effects/src/distort.rs @@ -5,7 +5,9 @@ use vectorcraft_geom::kurbo::ParamCurveArclen; use vectorcraft_geom::{Affine, Anchor, ParamCurve, PathData, Point, Rect, SubPath, Vec2}; use vectorcraft_pathops::addons::pathtools::insert_at; -use crate::util::{catmull_rom, fit_piece, flag, map_nonlinear_within, mean_size, noise, normal_at, num, pieces, seed, seg_cubic, smooth_points}; +use crate::util::{ + catmull_rom, fit_piece, flag, map_nonlinear_within, map_smooth_within, mean_size, noise, normal_at, num, pieces, seed, seg_cubic, smooth_points, +}; fn diag(b: Rect) -> f64 { b.width().hypot(b.height()).max(1e-6) @@ -325,8 +327,8 @@ pub fn tweak(path: &PathData, b: Rect, p: &Value) -> PathData { } /// Twist: rotation that is strongest at the centre and fades to zero at the bounding circle, -/// clockwise on the page for a positive `angle`, making at most `max` anchors -/// ([`map_nonlinear_within`]). +/// clockwise on the page for a positive `angle`, making at most `max` anchors. Its handles follow +/// the rotation's derivative ([`map_smooth_within`]), so the pieces join without kinks (#7069). pub fn twist(path: &PathData, b: Rect, angle: f64, max: usize) -> PathData { let ang = angle.clamp(-3600.0, 3600.0).to_radians(); if ang == 0.0 { @@ -343,7 +345,7 @@ pub fn twist(path: &PathData, b: Rect, angle: f64, max: usize) -> PathData { c + Vec2::new(d.x * co - d.y * s, d.x * s + d.y * co) }; let piece = (r / 8.0).min(r / (1.0 + ang.abs() * 2.0)); - map_nonlinear_within(path, piece, max, f) + map_smooth_within(path, piece, max, f) } const ZIGZAG_ARCLEN_ACCURACY: f64 = 1e-4; diff --git a/crates/effects/src/lib.rs b/crates/effects/src/lib.rs index 271ce1c162..9eae81118a 100644 --- a/crates/effects/src/lib.rs +++ b/crates/effects/src/lib.rs @@ -94,13 +94,13 @@ pub use revolve::{ CLASSIC_REVOLVE, REVOLVE, has_revolve, is_revolve, revolve_art, revolve_art_in, revolve_options, validate_revolve, validate_revolve_in, }; pub use solids::{ - CLASSIC_EXTRUDE, CLASSIC_ROTATE, EXTRUDE, GRAPHICS, GraphicFrame, INFLATE, MAX_GRAPHICS, MappedGraphic, RENDER, RENDER_MODES, ROTATE, - ROTATE_SURFACES, ROTATION_PRESETS, SHADING_COLORS, SOLIDS, SolidMesh, THREE_D_TYPES, classic_extrude_options, classic_shading, extrude_options, - graphic_bounds, graphic_frame, graphic_symbols, has_solid, inflate_options, is_classic_three_d, is_three_d, mapped_graphics, missing_symbol, - names_graphic_symbol, rename_graphic_symbol, rename_graphic_symbol_in, renders_wireframe, solid_art, solid_art_in, takes_graphics, - three_d_meshes, three_d_meshes_in, three_d_meshes_of, three_d_meshes_of_in, three_d_params_as, three_d_wireframe_in, validate_solid, - validate_solid_in, validate_three_d, validate_three_d_at, validate_three_d_at_in, validate_three_d_in, validate_three_d_params, view_options, - with_graphic, + CLASSIC_EXTRUDE, CLASSIC_ROTATE, EXTRUDE, GRAPHICS, GraphicFrame, INFLATE, MAX_GRAPHICS, MappedGraphic, MeshGraphics, RENDER, RENDER_MODES, + ROTATE, ROTATE_SURFACES, ROTATION_PRESETS, SHADING_COLORS, SOLIDS, SolidMesh, THREE_D_TYPES, classic_extrude_options, classic_shading, + extrude_options, graphic_bounds, graphic_frame, graphic_symbols, has_solid, inflate_options, is_classic_three_d, is_three_d, mapped_graphics, + mesh_graphics_art, missing_symbol, names_graphic_symbol, rename_graphic_symbol, rename_graphic_symbol_in, renders_wireframe, solid_art, + solid_art_in, takes_graphics, three_d_meshes, three_d_meshes_in, three_d_meshes_of, three_d_meshes_of_in, three_d_params_as, + three_d_wireframe_in, validate_solid, validate_solid_in, validate_three_d, validate_three_d_at, validate_three_d_at_in, validate_three_d_in, + validate_three_d_params, view_options, with_graphic, }; pub use solids::{ GRAPHIC_MAX_OFFSET, GRAPHIC_SCALE_RANGE, GRAPHICS_NOT_TAKEN, appearance_graphic_symbols, exports_three_d, graphic_frame_at, diff --git a/crates/effects/src/revolve.rs b/crates/effects/src/revolve.rs index c065e507df..acd6cf7c94 100644 --- a/crates/effects/src/revolve.rs +++ b/crates/effects/src/revolve.rs @@ -801,7 +801,7 @@ pub(crate) fn revolve_meshes(n: &Node, total: &mut usize, limit: usize) -> Resul let b = path.bounds().ok_or("Revolve requires a shape with at least two anchors")?; let (paint, opacity, _) = paint_of(item); let mesh = vectorcraft_three_d::revolve_mesh(path, rule, b, fx_options(fx))?; - Ok(crate::SolidMesh { mesh, color: crate::solids::mesh_color(&paint, opacity) }) + Ok(crate::SolidMesh::plain(mesh, crate::solids::mesh_color(&paint, opacity))) }; if let Some(index) = n.appearance.effects.iter().position(|e| e.visible && is_revolve(&e.id)) { let before = n.appearance.effects.get(..index).unwrap_or_default(); @@ -924,7 +924,7 @@ fn group_meshes(n: &Node, total: &mut usize, limit: usize) -> Result, +} + +impl SolidMesh { + /// A mesh painted `color`, with no graphics. + pub fn plain(mesh: Mesh, color: [f32; 4]) -> Self { + Self { mesh, color, graphics: None } + } +} + +/// The parts of `mesh`, a solid that 3D effect `id` with parameters `p` built about `bounds`, painted +/// `color` from a fill or stroke at `opacity`: for each planar face that carries graphics (Extrude & +/// Bevel's caps, the plane), the triangles on it as a mesh of their own with the art point of each +/// corner ([`MeshGraphics`]), then the rest. Revolve's side, whose graphics are not mapped onto its +/// mesh, stays plain. +fn split_graphics(id: &str, p: &Value, bounds: Rect, mesh: Mesh, (color, opacity): ([f32; 4], f32)) -> Vec { + let list = graphics::mapped_graphics(p); + if list.is_empty() || !takes_graphics(id) || id == crate::REVOLVE { + return vec![SolidMesh::plain(mesh, color)]; + } + let view = view_options(p); + let mut rest = mesh; + let mut out = vec![]; + for face in PlanarFace::ALL { + if !list.iter().any(|g| g.face == face) { + continue; + } + let on_mesh = if id == ROTATE { + vectorcraft_three_d::plane_mesh_face(bounds, view) + } else { + vectorcraft_three_d::extrude_mesh_face(bounds, extrude_options(p), view, face) + }; + let Some(on_mesh) = on_mesh else { continue }; + let (mut taken, mut left, mut art) = (Mesh::default(), Mesh::default(), vec![]); + for t in &rest.triangles { + let corner = |i: u32| rest.positions.get(i as usize).copied().zip(rest.normals.get(i as usize).copied()); + let Some(corners) = t.iter().map(|&i| corner(i)).collect::>>() else { continue }; + let points: Option> = corners.iter().map(|(m, n)| on_mesh.art_point(*m, *n)).collect(); + let into = match points { + Some(points) => { + art.extend(points); + &mut taken + } + None => &mut left, + }; + let base = into.positions.len() as u32; + for (m, n) in corners { + into.positions.push(m); + into.normals.push(n); + } + into.triangles.push([base, base + 1, base + 2]); + } + rest = left; + if !taken.is_empty() { + let graphics = list.iter().filter(|g| g.face == face).cloned().collect(); + let graphics = MeshGraphics { face, graphics, center: bounds.center(), art, opacity, object: 1.0 }; + out.push(SolidMesh { mesh: taken, color, graphics: Some(graphics) }); + } + } + if !rest.is_empty() { + out.insert(0, SolidMesh::plain(rest, color)); + } + out } /// The color a mesh of `paint` at `opacity` takes ([`SolidMesh::color`]). @@ -2363,13 +2428,18 @@ fn meshes_for(fx: &Effect, shapes: &[Profile], total: &mut usize, limit: usize) let p = crate::merged_params(&fx.id, &fx.params); let view = view_options(&p); let mut out = vec![]; - let mut keep = |out: &mut Vec, mesh: Mesh, color: [f32; 4]| keep_mesh(out, total, SolidMesh { mesh, color }, limit); + // A solid's parts with and without graphics count together against the limit. + let mut keep = |out: &mut Vec, mesh: Mesh, (paint, opacity): (&Paint, f32), bounds: Rect| { + split_graphics(&fx.id, &p, bounds, mesh, (mesh_color(paint, opacity), opacity)) + .into_iter() + .try_for_each(|part| keep_mesh(out, total, part, limit)) + }; if is_plane(&fx.id) { for s in shapes { for item in &s.items { let (paint, opacity, _) = paint_of(item, s.opacity); let (area, rule) = region(&s.path, s.rule, item); - keep(&mut out, vectorcraft_three_d::plane_mesh(&area, rule, b, view)?, mesh_color(&paint, opacity))?; + keep(&mut out, vectorcraft_three_d::plane_mesh(&area, rule, b, view)?, (&paint, opacity), b)?; } } return Ok(out); @@ -2406,7 +2476,7 @@ fn meshes_for(fx: &Effect, shapes: &[Profile], total: &mut usize, limit: usize) match solid.mesh() { Ok(mesh) => { let (paint, opacity, _) = paint_of(item, *member); - keep(&mut out, mesh, mesh_color(&paint, opacity))?; + keep(&mut out, mesh, (&paint, opacity), bounds)?; } Err(_) if matches!(item, AppearanceItem::Stroke(_)) => {} Err(e) => return Err(e), @@ -2494,6 +2564,9 @@ fn meshes_within(doc: Option<&Document>, n: &Node, total: &mut usize, limit: usi .filter(|m| !m.mesh.is_empty()) .map(|mut m| { m.color[3] *= n.opacity.clamp(0.0, 1.0); + if let Some(g) = &mut m.graphics { + g.object *= n.opacity.clamp(0.0, 1.0); + } m }) .collect(); diff --git a/crates/effects/src/solids/graphics.rs b/crates/effects/src/solids/graphics.rs index 7c0087e15b..7ef2fe4e28 100644 --- a/crates/effects/src/solids/graphics.rs +++ b/crates/effects/src/solids/graphics.rs @@ -519,6 +519,71 @@ pub(super) fn face_art( Some(Node::new(id, NodeKind::Group { children: vec![Arc::new(clip), Arc::new(Node::group(id, children))], clip: true })) } +/// The graphics on one planar face of a solid's mesh ([`super::SolidMesh`]): those mapped onto +/// `face`, placed about `center` (the center of the bounds the solids were built with), and the +/// point of the art's plane that each corner of the mesh shows (document coordinates of the art +/// before its 3D effect, y down). +#[derive(Clone, Debug, PartialEq)] +pub struct MeshGraphics { + pub face: PlanarFace, + pub graphics: Vec, + pub center: Point, + /// One for each position of the mesh. + pub art: Vec, + /// The opacity of the fill or stroke the face is painted with, which the graphics take too, as + /// the canvas draws them; neither a gradient's stops nor the object's own opacity is in it. + pub opacity: f32, + /// The opacity of the object the face belongs to, which applies to the face and its graphics + /// together. + pub object: f32, +} + +impl MeshGraphics { + /// The bounds of the art points of the mesh's corners; `None` without corners. + pub fn art_bounds(&self) -> Option { + let first = *self.art.first()?; + Some(self.art.iter().fold(Rect::from_points(first, first), |r, p| r.union_pt(*p))) + } +} + +/// The art `graphics` draws on its face, flat in the art's plane, unshaded and unclipped: each +/// graphic's fills and stroke outlines at its place ([`MappedGraphic`]), back to front, as one +/// group of objects with id `id`. A graphic whose symbol `doc` does not have, or whose art is past +/// the limits of [`pieces_of`], is left out, as the canvas leaves it out. `Ok(None)` when nothing +/// is drawn; an error when the graphics' art draws more than [`MAX_ELEMENTS`] path elements +/// together. +pub fn mesh_graphics_art(doc: &Document, id: NodeId, graphics: &MeshGraphics) -> Result, String> { + let mut children = vec![]; + let mut elements = 0usize; + for g in graphics.graphics.iter().filter(|g| g.face == graphics.face) { + let Some(symbol) = doc.symbols.iter().find(|s| s.name == g.symbol) else { continue }; + let Ok(pieces) = pieces_of(doc, symbol) else { continue }; + let Some(bounds) = pieces.iter().filter_map(|p| p.path.bounds()).reduce(|a, b| a.union(b)) else { continue }; + let place = g.placement(bounds, graphics.center); + for piece in pieces { + elements = elements.saturating_add(drawn_elements(&piece.path, 1)); + if elements > MAX_ELEMENTS { + return Err("The graphics are too complex: simplify the symbols' art".into()); + } + let mut paint = piece.paint; + if let Paint::Pattern { xf, .. } = &mut paint { + *xf = place * *xf; + } + let mut fill = FillLayer::new(paint); + fill.opacity = piece.opacity; + fill.blend = piece.blend; + let mut appearance = Appearance { items: vec![AppearanceItem::Fill(fill)], ..Default::default() }; + appearance.transform_gradients(place); + let mut node = Node::path(id, piece.path.transformed(place), appearance); + if let NodeKind::Path { rule, .. } = &mut node.kind { + *rule = piece.rule; + } + children.push(Arc::new(node)); + } + } + Ok((!children.is_empty()).then(|| Node::group(id, children))) +} + /// One area of a graphic placed on Revolve's unrolled side surface, cut into straight pieces. struct Unrolled { polygons: Vec>, diff --git a/crates/effects/src/solids/tests_graphics.rs b/crates/effects/src/solids/tests_graphics.rs index f0da6b992b..fe89dd1f84 100644 --- a/crates/effects/src/solids/tests_graphics.rs +++ b/crates/effects/src/solids/tests_graphics.rs @@ -86,6 +86,48 @@ fn a_graphic_is_drawn_on_the_front_cap_at_its_offset_size_and_turn() { assert!((b.width() - 10.0 * 2f64.sqrt()).abs() < 1e-6); } +#[test] +fn a_mesh_carries_its_caps_graphics_flat_in_the_arts_plane() { + let d = document(); + let graphics = + json!([{"symbol": "Mark", "x": 20.0, "y": -10.0, "scale": 200.0}, {"symbol": "Mark", "face": "back", "x": 20.0, "y": -10.0, "scale": 200.0}]); + // Turned, so the caps' corners in the mesh are not the art's. + let n = object(EXTRUDE, json!({"rotationX": -20.0, "rotationY": 35.0, "rotationZ": 10.0, "graphics": graphics})); + let parts = super::super::three_d_meshes_in(Some(&d), &n).unwrap(); + // The walls first, then the front cap and the back cap, each two triangles. + assert_eq!( + parts.iter().map(|p| p.graphics.as_ref().map(|g| g.face)).collect::>(), + [None, Some(PlanarFace::Front), Some(PlanarFace::Back)] + ); + let total: usize = parts.iter().map(|p| p.mesh.triangles.len()).sum(); + let plain = super::super::three_d_meshes_in(Some(&d), &object(EXTRUDE, json!({"rotationX": -20.0, "rotationY": 35.0, "rotationZ": 10.0}))); + assert_eq!(total, plain.as_ref().map_or(0, |p| p.iter().map(|p| p.mesh.triangles.len()).sum()), "no triangle is lost or doubled"); + assert!(plain.unwrap().iter().all(|p| p.graphics.is_none())); + // The art points of each cap's corners are the art's own square; the graphic is drawn flat at + // its place, mirrored on the back so it reads from behind. + for (part, drawn) in parts[1..].iter().zip([Rect::new(60.0, 30.0, 80.0, 50.0), Rect::new(20.0, 30.0, 40.0, 50.0)]) { + let Some(g) = &part.graphics else { panic!("no graphics") }; + assert_eq!(g.art.len(), part.mesh.positions.len()); + assert!(close(g.art_bounds().unwrap(), Rect::new(0.0, 0.0, 100.0, 100.0)), "{:?}", g.art_bounds()); + assert_eq!(g.graphics.len(), 1); + let art = mesh_graphics_art(&d, NodeId(9), g).unwrap().unwrap(); + let paths: Vec<(PathData, Paint)> = art + .children() + .into_iter() + .flatten() + .filter_map(|c| Some((c.path_data()?.clone(), c.appearance.items.first()?.paint().clone()))) + .collect(); + assert!(close(bounds_of(&paths), drawn), "{:?}: {:?}", g.face, bounds_of(&paths)); + assert_eq!(paths[0].1, Paint::solid(red()), "unshaded"); + } + // A plane is all one face; a graphic whose symbol is gone draws nothing. + let n = object(ROTATE, json!({"rotationY": 35.0, "graphics": [{"symbol": "Gone"}]})); + let parts = super::super::three_d_meshes_in(Some(&d), &n).unwrap(); + assert_eq!(parts.len(), 1); + let Some(g) = &parts[0].graphics else { panic!("no graphics") }; + assert_eq!(mesh_graphics_art(&d, NodeId(9), g), Ok(None)); +} + #[test] fn without_the_document_or_its_symbol_nothing_is_drawn() { let n = object(EXTRUDE, json!({"graphics": [{"symbol": "Mark"}]})); @@ -563,6 +605,15 @@ fn art_nested_too_deep_is_refused_and_not_drawn() { // A loaded file draws its other graphics. let both = object(EXTRUDE, json!({"graphics": [{"symbol": "Deep"}, {"symbol": "Mark"}]})); assert_eq!(graphics_in(&solid_art_in(Some(&d), &both).unwrap()).len(), 1); + // A mesh's graphics leave it out as well and draw the others. + let parts = super::super::three_d_meshes_in(Some(&d), &both).unwrap(); + let Some(g) = parts.iter().find_map(|p| p.graphics.as_ref()) else { panic!("no graphics") }; + let art = mesh_graphics_art(&d, NodeId(9), g).unwrap().unwrap(); + assert_eq!(art.children().map_or(0, |c| c.len()), 1); + let deep = object(EXTRUDE, json!({"graphics": [{"symbol": "Deep"}]})); + let parts = super::super::three_d_meshes_in(Some(&d), &deep).unwrap(); + let Some(g) = parts.iter().find_map(|p| p.graphics.as_ref()) else { panic!("no graphics") }; + assert_eq!(mesh_graphics_art(&d, NodeId(9), g), Ok(None)); } #[test] diff --git a/crates/effects/src/solids/tests_mesh.rs b/crates/effects/src/solids/tests_mesh.rs index a9de7cd7f9..b7ecb75384 100644 --- a/crates/effects/src/solids/tests_mesh.rs +++ b/crates/effects/src/solids/tests_mesh.rs @@ -238,7 +238,7 @@ fn meshes_built_apart(fx: &Effect, shapes: &[Profile], total: &mut usize, limit: match mesh { Ok(mesh) => { let (paint, opacity, _) = paint_of(item, *opacity); - keep_mesh(&mut out, total, SolidMesh { mesh, color: mesh_color(&paint, opacity) }, limit)?; + keep_mesh(&mut out, total, SolidMesh::plain(mesh, mesh_color(&paint, opacity)), limit)?; } Err(_) if matches!(item, AppearanceItem::Stroke(_)) => {} Err(e) => return Err(e), diff --git a/crates/effects/src/tests.rs b/crates/effects/src/tests.rs index ac340224c6..52b38f986d 100644 --- a/crates/effects/src/tests.rs +++ b/crates/effects/src/tests.rs @@ -1687,6 +1687,27 @@ fn twist_turns_clockwise_for_positive_angles() { assert!(turned(-45.0).y < 49.5, "{:?}", turned(-45.0)); } +/// Twist turns a line into a smooth spiral: the points it adds join their pieces without a kink, +/// however far it turns (#7069). +#[test] +fn twist_joins_its_pieces_smoothly() { + let line = PathData::single(SubPath::polyline(&[Point::new(40.0, 30.0), Point::new(60.0, 30.0)], false)); + let bounds = Rect::new(40.0, 30.0, 60.0, 30.0); + for angle in [90.0, 400.0, -720.0] { + let out = apply_geometry(&[fx("distort.twist", json!({"angle": angle}))], &line, bounds); + let anchors = &out.subpaths[0].anchors; + assert!(anchors.len() > 8, "{angle}°: {} anchors", anchors.len()); + for a in anchors.iter().skip(1).take(anchors.len() - 2) { + let (into, out) = (a.p - a.h_in, a.h_out - a.p); + if into.hypot() < 1e-9 || out.hypot() < 1e-9 { + continue; + } + let kink = (into.x * out.y - into.y * out.x).atan2(into.dot(out)).to_degrees().abs(); + assert!(kink < 1.0, "{angle}°: a kink of {kink:.1}° at {:?}", a.p); + } + } +} + #[test] fn twist_fixes_the_outer_circle_and_rotates_inside() { let out = run("distort.twist", json!({"angle": 0}), &square()); diff --git a/crates/effects/src/util.rs b/crates/effects/src/util.rs index ec8cb4cba8..de203b4955 100644 --- a/crates/effects/src/util.rs +++ b/crates/effects/src/util.rs @@ -71,7 +71,7 @@ pub fn seg_cubic(sp: &SubPath, i: usize) -> CubicBez { /// Non-linear path mapping (shared with live envelopes in `vectorcraft-doc`), and the split of /// segments into pieces within an anchor budget. -pub use vectorcraft_doc::live::{fit_piece, map_nonlinear_within, pieces}; +pub use vectorcraft_doc::live::{fit_piece, map_nonlinear_within, map_smooth_within, pieces}; /// About how many lines the renderer flattens `path` into at 1 px/pt: one for a straight /// segment, and for a curve the count Wang's formula gives at vello's tolerance of 0.25 px, diff --git a/crates/engine/Cargo.toml b/crates/engine/Cargo.toml index f972cbb7b3..4e07b323c1 100644 --- a/crates/engine/Cargo.toml +++ b/crates/engine/Cargo.toml @@ -47,6 +47,7 @@ vectorcraft-js = { workspace = true } vectorcraft-apischema = { workspace = true } image = { workspace = true } craft-image-codecs = { workspace = true } +tiff = { workspace = true } jxl-oxide = { workspace = true } jxl-color = { workspace = true } jxl-grid = { workspace = true } @@ -88,7 +89,6 @@ craft-jxl = { workspace = true } # vectorcraft-doc's Group 3 TIFF reader before craft-stream-codecs, the reference # tests/group3_reference.rs compares it with. hayro-ccitt = { workspace = true } -tiff = { workspace = true } craft-stream-codecs = { workspace = true } vectorcraft-affinity = { workspace = true, features = ["synth"] } crc32fast = { workspace = true } @@ -98,6 +98,8 @@ proptest = { workspace = true } vectorcraft-text = { workspace = true, features = ["test-fonts"] } # How many times an open reads a PDF. vectorcraft-pdf = { workspace = true, features = ["read-count"] } +# How many times the symbol list is read to find symbols by name. +vectorcraft-doc = { workspace = true, features = ["symbol-read-count"] } wat = { workspace = true } # Zstandard streams for the Illustrator editing data fuzz tests. ruzstd = { workspace = true } diff --git a/crates/engine/examples/selection_bench.rs b/crates/engine/examples/selection_bench.rs new file mode 100644 index 0000000000..49296f44d9 --- /dev/null +++ b/crates/engine/examples/selection_bench.rs @@ -0,0 +1,95 @@ +//! `cargo run --release -p vectorcraft-engine --example selection_bench` prints the time of the +//! selection steps behind `select.toggle`, `select.add` and `select.inverse` on selections of 2,000, +//! 20,000 and 50,000 objects, done one id at a time (`old`) and in one pass (`new`), side by side in +//! one process. Each step checks that both give the same selection before it is timed. +//! `ITERS` sets the runs per step (default 7); each row is the median wall time in ms. +// Example (dev tool): unwrapping and panicking on failure is fine here, unlike in shipped code (AGENTS.md › Robustness). +#![allow(clippy::unwrap_used, clippy::expect_used, clippy::panic)] + +use std::collections::HashSet; +use std::hint::black_box; +use std::time::Instant; + +use vectorcraft_doc::{NodeId, Selection}; + +fn iters() -> usize { + std::env::var("ITERS").ok().and_then(|v| v.parse().ok()).unwrap_or(7).max(1) +} + +fn median(mut ms: Vec) -> f64 { + ms.sort_by(f64::total_cmp); + ms[ms.len() / 2] +} + +/// The median time of `old` and of `new` on clones of `start`, run in turn. +fn time(start: &Selection, old: impl Fn(&mut Selection), new: impl Fn(&mut Selection)) -> (f64, f64) { + let (mut a, mut b) = (start.clone(), start.clone()); + old(&mut a); + new(&mut b); + assert_eq!(a, b, "both ways give the same selection"); + let run = |f: &dyn Fn(&mut Selection)| { + let mut s = start.clone(); + let t = Instant::now(); + f(&mut s); + let ms = t.elapsed().as_secs_f64() * 1000.0; + black_box(s); + ms + }; + let (mut olds, mut news) = (Vec::new(), Vec::new()); + for _ in 0..iters() { + olds.push(run(&old)); + news.push(run(&new)); + } + (median(olds), median(news)) +} + +/// `select.add` before the change: [`Selection::add`] for each id. +fn old_add(s: &mut Selection, ids: &[NodeId]) { + for id in ids { + s.add(*id); + } +} + +/// `select.toggle` before the change: [`Selection::toggle`] for each id. +fn old_toggle(s: &mut Selection, ids: &[NodeId]) { + for id in ids { + s.toggle(*id); + } +} + +/// `select.inverse` before the change: the selectable ids not found by [`Selection::contains`]. +fn old_inverse(s: &mut Selection, selectable: &[NodeId]) { + let ids: Vec = selectable.iter().copied().filter(|id| !s.contains(*id)).collect(); + s.set(ids); +} + +/// `select.inverse` after the change: the selectable ids not in a set of the selected ones. +fn new_inverse(s: &mut Selection, selectable: &[NodeId]) { + let selected: HashSet = s.objects.iter().copied().collect(); + let ids: Vec = selectable.iter().copied().filter(|id| !selected.contains(id)).collect(); + s.set(ids); +} + +fn row(name: &str, (old, new): (f64, f64)) { + println!(" {name:<44} {old:>12.3} ms {new:>12.3} ms {:>9.1}x", old / new.max(1e-9)); +} + +fn main() { + println!(" {:<44} {:>15} {:>15} {:>10}", "step", "old", "new", "speedup"); + for n in [2_000u64, 20_000, 50_000] { + println!("{n} objects"); + let all: Vec = (1..=n).map(NodeId).collect(); + let none = Selection::default(); + let mut every = Selection::default(); + every.set(all.iter().copied()); + let mut half = Selection::default(); + half.set(all.iter().copied().step_by(2)); + let interleaved: Vec = all.iter().copied().skip(n as usize / 4).chain(all.iter().copied().take(n as usize / 4)).collect(); + let half_new: Vec = all.iter().copied().skip(n as usize / 2).collect(); + row("toggle every object off", time(&every, |s| old_toggle(s, &all), |s| s.toggle_all(all.iter().copied()))); + row("toggle every object on", time(&none, |s| old_toggle(s, &all), |s| s.toggle_all(all.iter().copied()))); + row("toggle every object, half selected", time(&half, |s| old_toggle(s, &interleaved), |s| s.toggle_all(interleaved.iter().copied()))); + row("add half the objects, half selected", time(&half, |s| old_add(s, &half_new), |s| s.add_all(half_new.iter().copied()))); + row("inverse, half selected", time(&half, |s| old_inverse(s, &all), |s| new_inverse(s, &all))); + } +} diff --git a/crates/engine/src/cmd/addons/pathtools.rs b/crates/engine/src/cmd/addons/pathtools.rs index f84fb20f57..1c730e02b4 100644 --- a/crates/engine/src/cmd/addons/pathtools.rs +++ b/crates/engine/src/cmd/addons/pathtools.rs @@ -147,7 +147,7 @@ pub fn specs() -> Vec { "Add Points at Crossings", ["Object", "Plug-ins", "Path Precision Tools"], None, - "{cut?: bool (false: add anchors where the paths cross; true: also cut them there), selfCrossings?: bool (false: where a path crosses itself too, a curved segment that loops over itself included), ids?: [id…] (default: the selection)} where the paths under the objects cross one another, as one undo step; at most 10000 segments → {ids, crossings (anchors placed)}", + "{cut?: bool (false: add anchors where the paths cross; true: also cut them there), selfCrossings?: bool (false: where a path crosses itself too, a curved segment that loops over itself included), ids?: [id…] (default: the selection)} where the paths under the objects cross one another, an open end that lies within 0.001 pt of another path counting as crossing it there, as one undo step; at most 10000 segments → {ids, crossings (anchors placed)}", has_selection, crossings ), diff --git a/crates/engine/src/cmd/addons/pathtools/trim.rs b/crates/engine/src/cmd/addons/pathtools/trim.rs index e1a21393f1..c615c0537a 100644 --- a/crates/engine/src/cmd/addons/pathtools/trim.rs +++ b/crates/engine/src/cmd/addons/pathtools/trim.rs @@ -35,7 +35,7 @@ pub(super) fn specs() -> Vec { "Trim at Crossings", [], None, - "{at: [x, y], tolerance?: pt 0..100 (3; how near `at` a path counts as under it)} or {rect: [x, y, width, height]} or {points: [[x, y]…] (2 to 100000 points)} remove stretches of paths, a stretch running between two neighboring places where the path is crossed by another path or by itself, or from such a place to an open end: `at` removes the stretch of the nearest path at that point, `rect` every stretch the rectangle touches, `points` every stretch the line through the points crosses. Give exactly one of the three. Every path that can be edited takes part, selected or not, compound path members included; hidden and locked paths, guides and clipping paths (compound ones' members included) are neither trimmed nor counted as crossing; in isolation mode only paths inside the isolated object are trimmed. A path that ends on another marks a place on the other; paths that lie along each other don't cross. A closed path that loses a stretch becomes open, an open path that loses a middle stretch becomes two paths with its appearance in its place in the stacking order, and a path nothing crosses is removed whole; a live shape becomes a plain path. One undo step, none when nothing is removed → {ids (the paths left of those trimmed), removed (stretches)}", + "{at: [x, y], tolerance?: pt 0..100 (3; how near `at` a path counts as under it)} or {rect: [x, y, width, height]} or {points: [[x, y]…] (2 to 100000 points)} remove stretches of paths, a stretch running between two neighboring places where the path is crossed by another path or by itself, or from such a place to an open end: `at` removes the stretch of the nearest path at that point, `rect` every stretch the rectangle touches, `points` every stretch the line through the points crosses. Give exactly one of the three. Every path that can be edited takes part, selected or not, compound path members included; hidden and locked paths, guides and clipping paths (compound ones' members included) are neither trimmed nor counted as crossing; in isolation mode only paths inside the isolated object are trimmed. A path that ends on another, or within 0.001 pt of it, marks a place on the other; paths that lie along each other don't cross. A closed path that loses a stretch becomes open, an open path that loses a middle stretch becomes two paths with its appearance in its place in the stacking order, and a path nothing crosses is removed whole; a live shape becomes a plain path. One undo step, none when nothing is removed → {ids (the paths left of those trimmed), removed (stretches)}", has_doc, trim )] diff --git a/crates/engine/src/cmd/addons/pathtools/trim/tests.rs b/crates/engine/src/cmd/addons/pathtools/trim/tests.rs index 6e0e2c057a..aad361ad24 100644 --- a/crates/engine/src/cmd/addons/pathtools/trim/tests.rs +++ b/crates/engine/src/cmd/addons/pathtools/trim/tests.rs @@ -782,3 +782,45 @@ fn bad_params_are_refused_and_change_nothing() { assert_eq!(steps(&s), n); assert!(*s.doc().unwrap().doc == *before); } + +#[test] +fn a_line_ending_on_a_curve_that_was_cut_still_divides_it_there() { + // An open egg-shaped curve, lines across it whose stubs on the left are trimmed away, so each + // line ends on the curve, and the curve's bottom trimmed off below the last line, which cuts + // its segments there. A click on the curve between the last two lines removes only that + // stretch: the lines' ends on it still divide it, however the curve was cut. Twenty placements, + // as how near a cut end lies to the curve depends on the coordinates. + for shift in 0..20 { + let dx = shift as f64 * 7.31; + let mut s = session(); + let egg = json!({"anchors": [ + {"x": 160.0 + dx, "y": 40.0, "out": [110.0 + dx, 80.0]}, + {"x": 92.3 + dx, "y": 190.7, "in": [88.0 + dx, 140.0], "out": [97.0 + dx, 240.0]}, + {"x": 170.0 + dx, "y": 268.0, "in": [130.0 + dx, 265.0], "out": [210.0 + dx, 271.0]}, + {"x": 236.4 + dx, "y": 170.2, "in": [238.0 + dx, 230.0], "out": [233.0 + dx, 110.0]}, + {"x": 150.0 + dx, "y": 20.0, "in": [200.0 + dx, 40.0]} + ], "closed": false}); + let egg = NodeId(s.execute("path.create", &egg).unwrap()["id"].as_u64().unwrap()); + s.execute("select.none", &json!({})).unwrap(); + let ys: Vec = (0..8).map(|k| 70.0 + k as f64 * 23.17 + shift as f64 * 0.37).collect(); + let lines: Vec = ys.iter().map(|y| line(&mut s, &[(40.0 + dx, *y), (300.0 + dx, *y)], false)).collect(); + for y in &ys { + assert_eq!(s.execute(TRIM, &json!({"at": [50.0 + dx, y], "tolerance": 0.5})).unwrap()["removed"], json!(1)); + } + assert_eq!(s.execute(TRIM, &json!({"at": [170.0 + dx, 268.0], "tolerance": 0.5})).unwrap()["removed"], json!(1)); + let start = |id: NodeId| path(&s, id).subpaths[0].anchors[0].p; + let ends: Vec = lines.iter().map(|id| start(*id)).collect(); + // Off every path but the lines: the curve's pieces. + let off_curve = |s: &Session, p: Point| { + stack(s).into_iter().filter(|id| !lines.contains(id)).filter_map(|id| path(s, id).nearest(p)).map(|n| n.4).fold(f64::INFINITY, f64::min) + }; + let (a, b) = (ends[6], ends[7]); + let click = path(&s, egg).nearest(a.midpoint(b)).unwrap().3; + assert!(off_curve(&s, a) < 1e-3 && off_curve(&s, click) < 1e-3); + assert_eq!(s.execute(TRIM, &json!({"at": [click.x, click.y], "tolerance": 0.5})).unwrap()["removed"], json!(1)); + assert!(off_curve(&s, click) > 0.5, "{shift}: the stretch clicked is left"); + for (k, e) in ends.iter().enumerate().take(7) { + assert!(off_curve(&s, *e) < 1e-3, "{shift}: the curve no longer reaches line {k}'s end"); + } + } +} diff --git a/crates/engine/src/cmd/assets.rs b/crates/engine/src/cmd/assets.rs index fcb251347d..05c2fda1d7 100644 --- a/crates/engine/src/cmd/assets.rs +++ b/crates/engine/src/cmd/assets.rs @@ -10,8 +10,8 @@ use vectorcraft_doc::{ExportAsset, NodeId}; use super::edit::{refuse_symbol_part, roots_of, selected_roots}; use super::fileio::{ - DEFAULT_FORMAT_3D, FORMATS_3D, SCREEN_SETTINGS_KEYS, check_screen_settings, create_dir, export_crop, export_screens, mesh_file_names, mesh_files, - safe_file_name, store_screen_settings, with_screen_export_preset, write_file, + DEFAULT_FORMAT_3D, FORMATS_3D, SCREEN_SETTINGS_KEYS, TEXTURE_SIZE, TEXTURE_SIZES, check_screen_settings, create_dir, export_crop, export_screens, + image_maps, mesh_file_names, mesh_files, safe_file_name, store_screen_settings, textures, with_screen_export_preset, write_file, }; use super::{CommandSpec, EngineError, Result, Session, bad, bool_or, checked_ids_param, cmd, has_doc, ok, str_param, switch_or, text_param}; @@ -80,7 +80,7 @@ pub fn specs() -> Vec { "Export 3D Assets", [], None, - "{assets?: [asset id…] (default every 3D asset), folder?, zip?} each 3D asset's object as a mesh file in its format (assets.set3DFormat), named after the asset: USDA or USDZ, glTF 2.0 (one .gltf, its buffer embedded) or OBJ with its .mtl (whitespace and # in an OBJ's name become _). Every solid of the object (the fill's, each stroke's, a group's members') is a mesh with a material in the color it is painted; faces turned away from the viewer are included, at the object's 3D rotation, y up, about the point it turns about, in points (glTF: meters). Files that would share a name get -2, -3…; an object with a hole that crosses its face's outline or another hole, or with more than 2,000,000 triangles, is refused → {files: [path…]} (no folder: {files: [{name, dataBase64}]}, or with zip one zip as {name, dataBase64, files})", + "{assets?: [asset id…] (default every 3D asset), folder?, zip?, textureSize?: 128…4096 (default 1024: the pixels along the longer side of each face's texture)} each 3D asset's object as a mesh file in its format (assets.set3DFormat), named after the asset: USDA or USDZ, glTF 2.0 (one .gltf, its buffer embedded) or OBJ with its .mtl (whitespace and # in an OBJ's name become _). Every solid of the object (the fill's, each stroke's, a group's members') is a mesh with a material in the color it is painted; faces turned away from the viewer are included, at the object's 3D rotation, y up, about the point it turns about, in points (glTF: meters). The graphics mapped onto a plane or onto Extrude & Bevel's front or back cap (threeD.mapGraphic) are a PNG texture of that face: its color with the graphics drawn over it, flat and unlit, on a mesh of the face's own with texture coordinates; glTF embeds it, USDZ stores it after the layer, and OBJ and USDA write it beside them as -texture-1.png… (whitespace, # and @ become _); a face that is not opaque keeps its opacity in the texture's alpha, and an OBJ also gets -texture-1-opacity.png…, the alpha as gray levels for its map_d. Graphics on Revolve's side are not exported. Files that would share a name get -2, -3…; an object with a hole that crosses its face's outline or another hole, or with more than 2,000,000 triangles, or textures of more than 67,108,864 pixels in one export, is refused → {files: [path…]} (no folder: {files: [{name, dataBase64}]}, or with zip one zip as {name, dataBase64, files})", has_doc, export_3d ), @@ -299,6 +299,8 @@ fn export_3d(s: &mut Session, p: &Value) -> Result { } let folder = text_param(p, "folder", C)?.filter(|f| !f.is_empty()); let zip = switch_or(p, "zip", false, C)?; + let size = texture_size_param(p, C)?; + let mut pixels = 0u64; // Every file's name, compared without case: a later file that would take one gets -2, -3… let mut taken: HashSet = HashSet::new(); let mut files: Vec<(String, Vec)> = vec![]; @@ -311,18 +313,20 @@ fn export_3d(s: &mut Session, p: &Value) -> Result { let what = &a.name; let parts = vectorcraft_render::effects::three_d_meshes_of_in(Some(d), nodes).map_err(|e| bad(C, format!("{what} can't be exported in 3D: {e}")))?; + let pictures = textures(d, &parts, size, &mut pixels).map_err(|e| bad(C, format!("{what} can't be exported in 3D: {e}")))?; + let images = image_maps(&pictures); let base = Some(safe_file_name(&a.name)).filter(|b| !b.is_empty()).unwrap_or_else(|| "Asset".into()); let mut stem = base.clone(); let mut k = 1; loop { - let names = mesh_file_names(&stem, format).map_err(|e| bad(C, e))?; + let names = mesh_file_names(&stem, format, &images).map_err(|e| bad(C, e))?; if names.iter().all(|n| !taken.contains(&n.to_lowercase())) { break; } k += 1; stem = format!("{base}-{k}"); } - let made = mesh_files(&stem, format, &parts).map_err(|e| bad(C, e))?; + let made = mesh_files(&stem, format, &parts, &pictures).map_err(|e| bad(C, e))?; taken.extend(made.iter().map(|(n, _)| n.to_lowercase())); files.extend(made); } @@ -360,6 +364,21 @@ fn export_3d(s: &mut Session, p: &Value) -> Result { } } +/// Param `textureSize` of command `cmd`: the pixels along the longer side of each face's texture, +/// [`TEXTURE_SIZE`] when it is not given. +fn texture_size_param(p: &Value, cmd: &str) -> Result { + let key = "textureSize"; + let (lo, hi) = TEXTURE_SIZES; + match p.get(key) { + None | Some(Value::Null) => Ok(TEXTURE_SIZE), + Some(v) => v + .as_u64() + .and_then(|n| u32::try_from(n).ok()) + .filter(|n| (lo..=hi).contains(n)) + .ok_or_else(|| bad(cmd, format!("`{key}` must be a whole number of pixels from {lo} to {hi}"))), + } +} + /// The asset ids of param `key`. fn asset_ids(p: &Value, key: &str, cmd: &str) -> Result> { let ids = p.get(key).and_then(Value::as_array).ok_or_else(|| bad(cmd, format!("`{key}` must be an array of asset ids (see assets.list)")))?; diff --git a/crates/engine/src/cmd/buildcmds.rs b/crates/engine/src/cmd/buildcmds.rs index 39dc0db8a2..a15af16360 100644 --- a/crates/engine/src/cmd/buildcmds.rs +++ b/crates/engine/src/cmd/buildcmds.rs @@ -38,6 +38,7 @@ mod shape_builder; mod trace; pub use live_paint::live_paint_gaps; +pub(crate) use live_paint::{isolated_live_paint, merge_drawn_in_isolation}; use live_paint::{lp_expand, lp_fill, lp_gap_options, lp_info, lp_make, lp_merge, lp_release, lp_stroke_edge}; use shape_builder::{sb_merge, sb_regions}; pub(crate) use trace::TracePresetChanges; @@ -144,7 +145,7 @@ pub fn specs() -> Vec { "Make", ["Object", "Image Trace"], None, - "{id?: image or Image Trace group (default: selection), preset?: name (imageTrace.presets), savedPreset?: {settings} (a saved preset's settings, which the journal records so a replay traces with them after the preset is changed, renamed or deleted; used in place of the saved preset `preset` names), enhanced?: false (the preset's enhanced version: with Auto Grouping, and with Shapes in all but High Fidelity Photo; Flat Logo has none and is traced as it is), params?: {mode: \"blackAndWhite\"|\"grayscale\"|\"color\"|\"logo\", threshold: 0-255, palette: \"limited\"|\"fullTone\"|\"automatic\"|\"documentLibrary\" (color mode; limited: the `colors` best colours, fullTone: as many as the tones need, more with colorDetail, automatic: flat art with its own colours, else fullTone, documentLibrary: at most `colors` of the library's colours, as they are), colors: 2-256, colorDetail: 0-100 (fullTone, automatic), library: \"document\" (the document's swatches) or a swatch library id or name (swatch.library.list; documentLibrary), colorGroup?: name (color mode, documentLibrary with library \"document\": the colors of that document color group instead of every swatch; \"\" is every swatch), paths: 0-100, corners: 0-100, noise: px (an area smaller than this joins the color it shares the longest border with; when that color is far from its own and the area is 2 px or more, or a single pixel whose longest border is not tied between colors, it joins the neighboring color nearest its pixels among those sharing at least a tenth of that border), method: \"abutting\"|\"overlapping\" (abutting with fills, not mode logo: a \"Seam Fills\" clip group under the paths holds strokes along the edges two filled paths share, 1.5 image pixels wide (VectorCraft's own width), in the color of the lower path (on an image stretched more one way than another, each stroke's outline in image pixels as a filled path), clipped to the image's box within the traced paths' box; paths that became live shapes get none; the paths are not changed), ignoreWhite (leave out white areas), ignoreColor?: \"#rrggbb\" (with ignoreWhite: the colour left out instead of white), ignoreBackground: false (with ignoreWhite: only the areas of the ignored color that reach the image's edge are left out), keepColors?: [\"#rrggbb\"…] (not mode logo: only the palette colors within about 30 levels of a listed color are traced; empty: every color), snapCurvesToLines, shapes: false (filled outlines that are a circle, an ellipse, a rectangle or a regular polygon come out as that live shape), autoGrouping: false (each path that has others inside it is grouped with them), gradients: false (grayscale and color: an area whose colour changes evenly along one direction is one path with a linear gradient fill), fills: true, strokes: false (Create: lines up to strokeWidth wide become stroked centre lines; without fills, wider areas become stroked outlines), strokeWidth: px (10), logoColors?: [\"#rrggbb\"…] (mode logo: flat-colour logos only; colours found automatically or named here, at most ten; white is its own color, and a named color with every channel 245 or more is taken as that white, except with logoColors named, logoWhite false and no ignoreWhite; noise = areas under noise/10 px ignored; edges to a fraction of a pixel, sharp corners restored, lines and circles snapped; enclosed transparent areas are painted white while white is its own color, and stay holes with ignoreWhite or without a white of its own; fills/strokes are ignored; gradients and photos are refused, judged by the image's own colors also when logoColors are named), logoWhite: true (mode logo with logoColors named; false traces the named colors only: white areas take the nearest of them, a named white is kept and enclosed transparent areas stay holes; with ignoreWhite, white areas are left out either way)}, view?: as imageTrace.setView (default: the traced object's own, else tracingResult), ids?: [id…] (instead of id)} → {id, paths, anchors, colors, warnings: [text…] (the image is over 1500 px on a side, so it traces more slowly; or it was traced scaled down; Flat Logo names only the size it traced a larger image at; or a keepColors color matches none the trace found, or nothing was traced)}", + "{id?: image or Image Trace group (default: selection), preset?: name (imageTrace.presets), savedPreset?: {settings} (a saved preset's settings, which the journal records so a replay traces with them after the preset is changed, renamed or deleted; used in place of the saved preset `preset` names), enhanced?: false (the preset's enhanced version: with Auto Grouping, and with Shapes in all but High Fidelity Photo; Flat Logo has none and is traced as it is), params?: {mode: \"blackAndWhite\"|\"grayscale\"|\"color\"|\"logo\", threshold: 0-255, palette: \"limited\"|\"fullTone\"|\"automatic\"|\"documentLibrary\" (color mode; limited: the `colors` best colours, fullTone: as many as the tones need, more with colorDetail, split into at least colorDetail colors where the image has that many before colors that look alike merge (less than 5 apart in Oklab × 100 and thoroughly mixed, or less than 1.5 and mixed in patches), automatic: flat art with its own colours, else as many as the tones need without fullTone's least count, merging close RGB colors, documentLibrary: at most `colors` of the library's colours, as they are), colors: 2-256, colorDetail: 0-100 (fullTone, automatic), library: \"document\" (the document's swatches) or a swatch library id or name (swatch.library.list; documentLibrary), colorGroup?: name (color mode, documentLibrary with library \"document\": the colors of that document color group instead of every swatch; \"\" is every swatch), paths: 0-100, corners: 0-100, noise: px (an area smaller than this joins the color it shares the longest border with; when that color is far from its own and the area is 2 px or more, or a single pixel whose longest border is not tied between colors, it joins the neighboring color nearest its pixels among those sharing at least a tenth of that border), method: \"abutting\"|\"overlapping\" (abutting with fills, not mode logo: a \"Seam Fills\" clip group under the paths holds strokes along the edges two filled paths share, 1.5 image pixels wide (VectorCraft's own width), in the color of the lower path (on an image stretched more one way than another, each stroke's outline in image pixels as a filled path), clipped to the image's box within the traced paths' box; paths that became live shapes get none; the paths are not changed), ignoreWhite (leave out white areas), ignoreColor?: \"#rrggbb\" (with ignoreWhite: the colour left out instead of white), ignoreBackground: false (with ignoreWhite: only the areas of the ignored color that reach the image's edge are left out), keepColors?: [\"#rrggbb\"…] (not mode logo: only the palette colors within about 30 levels of a listed color are traced; empty: every color), snapCurvesToLines, shapes: false (filled outlines that are a circle, an ellipse, a rectangle or a regular polygon come out as that live shape), autoGrouping: false (each path that has others inside it is grouped with them), gradients: false (grayscale and color: an area whose colour changes evenly along one direction is one path with a linear gradient fill), fills: true, strokes: false (Create: lines up to strokeWidth wide become stroked centre lines; without fills, wider areas become stroked outlines), strokeWidth: px (10), logoColors?: [\"#rrggbb\"…] (mode logo: flat-colour logos only; colours found automatically or named here, at most ten; white is its own color, and a named color with every channel 245 or more is taken as that white, except with logoColors named, logoWhite false and no ignoreWhite; noise = areas under noise/10 px ignored; edges to a fraction of a pixel, sharp corners restored, lines and circles snapped; enclosed transparent areas are painted white while white is its own color, and stay holes with ignoreWhite or without a white of its own; fills/strokes are ignored; gradients and photos are refused, judged by the image's own colors also when logoColors are named), logoWhite: true (mode logo with logoColors named; false traces the named colors only: white areas take the nearest of them, a named white is kept and enclosed transparent areas stay holes; with ignoreWhite, white areas are left out either way)}, view?: as imageTrace.setView (default: the traced object's own, else tracingResult), ids?: [id…] (instead of id)} → {id, paths, anchors, colors, warnings: [text…] (the image is over 1500 px on a side, so it traces more slowly; or it was traced scaled down; Flat Logo names only the size it traced a larger image at; or a keepColors color matches none the trace found, or nothing was traced)}", has_selection_or_ids, |s, p| trace_make(s, p, false) ), diff --git a/crates/engine/src/cmd/buildcmds/live_paint.rs b/crates/engine/src/cmd/buildcmds/live_paint.rs index 7938c07879..2eea5c2c00 100644 --- a/crates/engine/src/cmd/buildcmds/live_paint.rs +++ b/crates/engine/src/cmd/buildcmds/live_paint.rs @@ -1,8 +1,8 @@ use super::{ Appearance, AppearanceItem, Arc, Beside, Document, EDGE_NAME, EngineError, FACE_NAME, GapOptions, GapSize, LIVE_PAINT_NAME, Node, NodeId, - PathData, Point, Rect, Result, SOURCES_NAME, Selection, Session, SubPath, Value, b, bad, build_children, edge_near, face_at, finite, - fit_to_old_edge, ids_json, is_live_paint, json, number_or, object_param, paint_from, po, point_param, repaint_from, replace_roots, root_ids, - source_nodes, source_shapes, switch_or, + PathData, Point, Rect, Result, Selection, Session, SubPath, Value, b, bad, build_children, edge_near, face_at, finite, fit_to_old_edge, ids_json, + is_live_paint, json, number_or, object_param, paint_from, po, point_param, repaint_from, replace_roots, root_ids, source_nodes, source_shapes, + switch_or, }; /// `options` as stored on a Live Paint group: none for the defaults. @@ -53,6 +53,27 @@ fn make_live(d: &mut Document, sel: &mut Selection, roots: &[NodeId]) -> Result< Ok((gid, nf, ne)) } +/// The children of Live Paint group `g` besides its sources group ([`b::sources`]) and its faces and +/// edges (paths named [`FACE_NAME`] or [`EDGE_NAME`]), back to front: objects drawn in it in +/// isolation mode. A group or other object named like a part is one of them. +fn others_in(g: &Node) -> impl Iterator> { + let src = b::sources(g).map(|s| s.id); + g.children() + .into_iter() + .flatten() + .filter(move |c| Some(c.id) != src && !(c.path_data().is_some() && matches!(c.name.as_deref(), Some(FACE_NAME | EDGE_NAME)))) +} + +/// Make `parts` (a sources group, faces and edges made again) the children of Live Paint group `g`, +/// with its other children ([`others_in`]) that are not among `gone` kept in front of them, in their +/// order. +fn set_parts(g: &mut Node, mut parts: Vec>, gone: &[NodeId]) { + parts.extend(others_in(g).filter(|c| !gone.contains(&c.id)).cloned()); + if let Some(ch) = g.children_mut() { + *ch = parts; + } +} + /// Select `ids` alone, without an undo step, when they are not selected that way already. fn select_only(s: &mut Session, ids: &[NodeId]) -> Result<()> { let st = s.doc()?; @@ -134,9 +155,15 @@ fn merge_live(d: &mut Document, sel: &mut Selection, roots: &[NodeId]) -> Result b::faces(&old).iter().filter(|f| draws(f)).filter_map(|f| Some((po::interior_point(f.path_data()?)?, Carried::of(f)))).collect(); let old_parts = old.clone(); let mut sources = source_nodes(&old); + // The objects drawn in the other Live Paint groups besides their parts stay in the merged group. + let mut others = vec![]; for r in roots { if *r != target { - sources.extend(source_nodes(d.node(*r).ok_or(EngineError::NoNode(*r))?)); + let n = d.node(*r).ok_or(EngineError::NoNode(*r))?; + sources.extend(source_nodes(n)); + if is_live_paint(n) { + others.extend(others_in(n).cloned()); + } } } // Merge applies the Gap Options' merge rules to the groups' options, bottom-most first. @@ -146,8 +173,9 @@ fn merge_live(d: &mut Document, sel: &mut Selection, roots: &[NodeId]) -> Result // The group keeps its name, lock, visibility, transparency, appearance, opacity mask, graphic // style link and the rest; its children are made again and its Gap Options set to the merged ones. let mut g = old; + set_parts(&mut g, children, roots); if let Some(ch) = g.children_mut() { - *ch = children; + ch.extend(others); } g.extras_mut().live_paint_gaps = stored_gap_options(options); for (pt, carried) in keep_faces { @@ -199,6 +227,38 @@ pub(super) fn lp_merge(s: &mut Session, p: &Value) -> Result { Ok(json!({ "id": id.0, "faces": faces, "edges": edges })) } +/// The Live Paint group whose drawn art is added when isolation mode leaves `isolated`: the innermost +/// Live Paint group that is `isolated` or holds it, such as a group drawn in an isolated Live Paint +/// group and then isolated itself. None when `isolated` is not in a Live Paint group. +pub(crate) fn isolated_live_paint(d: &Document, isolated: NodeId) -> Option { + d.ancestry(isolated)?.into_iter().rev().find(|id| d.node(*id).is_some_and(is_live_paint)) +} + +/// The children of Live Paint group `g` besides its parts ([`others_in`]) that Live Paint takes +/// ([`b::live_paint_takes`]) and that are shown and unlocked with everything in them, back to +/// front: the paths drawn in it in isolation mode. +fn drawn_in(g: &Node) -> Vec { + fn open(n: &Node) -> bool { + n.visible && !n.locked && n.children().is_none_or(|ch| ch.iter().all(|c| open(c))) + } + others_in(g).filter(|c| open(c) && b::live_paint_takes(c)).map(|c| c.id).collect() +} + +/// Leaving isolation mode in Live Paint group `g` adds the paths drawn in it to the group as +/// `livePaint.merge` does, in one "Merge Live Paint" undo step; → whether any were added. Type, +/// images, other objects Live Paint does not take, and hidden or locked objects stay where they +/// are. With nothing to add, or when `g` is not a Live Paint group, nothing changes and no undo +/// step is recorded. +pub(crate) fn merge_drawn_in_isolation(s: &mut Session, g: NodeId) -> Result { + let drawn = s.doc()?.doc.node(g).filter(|n| is_live_paint(n)).map(drawn_in).unwrap_or_default(); + if drawn.is_empty() { + return Ok(false); + } + let roots: Vec = std::iter::once(g).chain(drawn).collect(); + s.edit("Merge Live Paint", |d, sel| merge_live(d, sel, &roots))?; + Ok(true) +} + fn live_targets(s: &Session, p: &Value) -> Result> { let d = &s.doc()?.doc; let ids = root_ids(s, p)?; @@ -216,7 +276,8 @@ pub(super) fn lp_release(s: &mut Session, p: &Value) -> Result { let mut released = Beside::replacing(d, &targets); for g in &targets { let n = d.node(*g).cloned().ok_or(EngineError::NoNode(*g))?; - let srcs: Vec = source_nodes(&n).iter().map(|c| (**c).clone()).collect(); + // The objects drawn in the group besides its parts are released in front of its paths. + let srcs: Vec = source_nodes(&n).iter().chain(others_in(&n)).map(|c| (**c).clone()).collect(); out.extend(srcs.iter().map(|c| c.id)); released.put(d, *g, srcs)?; } @@ -245,10 +306,12 @@ pub(super) fn lp_expand(s: &mut Session, p: &Value) -> Result { e.trace = None; e.live_paint_gaps = None; } + // Objects drawn in the group ([`others_in`]) stay, whatever they are named. + let src = b::sources(n).map(|c| c.id); if let Some(ch) = n.children_mut() { ch.retain(|c| match c.name.as_deref() { - Some(SOURCES_NAME) => false, - Some(FACE_NAME | EDGE_NAME) => draws(c), + _ if Some(c.id) == src => false, + Some(FACE_NAME | EDGE_NAME) if c.path_data().is_some() => draws(c), _ => true, }); } @@ -354,9 +417,7 @@ pub(super) fn lp_gap_options(s: &mut Session, p: &Value) -> Result { // The faces change only with what paint stops at, or with new paths. if added > 0 || options.max_gap() != old.gap_options().max_gap() { let (children, _, _) = build_children(d, sources, options.max_gap())?; - if let Some(ch) = n.children_mut() { - *ch = children; - } + set_parts(&mut n, children, &[]); repaint_from(&mut n, &old); } n.extras_mut().live_paint_gaps = stored_gap_options(options); diff --git a/crates/engine/src/cmd/clipboard/flavours.rs b/crates/engine/src/cmd/clipboard/flavours.rs index c17d6a4428..680e2902c8 100644 --- a/crates/engine/src/cmd/clipboard/flavours.rs +++ b/crates/engine/src/cmd/clipboard/flavours.rs @@ -209,7 +209,7 @@ pub fn specs() -> Vec { "Load Metafile into Clipboard", [], None, - "{dataBase64 (EMF or WMF bytes), center?: [x, y]} replace the clipboard with the picture's objects (paths, clipping groups, images, point type; the images they use), centred on `center` (default: the first artboard) → {count, warnings}; records VectorCraft doesn't read are skipped with one warning; then run edit.paste", + "{dataBase64 (EMF or WMF bytes), center?: [x, y]} replace the clipboard with the picture's objects (paths, clipping groups, images, point type; the images they use), centred on `center` (default: the first artboard) → {count, warnings}; records VectorCraft doesn't read are skipped with one warning; a picture cut short by a reader limit, images and pattern brushes that can't be read, clips that can't be applied and raster operations other than a plain copy each add a warning; then run edit.paste", has_doc, import_emf ), diff --git a/crates/engine/src/cmd/create.rs b/crates/engine/src/cmd/create.rs index c5d3d70fd2..013b373d19 100644 --- a/crates/engine/src/cmd/create.rs +++ b/crates/engine/src/cmd/create.rs @@ -53,7 +53,7 @@ pub fn specs() -> Vec { "Flare", [], None, - "{cx, cy, diameter=100, opacity=50 (%), brightness=30 (%), growth=20 (%), fuzziness=50 (%), rays=15, longest=300 (%), rayFuzziness=100 (%), rotation=0 (deg, turns the rays clockwise), x2?, y2? (ring end; else pathLength at direction), pathLength=300, rings=10, largest=50 (%), direction=45 (deg counter-clockwise from 3 o'clock: where the rings run from the centre), seed?, ringSeed? (whole number below 2^53: places the rings along the path anew, keeping their count and sizes)} → {id}", + "{cx, cy, diameter=100, opacity=50 (%), brightness=30 (%), growth=20 (%), fuzziness=50 (%), rays=15, longest=300 (%), rayFuzziness=100 (%), rotation=0 (deg, turns the rays clockwise), x2?, y2? (ring end; else pathLength at direction), pathLength=300, rings=10, largest=50 (%), direction=45 (deg counter-clockwise from 3 o'clock: where the rings run from the centre), seed?, ringSeed? (whole number below 2^53: deterministically places every ring along the path, including the first for small seed values, keeping their count and sizes)} → {id}", has_doc, flare ), @@ -67,7 +67,15 @@ pub fn specs() -> Vec { circle_through_points ), cmd!("shape.line", "Line Segment", [], None, "{x1, y1, x2, y2, fill?: bool (Fill Line: the current fill, else none)} → {id}", has_doc, line), - cmd!("shape.spiral", "Spiral", [], None, "{cx, cy, radius, decay=80 (%), segments=10, clockwise?} → {id}", has_doc, spiral), + cmd!( + "shape.spiral", + "Spiral", + [], + None, + "{cx, cy, radius, decay=80 (%), segments=10, clockwise?, rotation?: deg clockwise about (cx, cy)} (0: outer end at (cx + radius, cy)) → {id}", + has_doc, + spiral + ), cmd!( "shape.arc", "Arc", @@ -125,13 +133,6 @@ pub fn specs() -> Vec { ] } -/// Insert a new object at the top of the insertion parent with the current paint and new-art -/// template; select it. -pub(crate) fn add_art(s: &mut Session, label: &str, kind: NodeKind, name: Option) -> Result { - let look = s.new_art_look(s.paint.fill.clone(), s.paint.stroke.clone(), s.paint.stroke_width); - add_look(s, label, kind, look, name) -} - /// Insert a new object looking like `look` (drawing modes apply); select it. pub(crate) fn add_look(s: &mut Session, label: &str, kind: NodeKind, look: NewArt, name: Option) -> Result { insert_look(s, label, kind, look, name, true) @@ -143,7 +144,8 @@ pub(crate) fn insert_look(s: &mut Session, label: &str, kind: NodeKind, look: Ne insert_look_turned(s, label, kind, look, name, select, 0.0, true) } -/// [`add_art`] for an object made turned by a `rotation` param (degrees, clockwise on the page): +/// Insert a new object at the top of the insertion parent with the current paint and new-art +/// template, made turned by a `rotation` param (degrees, clockwise on the page), and select it: /// its bounding box turns with it, as after the Rotate tool. fn add_art_turned(s: &mut Session, label: &str, kind: NodeKind, rotation: f64) -> Result { let look = s.new_art_look(s.paint.fill.clone(), s.paint.stroke.clone(), s.paint.stroke_width); @@ -321,7 +323,7 @@ fn path_kind(path: PathData, live: Option) -> NodeKind { /// a box (rectangle, ellipse, grid) runs along the turned axes from `pivot`, the point the dialog /// placed at the click (its top-left corner `x`, `y`, or a grid's reference point), which stays /// put; an arc sized by its lengths turns about its reference point `x`, `y`, which the dialog -/// placed at the click; a polygon or star turns its base orientation about its centre. The params as they are at +/// placed at the click; a polygon, star or spiral turns its base orientation about its centre. The params as they are at /// 0° or a whole turn, for other commands and when they already carry a `rotation`. pub fn constrain_click(s: &Session, cmd: &str, mut params: Value, pivot: Point) -> Value { let base = s.prefs.constrain_angle; @@ -337,7 +339,7 @@ pub fn constrain_click(s: &Session, cmd: &str, mut params: Value, pivot: Point) o.insert("y".into(), json!(c.y - h / 2.0)); o.insert("rotation".into(), json!(rotation)); } - "shape.polygon" | "shape.star" => { + "shape.polygon" | "shape.star" | "shape.spiral" => { o.insert("rotation".into(), json!(rotation)); } "shape.arc" if o.contains_key("lengthX") || o.contains_key("lengthY") => { @@ -565,7 +567,7 @@ fn flare(s: &mut Session, p: &Value) -> Result { None | Some(Value::Null) => Ok(None), Some(v) => v.as_u64().map(Some).ok_or_else(|| bad("shape.flare", format!("`{key}` must be a whole number of at least 0, not {v}"))), }; - // The generator's state is odd (never 0). + // Xorshift64. Both streams start from a nonzero state. let random = |mut state: u64| { move || { state ^= state << 13; @@ -580,7 +582,13 @@ fn flare(s: &mut Session, p: &Value) -> Result { Some(r) if r >= 1 << 53 => return Err(bad("shape.flare", format!("`ringSeed` must be below 2^53, not {r}"))), r => r, }; - let mut ring_at = ring_seed.map(|r| random((r << 1) | 1)); + let mut ring_at = ring_seed.map(|r| { + // SplitMix64 initializes the ring-position stream. + let mut z = r.wrapping_add(0x9e37_79b9_7f4a_7c15); + z = (z ^ (z >> 30)).wrapping_mul(0xbf58_476d_1ce4_e5b9); + z = (z ^ (z >> 27)).wrapping_mul(0x94d0_49bb_1331_11eb); + random(z ^ (z >> 31)) + }); let stop = |offset: f32, opacity: f32| GradientStop { opacity, ..GradientStop::new(offset, vectorcraft_color::Color::WHITE) }; let radial = |centre: Point, radius: f64, stops: Vec| { let mut g = GradientPaint::new(Gradient::new(GradientKind::Radial, stops)); @@ -667,6 +675,10 @@ fn line(s: &mut Session, p: &Value) -> Result { } fn spiral(s: &mut Session, p: &Value) -> Result { + let rotation = if p.get("rotation").is_some() { f64_req(p, "rotation", "shape.spiral")? } else { 0.0 }; + if !rotation.is_finite() { + return Err(bad("shape.spiral", "rotation must be finite")); + } let c = Point::new(f64_req(p, "cx", "shape.spiral")?, f64_req(p, "cy", "shape.spiral")?); let segments = count_or(p, "segments", 10, "shape.spiral")?.clamp(2, 1000) as u32; let path = shapes::spiral( @@ -676,7 +688,15 @@ fn spiral(s: &mut Session, p: &Value) -> Result { segments, switch_or(p, "clockwise", true, "shape.spiral")?, ); - add_art(s, "Spiral", path_kind(path, None), None) + // The outer end turns clockwise from (cx + radius, cy) about the center; 0 and whole turns + // leave the path as it is, and quarter turns are exact. + let path = if bbox_turn(rotation) == 0.0 { + path + } else { + let c = c.to_vec2(); + path.transformed(Affine::translate(c) * vectorcraft_geom::rotate_deg(rotation) * Affine::translate(-c)) + }; + add_art_turned(s, "Spiral", path_kind(path, None), constrained_turn(s, rotation)) } fn arc(s: &mut Session, p: &Value) -> Result { diff --git a/crates/engine/src/cmd/draw2/commands.rs b/crates/engine/src/cmd/draw2/commands.rs index b9015a4cc7..05dae578ce 100644 --- a/crates/engine/src/cmd/draw2/commands.rs +++ b/crates/engine/src/cmd/draw2/commands.rs @@ -11,7 +11,7 @@ pub fn specs() -> Vec { "Pencil", [], None, - "{points: [[x,y]…] or [[x,y,pressure]…] or [[x,y,pressure,tiltX,tiltY,rotation]…] (pen pressure 0..1: the stroke keeps it, for Calligraphic and Scatter brushes with Pressure variation; a point without one presses fully. Pen tilt in degrees, each −90..90, x positive leaning right and y leaning down the page, and barrel rotation in degrees clockwise, 0..360: the stroke keeps how far the pen leaned, which way and how far its barrel turned, for brushes with Tilt, Bearing and Rotation variation; null for what a point lacks. A pressure, tilt or rotation outside its range, or a point array of more than six numbers, is an error), fidelity?: pt (1.5; from 0.000015625 (0.01 / 640) to 100 / 0.0313 (about 3194.89), the Pencil's and the Paintbrush's 0.01 to 100 px Fidelity at the highest and the lowest zoom; a value outside that range is an error. The tools send their Fidelity in pixels divided by the zoom, kept within the range), fit?: bool (true; false: the points are joined by straight segments, as the Pencil previews a stroke with Live curve fitting off), closed?, style?: \"pencil\"|\"brush\", fill?: bool, keepSelected?: bool (true: the drawn or continued path is selected; false: a new path leaves nothing selected, and a continued or redrawn one is deselected while the rest of the selection stays), extend?: {id, end: \"start\"|\"end\"}, connect?: {id, end: \"start\"|\"end\"}, redraw?: {id, within?: pt (12)}} fit a freehand stroke → {id}. extend continues the path from that end, and closes it when `closed` is true (left out, when the stroke ends within four Fidelities of the path's other end, 6 to 400 pt); with connect, the stroke ends on that end of another path's last open subpath and joins it on, in one path with the extended path's appearance (the other path is removed when nothing of it is left); redraw (Edit Selected Paths) replaces the section of the path between where the stroke starts and ends, each within `within` of one subpath (the shorter way round a closed one), and draws a new path when the stroke doesn't end on it", + "{points: [[x,y]…] or [[x,y,pressure]…] or [[x,y,pressure,tiltX,tiltY,rotation]…] (pen pressure 0..1: the stroke keeps it, for Calligraphic and Scatter brushes with Pressure variation; a point without one presses fully. Pen tilt in degrees, each −90..90, x positive leaning right and y leaning down the page, and barrel rotation in degrees clockwise, 0..360: the stroke keeps how far the pen leaned, which way and how far its barrel turned, for brushes with Tilt, Bearing and Rotation variation; null for what a point lacks. A pressure, tilt or rotation outside its range, or a point array of more than six numbers, is an error), fidelity?: pt (1.5; from 0.000015625 (0.01 / 640) to 100 / 0.0313 (about 3194.89), the Pencil's and the Paintbrush's 0.01 to 100 px Fidelity at the highest and the lowest zoom; a value outside that range is an error. The tools send their Fidelity in pixels divided by the zoom, kept within the range), fit?: bool (true; false: the points are joined by straight segments, as the Pencil previews a stroke with Live curve fitting off), closed?, style?: \"pencil\" (default) | \"brush\", fill?: bool, keepSelected?: bool (true: the drawn or continued path is selected; false: a new path leaves nothing selected, and a continued or redrawn one is deselected while the rest of the selection stays), extend?: {id, end?: \"end\" (default) | \"start\"}, connect?: {id, end: \"start\"|\"end\"}, redraw?: {id, within?: pt (12)}} fit a freehand stroke → {id}. extend continues the path from that end, and closes it when `closed` is true (left out, when the stroke ends within four Fidelities of the path's other end, 6 to 400 pt); with connect, the stroke ends on that end of another path's last open subpath and joins it on, in one path with the extended path's appearance (the other path is removed when nothing of it is left); redraw (Edit Selected Paths) replaces the section of the path between where the stroke starts and ends, each within `within` of one subpath (the shorter way round a closed one), and draws a new path when the stroke doesn't end on it. Any other style, extend end or connect end is an error, and nothing changes", has_doc, freehand ), @@ -128,7 +128,7 @@ pub fn specs() -> Vec { "Blob Brush", [], None, - "{points: [[x,y]…] or [[x,y,pressure]…] (pen pressure 0..1; pen values are checked as path.freehand checks them), size?: pt (10; from 0.1 to 1000), sizeMode?: \"fixed\" (default) | \"pressure\" (Blob Brush Tool Options' Size set to Pressure: the brush is size − sizeVariation wide at the lightest pen pressure and size + sizeVariation at the heaviest, at least 0.1 pt; a stroke without pressure keeps the size), sizeVariation?: pt (0; from 0 to 1000, checked with Fixed too), angle?: ° (0, kept within −180–180: the tip's long axis counter-clockwise from horizontal, kept on the page along the stroke), roundness?: % (100, kept within 0–100: the tip's short axis in percent of its long one, 100 round; 0 is drawn as 0.1), fidelity?: pt (0.01–100; the brush follows the stroke fitted at this tolerance as path.freehand fits a Pencil stroke, and a higher value gives a smoother shape; without it the brush follows every point), merge?: true, mergeOnlySelection?: bool (false: merge with any touching same-color blob; true: only with selected ones), keepSelected?: bool (false: the drawn or merged path is not selected, and the rest of the selection stays; true: it is selected)} filled brush shape, merged with the topmost touching same-color blob and the touching ones next to it in stacking order in its group or layer → {id}", + "{points: [[x,y]…] or [[x,y,pressure]…] (pen pressure 0..1; pen values are checked as path.freehand checks them), size?: pt (10; from 0.1 to 1000), sizeMode?: \"fixed\" (default) | \"pressure\" (Blob Brush Tool Options' Size set to Pressure: the brush is size − sizeVariation wide at the lightest pen pressure and size + sizeVariation at the heaviest, at least 0.1 pt; a stroke without pressure keeps the size), sizeVariation?: pt (0; from 0 to 1000, checked with Fixed too), angle?: ° (0, −180–180: the tip's long axis counter-clockwise from horizontal, kept on the page along the stroke), roundness?: % (100, 0–100: the tip's short axis in percent of its long one, 100 round; 0 is drawn as 0.1), fidelity?: pt (0.01–100; the brush follows the stroke fitted at this tolerance as path.freehand fits a Pencil stroke, and a higher value gives a smoother shape; without it the brush follows every point), merge?: true, mergeOnlySelection?: bool (false: merge with any touching same-color blob; true: only with selected ones), keepSelected?: bool (false: the drawn or merged path is not selected, and the rest of the selection stays; true: it is selected)} filled brush shape, merged with the topmost touching same-color blob and the touching ones next to it in stacking order in its group or layer → {id}. An angle, roundness or fidelity outside its range is rejected with an error, and nothing changes", has_doc, blob ), diff --git a/crates/engine/src/cmd/draw2/freehand.rs b/crates/engine/src/cmd/draw2/freehand.rs index 9ca565667d..241d252816 100644 --- a/crates/engine/src/cmd/draw2/freehand.rs +++ b/crates/engine/src/cmd/draw2/freehand.rs @@ -200,14 +200,22 @@ pub(crate) fn freehand_brushed(s: &mut Session, p: &Value, brush_name: Option<&s // The tolerance the stroke is fitted at; with `fit: false` it is not fitted. let fit_tol = switch_or(p, "fit", true, C)?.then_some(tol); let closed = switch_or(p, "closed", false, C)?; - let brush = str_param(p, "style") == Some("brush"); + let brush = match p.get("style").filter(|v| !v.is_null()).map(Value::as_str) { + None | Some(Some("pencil")) => false, + Some(Some("brush")) => true, + Some(_) => return Err(bad(C, "style must be \"pencil\" or \"brush\"")), + }; // The undo step's name: a stroke painted with a brush is a Paintbrush stroke, whatever its style. let label = if brush || brush_name.is_some() { "Paintbrush" } else { "Pencil" }; let keep_selected = switch_or(p, "keepSelected", true, C)?; let filled = switch_or(p, "fill", false, C)?; if let Some(ext) = p.get("extend").filter(|v| !v.is_null()) { let id = object_param(ext, "id", C)?.ok_or_else(|| bad(C, "extend needs id"))?; - let at_start = str_param(ext, "end") == Some("start"); + let at_start = match ext.get("end").filter(|v| !v.is_null()).map(Value::as_str) { + None | Some(Some("end")) => false, + Some(Some("start")) => true, + Some(_) => return Err(bad(C, "extend end must be \"start\" or \"end\"")), + }; let (pd, _) = path_of(&s.doc()?.doc, id)?; let si = pd.subpaths.iter().rposition(|s| !s.closed && !s.anchors.is_empty()).ok_or_else(|| bad(C, "path has no open end"))?; let target = brush_target(&s.doc()?.doc, id); @@ -488,12 +496,23 @@ pub(super) fn blob(s: &mut Session, p: &Value) -> Result { let samples = samples_param(p, "points", C)?; let size = ranged(p, "size", 10.0, SIZES, C)?; let angle = number_or(p, "angle", 0.0, C)?; + if !(-180.0..=180.0).contains(&angle) { + return Err(bad(C, "`angle` must be from -180 to 180 degrees")); + } let roundness = number_or(p, "roundness", 100.0, C)?; - if !angle.is_finite() || !roundness.is_finite() { - return Err(bad(C, "angle and roundness must be finite")); + if !(0.0..=100.0).contains(&roundness) { + return Err(bad(C, "`roundness` must be from 0 to 100%")); + } + // With `fidelity` (pt), the brush follows the stroke fitted by [`fit_freehand`], as a Pencil + // stroke is fitted. Without it, or when the fitted stroke has no length (a short stroke back to + // its start), the brush follows every point. + let fidelity = match p.get("fidelity") { + None | Some(Value::Null) => None, + Some(_) => Some(number_or(p, "fidelity", 0.0, C)?), + }; + if fidelity.is_some_and(|f| !(vectorcraft_tools::draw2::MIN_FIDELITY..=100.0).contains(&f)) { + return Err(bad(C, "`fidelity` must be from 0.01 to 100 pt")); } - let angle = angle.clamp(-180.0, 180.0); - let roundness = roundness.clamp(0.0, 100.0); let tip = vectorcraft_tools::draw2::blob_tip(angle, roundness); let squash = tip.inverse(); // Width profiles use distance along the spine, so measure pressure on the same squashed @@ -515,13 +534,6 @@ pub(super) fn blob(s: &mut Session, p: &Value) -> Result { let mapped_pts: Vec = mapped_samples.into_iter().map(|s| s.pt).collect(); // The widest the brush gets: the area merges look in. let reach = pressure.as_ref().map_or(size, |(_, v)| size + v); - // With `fidelity` (pt), the brush follows the stroke fitted by [`fit_freehand`], as a Pencil - // stroke is fitted. Without it, or when the fitted stroke has no length (a short stroke back to - // its start), the brush follows every point. - let fidelity = match p.get("fidelity") { - None | Some(Value::Null) => None, - Some(_) => Some(number_or(p, "fidelity", 0.0, C)?.clamp(vectorcraft_tools::draw2::MIN_FIDELITY, 100.0)), - }; let spine = |tol: Option| { let path = match tol { Some(tol) => PathData::single(fit_freehand(&pts, tol, false)), diff --git a/crates/engine/src/cmd/fileio.rs b/crates/engine/src/cmd/fileio.rs index 6817f28b35..a6e913f9f6 100644 --- a/crates/engine/src/cmd/fileio.rs +++ b/crates/engine/src/cmd/fileio.rs @@ -39,7 +39,7 @@ pub mod jxlread; mod legacy_ai; mod load; mod mesh3d; -pub(crate) use load::{MAX_RASTER_ALLOC, file_clipped, png_clip, size_note}; +pub(crate) use load::{MAX_RASTER_ALLOC, file_clipped, image_clip, size_note}; mod heifread; mod hpgl; mod jp2read; @@ -87,8 +87,10 @@ pub use load::{ }; pub(crate) use load::{check_files_not_lossy_overwrite, check_not_lossy_overwrite, lossy_source}; pub use load::{losses_summary, overwrite_losses}; -pub use mesh3d::{DEFAULT_FORMAT_3D, FORMATS_3D, format_3d_label}; -pub(crate) use mesh3d::{mesh_file_names, mesh_files}; +#[cfg(test)] +pub(crate) use mesh3d::MAX_TEXTURE_PIXELS; +pub use mesh3d::{DEFAULT_FORMAT_3D, FORMATS_3D, draws_textures, format_3d_label}; +pub(crate) use mesh3d::{TEXTURE_SIZE, TEXTURE_SIZES, image_maps, mesh_file_names, mesh_files, textures}; pub use naming::{NameParts as FileNameParts, parse_date as parse_file_date, render as render_file_name}; pub(crate) use native::preview_png; pub use native::with_compression_pref; diff --git a/crates/engine/src/cmd/fileio/commands.rs b/crates/engine/src/cmd/fileio/commands.rs index 554d088b79..adc73c2c85 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, and the artboards are 36 pt apart plus that bleed on both sides; 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, through the profiles the document keeps after the color management policies of edit.colorSettings, 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; a blank page: its crop box; a PDF-compatible .ai: its trim box for crop; on its trim box a page shows its bleed box round the artboard and gives the document its bleed), in a row 36 pt apart (on trim boxes, plus the bleed on both sides), 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}]}; the color management policies of edit.colorSettings keep, take off or convert from the profiles the file is tagged with, their notes go to warnings, and a document they changed opens with unsaved changes; 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, and the artboards are 36 pt apart plus that bleed on both sides; 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, through the profiles the document keeps after the color management policies of edit.colorSettings, 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; a blank page: its crop box; a PDF-compatible .ai: its trim box for crop; on its trim box a page shows its bleed box round the artboard and gives the document its bleed), in a row 36 pt apart (on trim boxes, plus the bleed on both sides), 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}]}; the color management policies of edit.colorSettings keep, take off or convert from the profiles the file is tagged with, their notes go to warnings, and a document they changed opens with unsaved changes; 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; a picture cut short by a reader limit, images and pattern brushes that can't be read, clips that can't be applied and raster operations other than a plain copy each add a 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 ), diff --git a/crates/engine/src/cmd/fileio/export.rs b/crates/engine/src/cmd/fileio/export.rs index 1e27778aac..2fb2b63357 100644 --- a/crates/engine/src/cmd/fileio/export.rs +++ b/crates/engine/src/cmd/fileio/export.rs @@ -211,17 +211,11 @@ fn selected_part(n: &Arc, keep: &HashSet, holders: &HashSet Document { - fn kept( - n: &Arc, - doc: &Document, - symbols: &SymbolBoxes, - rect: vectorcraft_geom::Rect, - renderer: &mut vectorcraft_render::Renderer, - ) -> Option> { + fn kept(n: &Arc, symbols: &SymbolBoxes, rect: vectorcraft_geom::Rect, renderer: &mut vectorcraft_render::Renderer) -> Option> { if matches!(n.kind, NodeKind::Layer { clip: false, .. }) { let mut layer = Node::clone(n); let children = layer.children_mut()?; - *children = children.iter().filter_map(|c| kept(c, doc, symbols, rect, renderer)).collect(); + *children = children.iter().filter_map(|c| kept(c, symbols, rect, renderer)).collect(); return Some(Arc::new(layer)); } // A group that doesn't clip keeps only its members over the artboard, so art gathered in one @@ -230,20 +224,21 @@ pub(super) fn art_over(doc: &Document, rect: vectorcraft_geom::Rect, renderer: & if matches!(n.kind, NodeKind::Group { clip: false, .. }) && n.appearance.effects.is_empty() { let mut group = Node::clone(n); let children = group.children_mut()?; - *children = children.iter().filter_map(|c| kept(c, doc, symbols, rect, renderer)).collect(); + *children = children.iter().filter_map(|c| kept(c, symbols, rect, renderer)).collect(); return (!children.is_empty()).then(|| Arc::new(group)); } let over = |b: vectorcraft_geom::Rect| b.x0 <= rect.x1 && rect.x0 <= b.x1 && b.y0 <= rect.y1 && rect.y0 <= b.y1; let mut holds_instance = false; n.walk(&mut |c| holds_instance |= matches!(c.kind, NodeKind::SymbolInstance { .. })); - let painted = || holds_instance && vectorcraft_render::painted_bounds(doc, n).is_some_and(over); + // Measured in boxes of its own, which find symbols through the same index. + let painted = || holds_instance && vectorcraft_render::painted_bounds_with(&symbols.unmeasured(), n).is_some_and(over); let reach = vectorcraft_brush::reach_within(n); let brushed = |b: vectorcraft_geom::Rect| over(if reach > 0.0 { b.inflate(reach, reach) } else { b }); (n.visual_bounds_with(symbols).is_none_or(brushed) || renderer.effect_bounds(symbols, n).is_some_and(brushed) || painted()).then(|| n.clone()) } let symbols = doc.symbol_boxes().with_brush_art(); let mut d = doc.clone(); - d.layers = doc.layers.iter().filter_map(|l| kept(l, doc, &symbols, rect, renderer)).collect(); + d.layers = doc.layers.iter().filter_map(|l| kept(l, &symbols, rect, renderer)).collect(); d } diff --git a/crates/engine/src/cmd/fileio/load.rs b/crates/engine/src/cmd/fileio/load.rs index ff0e14c40d..4e59e378a5 100644 --- a/crates/engine/src/cmd/fileio/load.rs +++ b/crates/engine/src/cmd/fileio/load.rs @@ -60,8 +60,7 @@ impl Loaded { } } -/// An image ready to embed: PNG/JPEG/GIF/WebP keep their bytes, other formats are stored as PNG -/// (what browsers, PDF and SVG viewers show). +/// An image ready to embed. CMYK images use JPEG or TIFF; other images use browser-readable formats. #[derive(Clone)] pub struct RasterImage { /// Content key for `Document::images` (identical files share one blob). @@ -937,8 +936,9 @@ pub(crate) fn size_note(bytes: &[u8]) -> Option { /// ink are written again with their inks together ([`vectorcraft_doc::cmyk::stored_cmyk_tiff`]); /// CMYK TIFFs with an alpha channel, which the decoder can't read, become RGBA in the active color /// settings' CMYK, whichever of their extra channels is the alpha -/// ([`vectorcraft_doc::cmyk::extra_samples_tiff_rgba`]), as do CMYK Photoshop documents, whose -/// merged image is read ([`psdread`]). +/// ([`vectorcraft_doc::cmyk::extra_samples_tiff_rgba`]). Opaque CMYK PSD/PSB merged images retain +/// 8- or 16-bit inks and their CMYK ICC profile as TIFF, within the native CMYK pixel and allocation limits; +/// other CMYK composites use the RGBA decoder's allocation limit ([`psdread`]). /// 1-bit TIFFs compressed with CCITT Group 3, which the decoder can't read either, become RGBA /// too ([`vectorcraft_doc::cmyk::group3_tiff_rgba`]). /// Grayscale TIFFs with an alpha channel or other extra channels, which the decoder can't read @@ -961,14 +961,27 @@ pub(crate) fn size_note(bytes: &[u8]) -> Option { /// or TIFF keeps its inks, at the 8 or 16 bits the file has, and its CMYK ICC profile as a CMYK /// TIFF ([`vectorcraft_doc::cmyk::turned_cmyk`]). An image the decoder reads and that is stored as /// PNG keeps its gray or RGB samples at 8 or 16 bits, and the gray or RGB ICC profile they are in; -/// other samples become 8-bit RGBA. A Photoshop document's PNG keeps the clipping path the file -/// names ([`png_with_clip`]). +/// other samples become 8-bit RGBA. A PSD/PSB composite's stored image keeps its imported +/// clipping path ([`image_clip`]). pub fn raster_image(bytes: &[u8]) -> Result { let ppi = super::ppi::resolution(bytes); if let Some((w, h)) = vectorcraft_doc::cmyk::oversized_tiff(bytes) { return Err(err(format!("an image of {w} × {h} pixels is too large to draw"))); } if psdread::is_psd(bytes) { + if let Some(mut native) = psdread::decode_cmyk(bytes, MAX_RASTER_ALLOC).map_err(err)? { + native.meta.dpi = ppi.map(|(x, y)| (x as f32, y as f32)); + let clip = psdread::clipping_path(bytes).and_then(|path| { + let json = serde_json::to_string(&path).ok().filter(|j| j.len() <= MAX_PNG_CLIP)?; + native.meta.text.push(("Description".into(), format!("{CLIP_KEYWORD}\n{json}"))); + Some((path, vectorcraft_geom::FillRule::EvenOdd)) + }); + let data = + craft_image_codecs::encode(&native, craft_image_codecs::Format::Tiff, &craft_image_codecs::EncodeOptions::default()).map_err(err)?; + let mut img = stored(data, "image/tiff", native.dimensions(), ppi)?; + img.clip = clip; + return Ok(img); + } let cms = vectorcraft_color::cms::active(); let img = as_png(psdread::decode(bytes, MAX_RASTER_ALLOC, |c| cms.cmyk_to_srgb(c, false)).map_err(err)?, None, ppi)?; return Ok(png_with_clip(img, psdread::clipping_path(bytes))); @@ -1173,6 +1186,31 @@ pub(crate) fn png_clip(png: &[u8]) -> Option { vectorcraft_geom::path::with_anchor_budget(vectorcraft_geom::path::MAX_READ_ANCHORS, || serde_json::from_slice(json).ok()) } +/// The imported clipping-path marker in a stored PNG or CMYK TIFF, within the path budget. +pub(crate) fn image_clip(blob: &ImageBlob) -> Option { + if blob.mime == "image/png" { + return png_clip(&blob.bytes); + } + if blob.mime != "image/tiff" { + return None; + } + use tiff::tags::{Tag, Type, ValueBuffer}; + let mut d = tiff::decoder::Decoder::new(std::io::Cursor::new(blob.bytes.as_slice())).ok()?; + let mut ifd = d.image_ifd(); + let entry = ifd.find_entry(Tag::ImageDescription)?; + if entry.field_type() != Type::ASCII || entry.count() > (MAX_PNG_CLIP + CLIP_KEYWORD.len() + 2) as u64 { + return None; + } + let mut buf = ValueBuffer::empty(Type::ASCII); + ifd.find_tag_buf(Tag::ImageDescription, &mut buf).ok()??; + let json = buf.as_bytes().strip_prefix(CLIP_KEYWORD.as_bytes())?.strip_prefix(b"\n")?; + let json = json.strip_suffix(b"\0").unwrap_or(json); + if json.len() > MAX_PNG_CLIP { + return None; + } + vectorcraft_geom::path::with_anchor_budget(vectorcraft_geom::path::MAX_READ_ANCHORS, || serde_json::from_slice(json).ok()) +} + /// An image as a document of its physical size at the resolution it declares (as Place sizes it; /// 72 ppi, 1 px = 1 pt, when it declares none), the image named after the file. pub(super) fn raster_doc(name: &str, bytes: &[u8]) -> Result { diff --git a/crates/engine/src/cmd/fileio/mesh3d.rs b/crates/engine/src/cmd/fileio/mesh3d.rs index 50a919d834..2e781772ea 100644 --- a/crates/engine/src/cmd/fileio/mesh3d.rs +++ b/crates/engine/src/cmd/fileio/mesh3d.rs @@ -9,13 +9,24 @@ //! as their specifications ask; MTL colors are the display colors. Materials are two-sided, since //! an open solid or a turned plane is seen from both sides. //! +//! The graphics mapped onto a face of a solid ([`textures`]) are a PNG picture of that face: its +//! color with the graphics drawn over it, flat and unshaded, which the face's own mesh shows through +//! texture coordinates and a material of its own. glTF embeds each PNG as a data URI, USDZ stores it +//! after the layer, and OBJ and USDA name PNG files written beside them (`-texture-1.png`…). +//! //! Formats: glTF 2.0 , USD -//! (USDZ: ). +//! (USDZ: ; +//! textures: ), OBJ and MTL +//! . use std::fmt::Write as _; +use std::sync::Arc; use serde_json::{Value, json}; -use vectorcraft_render::effects::SolidMesh; +use vectorcraft_doc::color::{Color, Paint}; +use vectorcraft_doc::{Appearance, Document, Node, NodeId}; +use vectorcraft_geom::{Affine, Rect}; +use vectorcraft_render::effects::{MeshGraphics, SolidMesh}; /// The formats a 3D asset exports to, as `assets.set3DFormat` names them: USDA first, the default. pub const FORMATS_3D: [&str; 4] = ["usda", "usdz", "gltf", "obj"]; @@ -23,6 +34,12 @@ pub const FORMATS_3D: [&str; 4] = ["usda", "usdz", "gltf", "obj"]; pub const DEFAULT_FORMAT_3D: &str = "usda"; /// The meters in a point (1/72 inch). const METERS_PER_POINT: f64 = 0.0254 / 72.0; +/// The pixels along the longer side of a face's texture, unless `assets.export3D` is given another +/// size, and the sizes it takes. +pub(crate) const TEXTURE_SIZE: u32 = 1024; +pub(crate) const TEXTURE_SIZES: (u32, u32) = (128, 4096); +/// The most texture pixels one export draws, all its assets together. +pub(crate) const MAX_TEXTURE_PIXELS: u64 = 4 * 4096 * 4096; /// The label of `format` for menus: `USDA`, `USDZ`, `glTF`, `OBJ`. pub fn format_3d_label(format: &str) -> &'static str { @@ -40,14 +57,44 @@ fn obj_stem(stem: &str) -> String { stem.chars().map(|c| if c.is_whitespace() || c == '#' { '_' } else { c }).collect() } -/// The names of the files [`mesh_files`] writes for `stem` in `format`. -pub(crate) fn mesh_file_names(stem: &str, format: &str) -> Result, String> { +/// The name of texture `k` (from 0) of the object named `stem`: whitespace, `#` and `@` become `_`, +/// so an MTL `map_Kd` line and a USD asset path name it as one word. +fn texture_name(stem: &str, k: usize) -> String { + format!("{}-texture-{}.png", texture_stem(stem), k + 1) +} + +/// The name of the opacity map of texture `k` (from 0) of the object named `stem`, as +/// [`texture_name`] names the texture. +fn opacity_name(stem: &str, k: usize) -> String { + format!("{}-texture-{}-opacity.png", texture_stem(stem), k + 1) +} + +/// `stem` with whitespace, `#` and `@` turned into `_`, for the names of its textures. +fn texture_stem(stem: &str) -> String { + stem.chars().map(|c| if c.is_whitespace() || c == '#' || c == '@' { '_' } else { c }).collect() +} + +/// The names of the files [`mesh_files`] writes for `stem` in `format` with the textures `images` +/// ([`image_maps`]: for each, whether it has an opacity map): OBJ and USDA name a PNG file for each +/// texture after them, and OBJ also one for each opacity map, after its texture; glTF and USDZ hold +/// theirs. +pub(crate) fn mesh_file_names(stem: &str, format: &str, images: &[bool]) -> Result, String> { + let beside = |mut names: Vec, stem: &str, maps: bool| { + for (k, map) in images.iter().enumerate() { + names.push(texture_name(stem, k)); + if maps && *map { + names.push(opacity_name(stem, k)); + } + } + names + }; match format { "obj" => { let stem = obj_stem(stem); - Ok(vec![format!("{stem}.obj"), format!("{stem}.mtl")]) + Ok(beside(vec![format!("{stem}.obj"), format!("{stem}.mtl")], &stem, true)) } - "gltf" | "usda" | "usdz" => Ok(vec![format!("{stem}.{format}")]), + "usda" => Ok(beside(vec![format!("{stem}.usda")], stem, false)), + "gltf" | "usdz" => Ok(vec![format!("{stem}.{format}")]), _ => { let key = "format"; Err(format!("`{key}` must be one of {}", FORMATS_3D.join(", "))) @@ -55,35 +102,109 @@ pub(crate) fn mesh_file_names(stem: &str, format: &str) -> Result, S } } +/// A picture painted on one part of a 3D object ([`SolidMesh`]): a PNG, and for each corner of the +/// part's mesh where it falls on the picture (0 to 1 across from the left, 0 to 1 down from the +/// top). `opacity` is a grayscale PNG of the picture's alpha when some of it is not opaque. +#[derive(Clone, Debug, PartialEq)] +pub(crate) struct Texture { + pub png: Arc>, + pub opacity: Option>>, + pub uv: Vec<[f64; 2]>, +} + +/// A distinct picture of a 3D object: the PNG and its opacity map. +type Picture = (Arc>, Option>>); + +/// The distinct pictures of `textures` in order of first use, and the index among them of each +/// part's (`None` for a part without one). +fn images(parts: usize, textures: &[Option]) -> (Vec, Vec>) { + let mut out: Vec = vec![]; + let index = (0..parts) + .map(|k| { + let t = textures.get(k)?.as_ref()?; + Some(out.iter().position(|(p, _)| Arc::ptr_eq(p, &t.png) || p == &t.png).unwrap_or_else(|| { + out.push((t.png.clone(), t.opacity.clone())); + out.len() - 1 + })) + }) + .collect(); + (out, index) +} + +/// For each distinct picture of `textures`, whether it has an opacity map ([`mesh_file_names`]). +pub(crate) fn image_maps(textures: &[Option]) -> Vec { + images(textures.len(), textures).0.iter().map(|(_, map)| map.is_some()).collect() +} + /// The files of a 3D object named `stem` in `format` ([`FORMATS_3D`]): `(file name, bytes)`, the -/// OBJ with its MTL after it. -pub(crate) fn mesh_files(stem: &str, format: &str, parts: &[SolidMesh]) -> Result)>, String> { - let names = mesh_file_names(stem, format)?; - let bytes = match format { +/// OBJ with its MTL after it and the PNG files of `textures` last (an OBJ's opacity maps each after +/// its texture). `textures` holds the picture of each part that has one, in the order of `parts`. +pub(crate) fn mesh_files(stem: &str, format: &str, parts: &[SolidMesh], textures: &[Option]) -> Result)>, String> { + let (images, image) = images(parts.len(), textures); + let maps: Vec = images.iter().map(|(_, map)| map.is_some()).collect(); + let names = mesh_file_names(stem, format, &maps)?; + let pictures: Vec>> = images.iter().map(|(p, _)| p.clone()).collect(); + let scene = Scene { parts, textures, image: &image, pictures: &pictures, maps: &maps }; + let pngs = || pictures.iter().map(|p| p.as_ref().clone()); + let bytes: Vec> = match format { "obj" => { - let (obj, mtl) = obj(&obj_stem(stem), parts); - vec![obj.into_bytes(), mtl.into_bytes()] + let stem = obj_stem(stem); + let (obj, mtl) = obj(&stem, &scene); + let with_maps = images.iter().flat_map(|(p, map)| std::iter::once(p.as_ref().clone()).chain(map.as_ref().map(|m| m.as_ref().clone()))); + [obj.into_bytes(), mtl.into_bytes()].into_iter().chain(with_maps).collect() + } + "gltf" => vec![gltf(stem, &scene).into_bytes()], + "usda" => std::iter::once(usda(stem, &scene).into_bytes()).chain(pngs()).collect(), + _ => { + let mut members = vec![(format!("{stem}.usda"), usda(stem, &scene).into_bytes())]; + members.extend(pngs().enumerate().map(|(k, png)| (texture_name(stem, k), png))); + vec![super::zip::store_aligned(&members, 64)?] } - "gltf" => vec![gltf(stem, parts).into_bytes()], - "usda" => vec![usda(stem, parts).into_bytes()], - _ => vec![super::zip::store_aligned(&[(format!("{stem}.usda"), usda(stem, parts).into_bytes())], 64)?], }; Ok(names.into_iter().zip(bytes).collect()) } -/// The distinct colors of `parts` in order, and each part's index among them. -fn materials(parts: &[SolidMesh]) -> (Vec<[f32; 4]>, Vec) { - let mut colors: Vec<[f32; 4]> = vec![]; - let index = parts +/// The parts of an object with their pictures: `image` is each part's index among `pictures`, and +/// `maps` says for each picture whether it has an opacity map. +struct Scene<'a> { + parts: &'a [SolidMesh], + textures: &'a [Option], + image: &'a [Option], + pictures: &'a [Arc>], + maps: &'a [bool], +} + +impl Scene<'_> { + /// Part `k`'s texture coordinates and picture, when it has a picture. + fn texture(&self, k: usize) -> Option<(&[[f64; 2]], usize)> { + let t = self.textures.get(k)?.as_ref()?; + Some((t.uv.as_slice(), (*self.image.get(k)?)?)) + } +} + +/// A material: a color, with a picture that replaces its red, green and blue. +#[derive(Clone, Copy, PartialEq)] +struct Material { + color: [f32; 4], + image: Option, +} + +/// The distinct materials of `scene`'s parts in order, and each part's index among them. +fn materials(scene: &Scene) -> (Vec, Vec) { + let mut out: Vec = vec![]; + let index = scene + .parts .iter() - .map(|p| { - colors.iter().position(|c| *c == p.color).unwrap_or_else(|| { - colors.push(p.color); - colors.len() - 1 + .enumerate() + .map(|(k, p)| { + let m = Material { color: p.color, image: scene.texture(k).map(|(_, i)| i) }; + out.iter().position(|c| *c == m).unwrap_or_else(|| { + out.push(m); + out.len() - 1 }) }) .collect(); - (colors, index) + (out, index) } /// An sRGB channel (0..1) as linear light. @@ -96,8 +217,9 @@ fn num(v: f64) -> String { format!("{v}") } -fn obj(stem: &str, parts: &[SolidMesh]) -> (String, String) { - let (colors, material) = materials(parts); +fn obj(stem: &str, scene: &Scene) -> (String, String) { + let parts = scene.parts; + let (materials, material) = materials(scene); let mut o = String::new(); let _ = writeln!(o, "mtllib {stem}.mtl"); let _ = writeln!(o, "o {stem}"); @@ -106,33 +228,64 @@ fn obj(stem: &str, parts: &[SolidMesh]) -> (String, String) { let _ = writeln!(o, "v {} {} {}", num(v[0]), num(v[1]), num(v[2])); } } + // OBJ's texture coordinates run up from the picture's bottom. + for k in 0..parts.len() { + for uv in scene.texture(k).map(|(uv, _)| uv).unwrap_or_default() { + let _ = writeln!(o, "vt {} {}", num(uv[0]), num(1.0 - uv[1])); + } + } for p in parts { for n in &p.mesh.normals { let _ = writeln!(o, "vn {} {} {}", num(n[0]), num(n[1]), num(n[2])); } } - let mut base = 1usize; + let (mut base, mut uv_base) = (1usize, 1usize); for (k, p) in parts.iter().enumerate() { let _ = writeln!(o, "g Solid_{}", k + 1); let _ = writeln!(o, "usemtl Material_{}", material.get(k).copied().unwrap_or(0) + 1); + let textured = scene.texture(k).filter(|(uv, _)| uv.len() == p.mesh.positions.len()).is_some(); for t in &p.mesh.triangles { - let [a, b, c] = t.map(|i| i as usize + base); - let _ = writeln!(o, "f {a}//{a} {b}//{b} {c}//{c}"); + if textured { + let [a, b, c] = t.map(|i| i as usize); + let corner = |i: usize| format!("{}/{}/{}", i + base, i + uv_base, i + base); + let _ = writeln!(o, "f {} {} {}", corner(a), corner(b), corner(c)); + } else { + let [a, b, c] = t.map(|i| i as usize + base); + let _ = writeln!(o, "f {a}//{a} {b}//{b} {c}//{c}"); + } } base += p.mesh.positions.len(); + uv_base += scene.texture(k).map_or(0, |(uv, _)| uv.len()); } let mut m = String::new(); - for (k, c) in colors.iter().enumerate() { + for (k, mat) in materials.iter().enumerate() { + let c = mat.color; let _ = writeln!(m, "newmtl Material_{}", k + 1); - let _ = writeln!(m, "Kd {} {} {}", num(f64::from(c[0])), num(f64::from(c[1])), num(f64::from(c[2]))); - let _ = writeln!(m, "d {}", num(f64::from(c[3]))); + match mat.image { + // The picture holds the color; Kd multiplies it. + Some(_) => { + let _ = writeln!(m, "Kd 1 1 1"); + } + None => { + let _ = writeln!(m, "Kd {} {} {}", num(f64::from(c[0])), num(f64::from(c[1])), num(f64::from(c[2]))); + } + } + // A picture's opacity map holds the opacity, as gray levels. + let _ = writeln!(m, "d {}", if mat.image.is_some() { "1".to_string() } else { num(f64::from(c[3])) }); let _ = writeln!(m, "illum 1"); + if let Some(i) = mat.image { + let _ = writeln!(m, "map_Kd -clamp on {}", texture_name(stem, i)); + if scene.maps.get(i).copied().unwrap_or(false) { + let _ = writeln!(m, "map_d -clamp on {}", opacity_name(stem, i)); + } + } } (o, m) } -fn gltf(stem: &str, parts: &[SolidMesh]) -> String { - let (colors, material) = materials(parts); +fn gltf(stem: &str, scene: &Scene) -> String { + let parts = scene.parts; + let (materials, material) = materials(scene); let mut buffer: Vec = vec![]; let (mut views, mut accessors, mut primitives) = (vec![], vec![], vec![]); let mut view = |buffer: &mut Vec, bytes: Vec, target: u32| -> usize { @@ -154,16 +307,25 @@ fn gltf(stem: &str, parts: &[SolidMesh]) -> String { })); accessors.push(json!({ "bufferView": normals, "componentType": 5126, "count": count, "type": "VEC3" })); accessors.push(json!({ "bufferView": indices, "componentType": 5125, "count": p.mesh.triangles.len() * 3, "type": "SCALAR" })); - primitives.push(json!({ + let mut primitive = json!({ "attributes": { "POSITION": at, "NORMAL": at + 1 }, "indices": at + 2, "material": material.get(k).copied().unwrap_or(0), - })); + }); + // glTF's texture coordinates run down from the picture's top, as the picture's own do. + if let Some((uv, _)) = scene.texture(k).filter(|(uv, _)| uv.len() == count) { + let bytes = uv.iter().flatten().flat_map(|x| (*x as f32).to_le_bytes()).collect(); + let coords = view(&mut buffer, bytes, 34962); + primitive["attributes"]["TEXCOORD_0"] = json!(accessors.len()); + accessors.push(json!({ "bufferView": coords, "componentType": 5126, "count": count, "type": "VEC2" })); + } + primitives.push(primitive); } - let materials: Vec = colors + let materials: Vec = materials .iter() .enumerate() - .map(|(k, c)| { + .map(|(k, mat)| { + let c = mat.color; let mut m = json!({ "name": format!("Material_{}", k + 1), "pbrMetallicRoughness": { @@ -173,13 +335,18 @@ fn gltf(stem: &str, parts: &[SolidMesh]) -> String { }, "doubleSided": true, }); + if let Some(i) = mat.image { + // The picture holds the color and the opacity; the factor multiplies them. + m["pbrMetallicRoughness"]["baseColorFactor"] = json!([1.0, 1.0, 1.0, 1.0]); + m["pbrMetallicRoughness"]["baseColorTexture"] = json!({ "index": i }); + } if c[3] < 1.0 { m["alphaMode"] = json!("BLEND"); } m }) .collect(); - let doc = json!({ + let mut doc = json!({ "asset": { "version": "2.0", "generator": "VectorCraft" }, "scene": 0, "scenes": [{ "nodes": [0] }], @@ -193,6 +360,14 @@ fn gltf(stem: &str, parts: &[SolidMesh]) -> String { "bufferViews": views, "accessors": accessors, }); + if !scene.pictures.is_empty() { + // Linear filtering, mipmaps, and coordinates held at the picture's edge. + doc["samplers"] = json!([{ "magFilter": 9729, "minFilter": 9987, "wrapS": 33071, "wrapT": 33071 }]); + doc["textures"] = Value::Array((0..scene.pictures.len()).map(|i| json!({ "sampler": 0, "source": i })).collect()); + doc["images"] = Value::Array( + scene.pictures.iter().map(|p| json!({ "uri": format!("data:image/png;base64,{}", vectorcraft_format::base64_encode(p)) })).collect(), + ); + } serde_json::to_string_pretty(&doc).unwrap_or_default() } @@ -205,8 +380,9 @@ fn prim_name(name: &str) -> String { out } -fn usda(stem: &str, parts: &[SolidMesh]) -> String { - let (colors, material) = materials(parts); +fn usda(stem: &str, scene: &Scene) -> String { + let parts = scene.parts; + let (materials, material) = materials(scene); let root = prim_name(stem); let triple = |v: [f64; 3]| format!("({}, {}, {})", num(v[0]), num(v[1]), num(v[2])); let list = |items: Vec| items.join(", "); @@ -238,23 +414,178 @@ fn usda(stem: &str, parts: &[SolidMesh]) -> String { linear(c[2]) ); let _ = writeln!(u, " float[] primvars:displayOpacity = [{}] (\n interpolation = \"constant\"\n )", c[3]); + // USD's texture coordinates run up from the picture's bottom. + if let Some((uv, _)) = scene.texture(k).filter(|(uv, _)| uv.len() == p.mesh.positions.len()) { + let st = list(uv.iter().map(|t| format!("({}, {})", num(t[0]), num(1.0 - t[1]))).collect()); + let _ = writeln!(u, " texCoord2f[] primvars:st = [{st}] (\n interpolation = \"vertex\"\n )"); + } let _ = writeln!(u, " uniform token subdivisionScheme = \"none\"\n }}\n"); } let _ = writeln!(u, " def Scope \"Materials\"\n {{"); - for (k, c) in colors.iter().enumerate() { - let m = k + 1; + for (k, mat) in materials.iter().enumerate() { + let (m, c) = (k + 1, mat.color); + let at = format!("/{root}/Materials/Material_{m}"); let _ = writeln!(u, " def Material \"Material_{m}\"\n {{"); - let _ = writeln!(u, " token outputs:surface.connect = \n"); + let _ = writeln!(u, " token outputs:surface.connect = <{at}/Surface.outputs:surface>\n"); let _ = writeln!(u, " def Shader \"Surface\"\n {{"); let _ = writeln!(u, " uniform token info:id = \"UsdPreviewSurface\""); - let _ = writeln!(u, " color3f inputs:diffuseColor = ({}, {}, {})", linear(c[0]), linear(c[1]), linear(c[2])); - let _ = writeln!(u, " float inputs:opacity = {}", c[3]); + match mat.image { + // The picture holds the color, and the opacity when the face is not opaque. + Some(_) => { + let _ = writeln!(u, " color3f inputs:diffuseColor.connect = <{at}/Texture.outputs:rgb>"); + if c[3] < 1.0 { + let _ = writeln!(u, " float inputs:opacity.connect = <{at}/Texture.outputs:a>"); + } else { + let _ = writeln!(u, " float inputs:opacity = 1"); + } + } + None => { + let _ = writeln!(u, " color3f inputs:diffuseColor = ({}, {}, {})", linear(c[0]), linear(c[1]), linear(c[2])); + let _ = writeln!(u, " float inputs:opacity = {}", c[3]); + } + } let _ = writeln!(u, " float inputs:roughness = 1"); - let _ = writeln!(u, " token outputs:surface\n }}\n }}"); + let _ = writeln!(u, " token outputs:surface\n }}"); + if let Some(i) = mat.image { + let _ = writeln!(u, "\n def Shader \"Texture\"\n {{"); + let _ = writeln!(u, " uniform token info:id = \"UsdUVTexture\""); + let _ = writeln!(u, " asset inputs:file = @{}@", texture_name(stem, i)); + let _ = writeln!(u, " float2 inputs:st.connect = <{at}/Coordinates.outputs:result>"); + let _ = writeln!(u, " token inputs:sourceColorSpace = \"sRGB\""); + let _ = writeln!(u, " token inputs:wrapS = \"clamp\""); + let _ = writeln!(u, " token inputs:wrapT = \"clamp\""); + let _ = writeln!(u, " float3 outputs:rgb"); + if c[3] < 1.0 { + let _ = writeln!(u, " float outputs:a"); + } + let _ = writeln!(u, " }}"); + let _ = writeln!(u, "\n def Shader \"Coordinates\"\n {{"); + let _ = writeln!(u, " uniform token info:id = \"UsdPrimvarReader_float2\""); + let _ = writeln!(u, " string inputs:varname = \"st\""); + let _ = writeln!(u, " float2 outputs:result\n }}"); + } + let _ = writeln!(u, " }}"); } let _ = writeln!(u, " }}\n}}"); u } +/// The pictures of the graphics on `parts` ([`SolidMesh::graphics`]), one for each part in order +/// (`None` for a part without graphics, or whose graphics draw nothing): the part's color with its +/// graphics drawn over it, flat and unshaded ([`vectorcraft_render::effects::mesh_graphics_art`]), +/// over the bounds of the art points of its corners, `size` pixels along the longer side. Parts with +/// the same color, face, graphics and bounds share one picture. `pixels` counts the pixels drawn so +/// far, and every call of one export shares it: an error when it passes [`MAX_TEXTURE_PIXELS`]. +pub(crate) fn textures(doc: &Document, parts: &[SolidMesh], size: u32, pixels: &mut u64) -> Result>, String> { + let mut renderer: Option = None; + // Each picture drawn: the part it was drawn for, its bounds, and the PNG with its opacity map + // (`None`: nothing drawn). + let mut drawn: Vec = vec![]; + let mut out = vec![]; + for part in parts { + let Some(g) = &part.graphics else { + out.push(None); + continue; + }; + let Some(frame) = texture_frame(g) else { + out.push(None); + continue; + }; + let scale = f64::from(size) / frame.width().max(frame.height()); + let fit = |side: f64| ((side * scale).ceil() as u32).clamp(1, size); + let (w, h) = (fit(frame.width()), fit(frame.height())); + let same = |(p, r, _): &&Drawn| p.color == part.color && *r == frame && p.graphics.as_ref().is_some_and(|o| same_graphics(o, g)); + let png = match drawn.iter().find(same) { + Some((_, _, png)) => png.clone(), + None => { + let png = match vectorcraft_render::effects::mesh_graphics_art(doc, NodeId(0), g)? { + None => None, + Some(art) => { + *pixels = pixels.saturating_add(u64::from(w) * u64::from(h)); + if *pixels > MAX_TEXTURE_PIXELS { + return Err(format!( + "the graphics need more than {MAX_TEXTURE_PIXELS} pixels of textures: lower textureSize (now {size})" + )); + } + let renderer = renderer.get_or_insert_with(vectorcraft_render::Renderer::new); + Some(picture(doc, renderer, (part.color, g.opacity, g.object), art, (frame, scale), (w, h))?) + } + }; + drawn.push((part, frame, png.clone())); + png + } + }; + out.push(png.map(|(png, opacity)| { + let uv = g.art.iter().map(|p| [(p.x - frame.x0) * scale / f64::from(w), (p.y - frame.y0) * scale / f64::from(h)]).collect(); + Texture { png, opacity, uv } + })); + } + Ok(out) +} + +/// Does [`textures`] draw a picture for one of `parts`: a part with graphics whose corners span an +/// area and whose graphics draw something? Nothing is rendered. +pub fn draws_textures(doc: &Document, parts: &[SolidMesh]) -> bool { + parts.iter().any(|p| { + p.graphics + .as_ref() + .is_some_and(|g| texture_frame(g).is_some() && matches!(vectorcraft_render::effects::mesh_graphics_art(doc, NodeId(0), g), Ok(Some(_)))) + }) +} + +/// The part of the art's plane a picture of `g` covers: the bounds of its corners' art points, when +/// they span an area. +fn texture_frame(g: &MeshGraphics) -> Option { + g.art_bounds().filter(|r| r.width() > 1e-9 && r.height() > 1e-9 && r.width().is_finite() && r.height().is_finite()) +} + +/// A picture [`textures`] drew: the part, the bounds and the PNG with its opacity map. +type Drawn<'a> = (&'a SolidMesh, Rect, Option); + +/// Do `a` and `b` draw the same graphics on their face? +fn same_graphics(a: &MeshGraphics, b: &MeshGraphics) -> bool { + a.face == b.face && a.center == b.center && a.graphics == b.graphics && a.opacity == b.opacity && a.object == b.object +} + +/// `art` drawn over `color` as a PNG of `w` × `h` pixels whose top left is `frame`'s top left, at +/// `scale` pixels a point, with a grayscale PNG of its alpha when some of it is not opaque. As on +/// the canvas, the art is drawn at `face` (the opacity of the face's fill or stroke), the color at +/// its own opacity without `object`'s, and `object` (the object's opacity) applies to the whole +/// picture. +fn picture( + doc: &Document, + renderer: &mut vectorcraft_render::Renderer, + (color, face, object): ([f32; 4], f32, f32), + mut art: Node, + (frame, scale): (Rect, f64), + (w, h): (u32, u32), +) -> Result { + // The color reaches two pixels past the frame, so the picture's edge pixels are covered. + let reach = 2.0 / scale; + let back = Rect::new(frame.x0 - reach, frame.y0 - reach, frame.x0 + f64::from(w) / scale + reach, frame.y0 + f64::from(h) / scale + reach); + let fill = Paint::solid(Color::rgb(color[0], color[1], color[2])); + let mut ground = Node::path(NodeId(0), vectorcraft_geom::shapes::rectangle(back), Appearance::basic(fill, Paint::None, 0.0)); + let unit = |v: f32| if v.is_finite() { v.clamp(0.0, 1.0) } else { 0.0 }; + let object = unit(object); + ground.opacity = if object > 0.0 { unit(color[3] / object) } else { 0.0 }; + art.opacity *= unit(face); + let mut group = Node::group(NodeId(0), vec![Arc::new(ground), Arc::new(art)]); + group.opacity = object; + let group = Arc::new(group); + let (pw, ph) = (u16::try_from(w).map_err(|_| "texture too large")?, u16::try_from(h).map_err(|_| "texture too large")?); + let view = Affine::scale(scale) * Affine::translate((-frame.x0, -frame.y0)); + let drawn = renderer.render_node(doc, &group, pw, ph, view).ok_or_else(|| "the graphics could not be drawn".to_string())?; + let alpha: Vec = drawn.pixels.iter().skip(3).step_by(4).copied().collect(); + let opacity = if alpha.iter().all(|a| *a == 255) { + None + } else { + let gray = image::GrayImage::from_raw(w, h, alpha).ok_or("the texture's opacity could not be drawn")?; + let mut png = vec![]; + gray.write_to(&mut std::io::Cursor::new(&mut png), image::ImageFormat::Png).map_err(|e| format!("PNG encoding failed: {e}"))?; + Some(Arc::new(png)) + }; + Ok((Arc::new(drawn.to_png()?), opacity)) +} + #[cfg(test)] mod tests; diff --git a/crates/engine/src/cmd/fileio/mesh3d/tests.rs b/crates/engine/src/cmd/fileio/mesh3d/tests.rs index 7c467fafad..876140fce7 100644 --- a/crates/engine/src/cmd/fileio/mesh3d/tests.rs +++ b/crates/engine/src/cmd/fileio/mesh3d/tests.rs @@ -7,7 +7,7 @@ use super::*; fn square(color: [f32; 4]) -> SolidMesh { let [a, b, c, d] = [[-5.0, -5.0, 0.0], [5.0, -5.0, 0.0], [5.0, 5.0, 0.0], [-5.0, 5.0, 0.0]]; let mesh = Mesh { positions: vec![a, b, c, a, c, d], normals: vec![[0.0, 0.0, 1.0]; 6], triangles: vec![[0, 1, 2], [3, 4, 5]] }; - SolidMesh { mesh, color } + SolidMesh::plain(mesh, color) } const RED: [f32; 4] = [1.0, 0.0, 0.0, 1.0]; @@ -18,9 +18,14 @@ fn text(files: &[(String, Vec)], name: &str) -> String { String::from_utf8(bytes.clone()).unwrap() } +/// [`mesh_files`] without textures. +fn plain_files(stem: &str, format: &str, parts: &[SolidMesh]) -> Result)>, String> { + mesh_files(stem, format, parts, &[]) +} + #[test] fn obj_numbers_corners_across_solids_and_names_its_materials() { - let files = mesh_files("Box", "obj", &[square(RED), square(BLUE), square(RED)]).unwrap(); + let files = plain_files("Box", "obj", &[square(RED), square(BLUE), square(RED)]).unwrap(); assert_eq!(files.iter().map(|(n, _)| n.as_str()).collect::>(), ["Box.obj", "Box.mtl"]); let obj = text(&files, "Box.obj"); assert!(obj.starts_with("mtllib Box.mtl\no Box\n")); @@ -36,7 +41,7 @@ fn obj_numbers_corners_across_solids_and_names_its_materials() { #[test] fn gltf_holds_its_buffer_and_every_accessor_fits_it() { - let files = mesh_files("Box", "gltf", &[square(RED), square(BLUE)]).unwrap(); + let files = plain_files("Box", "gltf", &[square(RED), square(BLUE)]).unwrap(); let g: Value = serde_json::from_str(&text(&files, "Box.gltf")).unwrap(); assert_eq!(g["asset"]["version"], "2.0"); let uri = g["buffers"][0]["uri"].as_str().unwrap(); @@ -59,11 +64,13 @@ fn gltf_holds_its_buffer_and_every_accessor_fits_it() { assert_eq!(g["materials"][1]["alphaMode"], "BLEND"); assert!(g["materials"][0].get("alphaMode").is_none()); assert_eq!(g["materials"][0]["doubleSided"], true); + // Without graphics there are no textures. + assert!(g.get("images").is_none() && g.get("textures").is_none() && prims[0]["attributes"].get("TEXCOORD_0").is_none()); } #[test] fn usda_is_y_up_in_points_with_a_material_for_each_color() { - let files = mesh_files("My Box", "usda", &[square(RED), square([0.5, 0.5, 0.5, 1.0])]).unwrap(); + let files = plain_files("My Box", "usda", &[square(RED), square([0.5, 0.5, 0.5, 1.0])]).unwrap(); let u = text(&files, "My Box.usda"); assert!(u.starts_with("#usda 1.0\n")); assert!(u.contains("defaultPrim = \"My_Box\"") && u.contains("upAxis = \"Y\"") && u.contains("def Xform \"My_Box\""), "{u}"); @@ -75,11 +82,12 @@ fn usda_is_y_up_in_points_with_a_material_for_each_color() { // sRGB 0.5 is about 0.214 linear. assert!(u.contains("color3f inputs:diffuseColor = (0.21404"), "{u}"); assert_eq!(u.matches('{').count(), u.matches('}').count()); + assert!(!u.contains("primvars:st") && !u.contains("UsdUVTexture")); } #[test] fn usdz_stores_the_layer_uncompressed_on_a_64_byte_boundary() { - let files = mesh_files("Box", "usdz", &[square(RED)]).unwrap(); + let files = plain_files("Box", "usdz", &[square(RED)]).unwrap(); let (name, zip) = &files[0]; assert_eq!(name, "Box.usdz"); // The local header: 30 bytes, the name, then the extra field. @@ -88,7 +96,7 @@ fn usdz_stores_the_layer_uncompressed_on_a_64_byte_boundary() { assert_eq!(u16_at(8), 0, "stored, not deflated"); let start = 30 + u16_at(26) + u16_at(28); assert_eq!(start % 64, 0); - let layer = mesh_files("Box", "usda", &[square(RED)]).unwrap().remove(0).1; + let layer = plain_files("Box", "usda", &[square(RED)]).unwrap().remove(0).1; assert_eq!(&zip[start..start + layer.len()], layer.as_slice()); let archive = super::super::zip::Archive::open(zip, 8).unwrap(); assert_eq!(archive.read("Box.usda", usize::MAX).unwrap(), Some(layer)); @@ -96,11 +104,11 @@ fn usdz_stores_the_layer_uncompressed_on_a_64_byte_boundary() { #[test] fn an_obj_names_its_mtl_file_without_spaces_or_comment_marks() { - let files = mesh_files("Box #1", "obj", &[square(RED)]).unwrap(); + let files = plain_files("Box #1", "obj", &[square(RED)]).unwrap(); assert_eq!(files.iter().map(|(n, _)| n.as_str()).collect::>(), ["Box__1.obj", "Box__1.mtl"]); assert!(text(&files, "Box__1.obj").starts_with("mtllib Box__1.mtl\n")); - assert_eq!(mesh_file_names("Box #1", "obj").unwrap(), ["Box__1.obj", "Box__1.mtl"]); - assert_eq!(mesh_file_names("Box #1", "usda").unwrap(), ["Box #1.usda"]); + assert_eq!(mesh_file_names("Box #1", "obj", &[]).unwrap(), ["Box__1.obj", "Box__1.mtl"]); + assert_eq!(mesh_file_names("Box #1", "usda", &[]).unwrap(), ["Box #1.usda"]); } #[test] @@ -108,17 +116,17 @@ fn obj_and_usda_keep_coordinates_a_32_bit_float_would_merge() { let mut part = square(RED); part.mesh.positions[0] = [20_000_000.0, 0.0, 0.0]; part.mesh.positions[1] = [20_000_001.0, 0.0, 0.0]; - let obj = text(&mesh_files("Box", "obj", std::slice::from_ref(&part)).unwrap(), "Box.obj"); + let obj = text(&plain_files("Box", "obj", std::slice::from_ref(&part)).unwrap(), "Box.obj"); assert!(obj.contains("v 20000000 0 0\nv 20000001 0 0\n"), "{obj}"); - let usda = text(&mesh_files("Box", "usda", &[part]).unwrap(), "Box.usda"); + let usda = text(&plain_files("Box", "usda", &[part]).unwrap(), "Box.usda"); assert!(usda.contains("(20000001, 0, 0)")); } #[test] fn an_unknown_format_is_refused() { - assert!(mesh_files("Box", "fbx", &[square(RED)]).is_err()); - assert!(mesh_file_names("Box", "").is_err()); - assert_eq!(mesh_file_names("Box", "obj").unwrap(), ["Box.obj", "Box.mtl"]); + assert!(plain_files("Box", "fbx", &[square(RED)]).is_err()); + assert!(mesh_file_names("Box", "", &[]).is_err()); + assert_eq!(mesh_file_names("Box", "obj", &[]).unwrap(), ["Box.obj", "Box.mtl"]); } #[test] @@ -128,3 +136,114 @@ fn prim_names_are_usd_identifiers() { assert_eq!(prim_name(""), "_"); assert_eq!(prim_name("é/x"), "__x"); } + +/// A red square, then a blue one whose corners show picture `png` (u to the right, v down). +fn textured(png: &[u8]) -> (Vec, Vec>) { + let uv = vec![[0.0, 1.0], [1.0, 1.0], [1.0, 0.0], [0.0, 1.0], [1.0, 0.0], [0.0, 0.0]]; + let texture = Texture { png: Arc::new(png.to_vec()), opacity: None, uv }; + (vec![square(RED), square(BLUE)], vec![None, Some(texture)]) +} + +#[test] +fn each_format_carries_a_textured_part_with_its_coordinates_and_picture() { + let png = b"\x89PNG picture".to_vec(); + let (parts, pictures) = textured(&png); + // OBJ: vt runs up from the picture's bottom, the textured faces name it, and map_Kd the PNG + // written beside it, with its name in one word. + let files = mesh_files("My Box", "obj", &parts, &pictures).unwrap(); + assert_eq!(files.iter().map(|(n, _)| n.as_str()).collect::>(), ["My_Box.obj", "My_Box.mtl", "My_Box-texture-1.png"]); + assert_eq!(files[2].1, png); + let obj = text(&files, "My_Box.obj"); + assert_eq!(obj.lines().filter(|l| l.starts_with("vt ")).collect::>(), ["vt 0 0", "vt 1 0", "vt 1 1", "vt 0 0", "vt 1 1", "vt 0 1"]); + assert_eq!(obj.lines().rfind(|l| l.starts_with("f ")), Some("f 10/4/10 11/5/11 12/6/12")); + assert!(obj.contains("f 1//1 2//2 3//3"), "the plain part keeps no texture coordinates"); + let mtl = text(&files, "My_Box.mtl"); + assert!(mtl.contains("newmtl Material_2\nKd 1 1 1\nd 1\nillum 1\nmap_Kd -clamp on My_Box-texture-1.png\n"), "{mtl}"); + assert_eq!(mtl.matches("map_Kd").count(), 1); + // glTF: TEXCOORD_0 down from the top, and the picture embedded as a data URI. + let g: Value = serde_json::from_str(&text(&mesh_files("Box", "gltf", &parts, &pictures).unwrap(), "Box.gltf")).unwrap(); + let prims = g["meshes"][0]["primitives"].as_array().unwrap(); + assert!(prims[0]["attributes"].get("TEXCOORD_0").is_none()); + let uv = &g["accessors"][prims[1]["attributes"]["TEXCOORD_0"].as_u64().unwrap() as usize]; + assert_eq!((uv["type"].as_str(), uv["count"].as_u64(), uv["componentType"].as_u64()), (Some("VEC2"), Some(6), Some(5126))); + let view = &g["bufferViews"][uv["bufferView"].as_u64().unwrap() as usize]; + let data = vectorcraft_format::base64_decode(g["buffers"][0]["uri"].as_str().unwrap().split(',').nth(1).unwrap()).unwrap(); + let at = view["byteOffset"].as_u64().unwrap() as usize; + let first: Vec = (0..2).map(|k| f32::from_le_bytes(data[at + 4 * k..at + 4 * k + 4].try_into().unwrap())).collect(); + assert_eq!(first, [0.0, 1.0]); + let material = &g["materials"][prims[1]["material"].as_u64().unwrap() as usize]; + assert_eq!(material["pbrMetallicRoughness"]["baseColorTexture"]["index"], 0); + assert_eq!(material["pbrMetallicRoughness"]["baseColorFactor"], serde_json::json!([1.0, 1.0, 1.0, 1.0])); + assert_eq!(g["textures"][0]["source"], 0); + assert_eq!(g["samplers"][0]["wrapS"], 33071); + let image = g["images"][0]["uri"].as_str().unwrap().strip_prefix("data:image/png;base64,").unwrap(); + assert_eq!(vectorcraft_format::base64_decode(image).unwrap(), png); + // USDA: st up from the bottom, read by a primvar reader into a UV texture of the PNG beside it. + let files = mesh_files("Box", "usda", &parts, &pictures).unwrap(); + assert_eq!(files.iter().map(|(n, _)| n.as_str()).collect::>(), ["Box.usda", "Box-texture-1.png"]); + let u = text(&files, "Box.usda"); + assert_eq!(u.matches("primvars:st").count(), 1); + assert!(u.contains("texCoord2f[] primvars:st = [(0, 0), (1, 0), (1, 1), (0, 0), (1, 1), (0, 1)]"), "{u}"); + assert!(u.contains("color3f inputs:diffuseColor.connect = "), "{u}"); + assert!(u.contains("asset inputs:file = @Box-texture-1.png@") && u.contains("uniform token info:id = \"UsdUVTexture\"")); + assert!(u.contains("float2 inputs:st.connect = ")); + assert!(u.contains("string inputs:varname = \"st\"")); + assert_eq!(u.matches('{').count(), u.matches('}').count()); + // USDZ: the layer first, then the picture, each on a 64-byte boundary. + let zip = mesh_files("Box", "usdz", &parts, &pictures).unwrap().remove(0).1; + let archive = super::super::zip::Archive::open(&zip, 8).unwrap(); + assert_eq!(archive.read("Box.usda", usize::MAX).unwrap().map(String::from_utf8), Some(Ok(u))); + assert_eq!(archive.read("Box-texture-1.png", usize::MAX).unwrap(), Some(png.clone())); + let u16_at = |at: usize| u16::from_le_bytes([zip[at], zip[at + 1]]) as usize; + let u32_at = |at: usize| u32::from_le_bytes([zip[at], zip[at + 1], zip[at + 2], zip[at + 3]]) as usize; + let first = 30 + u16_at(26) + u16_at(28); + let second = first + u32_at(18); + assert_eq!(&zip[second..second + 4], &[0x50, 0x4b, 0x03, 0x04], "the picture comes second"); + let data = second + 30 + u16_at(second + 26) + u16_at(second + 28); + assert_eq!((first % 64, data % 64), (0, 0)); + assert_eq!(&zip[data..data + png.len()], png.as_slice()); +} + +#[test] +fn a_textured_face_that_is_not_opaque_takes_its_opacity_from_the_picture() { + let (parts, mut pictures) = textured(b"picture"); + if let Some(t) = pictures[1].as_mut() { + t.opacity = Some(Arc::new(b"gray".to_vec())); + } + // OBJ: the opacity map, written after its texture, is the MTL's map_d. + let files = mesh_files("My Box", "obj", &parts, &pictures).unwrap(); + let names: Vec<&str> = files.iter().map(|(n, _)| n.as_str()).collect(); + assert_eq!(names, ["My_Box.obj", "My_Box.mtl", "My_Box-texture-1.png", "My_Box-texture-1-opacity.png"]); + assert_eq!(files[3].1, b"gray"); + assert_eq!(mesh_file_names("My Box", "obj", &image_maps(&pictures)).unwrap(), names); + let mtl = text(&files, "My_Box.mtl"); + assert!(mtl.contains("d 1\nillum 1\nmap_Kd -clamp on My_Box-texture-1.png\nmap_d -clamp on My_Box-texture-1-opacity.png\n"), "{mtl}"); + let g: Value = serde_json::from_str(&text(&mesh_files("Box", "gltf", &parts, &pictures).unwrap(), "Box.gltf")).unwrap(); + let material = &g["materials"][1]; + assert_eq!((material["pbrMetallicRoughness"]["baseColorFactor"][3].as_f64(), material["alphaMode"].as_str()), (Some(1.0), Some("BLEND"))); + let usda = mesh_files("Box", "usda", &parts, &pictures).unwrap(); + assert_eq!(usda.len(), 2, "USD reads the opacity from the texture's alpha"); + let u = text(&usda, "Box.usda"); + assert!(u.contains("float inputs:opacity.connect = ") && u.contains("float outputs:a"), "{u}"); + // An opaque textured face reads no opacity from its picture. + let (_, plain) = textured(b"picture"); + let opaque = vec![square(RED), square([0.0, 0.0, 1.0, 1.0])]; + let u = text(&mesh_files("Box", "usda", &opaque, &plain).unwrap(), "Box.usda"); + assert!(!u.contains("outputs:a") && u.contains("float inputs:opacity = 1"), "{u}"); + let mtl = text(&mesh_files("Box", "obj", &opaque, &plain).unwrap(), "Box.mtl"); + assert!(!mtl.contains("map_d") && mtl.contains("Kd 1 1 1\nd 1\n"), "{mtl}"); +} + +#[test] +fn parts_sharing_a_picture_write_it_once() { + let (mut parts, mut pictures) = textured(b"one"); + parts.push(square(BLUE)); + pictures.push(pictures[1].clone()); + assert_eq!(image_maps(&pictures), [false]); + let files = mesh_files("Box", "obj", &parts, &pictures).unwrap(); + assert_eq!(files.len(), 3); + assert_eq!(text(&files, "Box.mtl").matches("newmtl").count(), 2, "the blue parts share the textured material"); + assert_eq!(mesh_file_names("Box", "usda", &[false, true]).unwrap(), ["Box.usda", "Box-texture-1.png", "Box-texture-2.png"]); + assert_eq!(mesh_file_names("A @b", "gltf", &[false, false]).unwrap(), ["A @b.gltf"]); + assert_eq!(texture_name("A @b#c", 0), "A__b_c-texture-1.png"); +} diff --git a/crates/engine/src/cmd/fileio/pdf.rs b/crates/engine/src/cmd/fileio/pdf.rs index 75e2dba02b..36b0845aa1 100644 --- a/crates/engine/src/cmd/fileio/pdf.rs +++ b/crates/engine/src/cmd/fileio/pdf.rs @@ -417,9 +417,13 @@ fn encode_carrying_at( } let (flat, flattened) = flatten_for(cmd, doc, set, p)?; vectorcraft_doc::cancel::check()?; - if flattened { + if let Some(o) = flattened { let kind = if set.standard.flattens() { set.standard.label() } else { set.compatibility.label() }; - notes.push(Note::loss(format!("transparency is flattened into opaque art and images ({kind} files have none): see the flattener preset"))); + let line_ppi = o.line_art_ppi.round() as u32; + let grad_ppi = o.gradient_ppi.round() as u32; + notes.push(Note::loss(format!( + "transparency is flattened into opaque art and images ({kind} files have none) at {line_ppi} ppi line art and text, {grad_ppi} ppi gradients and meshes: see the flattener preset" + ))); } let r = super::super::rasterfx::export_pdf_with_report(flat.as_ref().unwrap_or(doc), &opts).map_err(|e| pdf_error(cmd, e))?; notes.extend(r.warnings.into_iter().map(Note::loss)); @@ -438,9 +442,9 @@ pub const DEFAULT_FLATTENER: &str = "High Resolution"; /// discarded overprints are dropped. Layers the pages leave out (non-printing ones, unless asked /// for) are left out of the flattening, hidden. → the document to write (`None`: `doc` as it is) /// and whether its transparency was flattened. -fn flatten_for(cmd: &str, doc: &Document, set: &PdfSettings, p: &Value) -> Result<(Option, bool)> { +fn flatten_for(cmd: &str, doc: &Document, set: &PdfSettings, p: &Value) -> Result<(Option, Option)> { if !set.pdf13() { - return Ok((None, false)); + return Ok((None, None)); } let printed = if set.include_non_printing || set.create_layers { None } else { without_non_printing(&doc.layers) }; let shown = printed.map(|layers| { @@ -456,8 +460,8 @@ fn flatten_for(cmd: &str, doc: &Document, set: &PdfSettings, p: &Value) -> Resul // its art: it is clipped to its regions (opaque inside them). o.clip_complex_regions = true; Ok(match flatten_document(shown.as_ref().unwrap_or(doc), &o)? { - Some(flat) => (Some(flat), true), - None => (shown, false), + Some(flat) => (Some(flat), Some(o)), + None => (shown, None), }) } diff --git a/crates/engine/src/cmd/fileio/psdread.rs b/crates/engine/src/cmd/fileio/psdread.rs index 8571a19e4e..0b421e6c90 100644 --- a/crates/engine/src/cmd/fileio/psdread.rs +++ b/crates/engine/src/cmd/fileio/psdread.rs @@ -500,6 +500,48 @@ pub(super) fn to_rgb(h: &Header<'_>, v: impl Fn(usize) -> f32, cmyk: &impl Fn([f } } +/// An opaque CMYK composite as its original 8- or 16-bit ink samples. Other modes, +/// composites with transparency, and images beyond the native CMYK pixel or allocation limit return `None`. +pub(super) fn decode_cmyk(bytes: &[u8], max_alloc: u64) -> Result, String> { + use craft_image_codecs::{ChannelLayout, Image, SampleType}; + let mut r = Reader::new(bytes); + let h = header(&mut r)?; + if h.mode != Mode::Cmyk || (h.channels > 4 && merged_alpha(h.layers, h.psb)) { + return Ok(None); + } + let pixels = u64::from(h.width) * u64::from(h.height); + if pixels > vectorcraft_doc::cmyk::MAX_CMYK_PIXELS { + return Ok(None); + } + let sample_bytes = usize::from(h.depth / 8); + let samples = pixels * 4 * sample_bytes as u64; + let icc = resources(h.resources, false) + .find(|(id, _, _)| *id == 1039) + .map(|(_, _, data)| data) + .filter(|data| data.len() <= 16 << 20 && vectorcraft_doc::cmyk::icc_color_space(data) == Some(*b"CMYK")); + if samples.saturating_mul(2).saturating_add(icc.map_or(0, |p| p.len() as u64)) > max_alloc { + return Ok(None); + } + let count = pixels as usize; + let data = channel_data(r.rest(), &h, 4, row_bytes(h.width as usize, h.depth))?; + let mut out = Vec::with_capacity(samples as usize); + for i in 0..count { + for channel in 0..4 { + let at = (channel * count + i) * sample_bytes; + if h.depth == 8 { + out.push(255 - data.get(at).copied().ok_or(TRUNCATED)?); + } else { + let pair = data.get(at..at + 2).ok_or(TRUNCATED)?.try_into().map_err(|_| TRUNCATED)?; + out.extend((65535 - u16::from_be_bytes(pair)).to_ne_bytes()); + } + } + } + let sample = if h.depth == 16 { SampleType::U16 } else { SampleType::U8 }; + let mut image = Image::from_raw(h.width, h.height, ChannelLayout::Cmyk, sample, out).map_err(|e| e.to_string())?; + image.icc = icc.map(<[u8]>::to_vec); + Ok(Some(image)) +} + /// A Photoshop document's merged image as straight RGBA. CMYK converts through `cmyk` (ink /// amounts 0..1 → sRGB). Fails, without allocating, when the image would need more than /// `max_alloc` bytes. diff --git a/crates/engine/src/cmd/fileio/tests_psdread.rs b/crates/engine/src/cmd/fileio/tests_psdread.rs index ac728c8cb9..249a3f320c 100644 --- a/crates/engine/src/cmd/fileio/tests_psdread.rs +++ b/crates/engine/src/cmd/fileio/tests_psdread.rs @@ -97,6 +97,132 @@ fn every_colour_mode_and_depth_reads() { assert_eq!(pixels(&psd(1, 1, (1, 1), 8, 8, &[0; 40], &[], &[], &raw(&[&[64]]))), [[64, 64, 64, 255]]); } +#[test] +fn cmyk_psd_place_keeps_the_native_ink_samples() { + let f = psd(1, 4, (2, 1), 8, 4, &[], &[], &[], &raw(&[&[191, 255], &[127, 0], &[63, 127], &[223, 0]])); + let p = json!({"name": "inks.psd", "dataBase64": vectorcraft_format::base64_encode(&f)}); + let mut s = Session::new(); + s.execute("file.new", &json!({"width": 40, "height": 20})).unwrap(); + let info = s.execute("file.place.info", &p).unwrap(); + assert_eq!(info["colorMode"], "CMYK"); + let placed = s.execute("file.place", &p).unwrap(); + let id = NodeId(placed["ids"][0].as_u64().unwrap()); + let d = &s.doc().unwrap().doc; + let NodeKind::Image(im) = &d.node(id).unwrap().kind else { panic!("placed PSD is an image") }; + let blob = d.images.get(&im.key).unwrap(); + assert!(blob.is_cmyk()); + assert_eq!(blob.cmyk().unwrap().data, [64, 128, 192, 32, 0, 255, 128, 255]); +} + +#[test] +fn cmyk_psd_native_budget_keeps_the_rgba_fallback_available() { + let bytes = psd(1, 4, (2, 1), 16, 4, &[], &[], &[], &raw(&[&[0xff; 4], &[0xff; 4], &[0xff; 4], &[0; 4]])); + assert!(super::psdread::decode_cmyk(&bytes, 24).unwrap().is_none()); + assert_eq!(decode(&bytes, 24, naive).unwrap().into_raw(), [0, 0, 0, 255, 0, 0, 0, 255]); + assert!(decode(&bytes, 1, naive).is_err()); +} + +#[test] +fn cmyk_psd_depth_and_compression_preserve_exact_samples() { + for version in [1, 2] { + for depth in [8, 16] { + let values = if depth == 8 { [191u16, 127, 63, 223] } else { [0xcdef, 0x89ab, 0x4567, 0x0123] }; + let planes: Vec> = values.iter().map(|v| if depth == 8 { vec![*v as u8] } else { v.to_be_bytes().to_vec() }).collect(); + let uncompressed = planes.concat(); + for method in 0..=3u16 { + let mut data = method.to_be_bytes().to_vec(); + match method { + 0 => data.extend(&uncompressed), + 1 => { + for p in &planes { + let count = (p.len() + 1) as u32; + if version == 2 { data.extend(count.to_be_bytes()) } else { data.extend((count as u16).to_be_bytes()) } + } + for p in &planes { + data.push((p.len() - 1) as u8); + data.extend(p); + } + } + _ => { + // One sample per row has the same bytes with or without prediction. + let mut z = flate2::write::ZlibEncoder::new(Vec::new(), flate2::Compression::default()); + std::io::Write::write_all(&mut z, &uncompressed).unwrap(); + data.extend(z.finish().unwrap()); + } + } + let bytes = psd(version, 4, (1, 1), depth, 4, &[], &[], &[], &data); + let img = raster_image(&bytes).unwrap(); + assert!(img.blob.is_cmyk(), "version {version}, depth {depth}, compression {method}"); + assert_eq!(img.blob.is_cmyk16(), depth == 16); + let decoded = craft_image_codecs::decode(&img.blob.bytes).unwrap(); + let expected: Vec = + values.iter().flat_map(|v| if depth == 8 { vec![255 - *v as u8] } else { (65535 - v).to_ne_bytes().to_vec() }).collect(); + assert_eq!(decoded.data(), expected); + assert!(super::psdread::decode_cmyk(&bytes, 1).unwrap().is_none()); + assert!(super::psdread::decode_cmyk(&bytes[..bytes.len() - data.len() + 2], 1 << 30).is_err()); + } + } + } + let planes: [&[u8]; 5] = [&[255], &[255], &[255], &[255], &[128]]; + let saved = psd(1, 5, (1, 1), 8, 4, &[], &[], &[], &raw(&planes)); + assert!(raster_image(&saved).unwrap().blob.is_cmyk(), "a saved selection is not transparency"); + let alpha = psd(1, 5, (1, 1), 8, 4, &[], &[], &layer_count(-1, false), &raw(&planes)); + let img = raster_image(&alpha).unwrap(); + assert!(!img.blob.is_cmyk()); + assert_eq!(craft_image_codecs::decode(&img.blob.bytes).unwrap().to_rgba8()[3], 128); +} + +#[test] +fn cmyk_psd_links_keep_inks_profile_resolution_and_clipping() { + let profile = vectorcraft_color::cms::icc_bytes(vectorcraft_color::cms::GENERIC_CMYK).unwrap(); + let mut res = Vec::new(); + res.extend((144u32 << 16).to_be_bytes()); + res.extend([0, 1, 0, 1]); + res.extend((144u32 << 16).to_be_bytes()); + res.extend([0, 1, 0, 1]); + let make = |clip: &[u8], ink: u8| { + let resources = [resource(1039, b"", &profile), resource(1005, b"", &res), clip.to_vec()].concat(); + psd(1, 4, (2, 1), 8, 4, &[], &resources, &[], &raw(&[&[255 - ink; 2], &[127; 2], &[63; 2], &[223; 2]])) + }; + let dir = vectorcraft_testkit::TempDir::new("psd-cmyk-links"); + let cut = write_file(&dir, "cut.psd", &make(&triangle_resources(), 64)); + let square = write_file(&dir, "square.psd", &make(&square_resources(), 96)); + let mut s = Session::new(); + s.execute("file.new", &json!({"width": 20, "height": 10, "colorMode": "cmyk"})).unwrap(); + assert_eq!(s.execute("file.place.info", &json!({"path": cut})).unwrap()["colorMode"], "CMYK"); + let r = s.execute("file.place", &json!({"path": cut, "at": [0.5, 0.25]})).unwrap(); + let group = NodeId(r["ids"][0].as_u64().unwrap()); + let id = r["image"].as_u64().unwrap(); + assert_eq!(r["width"], 1.0); + assert_eq!(r["height"], 0.5); + let check = |s: &mut Session, ink, linked| { + let info = s.execute("links.info", &json!({"id": id})).unwrap(); + assert_eq!(info["colorMode"], "CMYK"); + assert_eq!(info["linked"], linked); + assert_eq!(info["ppi"], json!([144.0, 144.0])); + let d = &s.doc().unwrap().doc; + let NodeKind::Image(im) = &d.node(NodeId(id)).unwrap().kind else { panic!("placed image") }; + let blob = d.images.get(&im.key).unwrap(); + assert_eq!(blob.cmyk().unwrap().data, [ink, 128, 192, 32, ink, 128, 192, 32]); + assert_eq!(blob.cmyk_icc_profile().as_deref(), Some(profile.as_ref())); + assert_eq!( + super::load::image_clip(blob), + Some(clipping_path(&make(&if ink == 64 { triangle_resources() } else { square_resources() }, ink)).unwrap()) + ); + }; + check(&mut s, 64, true); + let triangle = clip_group(&s.doc().unwrap().doc, group); + s.execute("links.relink", &json!({"ids": [id], "path": square})).unwrap(); + check(&mut s, 96, true); + assert_ne!(clip_group(&s.doc().unwrap().doc, group).0, triangle.0); + std::fs::write(&square, make(&triangle_resources(), 64)).unwrap(); + s.execute("links.update", &json!({"ids": [id]})).unwrap(); + check(&mut s, 64, true); + assert_eq!(clip_group(&s.doc().unwrap().doc, group), triangle); + s.execute("links.embed", &json!({"ids": [id]})).unwrap(); + check(&mut s, 64, false); +} + #[test] fn transparency_comes_back_straight_and_extra_channels_without_it_stay_out() { // Half-transparent red, stored on white: (255, 127, 127) with alpha 128. diff --git a/crates/engine/src/cmd/fileio/tests_svgenc.rs b/crates/engine/src/cmd/fileio/tests_svgenc.rs index 7884c1e86b..944f373474 100644 --- a/crates/engine/src/cmd/fileio/tests_svgenc.rs +++ b/crates/engine/src/cmd/fileio/tests_svgenc.rs @@ -4,7 +4,7 @@ use std::sync::Arc; use serde_json::json; -use vectorcraft_doc::Document; +use vectorcraft_doc::{Document, Node, NodeKind}; use super::*; @@ -212,6 +212,44 @@ fn a_chosen_artboard_s_svg_keeps_nested_brush_art_but_not_unpainted_or_clipped_a assert!(kept.node(compounds[1]).is_some(), "a compound path that is brushed itself"); } +/// The art over an artboard, among 300 instances with drop shadows and 2,000 symbols, is found +/// reading the symbol list once, and keeps the instances over it. +#[test] +fn art_over_an_artboard_reads_the_symbol_list_once() { + let mut d = Document::new(100.0, 100.0); + let square = |d: &mut Document, side: f64| { + let r = vectorcraft_geom::Rect::new(-side, -side, side, side); + let ap = + vectorcraft_doc::Appearance::basic(vectorcraft_color::Paint::solid(vectorcraft_color::Color::BLACK), vectorcraft_color::Paint::None, 0.0); + Arc::new(Node::path(d.alloc_id(), vectorcraft_geom::shapes::rectangle(r), ap)) + }; + for i in 0..2000 { + let art = square(&mut d, 0.5); + d.symbols.push(vectorcraft_doc::Symbol { dynamic: false, name: format!("Filler {i}"), art }); + } + let art = square(&mut d, 2.0); + d.symbols.push(vectorcraft_doc::Symbol { dynamic: false, name: "Mark".into(), art }); + let layer = d.layers[0].id; + // Twenty rows of 15: the first ten over the artboard, the rest below it. + let ids: Vec<_> = (0..300) + .map(|i| { + let xf = vectorcraft_geom::Affine::translate((f64::from(i % 15) * 6.0 + 5.0, f64::from(i / 15) * 10.0 + 5.0)); + let mut n = Node::new(d.alloc_id(), NodeKind::SymbolInstance { symbol: "Mark".into(), xf }); + n.appearance.effects.push(vectorcraft_doc::Effect { + id: "stylize.dropShadow".into(), + params: json!({"x": 1, "y": 1, "blur": 0}), + visible: true, + }); + d.insert(Some(layer), usize::MAX, n).unwrap() + }) + .collect(); + let before = vectorcraft_doc::symbols_read(); + let kept = export::art_over(&d, d.artboards[0].rect, &mut vectorcraft_render::Renderer::new()); + let read = vectorcraft_doc::symbols_read() - before; + assert!(read <= d.symbols.len(), "{read} symbols read, {} in the document", d.symbols.len()); + assert_eq!(ids.iter().filter(|id| kept.node(**id).is_some()).count(), 150); +} + /// #3544: an SVG of one artboard on its own (an `artboard` or `range`, Export for Screens, an asset) /// has the artboard's (or asset's) name as ``; Save's SVG and Export for Screens' Full /// Document keep the document's. diff --git a/crates/engine/src/cmd/fonts.rs b/crates/engine/src/cmd/fonts.rs index f98386bcf1..45689adc17 100644 --- a/crates/engine/src/cmd/fonts.rs +++ b/crates/engine/src/cmd/fonts.rs @@ -247,10 +247,11 @@ impl Resources { fn expand(&mut self, d: &Document) { let mut symbols: Vec<String> = self.symbols.iter().cloned().collect(); let mut patterns: Vec<String> = self.patterns.iter().cloned().collect(); + let boxes = d.symbol_boxes(); while !symbols.is_empty() || !patterns.is_empty() { let mut more = Resources::default(); for name in symbols.drain(..) { - if let Some(sym) = d.symbols.iter().find(|sym| sym.name == name) { + if let Some(sym) = boxes.symbol(&name) { more.add(&sym.art); } } @@ -511,7 +512,7 @@ pub(super) fn art_fonts(d: &Document, art: &[Node]) -> BTreeSet<UsedFont> { /// art of a placed document (`d` as [`Document::with_placed_art`] gives it, for that art's /// resources). pub(super) fn printed_type(d: &Document, layers: &[Arc<Node>], areas: &[Rect]) -> (BTreeSet<UsedFont>, BTreeSet<NodeId>) { - let mut walk = Printed { d, own: true, fonts: BTreeSet::new(), overflow: BTreeSet::new(), symbols: BTreeSet::new(), patterns: BTreeSet::new() }; + let mut walk = Printed::new(d); for l in layers { walk.node(l, Some(areas)); } @@ -523,7 +524,7 @@ pub(super) fn printed_type(d: &Document, layers: &[Arc<Node>], areas: &[Rect]) - /// found as [`printed_type`] finds them for Print: visible objects of the document that aren't on /// a template layer. pub(super) fn export_overflow_warning(d: &Document, layers: &[Arc<Node>], areas: Option<&[Rect]>) -> Option<String> { - let mut walk = Printed { d, own: true, fonts: BTreeSet::new(), overflow: BTreeSet::new(), symbols: BTreeSet::new(), patterns: BTreeSet::new() }; + let mut walk = Printed::new(d); for l in layers { walk.node(l, areas); } @@ -534,6 +535,9 @@ pub(super) fn export_overflow_warning(d: &Document, layers: &[Arc<Node>], areas: /// The walk of [`printed_type`]. struct Printed<'a> { d: &'a Document, + /// `d`'s symbols, found by name. Each object is measured in boxes of its own made from these + /// ([`vectorcraft_doc::SymbolBoxes::unmeasured`]). + boxes: vectorcraft_doc::SymbolBoxes<'a>, /// Whether the walk is among the objects of the document, not in art drawn for one. own: bool, fonts: BTreeSet<UsedFont>, @@ -544,7 +548,13 @@ struct Printed<'a> { patterns: BTreeSet<String>, } -impl Printed<'_> { +impl<'a> Printed<'a> { + /// A walk of `d` among its own objects, nothing found yet. + fn new(d: &'a Document) -> Self { + let boxes = d.symbol_boxes(); + Self { d, boxes, own: true, fonts: BTreeSet::new(), overflow: BTreeSet::new(), symbols: BTreeSet::new(), patterns: BTreeSet::new() } + } + /// Adds the fonts of `n` and its descendants that print, and the ids of those that don't fit /// while [`Printed::own`] is set: those whose bounds meet one of `areas`, or with `None` (in the /// art of a symbol, opacity mask, pattern or placed document, in brush pieces, or in a live @@ -625,7 +635,7 @@ impl Printed<'_> { let clipped = match (clip, areas) { (false, _) => None, (true, Some(a)) => Some(self.clip(n, a)), - (true, None) => vectorcraft_render::painted_bounds(self.d, n).map(|c| vec![c]), + (true, None) => vectorcraft_render::painted_bounds_with(&self.boxes.unmeasured(), n).map(|c| vec![c]), }; for c in children { self.node(c, clipped.as_deref().or(areas)); @@ -641,9 +651,8 @@ impl Printed<'_> { /// Adds the fonts of symbol `name`'s art, the first time it is shown. fn symbol(&mut self, name: &str) { - let d = self.d; if self.symbols.insert(name.to_string()) - && let Some(s) = d.symbols.iter().find(|s| s.name == name) + && let Some(s) = self.boxes.symbol(name) { self.art(&s.art); } @@ -660,12 +669,13 @@ impl Printed<'_> { /// Whether what `n` paints, its effects applied, meets one of `areas`. fn meets(&self, n: &Node, areas: &[Rect]) -> bool { - vectorcraft_render::painted_bounds(self.d, n).is_some_and(|b| areas.iter().any(|r| b.intersect(*r).area() > 0.0 || r.contains_rect(b))) + vectorcraft_render::painted_bounds_with(&self.boxes.unmeasured(), n) + .is_some_and(|b| areas.iter().any(|r| b.intersect(*r).area() > 0.0 || r.contains_rect(b))) } /// The parts of `areas` inside the bounds of clip group `n` (its clipping path's). fn clip(&self, n: &Node, areas: &[Rect]) -> Vec<Rect> { - let Some(c) = vectorcraft_render::painted_bounds(self.d, n) else { return areas.to_vec() }; + let Some(c) = vectorcraft_render::painted_bounds_with(&self.boxes.unmeasured(), n) else { return areas.to_vec() }; areas.iter().filter(|r| c.intersect(**r).area() > 0.0 || r.contains_rect(c)).map(|r| r.intersect(c)).collect() } } @@ -2378,4 +2388,40 @@ mod dirty_tests { s.execute("edit.undo", &json!({})).unwrap(); assert!(!s.doc().unwrap().is_dirty(), "back to the saved state"); } + + /// The walk Print and the exports make over 300 instances with drop shadows, among 2,000 + /// symbols, reads the symbol list once to find their symbols. + #[test] + fn printed_type_reads_the_symbol_list_once() { + let mut d = Document::new(200.0, 200.0); + for i in 0..2000 { + let art = Node::path( + d.alloc_id(), + vectorcraft_geom::shapes::rectangle(Rect::new(0.0, 0.0, 1.0, 1.0)), + vectorcraft_doc::Appearance::basic(Paint::None, Paint::None, 0.0), + ); + d.symbols.push(vectorcraft_doc::Symbol { dynamic: false, name: format!("Filler {i}"), art: Arc::new(art) }); + } + let art = Node::path( + d.alloc_id(), + vectorcraft_geom::shapes::rectangle(Rect::new(-10.0, -10.0, 10.0, 10.0)), + vectorcraft_doc::Appearance::basic(Paint::solid(vectorcraft_color::Color::BLACK), Paint::None, 0.0), + ); + d.symbols.push(vectorcraft_doc::Symbol { dynamic: false, name: "Mark".into(), art: Arc::new(art) }); + let l = d.layers[0].id; + for i in 0..300 { + let xf = vectorcraft_geom::Affine::translate((f64::from(i % 20) * 10.0, f64::from(i / 20) * 10.0)); + let mut n = Node::new(d.alloc_id(), NodeKind::SymbolInstance { symbol: "Mark".into(), xf }); + n.appearance.effects.push(vectorcraft_doc::Effect { + id: "stylize.dropShadow".into(), + params: json!({"x": 1, "y": 1, "blur": 0}), + visible: true, + }); + d.insert(Some(l), usize::MAX, n).unwrap(); + } + let before = vectorcraft_doc::symbols_read(); + printed_type(&d, &d.layers, &[Rect::new(0.0, 0.0, 100.0, 100.0)]); + let read = vectorcraft_doc::symbols_read() - before; + assert!(read <= d.symbols.len(), "{read} symbols read, {} in the document", d.symbols.len()); + } } diff --git a/crates/engine/src/cmd/links.rs b/crates/engine/src/cmd/links.rs index 3c517c006a..81d1c72497 100644 --- a/crates/engine/src/cmd/links.rs +++ b/crates/engine/src/cmd/links.rs @@ -713,12 +713,12 @@ type FileClip = (PathData, FillRule); /// The clipping path the file of image content `blob` draws it through, in its pixel space, as it /// was kept when the file was read: a DCS file's ([`ImageBlob::separated_clip`]) or a PSD or PSB -/// file's ([`fileio::png_clip`]). +/// file's ([`fileio::image_clip`]). fn file_clip(blob: &ImageBlob) -> Option<FileClip> { if let Some(path) = blob.separated_clip() { return Some((path, FillRule::NonZero)); } - (blob.mime == "image/png").then(|| fileio::png_clip(&blob.bytes)).flatten().map(|path| (path, FillRule::EvenOdd)) + fileio::image_clip(blob).map(|path| (path, FillRule::EvenOdd)) } /// What happens to the clip of an object a link update remakes. diff --git a/crates/engine/src/cmd/object/arrange.rs b/crates/engine/src/cmd/object/arrange.rs index d925ac34c9..17568d50b9 100644 --- a/crates/engine/src/cmd/object/arrange.rs +++ b/crates/engine/src/cmd/object/arrange.rs @@ -357,6 +357,7 @@ pub(super) fn isolate(s: &mut Session, p: &Value) -> Result<Value> { && prev != isolation { crate::cmd::settle_interaction(s)?; + add_drawn_live_paint(s, prev, Some(isolation))?; let st = s.doc_mut()?; crate::cmd::distortcmds::finish_edit_text(st, prev); } @@ -369,6 +370,19 @@ pub(super) fn isolate(s: &mut Session, p: &Value) -> Result<Value> { ok() } +/// Leaving isolation mode in `isolated` for `next` (None: out of isolation mode) adds the paths drawn +/// in the Live Paint group isolation put new art in to that group, as `livePaint.merge` does, in one +/// undo step ([`crate::cmd::buildcmds::merge_drawn_in_isolation`]), unless `next` is that group or is +/// inside it; → the group when paths were added. +fn add_drawn_live_paint(s: &mut Session, isolated: NodeId, next: Option<NodeId>) -> Result<Option<NodeId>> { + let d = &s.doc()?.doc; + let Some(g) = crate::cmd::buildcmds::isolated_live_paint(d, isolated) else { return Ok(None) }; + if next.is_some_and(|n| d.ancestry(n).is_some_and(|a| a.contains(&g))) { + return Ok(None); + } + Ok(crate::cmd::buildcmds::merge_drawn_in_isolation(s, g)?.then_some(g)) +} + pub(super) fn exit_isolation(s: &mut Session, p: &Value) -> Result<Value> { // Opacity mask editing, pattern editing and symbol editing isolate their editing layer. Leaving // isolation mode then leaves that mode, as Stop Editing Opacity Mask and the isolation bar's @@ -378,10 +392,11 @@ pub(super) fn exit_isolation(s: &mut Session, p: &Value) -> Result<Value> { && let Some(inner) = st.isolation.filter(|i| *i != layer && st.doc.ancestry(*i).is_some_and(|a| a.contains(&layer))) { crate::cmd::settle_interaction(s)?; + let left = add_drawn_live_paint(s, inner, Some(layer))?.unwrap_or(inner); let st = s.doc_mut()?; crate::cmd::distortcmds::finish_edit_text(st, inner); st.isolation = Some(layer); - st.selection.set([inner]); + st.selection.set([left]); st.revision += 1; return ok(); } @@ -396,6 +411,8 @@ pub(super) fn exit_isolation(s: &mut Session, p: &Value) -> Result<Value> { }; if let Some(leave_mode) = leave_mode { if let Some(i) = st.isolation { + crate::cmd::settle_interaction(s)?; + add_drawn_live_paint(s, i, None)?; crate::cmd::distortcmds::finish_edit_text(s.doc_mut()?, i); } leave_mode(s, p)?; @@ -405,10 +422,11 @@ pub(super) fn exit_isolation(s: &mut Session, p: &Value) -> Result<Value> { let prev = s.active().and_then(|d| d.isolation); if let Some(i) = prev { crate::cmd::settle_interaction(s)?; + let left = add_drawn_live_paint(s, i, None)?.unwrap_or(i); let st = s.doc_mut()?; st.isolation = None; crate::cmd::distortcmds::finish_edit_text(st, i); - let target = st.doc.parent_of(i).filter(|p| st.doc.node(*p).is_some_and(|n| n.extras().shaper.is_some())).unwrap_or(i); + let target = st.doc.parent_of(left).filter(|p| st.doc.node(*p).is_some_and(|n| n.extras().shaper.is_some())).unwrap_or(left); st.selection.set([target]); // A guide path isolated while Lock Guides is on isn't selected (#1534). crate::deselect_hidden(&menu, &st.doc, &mut st.selection); diff --git a/crates/engine/src/cmd/object/bounds.rs b/crates/engine/src/cmd/object/bounds.rs index 0a427e3ea0..cf0473f353 100644 --- a/crates/engine/src/cmd/object/bounds.rs +++ b/crates/engine/src/cmd/object/bounds.rs @@ -56,6 +56,7 @@ pub(crate) fn object_bounds_transform(s: &Session, p: &Value, id: NodeId) -> Res /// direct-selected anchors are what changes ([`Bounds::Anchors`]). fn bounds_transform(s: &Session, p: &Value, ids: Vec<NodeId>, least: f64, anchors: bool) -> Result<Bounds> { check_numbers(p, &["x", "y", "width", "height", "reference"], "object.setBounds")?; + let refi = reference_index(p)?; let st = s.doc()?; check_switches(p, &TRANSFORM_SWITCHES, "object.setBounds")?; check_switches(p, &["proportional"], "object.setBounds")?; @@ -90,7 +91,6 @@ fn bounds_transform(s: &Session, p: &Value, ids: Vec<NodeId>, least: f64, anchor let margins = |b: Rect| [g.x0 - b.x0, g.y0 - b.y0, b.x1 - g.x1, b.y1 - g.y1]; let (m, all) = (margins(vs), margins(v)); let fixed = [all[0] - m[0], all[1] - m[1], all[2] - m[2], all[3] - m[3]]; - let refi = p.get("reference").and_then(Value::as_u64).unwrap_or(4).min(8) as usize; let rp = vectorcraft_geom::reference_point(v, refi); let (w, h) = wanted_size(p, v); // The geometric scale that gives the visual size: margins grow by the strokes' scale `f`. It is @@ -262,7 +262,7 @@ fn wanted_size(p: &Value, b: Rect) -> (f64, f64) { /// `b`, the box around the anchors (and the objects selected whole) square to the page, and only /// the anchors, their handles with them, and those objects move or scale. fn set_anchor_bounds(s: &mut Session, p: &Value, ids: Vec<NodeId>, b: Rect) -> Result<Value> { - let refi = p.get("reference").and_then(Value::as_u64).unwrap_or(4).min(8) as usize; + let refi = reference_index(p)?; let rp = vectorcraft_geom::reference_point(b, refi); let (w, h) = wanted_size(p, b); // A single anchor, or anchors in a line, have no size to scale on that side. @@ -272,6 +272,14 @@ fn set_anchor_bounds(s: &mut Session, p: &Value, ids: Vec<NodeId>, b: Rect) -> R apply_transform(s, "Transform", ids, Affine::translate(to - rp) * scale, p, true) } +fn reference_index(p: &Value) -> Result<usize> { + let reference = crate::cmd::number_or(p, "reference", 4.0, "object.setBounds")?; + if !reference.is_finite() || reference < 0.0 || reference.fract() != 0.0 { + return Err(crate::cmd::bad("object.setBounds", "`reference` must be a whole number")); + } + Ok(reference.min(8.0) as usize) +} + /// The visual box of `ids` square to `frame`, as [`Document::oriented_bounds`] measures it, with /// symbol instances measured without the strokes in their art /// ([`vectorcraft_doc::SymbolBoxes::without_art_strokes`]). diff --git a/crates/engine/src/cmd/object/commands.rs b/crates/engine/src/cmd/object/commands.rs index d9c0b22d4b..0c638ceb5e 100644 --- a/crates/engine/src/cmd/object/commands.rs +++ b/crates/engine/src/cmd/object/commands.rs @@ -245,7 +245,15 @@ pub fn specs() -> Vec<CommandSpec> { crate::cmd::maskedit::outside_mask_editing, isolate ), - cmd!("object.exitIsolation", "Exit Isolation Mode", [], None, "{}", has_doc, exit_isolation), + cmd!( + "object.exitIsolation", + "Exit Isolation Mode", + [], + None, + "{} leave isolation mode; leaving an isolated Live Paint group adds the paths, compound paths and groups of them drawn in it (shown and unlocked with everything in them) to the group as livePaint.merge does, in one undo step, and leaves type, images and other objects in it as they are; object.isolate on a level outside the group does the same", + has_doc, + exit_isolation + ), cmd!( "object.setProps", "Object Properties", @@ -287,7 +295,7 @@ pub fn specs() -> Vec<CommandSpec> { "Set Bounds", [], None, - "{x?, y?, width?, height?, reference?: 0..8 (9-point grid; a number past 8 is read as 8), proportional?, strokes?, corners?, copy?: bool, patterns?: bool (Transform Patterns), typeAreas?: bool (area type: the frame is reshaped and the text reflows at its size), objects?: bool (Transform Objects, as object.move)} (Transform panel; width/height and the reference point follow the bounding box, rotated with rotated objects; x, y are page coordinates; with Use Preview Bounds the values measure the visual bounds; with the typeGlyphBounds preference, each point type object selected as an object (not inside a selected group) is measured by its glyphs' ink (underline and strikethrough included), which the scale gives the size asked for; strokes/corners as object.scale; with anchor points selected (Direct Selection) and no copy, the values are the box around those points, square to the page, and only they move or scale, as with object.move (#1824))", + "{x?, y?, width?, height?, reference?: whole number >= 0 (9-point grid 0..8; 0.0 equals 0; a whole number past 8 is read as 8; omitted/null: center, 4), proportional?, strokes?, corners?, copy?: bool, patterns?: bool (Transform Patterns), typeAreas?: bool (area type: the frame is reshaped and the text reflows at its size), objects?: bool (Transform Objects, as object.move)} (Transform panel; width/height and the reference point follow the bounding box, rotated with rotated objects; x, y are page coordinates; with Use Preview Bounds the values measure the visual bounds; with the typeGlyphBounds preference, each point type object selected as an object (not inside a selected group) is measured by its glyphs' ink (underline and strikethrough included), which the scale gives the size asked for; strokes/corners as object.scale; with anchor points selected (Direct Selection) and no copy, the values are the box around those points, square to the page, and only they move or scale, as with object.move (#1824))", has_selection, set_bounds ), diff --git a/crates/engine/src/cmd/panelcmds.rs b/crates/engine/src/cmd/panelcmds.rs index a155245fbc..aa83466693 100644 --- a/crates/engine/src/cmd/panelcmds.rs +++ b/crates/engine/src/cmd/panelcmds.rs @@ -1276,7 +1276,7 @@ fn aligned_between(tab: &vectorcraft_doc::TabStop, from: f64, x: f64) -> bool { /// The frames of the story that type object `id` belongs to (its thread in thread order, else `id` /// alone), each with the length of its text in bytes. -fn story_frames(s: &Session, id: NodeId) -> Vec<(NodeId, usize)> { +pub(crate) fn story_frames(s: &Session, id: NodeId) -> Vec<(NodeId, usize)> { let Some(st) = s.active() else { return vec![] }; let d = &st.doc; let frames = d.text_threads.iter().find(|thread| thread.contains(&id)).cloned().unwrap_or_else(|| vec![id]); @@ -1314,6 +1314,16 @@ fn move_editing_selection( at + inserted.iter().filter(|(b, _)| *b <= at).map(|(_, n)| n).sum::<usize>() }; let (anchor, caret) = (story(anchor), story(caret)); + select_story_range(s, id, anchor, caret) +} + +/// The Type tool's anchor and caret become story positions `anchor` and `caret` of the story that +/// frame `id` belongs to, as its frames are now. The caret stays in `id` while its place is there, +/// and else goes to the frame that holds it, with the anchor in that frame; that frame becomes the +/// selection when it was not selected. +pub(crate) fn select_story_range(s: &mut Session, id: NodeId, anchor: usize, caret: usize) -> Result<()> { + let start_of = |frames: &[(NodeId, usize)], f: NodeId| frames.iter().take_while(|(g, _)| *g != f).map(|(_, n)| n).sum::<usize>(); + let len_of = |frames: &[(NodeId, usize)], f: NodeId| frames.iter().find(|(g, _)| *g == f).map_or(0, |(_, n)| *n); let after = story_frames(s, id); let fits = |f: NodeId| (start_of(&after, f)..=start_of(&after, f) + len_of(&after, f)).contains(&caret); let frame = if fits(id) { Some(id) } else { after.iter().map(|(f, _)| *f).find(|f| fits(*f)) }; diff --git a/crates/engine/src/cmd/params.rs b/crates/engine/src/cmd/params.rs index fdf7dd4b19..8dc29b9704 100644 --- a/crates/engine/src/cmd/params.rs +++ b/crates/engine/src/cmd/params.rs @@ -649,6 +649,7 @@ pub const UNCHECKED: &[&str] = &[ "transparency.setOpacityMask", "transparency.unlinkOpacityMask", "type.pathOptions", + "webExport.optimizeToFileSize", "webExport.presets.save", "webExport.settings", ]; @@ -663,18 +664,28 @@ fn pdf_option_tree() -> Value { tree } +/// The parameter error of command `id` for `key`, a key with the objects it is in (`marks.ofset`), +/// when a key those objects take is near it: `near`, written the same way (`marks.offset`). Each +/// is one value of the message, so a catalog can match the message and translate it. +fn misspelled(id: &str, key: &str, near: &str) -> crate::EngineError { + bad(id, format!("unknown parameter `{key}`; did you mean `{near}`?")) +} + /// `given`, the object at `within` (`marks.`), has only keys of `schema`, the objects inside it too. fn check_option_tree(id: &str, within: &str, given: &serde_json::Map<String, Value>, schema: &serde_json::Map<String, Value>) -> Result<()> { for (key, value) in given { match (schema.get(key), value) { (None, _) => { let keys: Vec<&str> = schema.keys().map(String::as_str).collect(); - let why = match nearest(key, &keys) { - Some(near) => format!("did you mean `{within}{near}`?"), - None => format!("`{}` takes: {}", within.trim_end_matches('.'), keys.join(", ")), - }; - let key = shown_key(key); - return Err(bad(id, format!("unknown parameter `{within}{key}`; {why}"))); + let near = nearest(key, &keys); + let key = format!("{within}{}", shown_key(key)); + return Err(match near { + Some(near) => misspelled(id, &key, &format!("{within}{near}")), + None => { + let (object, keys) = (within.trim_end_matches('.'), keys.join(", ")); + bad(id, format!("unknown parameter `{key}`; `{object}` takes: {keys}")) + } + }); } (Some(Value::Object(inner)), Value::Object(value)) => check_option_tree(id, &format!("{within}{key}."), value, inner)?, _ => {} @@ -691,14 +702,11 @@ fn check_option_keys(id: &str, within: &str, given: &serde_json::Map<String, Val for (key, value) in given { if !keys.contains(&key.as_str()) { let near = nearest(key, keys); - let key = shown_key(key); - return Err(bad( - id, - match near { - Some(near) => format!("unknown parameter `{within}{key}`; did you mean `{within}{near}`?"), - None => format!("unknown parameter `{within}{key}`; {why_not}"), - }, - )); + let key = format!("{within}{}", shown_key(key)); + return Err(match near { + Some(near) => misspelled(id, &key, &format!("{within}{near}")), + None => bad(id, format!("unknown parameter `{key}`; {why_not}")), + }); } if let (Some(Value::Object(schema)), Value::Object(value)) = (trees.get(key), value) { check_option_tree(id, &format!("{within}{key}."), value, schema)?; @@ -797,12 +805,15 @@ fn check_screen_rows(id: &str, within: &str, p: &serde_json::Map<String, Value>) let formats = screen_formats(); for (format, options) in settings { if !formats.contains(&format.as_str()) { - let why = match nearest(format, &formats) { - Some(near) => format!("did you mean `{within}settings.{near}`?"), - None => format!("`{within}settings` takes: {}", formats.join(", ")), - }; - let format = shown_key(format); - return Err(bad(id, format!("unknown parameter `{within}settings.{format}`; {why}"))); + let near = nearest(format, &formats); + let key = format!("{within}settings.{}", shown_key(format)); + return Err(match near { + Some(near) => misspelled(id, &key, &format!("{within}settings.{near}")), + None => { + let (object, keys) = (format!("{within}settings"), formats.join(", ")); + bad(id, format!("unknown parameter `{key}`; `{object}` takes: {keys}")) + } + }); } if let Value::Object(options) = options { check_option_keys(id, &format!("{within}settings.{format}."), options, &keys, NO_FORMAT, trees)?; diff --git a/crates/engine/src/cmd/place.rs b/crates/engine/src/cmd/place.rs index 85d2f769fc..486a5633a7 100644 --- a/crates/engine/src/cmd/place.rs +++ b/crates/engine/src/cmd/place.rs @@ -91,7 +91,7 @@ pub fn specs() -> Vec<CommandSpec> { "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?, 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}", + "{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; opaque CMYK PSD/PSB merged images keep 8- or 16-bit inks within VectorCraft's 67,108,864-pixel native CMYK limit and allocation allowance; other CMYK composites use the RGB decoder's allocation limit), 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 ), diff --git a/crates/engine/src/cmd/print.rs b/crates/engine/src/cmd/print.rs index 504a67d644..0826e848cf 100644 --- a/crates/engine/src/cmd/print.rs +++ b/crates/engine/src/cmd/print.rs @@ -23,7 +23,7 @@ pub fn specs() -> Vec<CommandSpec> { "Print Setup", [], None, - "{preset?: name ([Default] or a saved print preset, any case: print.presets.list; its settings replace the document's, as choosing it in the Print dialog does), settings?: {copies: 1 (1–999), collate: true, reverse, artboards: all|range|ignore (all the art as one page), range: \"1-3, 5\" (1-based, with artboards: range), skipBlank (leave out artboards with no art that prints), media: letter|legal|tabloid|a3|a4|a5|a6|b4|b5|b4 (jis)|b5 (jis)|b6 (jis)|japanese postcard|japanese double postcard|japanese envelope #3|japanese envelope #4|kaku #2|kaku #3|yonroku-ban|custom (a paper is named by its id or its dialog label, any case and spacing, so `B5 (JIS)` works; b4 and b5 stay the ISO 216 sizes, 250 × 353 and 176 × 250 mm, and the JIS sizes are b4 (jis) 257 × 364 mm, b5 (jis) 182 × 257 mm and b6 (jis) 128 × 182 mm), width, height (custom paper, 72–14400 pt), orientation: portrait|landscape|portraitFlipped|landscapeFlipped, autoRotate: true (turn the paper to each artboard; orientation ignored), transverse (the page a quarter turn on the paper), printLayers: visiblePrintable|visible|all (template layers never print), placement: {origin: topLeft|top|topRight|left|center|right|bottomLeft|bottom|bottomRight (the point of the printed area, the artboard with its bleed and marks, on the same point of the imageable area), x, y (pt, right and down)}, scaling: none|fit|custom|tileFull|tileImageable, scale: {width: 100, height: 100 (1–1000 % with custom and tiling), linked: true (width and height stay equal: give one and the other follows, and turning it on sets the height to the width; a different width and height without linked turn it off, and with linked: true, or linked: null over a linked scale, are an error; a saved scale without linked reads it as false)}, overlap: 0 (pt between tiles), tileRange: \"\" (1-based tiles across then down; empty: all), copiesPerSheet: false (not with tiling: as many copies of each artboard, with its bleed and marks, as fit the imageable area, across then down, not turned; the placement places the grid; an artboard that doesn't fit prints one copy per sheet, with a warning), gutter: 0 (pt between copies, 0–720), margin: 0 (pt the device can't print around the paper: the imageable area is inside it), marks: {trim, registration, colorBars, pageInfo, kind: roman|japanese, weight: 0.25, offset: 6} (as document.exportPdf, at the paper's scale; page information adds the tile and the ink), bleed: {useDocument: true (the document's bleed, document.setup), top, bottom, left, right} (pt), output: {mode: composite|separations (one gray page per ink that prints), emulsion: up|down (down mirrors), image: positive|negative, spotsToProcess, overprintBlack: false (separations: solid 100% K or 100% gray fills, strokes and characters, to within half a percent, overprint in the printed copy, gradients when every stop is (every point of a freeform one); rich, RGB, spot-linked and lighter blacks knock out; composite ignores it), inks: [{name: \"Cyan\"|…|a spot swatch, print: true, frequency (lpi, default 60), angle (screen angle, degrees counter-clockwise as PostScript setscreen takes it; default C 15, M 75, Y 0, K 45, spots 45)}]}, graphics: {autoFlatness: true, flatness: 1 (0.2–100), fonts: none|subset|complete}, color: {intent: perceptual|relativeColorimetric|saturation|absoluteColorimetric, preserveNumbers: true (CMYK colors keep their values), profile: \"\" (the printer profile, an RGB or CMYK one: composite PDF colors are converted to it with the intent, separations separate with a CMYK one; empty: as they are)}, advanced: {printAsBitmap (composite pages print as one image each, at the document's raster effects resolution, or lower for a page larger than 64 Mpx or 32,768 px a side), overprints: preserve|discard|simulate (composite output; preserve writes them to overprint (/OP), simulate prints them as Overprint Preview shows them; separations always keep them), flattenerPreset: \"\" (a flattener preset, built-in or saved: transparency is flattened before printing; empty: it prints live; PostScript defaults to medium)}, tileOrigin: {placed: false, x, y} (where the Print Tiling tool put the pages: print.tiling.set)}} store the print settings with the document, over the ones it has or the preset's (null keeps a value), as one undo step; no settings or preset → {settings} (the current ones, defaults if never set up)", + "{preset?: name ([Default] or a saved print preset, any case: print.presets.list; its settings replace the document's, as choosing it in the Print dialog does), settings?: {copies: 1 (1–999), collate: true, reverse, artboards: all|range|ignore (all the art as one page), range: \"1-3, 5\" (1-based, with artboards: range), skipBlank (leave out artboards with no art that prints), media: letter|legal|tabloid|a3|a4|a5|a6|b4|b5|b4 (jis)|b5 (jis)|b6 (jis)|japanese postcard|japanese double postcard|japanese envelope #3|japanese envelope #4|kaku #2|kaku #3|yonroku-ban|custom (a paper is named by its id or its dialog label, any case and spacing, so `B5 (JIS)` works; b4 and b5 stay the ISO 216 sizes, 250 × 353 and 176 × 250 mm, and the JIS sizes are b4 (jis) 257 × 364 mm, b5 (jis) 182 × 257 mm and b6 (jis) 128 × 182 mm), width, height (custom paper, 72–14400 pt), orientation: portrait|landscape|portraitFlipped|landscapeFlipped, autoRotate: true (turn the paper to each artboard; orientation ignored), transverse (the page a quarter turn on the paper), printLayers: visiblePrintable|visible|all (template layers never print), placement: {origin: topLeft|top|topRight|left|center|right|bottomLeft|bottom|bottomRight (the point of the printed area, the artboard with its bleed and marks, on the same point of the imageable area), x, y (pt, right and down)}, scaling: none|fit|custom|tileFull|tileImageable, scale: {width: 100, height: 100 (1–1000 % with custom and tiling), linked: true (width and height stay equal: give one and the other follows, and turning it on sets the height to the width; a different width and height without linked turn it off, and with linked: true, or linked: null over a linked scale, are an error; a saved scale without linked reads it as false)}, overlap: 0 (pt between tiles), tileRange: \"\" (1-based tiles across then down; empty: all), copiesPerSheet: false (not with tiling: as many copies of each artboard, with its bleed and marks, as fit the imageable area, across then down, not turned; the placement places the grid; an artboard that doesn't fit prints one copy per sheet, with a warning), gutter: 0 (pt between copies, 0–720), margin: 0 (pt the device can't print around the paper: the imageable area is inside it), marks: {trim, registration, colorBars, pageInfo, kind: roman|japanese, weight: 0.25, offset: 6} (as document.exportPdf, at the paper's scale; page information adds the tile and the ink), bleed: {useDocument: true (the document's bleed, document.setup), top, bottom, left, right} (pt), output: {mode: composite|separations (one gray page per ink that prints), emulsion: up|down (down mirrors), image: positive|negative, spotsToProcess, overprintBlack: false (separations: solid 100% K or 100% gray fills, strokes and characters, to within half a percent, overprint in the printed copy, gradients when every stop is (every point of a freeform one); rich, RGB, spot-linked and lighter blacks are not marked, and paints already set to overprint keep it; composite ignores it), inks: [{name: \"Cyan\"|…|a spot swatch, print: true, frequency (lpi, default 60), angle (screen angle, degrees counter-clockwise as PostScript setscreen takes it; default C 15, M 75, Y 0, K 45, spots 45), convertToProcess: false (a spot ink only: it prints on the process plates, with no plate of its own, and its print, frequency and angle are kept for when it prints as a spot ink again; spotsToProcess converts every spot ink whatever it says)}]}, graphics: {autoFlatness: true, flatness: 1 (0.2–100), fonts: none|subset|complete}, color: {intent: perceptual|relativeColorimetric|saturation|absoluteColorimetric, preserveNumbers: true (CMYK colors keep their values), profile: \"\" (the printer profile, an RGB or CMYK one: composite PDF colors are converted to it with the intent, separations separate with a CMYK one; empty: as they are)}, advanced: {printAsBitmap (composite pages print as one image each, at the document's raster effects resolution, or lower for a page larger than 64 Mpx or 32,768 px a side), overprints: preserve|discard|simulate (composite output; preserve writes them to overprint (/OP), simulate prints them as Overprint Preview shows them; separations always keep them), flattenerPreset: \"\" (a flattener preset, built-in or saved: transparency is flattened before printing; empty: it prints live; PostScript defaults to medium)}, tileOrigin: {placed: false, x, y} (where the Print Tiling tool put the pages: print.tiling.set)}} store the print settings with the document, over the ones it has or the preset's (null keeps a value), as one undo step; no settings or preset → {settings} (the current ones, defaults if never set up)", has_doc, setup ), @@ -32,7 +32,7 @@ pub fn specs() -> Vec<CommandSpec> { "Print Preview", [], None, - "{preset?: name (as print.setup's: its settings instead of the document's), settings?: {…settings of print.setup} (over the document's or the preset's)} → {pages (copies included), sheets: [{artboard (0-based; null with artboards ignored), tile? (1-based), ink? (separations), width, height (pt, the page), orientation, scale: [width %, height %], transform: [a, b, c, d, e, f] (document space → the page, pt, y down), area: [x0, y0, x1, y1] (the document region the page prints), trim: [x0, y0, x1, y1] (the artboard on the page; with copies per sheet, the box around every copy's), copies?: [[x0, y0, x1, y1]…] (copies per sheet: each copy's artboard on the page, across then down)}] (one copy, in order), tiles: [{artboard, columns, rows, printed: [1-based tiles], tiles: [[x0, y0, x1, y1]…] (document space)}], inks: [{name, spot, print, frequency, angle}] (separations), warnings (art larger than the imageable area, type that prints in the fallback font, type that doesn't fit its frame, options not applied yet…), settings} without printing", + "{preset?: name (as print.setup's: its settings instead of the document's), settings?: {…settings of print.setup} (over the document's or the preset's)} → {pages (copies included), sheets: [{artboard (0-based; null with artboards ignored), tile? (1-based), ink? (separations), width, height (pt, the page), orientation, scale: [width %, height %], transform: [a, b, c, d, e, f] (document space → the page, pt, y down), area: [x0, y0, x1, y1] (the document region the page prints), trim: [x0, y0, x1, y1] (the artboard on the page; with copies per sheet, the box around every copy's), copies?: [[x0, y0, x1, y1]…] (copies per sheet: each copy's artboard on the page, across then down)}] (one copy, in order), tiles: [{artboard, columns, rows, printed: [1-based tiles], tiles: [[x0, y0, x1, y1]…] (document space)}], inks: [{name, spot, print, frequency, angle}] (separations: the plates), documentInks: [{name, spot, print, frequency, angle, convertToProcess?: true (a spot ink printing as process, with no plate)}] (separations: every ink of the document), warnings (art larger than the imageable area, type that prints in the fallback font, type that doesn't fit its frame, options not applied yet…), settings} without printing", has_doc, preview ), diff --git a/crates/engine/src/cmd/rasterfx/report.rs b/crates/engine/src/cmd/rasterfx/report.rs index f26db6db68..90f2ad2771 100644 --- a/crates/engine/src/cmd/rasterfx/report.rs +++ b/crates/engine/src/cmd/rasterfx/report.rs @@ -66,11 +66,13 @@ impl FlattenReport { lowest .into_iter() .map(|r| { - let name = r.name.map(|name| format!(" ({name})")).unwrap_or_default(); - format!( - "raster effects on object {}{name}: requested {:.1} ppi, achieved {:.1} ppi due to the 64 million pixel cap", - r.id.0, self.requested_ppi, r.achieved_ppi - ) + // The id and the name are one value of the message, so a catalog can match it. + let object = match r.name { + Some(name) => format!("{} ({name})", r.id.0), + None => r.id.0.to_string(), + }; + let (requested, achieved) = (self.requested_ppi, r.achieved_ppi); + format!("raster effects on object {object}: requested {requested:.1} ppi, achieved {achieved:.1} ppi due to the 64 million pixel cap") }) .collect() } @@ -127,4 +129,23 @@ mod tests { assert_eq!(warnings.len(), 1); assert!(warnings[0].contains(&format!("object {}", original.id.0)), "{:?}", warnings); } + + #[test] + fn a_warning_names_the_object_by_its_id_and_its_name() { + let mut doc = Document::new(100.0, 100.0); + doc.raster_effects_ppi = 300.0; + let mut named = Node::group(NodeId(7), vec![]); + named.name = Some("Logo".into()); + let unnamed = Node::group(NodeId(8), vec![]); + let mut report = FlattenReport::new(Which::All, &doc); + report.record(&named, &image(72.0)); + report.record(&unnamed, &image(150.0)); + assert_eq!( + report.warnings(), + [ + "raster effects on object 7 (Logo): requested 300.0 ppi, achieved 72.0 ppi due to the 64 million pixel cap", + "raster effects on object 8: requested 300.0 ppi, achieved 150.0 ppi due to the 64 million pixel cap", + ] + ); + } } diff --git a/crates/engine/src/cmd/select.rs b/crates/engine/src/cmd/select.rs index 0f113c8a9d..ea3181faf9 100644 --- a/crates/engine/src/cmd/select.rs +++ b/crates/engine/src/cmd/select.rs @@ -1,6 +1,6 @@ //! Select menu. -use std::collections::BTreeSet; +use std::collections::{BTreeSet, HashSet}; use serde_json::{Value, json}; use vectorcraft_color::Paint; @@ -466,7 +466,8 @@ fn reselect(s: &mut Session, _: &Value) -> Result<Value> { fn inverse(s: &mut Session, _: &Value) -> Result<Value> { let st = s.doc()?; - let ids: Vec<NodeId> = selectable(&st.doc, st.isolation).into_iter().filter(|id| !st.selection.contains(*id)).collect(); + let selected: HashSet<NodeId> = st.selection.objects.iter().copied().collect(); + let ids: Vec<NodeId> = selectable(&st.doc, st.isolation).into_iter().filter(|id| !selected.contains(id)).collect(); s.select(|_, sel| sel.set(ids.iter().copied()))?; ok() } @@ -497,11 +498,7 @@ fn set(s: &mut Session, p: &Value) -> Result<Value> { fn add(s: &mut Session, p: &Value) -> Result<Value> { let ids = checked_ids_param(s, p, "ids", "select.add")?; - s.select(|_, sel| { - for i in ids { - sel.add(i); - } - })?; + s.select(|_, sel| sel.add_all(ids))?; selection_result(s) } @@ -512,11 +509,7 @@ fn toggle(s: &mut Session, p: &Value) -> Result<Value> { let value = p.get("id").ok_or_else(|| bad("select.toggle", "missing id or ids"))?; vec![checked_id(s, value, "select.toggle")?] }; - s.select(|_, sel| { - for id in ids { - sel.toggle(id); - } - })?; + s.select(|_, sel| sel.toggle_all(ids))?; selection_result(s) } diff --git a/crates/engine/src/cmd/swatch.rs b/crates/engine/src/cmd/swatch.rs index b43446af8b..59c13d9603 100644 --- a/crates/engine/src/cmd/swatch.rs +++ b/crates/engine/src/cmd/swatch.rs @@ -19,7 +19,7 @@ pub fn specs() -> Vec<CommandSpec> { "New Swatch", ["Window", "Swatches"], None, - "{name?, color? | colors?: [colour] (one swatch each, in one undo step; #rrggbbaa and #rgba are refused) | swatch? | gradient? | pattern?: name (default: the current fill), tint?: 0..100 (% of the global or spot `swatch`, or of the one the current fill links to), mode?: \"gray\"|\"rgb\"|\"hsb\"|\"lab\"|\"cmyk\"|\"web\" (convert the colour; lab: CIE L*a*b*, how spot colours are usually defined), global?, spot? (a spot colour, always global), group?: colour group name (solid colours only; default: ungrouped), none?: true (the None paint), paint?: paint.setFill params, keepModel?: bool (as paint.setFill)} save a colour, gradient or pattern as a swatch. A tint of a global or spot colour (below 100%, without mode, global or spot) becomes a tint swatch, \"Name 40%\", linked to its base: it follows edits to the base and applies as that tint of it. A gradient swatch keeps the gradient's aspect (with or without start/end) and holds no link to the swatch its gradient came from, and a pattern swatch holds the pattern untransformed. Names are unique (\"Sky 2\"); a colour's default name is its values (\"C=10 M=20 Y=30 K=0\", \"R=255 G=128 B=0\", \"Gray K=40\", \"L=55 a=60 b=40\") → {name, names: [every new swatch]}", + "{name?, color? | colors?: [colour | {swatch, tint?}] (one swatch each, in one undo step; #rrggbbaa and #rgba are refused; `{swatch, tint}` is the paint paint.setFill gives, so a tint of a global or spot color becomes a tint swatch) | swatch? | gradient? | pattern?: name (default: the current fill), tint?: 0..100 (% of the global or spot `swatch`, or of the one the current fill links to), mode?: \"gray\"|\"rgb\"|\"hsb\"|\"lab\"|\"cmyk\"|\"web\" (convert the colour; lab: CIE L*a*b*, how spot colours are usually defined), global?, spot? (a spot colour, always global), group?: colour group name (solid colours only; default: ungrouped), none?: true (the None paint), paint?: paint.setFill params, keepModel?: bool (as paint.setFill)} save a colour, gradient or pattern as a swatch. A tint of a global or spot colour (below 100%, without mode, global or spot) becomes a tint swatch, \"Name 40%\", linked to its base: it follows edits to the base and applies as that tint of it. A gradient swatch keeps the gradient's aspect (with or without start/end) and holds no link to the swatch its gradient came from, and a pattern swatch holds the pattern untransformed. Names are unique (\"Sky 2\"); a colour's default name is its values (\"C=10 M=20 Y=30 K=0\", \"R=255 G=128 B=0\", \"Gray K=40\", \"L=55 a=60 b=40\") → {name, names: [every new swatch]}", has_doc, swatch_new ), @@ -37,7 +37,7 @@ pub fn specs() -> Vec<CommandSpec> { "New Color Group", ["Window", "Swatches"], None, - "{name?, swatches?: [names] (solid colours move into the group; gradients, patterns and None stay), colors?: [colour] (added as new swatches; #rrggbbaa and #rgba are refused), keepModel?: bool (as paint.setFill), fromArtwork?: false (add the unique colours of the selected art: fills, strokes, text, gradient stops and mesh points; a colour linked to a global swatch moves that swatch into the group), toGlobal?: true (with fromArtwork: the new swatches are global and the selected art's matching unlinked colours link to them), includeTints?: false (with fromArtwork: tints of global swatches also get swatches of their own)} → {name, swatches: [names in the group], linked: paints linked}", + "{name?, swatches?: [names] (solid colours move into the group; gradients, patterns and None stay), colors?: [colour | {swatch, tint?}] (added as new swatches; #rrggbbaa and #rgba are refused; `{swatch, tint}` below 100% of a global or spot color adds a tint swatch, \"Name 40%\", linked to it, and any other `{swatch}` its color), keepModel?: bool (as paint.setFill), fromArtwork?: false (add the unique colours of the selected art: fills, strokes, text, gradient stops and mesh points; a colour linked to a global swatch moves that swatch into the group), toGlobal?: true (with fromArtwork: the new swatches are global and the selected art's matching unlinked colours link to them), includeTints?: false (with fromArtwork: tints of global swatches also get swatches of their own)} → {name, swatches: [names in the group], linked: paints linked}", has_doc, swatch_new_group ), @@ -146,9 +146,11 @@ fn swatch_new(s: &mut Session, p: &Value) -> Result<Value> { let stored = |c: Color| if mode.is_some() { c } else { super::paint::new_color(s, p, c) }; let cs: Vec<Paint> = cs .iter() - .map(|c| color_value(c).map(|c| Paint::solid(stored(c)))) - .collect::<Option<_>>() - .ok_or_else(|| bad(C, "bad colour in `colors`"))?; + .map(|c| match swatch_entry(s, c, C)? { + Some(paint) => Ok(paint), + None => color_value(c).map(|c| Paint::solid(stored(c))).ok_or_else(|| bad(C, "bad colour in `colors`")), + }) + .collect::<Result<_>>()?; if cs.is_empty() { return Err(bad(C, "`colors` is empty")); } @@ -216,6 +218,16 @@ fn swatch_new(s: &mut Session, p: &Value) -> Result<Value> { Ok(json!({ "name": names[0], "names": names })) } +/// A `colors` entry of `swatch.new` or `swatch.newGroup` that names a color swatch, +/// `{swatch, tint?}`: the paint `paint.setFill {swatch, tint}` applies (a tint of a global or spot +/// color stays linked to it). `None` for an entry without `swatch`. +fn swatch_entry(s: &Session, v: &Value, cmd: &str) -> Result<Option<Paint>> { + let Some(name) = v.get("swatch") else { return Ok(None) }; + let name = name.as_str().ok_or_else(|| bad(cmd, format!("`swatch` in `colors` must be a swatch name, not {name}")))?; + let tint = super::paint::tint_param(v, cmd)?; + super::paint::swatch_solid(&s.doc()?.doc, name, tint).map(Some).map_err(|e| bad(cmd, e)) +} + /// A gradient or pattern `paint`, parsed from the paint params `p`, as a new or edited swatch /// stores it. fn stored_paint(paint: Paint, p: &Value) -> Paint { @@ -475,10 +487,20 @@ fn swatch_new_group(s: &mut Session, p: &Value) -> Result<Value> { let mut names = str_list(p, "swatches"); super::paint::check_keep_model(p, C)?; check_switches(p, &["fromArtwork", "toGlobal", "includeTints"], C)?; - let colors: Vec<Color> = p + // A `{swatch, tint}` entry below 100% becomes a tint swatch linked to its base; any other + // entry becomes a process color swatch. + let colors: Vec<Paint> = p .get("colors") .and_then(Value::as_array) - .map(|a| a.iter().map(|v| color_value(v).map(|c| super::paint::new_color(s, p, c)).ok_or_else(|| bad(C, format!("bad color {v}")))).collect()) + .map(|a| { + a.iter() + .map(|v| match swatch_entry(s, v, C)? { + Some(paint @ Paint::Solid { swatch: Some(_), tint, .. }) if tint < 1.0 => Ok(paint), + Some(paint) => paint.color().map(Paint::solid).ok_or_else(|| bad(C, format!("bad color {v}"))), + None => color_value(v).map(|c| Paint::solid(super::paint::new_color(s, p, c))).ok_or_else(|| bad(C, format!("bad color {v}"))), + }) + .collect::<Result<Vec<_>>>() + }) .transpose()? .unwrap_or_default(); let from_art = bool_or(p, "fromArtwork", false); @@ -486,15 +508,15 @@ fn swatch_new_group(s: &mut Session, p: &Value) -> Result<Value> { let tints = bool_or(p, "includeTints", false); let requested = name_param(p, "name"); let (name, members, linked) = s.edit("New Color Group", |d, sel| { - // New swatches: (colour, global). - let mut new: Vec<(Color, bool)> = colors.iter().map(|c| (*c, false)).collect(); + // New swatches: (paint, global). + let mut new: Vec<(Paint, bool)> = colors.iter().map(|c| (c.clone(), false)).collect(); if from_art { if sel.objects.is_empty() { return Err(bad(C, "select artwork to make a group of its colours")); } let mut art = vec![]; artwork_colors(d, &sel.objects, tints, &mut names, &mut art); - new.extend(art.into_iter().map(|c| (c, to_global))); + new.extend(art.into_iter().map(|c| (Paint::solid(c), to_global))); } let name = d.free_swatch_name(requested.as_deref().unwrap_or("Color Group")); // Colour groups hold solid colours only. @@ -505,12 +527,13 @@ fn swatch_new_group(s: &mut Session, p: &Value) -> Result<Value> { let mut free = d.free_swatch_names(); free.insert(&name); group.swatches.iter().for_each(|sw| free.insert(&sw.name)); - for (c, global) in new { - let nm = free.take(&color_name(c)); - if global { + for (paint, global) in new { + // A tint swatch is named "Name 40%", a colour after its values. + let nm = free.take_new(&paint); + if global && let Some(c) = paint.color() { links.push((c, nm.clone())); } - group.swatches.push(Swatch { name: nm, paint: Paint::solid(c), global, spot: false }); + group.swatches.push(Swatch { name: nm, paint, global, spot: false }); } let members: Vec<String> = group.swatches.iter().map(|w| w.name.clone()).collect(); d.swatch_groups.push(group); diff --git a/crates/engine/src/cmd/textedit.rs b/crates/engine/src/cmd/textedit.rs index 9079f7b892..cf0ceb82ee 100644 --- a/crates/engine/src/cmd/textedit.rs +++ b/crates/engine/src/cmd/textedit.rs @@ -270,7 +270,7 @@ fn range_of(p: &Value, len: usize, cmd: &str) -> Result<(usize, usize)> { Ok((a.min(b), a.max(b))) } -fn edit_range(s: &mut Session, p: &Value) -> Result<Value> { +pub(crate) fn edit_range(s: &mut Session, p: &Value) -> Result<Value> { const C: &str = "text.editRange"; let id = object_param(p, "id", C)?.ok_or_else(|| bad(C, "missing `id`"))?; let t = text_ref(s, id)?; diff --git a/crates/engine/src/cmd/typemenu.rs b/crates/engine/src/cmd/typemenu.rs index da930d7e59..359b369a89 100644 --- a/crates/engine/src/cmd/typemenu.rs +++ b/crates/engine/src/cmd/typemenu.rs @@ -10,8 +10,8 @@ use super::object::choice; use super::threads::ThreadIndex; use super::typecmd::{area_text, block_gaps, needed_room, refresh_bounds}; use super::{ - CommandSpec, EngineError, Result, Session, bad, checked_ids_param, cmd, find_command, has_clipboard, has_doc, has_selection, number_or, - switch_or, targets, text_param, + CommandSpec, EngineError, Result, Session, bad, checked_ids_param, cmd, find_command, has_clipboard, has_doc, has_selection, named_ids, + number_or, switch_or, targets, text_param, }; pub fn specs() -> Vec<CommandSpec> { @@ -111,7 +111,7 @@ pub fn specs() -> Vec<CommandSpec> { "Insert Character", ["Type"], None, - "{char: \"bullet\"|\"copyright\"|\"ellipsis\"|\"paragraph\"|\"registered\"|\"section\"|\"trademark\"|\"emDash\"|\"enDash\"|\"discretionaryHyphen\"|\"nonBreakingHyphen\"|\"doubleLeftQuote\"|\"doubleRightQuote\"|\"singleLeftQuote\"|\"singleRightQuote\"|\"emSpace\"|\"enSpace\"|\"hairSpace\"|\"sixthSpace\"|\"thinSpace\"|\"nonBreakingSpace\"|\"figureSpace\"|\"punctuationSpace\"|\"thirdSpace\"|\"quarterSpace\"|\"tab\"|\"forcedLineBreak\"|\"paragraphReturn\" | text: string | code: Windows Alt+0 code (0–255 in Windows-1252, a Unicode code point above: 176 → °, 151 → —) | unicode: hex code point (\"00B0\" or \"U+00B0\"), ids?|id?: object ids (default: the selection)} append to the selected text objects", + "{char: \"bullet\"|\"copyright\"|\"ellipsis\"|\"paragraph\"|\"registered\"|\"section\"|\"trademark\"|\"emDash\"|\"enDash\"|\"discretionaryHyphen\"|\"nonBreakingHyphen\"|\"doubleLeftQuote\"|\"doubleRightQuote\"|\"singleLeftQuote\"|\"singleRightQuote\"|\"emSpace\"|\"enSpace\"|\"hairSpace\"|\"sixthSpace\"|\"thinSpace\"|\"nonBreakingSpace\"|\"figureSpace\"|\"punctuationSpace\"|\"thirdSpace\"|\"quarterSpace\"|\"tab\"|\"forcedLineBreak\"|\"paragraphReturn\" | text: string | code: Windows Alt+0 code (0–255 in Windows-1252, a Unicode code point above: 176 → °, 151 → —) | unicode: hex code point (\"00B0\" or \"U+00B0\"), ids?|id?: object ids (default: the selection)} insert at the Type tool's caret, replacing its selection, while it edits text and no ids are given; otherwise append to the selected text objects. forcedLineBreak is U+2028, a new line in the same paragraph; paragraphReturn is a line feed, which starts a new paragraph", has_selection, insert_char ), @@ -786,8 +786,9 @@ fn to_point(s: &mut Session, p: &Value) -> Result<Value> { let plain = t.plain_text(); let baseline = lay.lines.first().map(|l| l.baseline).unwrap_or(fb.y0 + t.first_style().size * 0.8); // Soft wraps → explicit breaks (replace the space before the wrap when there is one). - let mut breaks: Vec<usize> = - lay.lines.iter().skip(1).map(|l| l.start).filter(|&b| b > 0 && plain.as_bytes().get(b - 1) != Some(&b'\n')).collect(); + // A line after a paragraph return or a forced line break (U+2028) already starts there. + let hard = |b: usize| plain.get(..b).is_some_and(|s| s.ends_with(['\n', '\u{2028}'])); + let mut breaks: Vec<usize> = lay.lines.iter().skip(1).map(|l| l.start).filter(|&b| b > 0 && !hard(b)).collect(); breaks.sort_unstable(); breaks.dedup(); for b in breaks.into_iter().rev() { @@ -1525,8 +1526,9 @@ pub(crate) fn special_char(name: &str) -> Option<&'static str> { "thirdSpace" => "\u{2004}", "quarterSpace" => "\u{2005}", "tab" => "\t", - // Our text model breaks lines at paragraph returns only. - "forcedLineBreak" | "paragraphReturn" => "\n", + // A line break inside the paragraph, as Shift+Enter types it. + "forcedLineBreak" => "\u{2028}", + "paragraphReturn" => "\n", _ => return None, }) } @@ -1576,6 +1578,11 @@ fn insert_char(s: &mut Session, p: &Value) -> Result<Value> { (None, None, None, Some(u)) => unicode_char(u).ok_or_else(|| bad(C, format!("`{u}` is no Unicode character")))?.to_string(), (None, None, None, None) => return Err(bad(C, "give `char`, `text`, `code` or `unicode`")), }; + if named_ids(p)?.is_none() + && let Some(r) = insert_at_type_caret(s, &text)? + { + return Ok(r); + } let ids = texts(s, p, C)?; // When `text` is empty and every object ends with a run of text, the document and its undo // history stay as they are. @@ -1606,6 +1613,44 @@ fn insert_char(s: &mut Session, p: &Value) -> Result<Value> { Ok(ids_json(&ids)) } +/// `type.insert` while the Type tool edits text: `text` replaces the tool's selection (inserts at +/// its caret) as one undo step, and the caret goes after it. `None` when no text is being edited. +fn insert_at_type_caret(s: &mut Session, text: &str) -> Result<Option<Value>> { + let tool = s.tool_options(); + let Some(id) = tool.get("editing").and_then(Value::as_u64).map(NodeId) else { return Ok(None) }; + let d = &s.doc()?.doc; + let Some(NodeKind::Text(t)) = d.node(id).map(|n| &n.kind) else { return Ok(None) }; + let len = vectorcraft_text::edit::runs_len(&t.runs); + let g = |k: &str| tool.get(k).and_then(Value::as_u64).map_or(len, |v| (v as usize).min(len)); + let (x, y) = (g("start"), g("end")); + let (a, b) = (x.min(y), x.max(y)); + // After Select All in threaded text the whole story is selected: the other frames' text goes + // in the same edit, as when typing replaces it. + let story: Vec<NodeId> = tool.get("story").and_then(Value::as_array).into_iter().flatten().filter_map(Value::as_u64).map(NodeId).collect(); + let clear: Vec<u64> = if a == 0 && b == len && story.contains(&id) { + let has_text = |f: &NodeId| matches!(d.node(*f).map(|n| &n.kind), Some(NodeKind::Text(o)) if !o.runs.iter().all(|r| r.text.is_empty())); + story.iter().filter(|f| **f != id && has_text(f)).map(|f| f.0).collect() + } else { + vec![] + }; + if text.is_empty() && a == b && clear.is_empty() { + return Ok(Some(ids_json(&[id]))); + } + // A typing session ends first: the insertion is a step of its own. + if tool.get("typing").and_then(Value::as_bool) == Some(true) { + s.set_tool_option("commitTyping", &Value::Bool(true)); + s.commit_interaction()?; + } + // The frame's place in the story once the edit has cleared the frames in `clear`. + let start: usize = + super::panelcmds::story_frames(s, id).iter().take_while(|(f, _)| *f != id).filter(|(f, _)| !clear.contains(&f.0)).map(|(_, n)| n).sum(); + let r = super::textedit::edit_range(s, &json!({"id": id.0, "start": a, "end": b, "insert": text, "clear": clear}))?; + let caret = r.get("caret").and_then(Value::as_u64).map_or(a + text.len(), |c| c as usize); + // Threaded text re-flows in the edit: the caret goes to the frame its place moved to. + super::panelcmds::select_story_range(s, id, start + caret, start + caret)?; + Ok(Some(ids_json(&[id]))) +} + // ---------- Find and Replace ---------- fn is_word(c: char) -> bool { diff --git a/crates/engine/src/cmd/webexport.rs b/crates/engine/src/cmd/webexport.rs index 078391d5b7..c6764cddb4 100644 --- a/crates/engine/src/cmd/webexport.rs +++ b/crates/engine/src/cmd/webexport.rs @@ -45,6 +45,15 @@ pub fn specs() -> Vec<CommandSpec> { has_doc, preview ), + cmd!( + query "webExport.optimizeToFileSize", + "Optimize to File Size", + [], + None, + "{desiredK: the desired file size in K (1024 bytes; above 0, at most 1048576), startWith?: current (default: the format given, its JPEG quality or GIF/PNG-8 colors lowered; GIF then takes lossy 100)|auto (GIF for art with transparency or at most 256 colors (blended over the matte without transparency), else JPEG; the other one when the first can't reach the size and the art is opaque), use?: allSlices (default: the image, or the image slices' files together)|eachSlice (every image slice's file)|currentSlice (the `slice` given, else the selected image slice, else the first), slice?: n (1-based, from slice.list), preset?, …the settings of document.exportForWeb} the settings whose files fit in the size, searched by encoding at most 32 trial settings (each one encodes every image it measures); slices share one setting, which every scope changes → {targetBytes, achieved (false: no setting tried fits, and settings are the smallest one found), bytes (as use measures them), format, settings, trials, images, warnings}; writes nothing and changes no remembered setting", + has_doc, + optimize_to_file_size + ), cmd!( query "webExport.settings", "Save for Web Settings", @@ -1054,6 +1063,297 @@ fn preview(s: &mut Session, p: &Value) -> Result<Value> { Ok(out) } +// ---------- Optimize to File Size ---------- + +/// The most trial settings `webExport.optimizeToFileSize` encodes. Each trial encodes every image +/// it measures once. +pub const OPTIMIZE_TRIALS: usize = 32; +/// The largest desired file size, in K (1 GiB). +pub const MAX_DESIRED_K: f64 = 1_048_576.0; + +/// Where Optimize to File Size starts. +#[derive(Clone, Copy, Debug, PartialEq, Eq)] +pub enum StartWith { + /// The current format, with its JPEG quality or palette colors lowered. + Current, + /// GIF or JPEG, by the image's content. + Auto, +} + +/// The pixels `px` (`[x0, y0, x1, y1]`) of `r` as an image: borrowed when `px` is the whole render, +/// else a copy. +fn file_pixels(r: &WebRender, px: [u32; 4]) -> std::borrow::Cow<'_, [u8]> { + if px == [0, 0, r.width, r.height] { std::borrow::Cow::Borrowed(r.rgba.as_slice()) } else { std::borrow::Cow::Owned(crop(r, px)) } +} + +/// The settings Optimize to File Size found. +#[derive(Clone, Debug)] +pub struct SizeFit { + pub settings: WebSettings, + /// The size the settings give the measured images. + pub bytes: usize, + /// Whether `bytes` is within the target. + pub achieved: bool, + /// The trial settings encoded. + pub trials: usize, +} + +/// The files a search measures and the trials it has left. +struct Trials<'a> { + doc: &'a Document, + r: &'a WebRender, + /// The pixels (`[x0, y0, x1, y1]`) of each file in `r`. + files: &'a [[u32; 4]], + /// Measure the largest file (else the files together). + each: bool, + left: usize, + used: usize, +} + +impl Trials<'_> { + /// The size `s` gives the files, encoded one at a time; `None` when no trial is left. + fn size(&mut self, s: &WebSettings) -> std::result::Result<Option<usize>, String> { + if self.left == 0 { + return Ok(None); + } + self.left -= 1; + self.used += 1; + let mut out = 0usize; + for &px in self.files { + let n = optimize(self.doc, &file_pixels(self.r, px), px[2] - px[0], px[3] - px[1], s)?.bytes.len(); + out = if self.each { out.max(n) } else { out.saturating_add(n) }; + } + Ok(Some(out)) + } +} + +/// `(settings, bytes)` of a trial. +pub type Trial = (WebSettings, usize); + +/// Keep `(s, n)` in `smallest` when it is the smallest trial so far. +fn keep_smallest(smallest: &mut Option<Trial>, s: WebSettings, n: usize) { + if smallest.as_ref().is_none_or(|(_, b)| n < *b) { + *smallest = Some((s, n)); + } +} + +/// The values [`highest_within`] measures spread over its range before it narrows a step. +pub const OPTIMIZE_SAMPLES: u16 = 6; + +/// Measures the size a setting gives; `None` when no trial is left. +pub type MeasureSize<'a> = dyn FnMut(&WebSettings) -> std::result::Result<Option<usize>, String> + 'a; + +/// The highest value in `lo..hi` that `set` gives `start` whose size is within `target`, when the +/// value `hi` is over it. A lower value can give a larger file, so the search measures up to +/// [`OPTIMIZE_SAMPLES`] values spread over the range, from `hi - 1` down, stops at the first that +/// fits, and halves the step between it and the measured value above it, keeping the highest value +/// measured within `target`. `None` when no value measured fits or no trial is left; the trials over +/// the target go to `smallest`. +pub fn highest_within( + size: &mut MeasureSize, + start: &WebSettings, + (lo, hi): (u16, u16), + set: fn(&mut WebSettings, u16), + target: usize, + smallest: &mut Option<Trial>, +) -> std::result::Result<Option<Trial>, String> { + let with = |v: u16| { + let mut s = start.clone(); + set(&mut s, v); + s + }; + if lo >= hi { + return Ok(None); + } + let span = u32::from(hi - lo); + let samples = u32::from(OPTIMIZE_SAMPLES).min(span); + let (mut above, mut found) = (hi, None); + for i in (0..samples).rev() { + let step = if samples == 1 { 0 } else { (span - 1) * i / (samples - 1) }; + let v = lo.saturating_add(u16::try_from(step).unwrap_or(0)); + let s = with(v); + let Some(n) = size(&s)? else { return Ok(None) }; + if n <= target { + found = Some((v, (s, n))); + break; + } + keep_smallest(smallest, s, n); + above = v; + } + let Some((mut lo, mut best)) = found else { return Ok(None) }; + let mut hi = above; + while hi - lo > 1 { + let mid = lo + (hi - lo) / 2; + let s = with(mid); + let Some(n) = size(&s)? else { break }; + if n <= target { + lo = mid; + best = (s, n); + } else { + keep_smallest(smallest, s, n); + hi = mid; + } + } + Ok(Some(best)) +} + +/// Sets the JPEG quality, for [`highest_within`]. +pub fn set_quality(s: &mut WebSettings, v: u16) { + s.quality = u8::try_from(v).unwrap_or(100); +} + +/// Sets the palette colors, for [`highest_within`]. +pub fn set_colors(s: &mut WebSettings, v: u16) { + s.colors = v; +} + +/// The best settings of `start`'s format within `target`: `start` when it fits, else the highest +/// JPEG quality or the most palette colors [`highest_within`] finds that fit, and for GIF, when none +/// is found, lossy 100 with the most colors that fit. When nothing tried fits, the smallest trial, not achieved. +/// `None` when no trial is left. +fn search_format(t: &mut Trials, start: &WebSettings, target: usize) -> std::result::Result<Option<SizeFit>, String> { + let fit = |(settings, bytes): Trial, achieved: bool| SizeFit { settings, bytes, achieved, trials: 0 }; + let Some(n) = t.size(start)? else { return Ok(None) }; + if n <= target { + return Ok(Some(fit((start.clone(), n), true))); + } + let mut smallest = Some((start.clone(), n)); + let found = match start.format { + WebFormat::Jpg => highest_within(&mut |s: &WebSettings| t.size(s), start, (1, u16::from(start.quality)), set_quality, target, &mut smallest)?, + WebFormat::Gif | WebFormat::Png8 => { + match highest_within(&mut |s: &WebSettings| t.size(s), start, (2, start.colors), set_colors, target, &mut smallest)? { + None if start.format == WebFormat::Gif && start.lossy < 100 => { + let lossy = WebSettings { lossy: 100, ..start.clone() }; + match t.size(&lossy)? { + Some(n) if n <= target => Some((lossy, n)), + Some(n) => { + keep_smallest(&mut smallest, lossy.clone(), n); + highest_within(&mut |s: &WebSettings| t.size(s), &lossy, (2, lossy.colors), set_colors, target, &mut smallest)? + } + None => None, + } + } + found => found, + } + } + WebFormat::Png24 => None, + }; + Ok(match (found, smallest) { + (Some(f), _) => Some(fit(f, true)), + (None, Some(s)) => Some(fit(s, false)), + (None, None) => None, + }) +} + +/// The format Auto Select GIF/JPEG starts with, and whether the files (`[x0, y0, x1, y1]` of `r`) +/// are opaque: GIF for files with transparent pixels (when `transparency` keeps them) or at most +/// 256 colors, else JPEG. The colors counted are the ones the files are written with: without +/// `transparency`, the pixels blended over `matte`. +fn auto_format(r: &WebRender, files: &[[u32; 4]], transparency: bool, matte: [u8; 3]) -> (WebFormat, bool) { + let stride = r.width as usize * 4; + let row = + move |y: u32, x0: u32, x1: u32| r.rgba.get(y as usize * stride + x0 as usize * 4..y as usize * stride + x1 as usize * 4).unwrap_or_default(); + let pixels = || files.iter().flat_map(move |&[x0, y0, x1, y1]| (y0..y1).flat_map(move |y| row(y, x0, x1).as_chunks::<4>().0.iter())); + let opaque = !transparency || pixels().all(|p| p[3] == 255); + if !opaque { + return (WebFormat::Gif, false); + } + let mut seen = HashSet::new(); + // An opaque pixel blends to itself. + let few = pixels().all(|p| { + seen.insert(flatten(p, matte).next().unwrap_or_default()); + seen.len() <= 256 + }); + (if few { WebFormat::Gif } else { WebFormat::Jpg }, true) +} + +/// Optimize to File Size: the settings, from `s`, whose files (the pixels `[x0, y0, x1, y1]` of +/// `r`) fit in `target` bytes, measured together, or with `each` the largest one. At most +/// [`OPTIMIZE_TRIALS`] trial settings are encoded, and a trial encodes the files one at a time. +pub fn optimize_to_size( + doc: &Document, + r: &WebRender, + files: &[[u32; 4]], + s: &WebSettings, + start: StartWith, + each: bool, + target: usize, +) -> std::result::Result<SizeFit, String> { + let mut t = Trials { doc, r, files, each, left: OPTIMIZE_TRIALS, used: 0 }; + let with = |format: WebFormat| WebSettings { format, ..s.clone() }; + let found = match start { + _ if files.is_empty() => None, + StartWith::Current => search_format(&mut t, s, target)?, + StartWith::Auto => { + let (first, opaque) = auto_format(r, files, s.transparency, s.matte_rgb()?.unwrap_or([255; 3])); + let other = if first == WebFormat::Gif { WebFormat::Jpg } else { WebFormat::Gif }; + match search_format(&mut t, &with(first), target)? { + Some(a) if !a.achieved && opaque => match search_format(&mut t, &with(other), target)? { + Some(b) if b.achieved || b.bytes < a.bytes => Some(b), + _ => Some(a), + }, + a => a, + } + } + }; + let mut best = found.ok_or("Optimize to File Size: there is no image to measure")?; + best.trials = t.used; + Ok(best) +} + +fn optimize_to_file_size(s: &mut Session, p: &Value) -> Result<Value> { + const O: &str = "webExport.optimizeToFileSize"; + let k = p + .get("desiredK") + .and_then(Value::as_f64) + .filter(|k| k.is_finite() && *k > 0.0 && *k <= MAX_DESIRED_K) + .ok_or_else(|| bad(O, "give `desiredK`, the desired file size in K (1024 bytes): a number above 0 and at most 1048576"))?; + let target = ((k * 1024.0).floor() as usize).max(1); + let start = match p.get("startWith").map(Value::as_str) { + None | Some(Some("current")) => StartWith::Current, + Some(Some("auto")) => StartWith::Auto, + Some(_) => return Err(bad(O, "`startWith` is `current` or `auto`")), + }; + let scope = match p.get("use").map(Value::as_str) { + None if p.get("slice").is_some() => "currentSlice", + None => "allSlices", + Some(Some(u @ ("allSlices" | "eachSlice" | "currentSlice"))) => u, + Some(_) => return Err(bad(O, "`use` is `allSlices`, `eachSlice` or `currentSlice`")), + }; + let slice = match p.get("slice").map(|v| v.as_u64().filter(|n| *n >= 1 && scope == "currentSlice")) { + None => None, + Some(Some(n)) => Some(n), + Some(None) => return Err(bad(O, "`slice` is a slice number from `slice.list`, with `use: currentSlice`")), + }; + let settings = s.web_settings(p).map_err(|e| bad(O, e))?; + let st = s.doc()?; + let doc = &st.doc; + let failed = vectorcraft_render::decode_failures(); + let r = render(doc, &settings).map_err(|e| bad(O, e))?; + let warnings = undecoded(failed); + let areas = doc.slice_layout(); + let selected = super::slices::selected_slices(doc, &st.selection); + let cells = cells(&areas, &selected, &settings, &r).map_err(|e| bad(O, e))?; + let image_cells: Vec<&Cell> = + cells.iter().filter(|c| c.area.id.and_then(|id| doc.slice_options(id)).is_none_or(|o| o.kind == SliceKind::Image)).collect(); + let picked: Vec<&Cell> = match (scope, slice) { + ("currentSlice", Some(n)) => { + let c = image_cells.iter().find(|c| c.area.number as u64 == n); + vec![*c.ok_or_else(|| bad(O, format!("no slice {n} in the image (see slice.list)")))?] + } + ("currentSlice", None) => { + image_cells.iter().find(|c| c.area.id.is_some_and(|id| selected.contains(&id))).or(image_cells.first()).copied().into_iter().collect() + } + _ => image_cells, + }; + let files: Vec<[u32; 4]> = if cells.is_empty() { vec![[0, 0, r.width, r.height]] } else { picked.iter().map(|c| c.px).collect() }; + let fit = optimize_to_size(doc, &r, &files, &settings, start, scope == "eachSlice", target).map_err(|e| bad(O, e))?; + Ok(json!({ + "targetBytes": target, "achieved": fit.achieved, "bytes": fit.bytes, "format": fit.settings.format.id(), + "settings": fit.settings.to_json(), "trials": fit.trials, "images": files.len(), "warnings": warnings, + })) +} + fn settings(s: &mut Session, p: &Value) -> Result<Value> { const S: &str = "webExport.settings"; let base = if bool_or(p, "reset", false) { WebSettings::default() } else { s.last_web_settings() }; diff --git a/crates/engine/src/tests.rs b/crates/engine/src/tests.rs index 2b711976ef..e6c622963a 100644 --- a/crates/engine/src/tests.rs +++ b/crates/engine/src/tests.rs @@ -3313,6 +3313,26 @@ fn flare_ring_seed_moves_only_the_rings() { assert_eq!(s.doc().unwrap().history.undo.len(), undo); } +#[test] +fn flare_small_ring_seeds_spread_the_first_ring_along_the_path() { + let mut s = session(); + let mut positions = Vec::new(); + for seed in [0, 1, 2, 5, 11, (1u64 << 53) - 1] { + let p = json!({"cx": 20, "cy": 30, "x2": 1020, "y2": 30, "rays": 0, "rings": 1, "ringSeed": seed}); + let id = NodeId(s.execute("shape.flare", &p).unwrap()["id"].as_u64().unwrap()); + let NodeKind::Group { children, .. } = &s.doc().unwrap().doc.node(id).unwrap().kind else { panic!("flare is a group") }; + let ring = children.iter().find(|n| n.name.as_deref() == Some("Ring")).unwrap(); + let center = ring.geometric_bounds().unwrap().center(); + assert!((20.0..=1020.0).contains(¢er.x), "seed {seed}: {center:?}"); + assert!((center.y - 30.0).abs() < 1e-9); + positions.push(center.x); + } + assert!((positions[0] - positions[1]).abs() > 1.0, "neighboring small seeds visibly move the first ring: {positions:?}"); + let lo = positions[..5].iter().copied().fold(f64::INFINITY, f64::min); + let hi = positions[..5].iter().copied().fold(f64::NEG_INFINITY, f64::max); + assert!(hi - lo > 250.0, "small seeds spread the first ring along the path: {positions:?}"); +} + /// `shape.ellipse` without `anchors`, or with 4, draws the live ellipse it always drew. #[test] fn ellipse_with_four_anchors_is_the_live_ellipse() { diff --git a/crates/engine/src/tests/assets_3d.rs b/crates/engine/src/tests/assets_3d.rs index 2d1fbd7761..d546eed793 100644 --- a/crates/engine/src/tests/assets_3d.rs +++ b/crates/engine/src/tests/assets_3d.rs @@ -246,6 +246,163 @@ fn export_3d_writes_into_a_folder_or_one_zip() { let _ = std::fs::remove_dir_all(&dir); } +/// A blue 100 × 100 square extruded straight on, with a red 10 × 20 graphic "Mark" mapped onto its +/// front at its center and onto its back 30 pt to the right (as the back is seen from behind), +/// collected as a 3D asset in `format`. +fn mapped(format: &str) -> (Session, u64) { + let mut s = session(); + let mark = run(&mut s, "path.create", json!({"d": "M300 300L310 300L310 320L300 320Z"}))["id"].clone(); + run(&mut s, "paint.setFill", json!({"color": "#ff0000"})); + run(&mut s, "threeD.addGraphic", json!({"name": "Mark", "ids": [mark]})); + let id = run(&mut s, "path.create", json!({"d": "M100 100L200 100L200 200L100 200Z"}))["id"].as_u64().unwrap(); + run(&mut s, "paint.setFill", json!({"color": "#0000ff"})); + run(&mut s, "effect.apply", json!({"effect": "threeD.extrude", "params": {"rotationX": 0.0, "rotationY": 0.0, "rotationZ": 0.0, "depth": 20.0}})); + run(&mut s, "threeD.mapGraphic", json!({"symbol": "Mark", "ids": [id]})); + run(&mut s, "threeD.mapGraphic", json!({"symbol": "Mark", "face": "back", "x": 30.0, "ids": [id]})); + run(&mut s, "layer.setProps", json!({"id": id, "name": "Box"})); + let asset = run(&mut s, "assets.add3D", json!({"ids": [id], "format": format}))["assets"][0].as_u64().unwrap(); + (s, asset) +} + +/// The color of pixel `(x, y)` of PNG `png`. +fn pixel(png: &[u8], x: u32, y: u32) -> [u8; 4] { + image::load_from_memory(png).unwrap().to_rgba8().get_pixel(x, y).0 +} + +fn is_red(p: [u8; 4]) -> bool { + p[0] > 200 && p[1] < 50 && p[2] < 50 && p[3] == 255 +} + +fn is_blue(p: [u8; 4]) -> bool { + p[0] < 50 && p[1] < 50 && p[2] > 200 && p[3] == 255 +} + +#[test] +fn export_3d_paints_mapped_graphics_on_their_caps_in_every_format() { + for (format, names) in [ + ("usda", vec!["Box.usda", "Box-texture-1.png", "Box-texture-2.png"]), + ("usdz", vec!["Box.usdz"]), + ("gltf", vec!["Box.gltf"]), + ("obj", vec!["Box.obj", "Box.mtl", "Box-texture-1.png", "Box-texture-2.png"]), + ] { + let (mut s, _) = mapped(format); + let out = files(&run(&mut s, "assets.export3D", json!({"textureSize": 128}))); + assert_eq!(out.iter().map(|(n, _)| n.as_str()).collect::<Vec<_>>(), names, "{format}"); + } + // The front's picture: the cap's 100 pt across 128 pixels, blue with the red graphic at the + // middle; the back's: the graphic 30 pt to the right as seen from behind, which is to the left + // in the art's plane. + let (mut s, _) = mapped("usda"); + let out = files(&run(&mut s, "assets.export3D", json!({"textureSize": 128}))); + let (front, back) = (&out[1].1, &out[2].1); + assert_eq!(image::load_from_memory(front).unwrap().to_rgba8().dimensions(), (128, 128)); + assert!(is_red(pixel(front, 64, 64)) && is_blue(pixel(front, 2, 2)) && is_blue(pixel(front, 64, 10))); + let at = |pt: f64| (pt * 1.28) as u32; + assert!(is_red(pixel(back, at(20.0), 64)) && is_blue(pixel(back, 64, 64)), "{:?}", pixel(back, 64, 64)); + // The USDA's front cap shows the front picture through st, up from the picture's bottom. + let usda = String::from_utf8(out[0].1.clone()).unwrap(); + assert_eq!(usda.matches("primvars:st").count(), 2); + assert_eq!(usda.matches("def Mesh").count(), 3, "the walls, the front cap and the back cap"); + // glTF holds both pictures, and a cap's coordinates stay inside its picture. + let (mut s, _) = mapped("gltf"); + let out = files(&run(&mut s, "assets.export3D", json!({}))); + let g: Value = serde_json::from_slice(&out[0].1).unwrap(); + assert_eq!(g["images"].as_array().map(Vec::len), Some(2)); + let png = vectorcraft_format::base64_decode(g["images"][0]["uri"].as_str().unwrap().split(',').nth(1).unwrap()).unwrap(); + assert_eq!(image::load_from_memory(&png).unwrap().to_rgba8().dimensions(), (1024, 1024), "1024 pixels by default"); +} + +#[test] +fn a_texture_takes_the_opacity_of_the_fill_and_of_the_object_as_the_canvas_draws_them() { + let half = |a: u8| (120..=135).contains(&a); + // A half-opaque fill: the face and the graphic over it are each drawn at half opacity, so the + // graphic covers three quarters. + let (mut s, asset) = mapped("usda"); + let doc = &s.active().unwrap().doc; + let id = doc.asset(asset).unwrap().nodes[0]; + let fill = doc.node(id).unwrap().appearance.items.iter().position(|i| matches!(i, vectorcraft_doc::AppearanceItem::Fill(_))).unwrap(); + run(&mut s, "select.set", json!({"ids": [id.0]})); + run(&mut s, "transparency.set", json!({"item": fill, "opacity": 50})); + let out = files(&run(&mut s, "assets.export3D", json!({"textureSize": 128}))); + let (on, around) = (pixel(&out[1].1, 64, 64), pixel(&out[1].1, 2, 2)); + assert!(on[0] > on[2] && (185..=197).contains(&on[3]), "{on:?}"); + assert!(around[2] > 200 && half(around[3]), "{around:?}"); + let usda = String::from_utf8(out[0].1.clone()).unwrap(); + assert!(usda.contains("float inputs:opacity.connect"), "the texture's alpha is the opacity"); + // An OBJ's opacity map has the alpha as gray levels. + run(&mut s, "assets.set3DFormat", json!({"assets": [asset], "format": "obj"})); + let out = files(&run(&mut s, "assets.export3D", json!({"textureSize": 128}))); + assert_eq!(out[3].0, "Box-texture-1-opacity.png"); + let gray = image::load_from_memory(&out[3].1).unwrap().to_luma8(); + let (g_on, g_around) = (gray.get_pixel(64, 64).0[0], gray.get_pixel(2, 2).0[0]); + assert!((185..=197).contains(&g_on) && half(g_around), "{g_on} {g_around}"); + // A half-opaque object: the face and the graphic are drawn opaque, and the whole picture at + // half opacity. + let (mut s, asset) = mapped("usda"); + let id = s.active().unwrap().doc.asset(asset).unwrap().nodes[0]; + run(&mut s, "transparency.set", json!({"ids": [id.0], "opacity": 50})); + let out = files(&run(&mut s, "assets.export3D", json!({"textureSize": 128}))); + let (on, around) = (pixel(&out[1].1, 64, 64), pixel(&out[1].1, 2, 2)); + assert!(on[0] > 200 && on[2] < 50 && half(on[3]), "{on:?}"); + assert!(around[2] > 200 && around[0] < 50 && half(around[3]), "{around:?}"); + // A gradient whose stops are clear: the face is clear, and the graphic keeps its opacity. + let (mut s, asset) = mapped("usda"); + let id = s.active().unwrap().doc.asset(asset).unwrap().nodes[0]; + run(&mut s, "select.set", json!({"ids": [id.0]})); + let clear = json!({"stops": [{"offset": 0, "color": "#0000ff", "opacity": 0}, {"offset": 1, "color": "#0000ff", "opacity": 0}]}); + run(&mut s, "paint.setFill", json!({"gradient": clear})); + let out = files(&run(&mut s, "assets.export3D", json!({"textureSize": 128}))); + let (on, around) = (pixel(&out[1].1, 64, 64), pixel(&out[1].1, 2, 2)); + assert!(is_red(on), "{on:?}"); + assert_eq!(around[3], 0, "{around:?}"); +} + +#[test] +fn export_3d_keeps_flat_colors_without_graphics_and_refuses_bad_texture_sizes() { + let (mut s, asset) = mapped("obj"); + for bad in [json!(64), json!(5000), json!(512.5), json!("512"), json!(-1)] { + assert!(s.execute("assets.export3D", &json!({"textureSize": bad})).is_err(), "{bad}"); + } + // Without its graphics the box is one plain mesh, as before. + let id = s.doc().unwrap().doc.asset(asset).unwrap().nodes[0].0; + run(&mut s, "select.set", json!({"ids": [id]})); + run(&mut s, "effect.setParams", json!({"index": 0, "params": {"graphics": []}})); + let out = files(&run(&mut s, "assets.export3D", json!({"textureSize": 128}))); + assert_eq!(out.iter().map(|(n, _)| n.as_str()).collect::<Vec<_>>(), ["Box.obj", "Box.mtl"]); + let obj = String::from_utf8(out[0].1.clone()).unwrap(); + assert!(!obj.contains("vt ") && obj.lines().filter(|l| l.starts_with("g ")).count() == 1); +} + +#[test] +fn texture_pixels_are_counted_across_one_export() { + let (s, asset) = mapped("gltf"); + let d = &s.doc().unwrap().doc; + let node = d.node(d.asset(asset).unwrap().nodes[0]).unwrap(); + let parts = vectorcraft_render::effects::three_d_meshes_in(Some(d), node).unwrap(); + let mut pixels = 0; + let made = crate::cmd::fileio::textures(d, &parts, 128, &mut pixels).unwrap(); + assert_eq!((made.iter().flatten().count(), pixels), (2, 2 * 128 * 128)); + let mut pixels = crate::cmd::fileio::MAX_TEXTURE_PIXELS - 128 * 128; + let e = crate::cmd::fileio::textures(d, &parts, 128, &mut pixels).unwrap_err(); + assert!(e.contains("textureSize"), "{e}"); +} + +#[test] +fn only_graphics_that_draw_count_as_textures() { + let parts_of = |s: &Session, asset: u64| { + let d = &s.doc().unwrap().doc; + let node = d.node(d.asset(asset).unwrap().nodes[0]).unwrap(); + vectorcraft_render::effects::three_d_meshes_in(Some(d), node).unwrap() + }; + let (mut s, asset) = mapped("obj"); + assert!(crate::cmd::fileio::draws_textures(&s.doc().unwrap().doc, &parts_of(&s, asset))); + // With its symbol gone the graphic draws nothing, so the export writes no texture. + run(&mut s, "symbol.delete", json!({"name": "Mark"})); + assert!(!crate::cmd::fileio::draws_textures(&s.doc().unwrap().doc, &parts_of(&s, asset))); + let out = files(&run(&mut s, "assets.export3D", json!({"textureSize": 128}))); + assert_eq!(out.iter().map(|(n, _)| n.as_str()).collect::<Vec<_>>(), ["Box.obj", "Box.mtl"]); +} + #[test] fn three_d_assets_round_trip_through_the_native_format() { let mut s = session(); diff --git a/crates/engine/src/tests/bboxrotate.rs b/crates/engine/src/tests/bboxrotate.rs index dfabb77236..db09eba280 100644 --- a/crates/engine/src/tests/bboxrotate.rs +++ b/crates/engine/src/tests/bboxrotate.rs @@ -428,6 +428,75 @@ fn transform_panel_sizes_follow_the_turned_box() { assert!(near(angle(&s, a), 45.0)); } +#[test] +fn set_bounds_whole_number_references_match_integer_references() { + for direct in [false, true] { + for index in 0..=9 { + let run = |reference: Value| { + let mut s = session(); + let a = rect(&mut s, 10.0, 20.0, 100.0, 50.0); + sel(&mut s, &[a]); + if direct { + s.execute("select.anchors", &json!({"id": a.0, "anchors": [[0, 0], [0, 2]], "mode": "set"})).unwrap(); + } + let before = anchors(&s, a); + let selection = s.doc().unwrap().selection.clone(); + let n = undo_len(&s); + s.execute("object.setBounds", &json!({"x": 200, "y": 300, "reference": reference})).unwrap(); + assert_eq!(undo_len(&s), n + 1); + assert_eq!(s.doc().unwrap().selection, selection); + if !direct { + let b = selection_box(&s); + assert!(b.reference_point(index.min(8)).distance(Point::new(200.0, 300.0)) < 1e-6, "{b:?}"); + } + let after = anchors(&s, a); + s.execute("edit.undo", &json!({})).unwrap(); + assert_eq!(anchors(&s, a), before); + s.execute("edit.redo", &json!({})).unwrap(); + assert_eq!(anchors(&s, a), after); + after + }; + assert_eq!(run(json!(index as f64)), run(json!(index)), "reference {index}, direct {direct}"); + if index == 8 { + assert_eq!(run(json!(u64::MAX)), run(json!(8)), "large reference, direct {direct}"); + assert_eq!(run(json!(1e100)), run(json!(8)), "large float reference, direct {direct}"); + } + } + } + for reference in [None, Some(Value::Null)] { + let mut s = session(); + let a = rect(&mut s, 10.0, 20.0, 100.0, 50.0); + sel(&mut s, &[a]); + let mut p = json!({"x": 200, "y": 300}); + if let Some(reference) = reference { + p["reference"] = reference; + } + s.execute("object.setBounds", &p).unwrap(); + assert!(selection_box(&s).center().distance(Point::new(200.0, 300.0)) < 1e-6); + } +} + +#[test] +fn set_bounds_rejects_invalid_references_without_changes() { + for direct in [false, true] { + for reference in [json!(-1), json!(-1.0), json!(0.5), json!(8.5), json!("0"), json!(true), json!([]), json!({})] { + let mut s = session(); + let a = rect(&mut s, 10.0, 20.0, 100.0, 50.0); + sel(&mut s, &[a]); + if direct { + s.execute("select.anchors", &json!({"id": a.0, "anchors": [[0, 0], [0, 2]], "mode": "set"})).unwrap(); + } + let before = anchors(&s, a); + let selection = s.doc().unwrap().selection.clone(); + let n = undo_len(&s); + assert!(s.execute("object.setBounds", &json!({"x": 200, "y": 300, "reference": reference})).is_err(), "{reference}, direct {direct}"); + assert_eq!(anchors(&s, a), before); + assert_eq!(s.doc().unwrap().selection, selection); + assert_eq!(undo_len(&s), n); + } + } +} + #[test] fn reset_bounding_box_squares_the_box_in_one_step() { let mut s = session(); diff --git a/crates/engine/src/tests/build.rs b/crates/engine/src/tests/build.rs index 011e76752e..8a0ba40084 100644 --- a/crates/engine/src/tests/build.rs +++ b/crates/engine/src/tests/build.rs @@ -4762,6 +4762,279 @@ fn live_paint_refuses_type_and_images_and_changes_nothing() { assert!(!vectorcraft_tools::builder::live_paint_takes(&node(&s, text_group))); } +/// A horizontal open path across [`live`]'s group at `y`, drawn with the Pen's defaults. +fn line_across(s: &mut Session, y: f64) -> NodeId { + let r = s.execute("path.create", &json!({"anchors": [{"x": -10, "y": y}, {"x": 160, "y": y}]})).unwrap(); + NodeId(r["id"].as_u64().unwrap()) +} + +/// Paths drawn in an isolated Live Paint group join it when isolation mode ends: they go among its +/// sources and cut the faces they cross, which take their sources' fill, a painted face they do not +/// cross keeps its fill, and the whole addition is one undo step, which Undo takes back to the +/// drawn paths in the group and Redo makes again. +#[test] +fn live_paint_isolation_adds_drawn_paths_on_exit() { + use vectorcraft_tools::builder::{face_at, faces, sources}; + let green = Paint::solid(Color::from_hex("#00ff00").unwrap()); + let mut s = session(); + let g = live(&mut s); + s.execute("livePaint.fill", &json!({"group": g.0, "point": [125, 50], "color": "#00ff00"})).unwrap(); + s.execute("object.isolate", &json!({"id": g.0})).unwrap(); + // Two lines from left of the group that end in its right face, so they cut only the other two. + let line = |s: &mut Session, y: f64| { + let r = s.execute("path.create", &json!({"anchors": [{"x": -10, "y": y}, {"x": 105, "y": y}]})).unwrap(); + NodeId(r["id"].as_u64().unwrap()) + }; + let (a, b) = (line(&mut s, 30.0), line(&mut s, 70.0)); + assert_eq!(s.doc().unwrap().doc.parent_of(a), Some(g), "a path drawn in isolation goes into the group"); + let steps = s.doc().unwrap().history.undo.len(); + s.execute("object.exitIsolation", &json!({})).unwrap(); + let d = s.doc().unwrap(); + assert_eq!(d.isolation, None); + assert_eq!(d.history.undo.len(), steps + 1, "both paths join in one undo step"); + assert_eq!(d.selection.objects, vec![g]); + let n = node(&s, g); + let src = sources(&n).unwrap(); + assert_eq!(src.children().unwrap().len(), 4); + for id in [a, b] { + assert_eq!(s.doc().unwrap().doc.parent_of(id), Some(src.id), "{id} joined the sources"); + } + assert_eq!(faces(&n).len(), 7, "two lines cut each of the two faces they cross in three"); + assert_eq!(face_at(&n, Point::new(125.0, 50.0)).unwrap().appearance.fill_paint(), green, "the face the lines do not cross keeps its fill"); + let red = Paint::solid(Color::rgb(1.0, 0.0, 0.0)); + for y in [15.0, 85.0] { + assert_eq!(face_at(&n, Point::new(25.0, y)).unwrap().appearance.fill_paint(), red, "a new face takes its source's fill"); + } + s.execute("edit.undo", &json!({})).unwrap(); + let n = node(&s, g); + assert_eq!(faces(&n).len(), 3); + assert_eq!(sources(&n).unwrap().children().unwrap().len(), 2); + for id in [a, b] { + assert_eq!(s.doc().unwrap().doc.parent_of(id), Some(g), "Undo puts {id} back in the group as drawn"); + } + s.execute("edit.redo", &json!({})).unwrap(); + assert_eq!(faces(&node(&s, g)).len(), 7); +} + +/// Leaving isolation mode in a Live Paint group with nothing drawn in it records no undo step and +/// leaves the document as it is. Type, and a path that is hidden, stay in the group as they are, +/// while a group of paths drawn beside them joins it. +#[test] +fn live_paint_isolation_adds_only_paths_it_takes() { + use vectorcraft_tools::builder::{faces, sources}; + let mut s = session(); + let g = live(&mut s); + s.execute("object.isolate", &json!({"id": g.0})).unwrap(); + let before = (s.doc().unwrap().doc.clone(), s.doc().unwrap().history.undo.len()); + s.execute("object.exitIsolation", &json!({})).unwrap(); + assert!(s.doc().unwrap().doc == before.0, "an exit with nothing drawn changes nothing"); + assert_eq!(s.doc().unwrap().history.undo.len(), before.1, "and records no undo step"); + s.execute("object.isolate", &json!({"id": g.0})).unwrap(); + let text = NodeId(s.execute("text.create", &json!({"x": 20, "y": 20, "text": "Hi"})).unwrap()["id"].as_u64().unwrap()); + let hidden = line_across(&mut s, 50.0); + s.edit("t", |d, _| { + d.node_mut(hidden).unwrap().visible = false; + Ok(()) + }) + .unwrap(); + let steps = s.doc().unwrap().history.undo.len(); + s.execute("object.exitIsolation", &json!({})).unwrap(); + assert_eq!(s.doc().unwrap().history.undo.len(), steps, "type and a hidden path add nothing"); + assert_eq!(faces(&node(&s, g)).len(), 3); + s.execute("object.isolate", &json!({"id": g.0})).unwrap(); + let (a, b) = (line_across(&mut s, 30.0), line_across(&mut s, 70.0)); + s.execute("select.set", &json!({"ids": [a.0, b.0]})).unwrap(); + let paths = NodeId(s.execute("object.group", &json!({})).unwrap()["id"].as_u64().unwrap()); + assert_eq!(s.doc().unwrap().doc.parent_of(paths), Some(g)); + s.execute("object.exitIsolation", &json!({})).unwrap(); + let n = node(&s, g); + assert_eq!(faces(&n).len(), 9, "the group of paths joined"); + let d = &s.doc().unwrap().doc; + assert_eq!(d.parent_of(paths), Some(sources(&n).unwrap().id)); + for id in [text, hidden] { + assert_eq!(d.parent_of(id), Some(g), "{id} stays in the group"); + assert!(d.node(id).is_some()); + } +} + +/// A group drawn in an isolated Live Paint group that holds a locked path stays in it as it is when +/// isolation mode ends, as a locked path drawn there does. +#[test] +fn live_paint_isolation_leaves_a_group_holding_a_locked_path() { + use vectorcraft_tools::builder::faces; + let mut s = session(); + let g = live(&mut s); + s.execute("object.isolate", &json!({"id": g.0})).unwrap(); + let (a, b) = (line_across(&mut s, 30.0), line_across(&mut s, 70.0)); + s.execute("select.set", &json!({"ids": [a.0, b.0]})).unwrap(); + let paths = NodeId(s.execute("object.group", &json!({})).unwrap()["id"].as_u64().unwrap()); + s.edit("t", |d, _| { + d.node_mut(b).unwrap().locked = true; + Ok(()) + }) + .unwrap(); + let steps = s.doc().unwrap().history.undo.len(); + s.execute("object.exitIsolation", &json!({})).unwrap(); + assert_eq!(s.doc().unwrap().history.undo.len(), steps); + assert_eq!(s.doc().unwrap().doc.parent_of(paths), Some(g)); + assert_eq!(faces(&node(&s, g)).len(), 3); +} + +/// Type drawn in an isolated Live Paint group stays in it when Gap Options or Merge make the group's +/// faces and edges again, including type in a Live Paint group merged into another, and Release +/// puts it beside the released paths. +#[test] +fn live_paint_keeps_type_drawn_in_it_through_gap_options_merge_and_release() { + let mut s = session(); + let g = live(&mut s); + s.execute("object.isolate", &json!({"id": g.0})).unwrap(); + let text = NodeId(s.execute("text.create", &json!({"x": 20, "y": 20, "text": "Hi"})).unwrap()["id"].as_u64().unwrap()); + s.execute("object.exitIsolation", &json!({})).unwrap(); + s.execute("livePaint.gapOptions", &json!({"ids": [g.0], "detect": true})).unwrap(); + assert_eq!(s.doc().unwrap().doc.parent_of(text), Some(g), "Gap Options keeps the type"); + let c = rect(&mut s, 120.0, 20.0, 100.0, 20.0); + s.execute("livePaint.merge", &json!({"ids": [g.0, c.0]})).unwrap(); + assert_eq!(s.doc().unwrap().doc.parent_of(text), Some(g), "Merge keeps the type"); + let other = rect(&mut s, 300.0, 300.0, 50.0, 50.0); + let h = NodeId(s.execute("livePaint.make", &json!({"ids": [other.0]})).unwrap()["id"].as_u64().unwrap()); + s.execute("object.isolate", &json!({"id": h.0})).unwrap(); + let text2 = NodeId(s.execute("text.create", &json!({"x": 310, "y": 320, "text": "Yo"})).unwrap()["id"].as_u64().unwrap()); + s.execute("object.exitIsolation", &json!({})).unwrap(); + s.execute("livePaint.merge", &json!({"ids": [g.0, h.0]})).unwrap(); + assert_eq!(s.doc().unwrap().doc.parent_of(text2), Some(g), "the type of the merged group moves with its paths"); + s.execute("livePaint.release", &json!({"ids": [g.0]})).unwrap(); + let d = &s.doc().unwrap().doc; + for id in [text, text2] { + assert_eq!(d.parent_of(id), d.default_layer(), "Release keeps {id}"); + } +} + +/// Art drawn in an isolated Live Paint group and named like one of the group's parts is not taken +/// for one: type named "Live Paint Sources" stays in the group through Gap Options, and a group of +/// paths named "Face" joins the group when isolation mode ends. +#[test] +fn live_paint_isolation_keeps_art_named_like_its_parts() { + use vectorcraft_tools::builder::{SOURCES_NAME, faces, sources}; + let mut s = session(); + let g = live(&mut s); + s.execute("object.isolate", &json!({"id": g.0})).unwrap(); + let text = NodeId(s.execute("text.create", &json!({"x": 20, "y": 20, "text": "Hi"})).unwrap()["id"].as_u64().unwrap()); + s.execute("object.setProps", &json!({"id": text.0, "name": SOURCES_NAME})).unwrap(); + let (a, b) = (line_across(&mut s, 30.0), line_across(&mut s, 70.0)); + s.execute("select.set", &json!({"ids": [a.0, b.0]})).unwrap(); + let paths = NodeId(s.execute("object.group", &json!({})).unwrap()["id"].as_u64().unwrap()); + s.execute("object.setProps", &json!({"id": paths.0, "name": "Face"})).unwrap(); + s.execute("object.exitIsolation", &json!({})).unwrap(); + let n = node(&s, g); + assert_eq!(faces(&n).len(), 9, "the group named Face joined"); + assert_eq!(s.doc().unwrap().doc.parent_of(paths), Some(sources(&n).unwrap().id)); + s.execute("livePaint.gapOptions", &json!({"ids": [g.0], "detect": true})).unwrap(); + assert_eq!(s.doc().unwrap().doc.parent_of(text), Some(g), "Gap Options keeps the type named like the sources"); +} + +/// Type drawn in an isolated Live Paint group under the name of a face, an edge or the sources +/// group is not one of the group's parts: Gap Options, Info and Make count only the faces and edges +/// Live Paint made, and Expand keeps the type. +#[test] +fn live_paint_does_not_count_art_named_like_its_parts() { + use vectorcraft_tools::builder::{EDGE_NAME, FACE_NAME, SOURCES_NAME}; + let mut s = session(); + let g = live(&mut s); + let edges = s.execute("livePaint.info", &json!({"group": g.0})).unwrap()["edges"].as_array().unwrap().len(); + s.execute("object.isolate", &json!({"id": g.0})).unwrap(); + let mut texts = vec![]; + for (i, name) in [FACE_NAME, EDGE_NAME, SOURCES_NAME].into_iter().enumerate() { + let r = s.execute("text.create", &json!({"x": 20 + 20 * i, "y": 20, "text": "Hi"})).unwrap(); + let t = NodeId(r["id"].as_u64().unwrap()); + s.execute("object.setProps", &json!({"id": t.0, "name": name})).unwrap(); + texts.push(t); + } + s.execute("object.exitIsolation", &json!({})).unwrap(); + let r = s.execute("livePaint.gapOptions", &json!({"ids": [g.0], "detect": true})).unwrap(); + assert_eq!(r["faces"], 3, "Gap Options counts the faces Live Paint made"); + let info = s.execute("livePaint.info", &json!({"group": g.0})).unwrap(); + assert_eq!(info["faces"].as_array().unwrap().len(), 3); + assert_eq!(info["edges"].as_array().unwrap().len(), edges); + let r = s.execute("livePaint.make", &json!({"ids": [g.0]})).unwrap(); + assert_eq!((r["faces"].as_u64(), r["edges"].as_u64()), (Some(3), Some(edges as u64))); + s.execute("livePaint.expand", &json!({"ids": [g.0]})).unwrap(); + let d = &s.doc().unwrap().doc; + for t in texts { + assert_eq!(d.parent_of(t), Some(g), "Expand keeps {t}"); + } +} + +/// With Real-time Drawing and Editing off, a rectangle still being drawn in a Live Paint group +/// isolated in a pattern tile is drawn first when Exit Isolation Mode leaves pattern editing, and +/// joins the group with the tile saved. +#[test] +fn live_paint_in_a_pattern_tile_adds_a_shape_still_being_drawn_on_exit() { + use vectorcraft_tools::builder::{is_live_paint, sources}; + let mut s = session(); + two(&mut s); + s.execute("object.pattern.make", &json!({"name": "P"})).unwrap(); + let g = NodeId(s.execute("livePaint.make", &json!({})).unwrap()["id"].as_u64().unwrap()); + s.execute("object.isolate", &json!({"id": g.0})).unwrap(); + s.execute("prefs.set", &json!({"key": "realTimeDrawing", "value": false})).unwrap(); + let v = ViewInfo::default(); + s.select_tool("rectangle", v).unwrap(); + s.pointer(&PointerEvent::new(PointerKind::Down, 10.0, 10.0), v).unwrap(); + s.pointer(&PointerEvent::new(PointerKind::Drag, 40.0, 40.0), v).unwrap(); + assert!(s.interaction_unapplied()); + s.execute("object.exitIsolation", &json!({})).unwrap(); + let st = s.doc().unwrap(); + assert!(st.doc.pattern_edit.is_none()); + let art = &st.doc.pattern("P").unwrap().art; + let n = art.iter().find(|n| is_live_paint(n)).expect("the tile holds the Live Paint group"); + assert_eq!(sources(n).unwrap().children().unwrap().len(), 3, "the rectangle joined the sources"); +} + +/// Isolating a level outside an isolated Live Paint group, as the isolation bar's back arrow does, +/// leaves the group and adds the paths drawn in it; isolating a path drawn in it does not. +#[test] +fn live_paint_isolation_adds_drawn_paths_when_isolating_a_level_outside() { + use vectorcraft_tools::builder::{faces, sources}; + let mut s = session(); + let g = live(&mut s); + s.execute("object.isolate", &json!({"id": g.0})).unwrap(); + let a = line_across(&mut s, 50.0); + s.execute("object.isolate", &json!({"id": a.0})).unwrap(); + assert_eq!(s.doc().unwrap().doc.parent_of(a), Some(g), "the path is still being drawn in the group"); + assert_eq!(faces(&node(&s, g)).len(), 3); + let layer = s.doc().unwrap().doc.parent_of(g).unwrap(); + s.execute("object.isolate", &json!({"id": layer.0})).unwrap(); + assert_eq!(s.doc().unwrap().isolation, Some(layer)); + let n = node(&s, g); + assert_eq!(faces(&n).len(), 6); + assert_eq!(s.doc().unwrap().doc.parent_of(a), Some(sources(&n).unwrap().id)); +} + +/// A group of paths drawn in an isolated Live Paint group and then isolated itself joins the Live +/// Paint group when isolation mode ends, or when a level outside the Live Paint group is isolated. +#[test] +fn live_paint_isolation_adds_a_drawn_group_isolated_inside_it() { + use vectorcraft_tools::builder::{faces, sources}; + for to_layer in [false, true] { + let mut s = session(); + let g = live(&mut s); + s.execute("object.isolate", &json!({"id": g.0})).unwrap(); + let (a, b) = (line_across(&mut s, 30.0), line_across(&mut s, 70.0)); + s.execute("select.set", &json!({"ids": [a.0, b.0]})).unwrap(); + let paths = NodeId(s.execute("object.group", &json!({})).unwrap()["id"].as_u64().unwrap()); + s.execute("object.isolate", &json!({"id": paths.0})).unwrap(); + assert_eq!(faces(&node(&s, g)).len(), 3, "isolating the drawn group stays in the Live Paint group"); + if to_layer { + let layer = s.doc().unwrap().doc.parent_of(g).unwrap(); + s.execute("object.isolate", &json!({"id": layer.0})).unwrap(); + } else { + s.execute("object.exitIsolation", &json!({})).unwrap(); + } + let n = node(&s, g); + assert_eq!(faces(&n).len(), 9, "the drawn group joined (to the layer: {to_layer})"); + assert_eq!(s.doc().unwrap().doc.parent_of(paths), Some(sources(&n).unwrap().id)); + } +} + /// Give Live Paint group `g` a lock, hidden state, appearance, knockout, opacity mask and /// graphic style link, and return it as it then is. fn dress_live_group(s: &mut Session, g: NodeId) -> Node { diff --git a/crates/engine/src/tests/colorguide.rs b/crates/engine/src/tests/colorguide.rs index 6213b202cd..a13cf61b07 100644 --- a/crates/engine/src/tests/colorguide.rs +++ b/crates/engine/src/tests/colorguide.rs @@ -95,3 +95,50 @@ fn new_swatch_saves_several_colours_in_one_step() { assert!(s.execute("swatch.new", &json!({"colors": []})).is_err()); assert!(s.execute("swatch.new", &json!({"colors": ["nope"]})).is_err()); } + +/// The tint swatch a swatch named `name` is: (base, tint 0..1); none for any other swatch. +fn tint_of(s: &Session, name: &str) -> Option<(String, f32)> { + s.doc().unwrap().doc.swatch(name)?.tint_of().map(|(b, t)| (b.to_string(), t)) +} + +/// `{swatch, tint}` entries of `swatch.new {colors}` and `swatch.newGroup {colors}` make tint +/// swatches linked to their spot color, beside plain colors, in one undo step; the tints follow an +/// edit of the spot color; a bad entry saves nothing. +#[test] +fn colors_entries_naming_a_spot_color_save_tint_swatches() { + let mut s = session(); + s.execute("swatch.new", &json!({"name": "Ink", "color": "#0066cc", "spot": true})).unwrap(); + let undo = s.doc().unwrap().history.undo.len(); + let r = s.execute("swatch.new", &json!({"colors": [{"swatch": "Ink", "tint": 60}, "#112233", {"swatch": "Ink", "tint": 30}]})).unwrap(); + let names = hexes(&r["names"]); + assert_eq!(names, ["Ink 60%", "R=17 G=34 B=51", "Ink 30%"]); + assert_eq!(s.doc().unwrap().history.undo.len(), undo + 1, "one undo step"); + let (base, tint) = tint_of(&s, "Ink 60%").expect("a tint swatch"); + assert_eq!(base, "Ink"); + assert!((tint - 0.6).abs() < 1e-6, "{tint}"); + assert!(tint_of(&s, "R=17 G=34 B=51").is_none()); + let r = s.execute("swatch.newGroup", &json!({"name": "Guide", "colors": [{"swatch": "Ink", "tint": 45}, "#445566", {"swatch": "Ink"}]})).unwrap(); + let members = hexes(&r["swatches"]); + assert_eq!(members[0], "Ink 45%"); + assert_eq!(tint_of(&s, "Ink 45%").map(|(b, _)| b).as_deref(), Some("Ink")); + assert!(members[1..].iter().all(|m| tint_of(&s, m).is_none()), "a color and the full spot color are process copies: {members:?}"); + let d = &s.doc().unwrap().doc; + let full = d.swatch(&members[2]).unwrap(); + assert!(!full.spot && !full.global, "{full:?}"); + // The tint swatches follow an edit of the spot color. + s.execute("swatch.edit", &json!({"name": "Ink", "color": "#cc0000"})).unwrap(); + let d = &s.doc().unwrap().doc; + let ink = d.global_color("Ink").unwrap(); + for name in ["Ink 60%", "Ink 45%"] { + let w = d.swatch(name).unwrap(); + let t = w.tint_of().unwrap().1; + assert_eq!(w.paint.color().map(|c| c.to_hex()), Some(ink.tinted(t).to_hex()), "{name}"); + } + // A missing swatch, a tint of a process color or a tint that is not a number saves nothing. + let count = s.doc().unwrap().doc.swatches_iter().count(); + for bad in [json!({"swatch": "Nope", "tint": 50}), json!({"swatch": "R=17 G=34 B=51", "tint": 50}), json!({"swatch": "Ink", "tint": "half"})] { + assert!(s.execute("swatch.new", &json!({"colors": ["#010203", bad]})).is_err(), "{bad}"); + assert!(s.execute("swatch.newGroup", &json!({"colors": ["#010203", bad]})).is_err(), "{bad}"); + } + assert_eq!(s.doc().unwrap().doc.swatches_iter().count(), count); +} diff --git a/crates/engine/src/tests/constrain_new.rs b/crates/engine/src/tests/constrain_new.rs index d78ceae054..9a26e45867 100644 --- a/crates/engine/src/tests/constrain_new.rs +++ b/crates/engine/src/tests/constrain_new.rs @@ -506,3 +506,92 @@ fn arc_rotation_turns_it_and_must_be_a_number() { } } } + +/// The outer end of the spiral `id`. +fn spiral_outer_end(s: &Session, id: NodeId) -> Point { + *path_points(s, id).last().unwrap() +} + +/// A spiral dragged out turns about its center so that its outer end is at the pointer, in every +/// direction and with a turned Constrain Angle too; its bounding box stays on the page, except +/// along the turned x axis, where it is the click dialog's spiral with its turned box. +#[test] +fn a_dragged_spiral_turns_its_outer_end_to_the_pointer() { + let mut s = new_doc(); + for deg in [0.0, 30.0] { + set_angle(&mut s, deg); + s.select_tool("spiral", ViewInfo::default()).unwrap(); + for (x, y) in [(260.0, 200.0), (200.0, 260.0), (140.0, 200.0), (200.0, 140.0), (240.0, 170.0)] { + gesture(&mut s, Mods::default(), &[(Down, 200.0, 200.0), (Drag, 230.0, 230.0), (Drag, x, y), (Up, x, y)]); + let id = last_id(&s); + let end = spiral_outer_end(&s, id); + assert!(near(end, x, y), "{deg}°, to ({x}, {y}): {end:?}"); + assert_eq!(bbox_angle(&s, id).to_bits(), 0.0f64.to_bits(), "{deg}°, to ({x}, {y})"); + } + } + let mut s = new_doc(); + set_angle(&mut s, 90.0); + s.select_tool("spiral", ViewInfo::default()).unwrap(); + gesture(&mut s, Mods::default(), &[(Down, 200.0, 200.0), (Drag, 230.0, 230.0), (Drag, 200.0, 150.0), (Up, 200.0, 150.0)]); + let id = last_id(&s); + assert_eq!(spiral_outer_end(&s, id), Point::new(200.0, 150.0)); + assert_eq!(bbox_angle(&s, id), 90.0, "along the turned x axis"); +} + +/// A spiral placed by the click dialog starts along the turned x axis, about the click: at 90° its +/// outer end is straight above the center, exactly, and its bounding box turns with it; at 0°, a +/// whole turn and with a `rotation` given the dialog's params are unchanged. +#[test] +fn constrain_angle_turns_a_click_made_spiral() { + let mut s = new_doc(); + let click = Point::new(200.0, 200.0); + let p = json!({"cx": 200.0, "cy": 200.0, "radius": 50.0, "decay": 80.0, "segments": 10, "clockwise": true}); + assert_eq!(constrain_click(&s, "shape.spiral", p.clone(), click), p, "0°"); + set_angle(&mut s, 360.0); + assert_eq!(constrain_click(&s, "shape.spiral", p.clone(), click), p, "a whole turn"); + set_angle(&mut s, 90.0); + let mut given = p.clone(); + given["rotation"] = json!(10.0); + assert_eq!(constrain_click(&s, "shape.spiral", given.clone(), click), given, "a given rotation"); + let turned = constrain_click(&s, "shape.spiral", p.clone(), click); + assert_eq!(turned["rotation"], json!(-90.0)); + let id = NodeId(s.execute("shape.spiral", &turned).unwrap()["id"].as_u64().unwrap()); + assert_eq!(spiral_outer_end(&s, id), Point::new(200.0, 150.0)); + assert_eq!(bbox_angle(&s, id), 90.0); + set_angle(&mut s, 30.0); + let id = NodeId(s.execute("shape.spiral", &constrain_click(&s, "shape.spiral", p, click)).unwrap()["id"].as_u64().unwrap()); + let r = 30f64.to_radians(); + let end = spiral_outer_end(&s, id); + assert!(near(end, 200.0 + 50.0 * r.cos(), 200.0 - 50.0 * r.sin()), "{end:?}"); + assert!(close(bbox_angle(&s, id), 30.0), "{}", bbox_angle(&s, id)); +} + +/// `shape.spiral` turns by an explicit `rotation` (clockwise) about its center; 0 and a whole +/// turn draw it exactly as without one; a `rotation` that is not a number is refused and adds +/// nothing. +#[test] +fn spiral_rotation_turns_it_and_must_be_a_number() { + let mut s = new_doc(); + let base = json!({"cx": 100, "cy": 100, "radius": 40, "segments": 6}); + let with = |r: Value| { + let mut p = base.clone(); + p["rotation"] = r; + p + }; + let plain = NodeId(s.execute("shape.spiral", &base).unwrap()["id"].as_u64().unwrap()); + let plain = path_points(&s, plain); + assert_eq!(*plain.last().unwrap(), Point::new(140.0, 100.0), "upright: the outer end to the right"); + for r in [json!(0), json!(360)] { + let id = NodeId(s.execute("shape.spiral", &with(r.clone())).unwrap()["id"].as_u64().unwrap()); + assert_eq!(path_points(&s, id), plain, "{r}"); + assert_eq!(bbox_angle(&s, id).to_bits(), 0.0f64.to_bits(), "{r}"); + } + let id = NodeId(s.execute("shape.spiral", &with(json!(90))).unwrap()["id"].as_u64().unwrap()); + assert_eq!(spiral_outer_end(&s, id), Point::new(100.0, 140.0), "a quarter turn clockwise"); + assert_eq!(bbox_angle(&s, id).to_bits(), 0.0f64.to_bits(), "not the Constrain Angle's turn"); + for bad in [json!("x"), Value::Null, json!(true)] { + let p = with(bad); + assert!(s.execute("shape.spiral", &p).is_err(), "{p}"); + assert_eq!(last_id(&s), id, "nothing added for {p}"); + } +} diff --git a/crates/engine/src/tests/draw2.rs b/crates/engine/src/tests/draw2.rs index 6c823f8aeb..f4af510230 100644 --- a/crates/engine/src/tests/draw2.rs +++ b/crates/engine/src/tests/draw2.rs @@ -86,8 +86,57 @@ fn blob_tip_zero_and_invalid_values_are_safe() { p[key] = value; assert!(s.execute("path.blob", &p).is_err(), "{key}: {p}"); } - s.execute("path.blob", &json!({"points": [[100, 200], [300, 200]], "angle": 1e300, "roundness": -1e300, "merge": false})).unwrap(); - assert!(paths(&s)[1].1.control_bounds().unwrap().height().is_finite()); + let stroke = json!({"points": [[100, 200], [300, 200]], "merge": false}); + refuses_with(&mut s, "path.blob", &with(&stroke, json!({"angle": 1e300})), "`angle` must be from -180 to 180 degrees"); + refuses_with(&mut s, "path.blob", &with(&stroke, json!({"roundness": -1e300})), "`roundness` must be from 0 to 100%"); + assert_eq!(paths(&s).len(), 1); +} + +/// `path.blob` refuses an `angle`, `roundness` or `fidelity` outside its range and changes nothing; +/// each end of a range paints, and a key left out or null takes its default (0°, 100% and no fitting). +#[test] +fn blob_brush_rejects_out_of_range_tip_and_fidelity_without_edit() { + let mut s = session(); + let stroke = json!({"points": [[100, 100], [300, 100]], "size": 20, "merge": false}); + let angle = "`angle` must be from -180 to 180 degrees"; + let roundness = "`roundness` must be from 0 to 100%"; + let fidelity = "`fidelity` must be from 0.01 to 100 pt"; + for (extra, want) in [ + (json!({"angle": -180.5}), angle), + (json!({"angle": 181}), angle), + (json!({"angle": 1e300}), angle), + (json!({"roundness": -0.5}), roundness), + (json!({"roundness": 101}), roundness), + (json!({"fidelity": 0.005}), fidelity), + (json!({"fidelity": 0}), fidelity), + (json!({"fidelity": -1}), fidelity), + (json!({"fidelity": 101}), fidelity), + (json!({"fidelity": 1e300}), fidelity), + (json!({"angle": 45, "roundness": 50, "fidelity": 100.5}), fidelity), + ] { + refuses_with(&mut s, "path.blob", &with(&stroke, extra), want); + } + assert!(paths(&s).is_empty()); + let painted = |s: &mut Session, extra: serde_json::Value| { + let id = NodeId(s.execute("path.blob", &with(&stroke, extra)).unwrap()["id"].as_u64().unwrap()); + path(s, id) + }; + for extra in [ + json!({"angle": -180}), + json!({"angle": 180}), + json!({"roundness": 0}), + json!({"roundness": 100}), + json!({"fidelity": 0.01}), + json!({"fidelity": 100}), + ] { + let pd = painted(&mut s, extra.clone()); + assert!(pd.control_bounds().is_some_and(|b| b.height().is_finite() && b.height() > 0.0), "{extra}: {pd:?}"); + } + let defaults = painted(&mut s, json!({})); + let nulls = painted(&mut s, json!({"angle": null, "roundness": null, "fidelity": null})); + let given = painted(&mut s, json!({"angle": 0, "roundness": 100})); + assert_eq!(nulls, defaults); + assert_eq!(given, defaults); } #[test] @@ -330,6 +379,41 @@ fn pencil_connect_keeps_the_rest_of_a_compound_path_and_refuses_the_extended_pat assert!(s.execute("path.freehand", &json!({"points": points, "extend": {"id": a.0}, "connect": {"id": a.0}})).is_err()); } +/// `path.freehand` refuses a `style` other than "pencil" or "brush" and an `extend` end other than +/// "start" or "end" and changes nothing; left out or null, the style is "pencil" and the stroke +/// continues the path from its end. +#[test] +fn pencil_refuses_an_unknown_style_or_extend_end() { + let mut s = session(); + let a = line(&mut s, 100.0, 100.0, 200.0, 100.0); + let stroke = json!({"points": [[100, 300], [200, 320], [300, 300]]}); + for style in [json!("calligraphic"), json!("Brush"), json!(""), json!(1), json!(true)] { + refuses_with(&mut s, "path.freehand", &with(&stroke, json!({ "style": style })), "style must be \"pencil\" or \"brush\""); + } + let from_end = json!({"points": [[200, 100], [250, 150], [300, 100]]}); + for end in [json!("middle"), json!("START"), json!(""), json!(0), json!(false)] { + let p = with(&from_end, json!({"extend": {"id": a.0, "end": end}})); + refuses_with(&mut s, "path.freehand", &p, "extend end must be \"start\" or \"end\""); + } + assert_eq!((paths(&s).len(), path(&s, a).anchor_count()), (1, 2), "refused: nothing changed"); + for style in [json!("pencil"), json!("brush"), json!(null)] { + s.execute("path.freehand", &with(&stroke, json!({ "style": style }))).unwrap(); + } + assert_eq!(paths(&s).len(), 4); + for end in [json!(null), json!("end")] { + let mut s = session(); + let a = line(&mut s, 100.0, 100.0, 200.0, 100.0); + s.execute("path.freehand", &with(&from_end, json!({"extend": {"id": a.0, "end": end}}))).unwrap(); + let sp = &path(&s, a).subpaths[0]; + assert_eq!((sp.anchors[0].p, sp.anchors[sp.anchors.len() - 1].p), (Point::new(100.0, 100.0), Point::new(300.0, 100.0)), "{end}"); + } + let mut s = session(); + let a = line(&mut s, 100.0, 100.0, 200.0, 100.0); + s.execute("path.freehand", &json!({"points": [[100, 100], [50, 150], [0, 100]], "extend": {"id": a.0, "end": "start"}})).unwrap(); + let ends: Vec<Point> = path(&s, a).subpaths[0].anchors.iter().map(|x| x.p).collect(); + assert!(ends.contains(&Point::new(0.0, 100.0)) && ends.contains(&Point::new(200.0, 100.0)), "continued from its start: {ends:?}"); +} + /// With Keep selected off, a compound path whose direct-selected anchors all lie on the subpath /// that connect joins on is no longer selected, and Delete then has nothing to delete. #[test] diff --git a/crates/engine/src/tests/eyedropper.rs b/crates/engine/src/tests/eyedropper.rs index f4728f8a18..182d989662 100644 --- a/crates/engine/src/tests/eyedropper.rs +++ b/crates/engine/src/tests/eyedropper.rs @@ -615,6 +615,141 @@ fn clicking_an_image_samples_its_pixel() { assert_eq!(node(&s, dst).appearance.fill_paint().color(), Some(Color::rgb8(128, 128, 64)), "5 x 5 average of both pixels"); } +/// Gradient mesh points picked with Direct Selection or the Mesh tool take the color the +/// Eyedropper then samples from an image or from other art, each sample one undo step, and only +/// they change: the mesh's other points and its appearance stay as they were (#8090). +#[test] +fn picked_mesh_points_take_the_eyedropper_sample() { + let mut s = session(); + // Two pixels, orange and teal, 100 pt each, at (300, 0). + let rgba = [[255u8, 128, 0, 255], [0, 128, 128, 255]].concat(); + let img = craft_image_codecs::Image::from_raw(2, 1, craft_image_codecs::ChannelLayout::Rgba, craft_image_codecs::SampleType::U8, rgba).unwrap(); + let png = craft_image_codecs::encode(&img, craft_image_codecs::Format::Png, &craft_image_codecs::EncodeOptions::default()).unwrap(); + s.edit("Place", |d, _| { + d.images.insert("px".into(), ImageBlob::png(png.to_vec())); + let l = d.layers[0].id; + let id = d.alloc_id(); + let xf = vectorcraft_geom::Affine::translate((300.0, 0.0)) * vectorcraft_geom::Affine::scale(100.0); + let im = ImageObject { key: "px".into(), width: 2, height: 1, xf, link: None, placement: Default::default(), pixels: None }; + d.insert(Some(l), 0, Node::new(id, NodeKind::Image(Box::new(im)))).map_err(|e| crate::EngineError::Other(e.to_string())) + }) + .unwrap(); + let m = rect(&mut s, 10.0); + s.execute("object.mesh.create", &json!({"ids": [m.0], "rows": 1, "cols": 1})).unwrap(); + let red = rect(&mut s, 100.0); + s.execute("paint.setFill", &json!({"color": "#ff0000"})).unwrap(); + let colors = |s: &Session| match node(s, m).kind { + NodeKind::Mesh(g) => g.points.iter().map(|p| p.color).collect::<Vec<_>>(), + k => panic!("not a mesh: {k:?}"), + }; + let white = colors(&s)[0]; + assert!(colors(&s).iter().all(|c| *c == white && *c != Color::rgb8(255, 0, 0))); + let appearance = node(&s, m).appearance; + let v = ViewInfo::default(); + let pick = |s: &mut Session, tool: &str, i: usize, shift: bool| { + s.select_tool(tool, v).unwrap(); + let q = match node(s, m).kind { + NodeKind::Mesh(g) => g.points[i].p, + k => panic!("not a mesh: {k:?}"), + }; + let mods = Mods { shift, ..Default::default() }; + for kind in [PointerKind::Down, PointerKind::Up] { + s.pointer(&PointerEvent::new(kind, q.x, q.y).with_mods(mods), v).unwrap(); + } + }; + let (teal, orange) = (Color::rgb8(0, 128, 128), Color::rgb8(255, 128, 0)); + s.execute("select.set", &json!({"ids": [m.0]})).unwrap(); + pick(&mut s, "directSelection", 0, false); + let undo = undo_len(&s); + click(&mut s, 450.0, 50.0, Mods::default()); + assert_eq!(colors(&s), [teal, white, white, white], "the picked point takes the image's color"); + assert_eq!(node(&s, m).appearance, appearance, "the mesh's appearance stays"); + assert_eq!(undo_len(&s), undo + 1, "one undo step"); + // The Eyedropper keeps the picks: a Shift-click samples into the point again. + s.pointer(&PointerEvent::new(PointerKind::Down, 350.0, 50.0).with_mods(Mods { shift: true, ..Default::default() }), v).unwrap(); + assert_eq!(colors(&s), [orange, white, white, white]); + assert_eq!(undo_len(&s), undo + 2); + // A sample of the color the point already has changes nothing and adds no step. + s.pointer(&PointerEvent::new(PointerKind::Down, 350.0, 50.0), v).unwrap(); + assert_eq!(undo_len(&s), undo + 2, "no step when nothing changes"); + s.execute("edit.undo", &json!({})).unwrap(); + assert_eq!(colors(&s), [teal, white, white, white]); + // Two points picked with the Mesh tool both take a plain click's sample of other art, and the + // art keeps its fill. + pick(&mut s, "mesh", 1, false); + pick(&mut s, "mesh", 3, true); + let undo = undo_len(&s); + click(&mut s, 125.0, 35.0, Mods::default()); + let r = Color::rgb8(255, 0, 0); + assert_eq!(colors(&s), [teal, r, white, r]); + assert_eq!(undo_len(&s), undo + 1, "one undo step for every picked point"); + assert_eq!(node(&s, m).appearance, appearance); + assert_eq!(node(&s, red).appearance.fill_paint().color(), Some(r)); + // Back in the Mesh tool the two points are still picked: a fill color recolors just them. + s.select_tool("mesh", v).unwrap(); + s.execute("paint.setFill", &json!({"color": "#0000ff"})).unwrap(); + let b = Color::rgb8(0, 0, 255); + assert_eq!(colors(&s), [teal, b, white, b], "the picks go back to the Mesh tool"); + // Without picked points a click on an image samples into the whole selected mesh as before. + s.select_tool("selection", v).unwrap(); + s.execute("select.set", &json!({"ids": [m.0]})).unwrap(); + click(&mut s, 450.0, 50.0, Mods::default()); + assert_eq!(colors(&s), [teal, b, white, b], "the points keep their colors"); + assert_ne!(node(&s, m).appearance, appearance); +} + +/// A Cmd-click with the Direct Selection tool the Eyedropper lends picks gradient mesh points for +/// the Eyedropper: the lent tool starts from the Eyedropper's picks, so a Shift-click adds to +/// them, and the Eyedropper samples into what the lent tool left picked (#8090). +#[test] +fn mesh_points_picked_through_the_lent_tool_take_the_eyedropper_sample() { + let mut s = session(); + // Two pixels, orange and teal, 100 pt each, at (300, 0). + let rgba = [[255u8, 128, 0, 255], [0, 128, 128, 255]].concat(); + let img = craft_image_codecs::Image::from_raw(2, 1, craft_image_codecs::ChannelLayout::Rgba, craft_image_codecs::SampleType::U8, rgba).unwrap(); + let png = craft_image_codecs::encode(&img, craft_image_codecs::Format::Png, &craft_image_codecs::EncodeOptions::default()).unwrap(); + s.edit("Place", |d, _| { + d.images.insert("px".into(), ImageBlob::png(png.to_vec())); + let l = d.layers[0].id; + let id = d.alloc_id(); + let xf = vectorcraft_geom::Affine::translate((300.0, 0.0)) * vectorcraft_geom::Affine::scale(100.0); + let im = ImageObject { key: "px".into(), width: 2, height: 1, xf, link: None, placement: Default::default(), pixels: None }; + d.insert(Some(l), 0, Node::new(id, NodeKind::Image(Box::new(im)))).map_err(|e| crate::EngineError::Other(e.to_string())) + }) + .unwrap(); + let m = rect(&mut s, 10.0); + s.execute("object.mesh.create", &json!({"ids": [m.0], "rows": 1, "cols": 1})).unwrap(); + let colors = |s: &Session| match node(s, m).kind { + NodeKind::Mesh(g) => g.points.iter().map(|p| p.color).collect::<Vec<_>>(), + k => panic!("not a mesh: {k:?}"), + }; + let white = colors(&s)[0]; + let v = ViewInfo::default(); + let press = |s: &mut Session, i: usize, mods: Mods| { + let q = match node(s, m).kind { + NodeKind::Mesh(g) => g.points[i].p, + k => panic!("not a mesh: {k:?}"), + }; + for kind in [PointerKind::Down, PointerKind::Up] { + s.pointer(&PointerEvent::new(kind, q.x, q.y).with_mods(mods), v).unwrap(); + } + }; + let (teal, orange) = (Color::rgb8(0, 128, 128), Color::rgb8(255, 128, 0)); + s.execute("select.set", &json!({"ids": [m.0]})).unwrap(); + s.select_tool("directSelection", v).unwrap(); + press(&mut s, 0, Mods::default()); + s.select_tool("eyedropper", v).unwrap(); + // Cmd-click point 3: Direct Selection, lent, picks it in place of point 0. + press(&mut s, 3, Mods { cmd: true, ..Default::default() }); + assert_eq!(s.tool_id(), "eyedropper"); + click(&mut s, 450.0, 50.0, Mods::default()); + assert_eq!(colors(&s), [white, white, white, teal], "the point the lent tool picked takes the sample"); + // Cmd+Shift-click point 0 adds it to the Eyedropper's pick. + press(&mut s, 0, Mods { cmd: true, shift: true, ..Default::default() }); + click(&mut s, 350.0, 50.0, Mods::default()); + assert_eq!(colors(&s), [orange, white, white, orange], "both picked points take the sample"); +} + /// A CMYK document with one image of `px` (one row, 100 pt a pixel) at (300, 0). fn cmyk_doc_with_image(px: &[[u8; 4]]) -> Session { let mut s = Session::new(); diff --git a/crates/engine/src/tests/menucmds.rs b/crates/engine/src/tests/menucmds.rs index ae40324b9e..1faeaa76ad 100644 --- a/crates/engine/src/tests/menucmds.rs +++ b/crates/engine/src/tests/menucmds.rs @@ -4109,6 +4109,17 @@ fn area_to_point_turns_wraps_into_breaks() { assert_eq!(txt.replace('\n', " "), "one two three four five six"); } +/// Convert To Point Type keeps the lines that a paragraph return or a forced line break (U+2028) +/// starts as they are: neither gets a paragraph return added after it. +#[test] +fn area_to_point_keeps_forced_line_breaks() { + let mut s = session(); + let a = id_of(&s.execute("text.create", &json!({"x": 0, "y": 0, "text": "ab\u{2028}c\nd", "area": {"width": 300, "height": 200}})).unwrap()); + sel(&mut s, &[a]); + s.execute("type.convertToPointType", &json!({})).unwrap(); + assert_eq!(plain(&s, a), "ab\u{2028}c\nd"); +} + #[test] fn placeholder_and_insert_characters() { let mut s = session(); @@ -4124,6 +4135,76 @@ fn placeholder_and_insert_characters() { assert!(s.execute("type.insert", &json!({"char": "nope"})).is_err()); } +/// Type › Insert Break Character › Forced Line Break (`type.insert {char: "forcedLineBreak"}`) +/// starts a new line in the same paragraph (U+2028, as Shift+Enter types it), so the paragraph's +/// space before does not come between the two lines; `paragraphReturn` starts a new paragraph. +/// Each insert is one undo step. +#[test] +fn insert_forced_line_break_differs_from_paragraph_return() { + fn second_line_gap(s: &Session, id: NodeId) -> f64 { + let NodeKind::Text(t) = &node(s, id).kind else { panic!("not text") }; + let lay = vectorcraft_text::layout(vectorcraft_text::FontDb::global(), t); + assert_eq!(lay.lines.len(), 2, "{:?}", t.plain_text()); + lay.lines[1].baseline - lay.lines[0].baseline + } + let mut s = session(); + let mut gaps = Vec::new(); + for (c, want) in [("forcedLineBreak", "ab\u{2028}c"), ("paragraphReturn", "ab\nc")] { + let t = text(&mut s, "ab"); + sel(&mut s, &[t]); + s.execute("text.setFormat", &json!({"ids": [t.0], "spaceBefore": 30})).unwrap(); + let steps = undo_len(&s); + s.execute("type.insert", &json!({"char": c})).unwrap(); + assert_eq!(undo_len(&s), steps + 1, "{c}"); + s.execute("type.insert", &json!({"text": "c"})).unwrap(); + assert_eq!(plain(&s, t), want, "{c}"); + gaps.push(second_line_gap(&s, t)); + } + assert!(gaps[1] - gaps[0] > 29.0, "space before only at the paragraph return: {gaps:?}"); + // The same character by `unicode` and by `text`. + let t = text(&mut s, ""); + sel(&mut s, &[t]); + s.execute("type.insert", &json!({"unicode": "2028"})).unwrap(); + s.execute("type.insert", &json!({"text": "\u{2028}"})).unwrap(); + assert_eq!(plain(&s, t), "\u{2028}\u{2028}"); +} + +/// While the Type tool edits text, the Insert Special, Whitespace and Break menu items +/// (`type.insert` without `ids`) insert at its caret or replace its selection, as one undo step, +/// and the caret goes after the insertion; `ids` still appends to those objects. +#[test] +fn insert_character_goes_to_the_type_tool_caret() { + use vectorcraft_tools::{Mods, PointerEvent, PointerKind, ToolKey}; + let mut s = session(); + let v = ViewInfo::default(); + s.select_tool("type", v).unwrap(); + for k in [PointerKind::Down, PointerKind::Up] { + s.pointer(&PointerEvent::new(k, 50.0, 300.0), v).unwrap(); + } + let t = s.doc().unwrap().selection.objects[0]; + s.tool_text("abcd", v).unwrap(); + for _ in 0..2 { + s.tool_key(ToolKey::Left, Mods::default(), v).unwrap(); + } + let steps = undo_len(&s); + s.execute("type.insert", &json!({"text": ""})).unwrap(); + assert_eq!(undo_len(&s), steps, "an empty insert changes nothing"); + s.execute("type.insert", &json!({"char": "forcedLineBreak"})).unwrap(); + assert_eq!(plain(&s, t), "ab\u{2028}cd"); + assert_eq!(s.tool_options()["caret"], json!(5)); + s.tool_text("X", v).unwrap(); + assert_eq!(plain(&s, t), "ab\u{2028}Xcd"); + s.tool_key(ToolKey::Left, Mods { shift: true, ..Mods::default() }, v).unwrap(); + s.execute("type.insert", &json!({"char": "paragraphReturn"})).unwrap(); + assert_eq!(plain(&s, t), "ab\u{2028}\ncd"); + s.execute("type.insert", &json!({"ids": [t.0], "text": "!"})).unwrap(); + assert_eq!(plain(&s, t), "ab\u{2028}\ncd!"); + s.tool_key(ToolKey::Escape, Mods::default(), v).unwrap(); + s.execute("edit.undo", &json!({})).unwrap(); + s.execute("edit.undo", &json!({})).unwrap(); + assert_eq!(plain(&s, t), "ab\u{2028}Xcd", "the replacement is one undo step"); +} + /// `type.insert` by code (#5108): `code` as a Windows Alt+0 code types (Windows-1252 for /// 128–159, the code point otherwise), `unicode` as a hex code point. #[test] diff --git a/crates/engine/src/tests/print.rs b/crates/engine/src/tests/print.rs index e2ea85d54f..140fb1aaa0 100644 --- a/crates/engine/src/tests/print.rs +++ b/crates/engine/src/tests/print.rs @@ -391,3 +391,21 @@ fn for_a_printer_a_landscape_page_is_written_upright() { assert_eq!(size(&spooled), [(612.0, 792.0)]); assert_eq!(v["pages"], 1); } + +#[test] +fn a_spot_ink_converted_to_process_is_saved_and_listed_without_a_plate() { + let (mut s, _) = session(); + s.execute("swatch.new", &json!({"name": "Gold", "color": {"model": "cmyk", "c": 0, "m": 0.2, "y": 0.8, "k": 0.1}, "spot": true})).unwrap(); + let ink = json!({"name": "Gold", "convertToProcess": true}); + let v = s.execute("print.setup", &json!({"settings": {"output": {"mode": "separations", "inks": [ink]}}})).unwrap(); + assert_eq!(v["settings"]["output"]["inks"], json!([{"name": "Gold", "print": true, "convertToProcess": true}])); + let doc = &s.doc().unwrap().doc; + let back = vectorcraft_format::load(&vectorcraft_format::save(doc, false)).unwrap(); + assert_eq!(back.print_setup.as_ref().map(|p| p["output"]["inks"][0]["convertToProcess"].clone()), Some(json!(true)), "kept in the file"); + let pv = s.execute("print.preview", &json!({})).unwrap(); + let names = |list: &Value| list.as_array().unwrap().iter().map(|i| i["name"].as_str().unwrap().to_string()).collect::<Vec<_>>(); + assert_eq!(names(&pv["inks"]), ["Cyan", "Magenta", "Yellow", "Black"], "no Gold plate"); + assert_eq!(names(&pv["documentInks"]), ["Cyan", "Magenta", "Yellow", "Black", "Gold"]); + assert_eq!(pv["documentInks"][4]["convertToProcess"], json!(true)); + assert_eq!(pv["documentInks"][0].get("convertToProcess"), None, "written only when on"); +} diff --git a/crates/engine/src/tests/select_effects.rs b/crates/engine/src/tests/select_effects.rs index f52ad14481..055711cb43 100644 --- a/crates/engine/src/tests/select_effects.rs +++ b/crates/engine/src/tests/select_effects.rs @@ -393,10 +393,10 @@ fn a_group_selection_marquee_leaves_out_a_drop_shadow() { run(&mut s, "select.none", json!({})); let sel = marquee(&mut s, "groupSelection", (85.0, 40.0), (95.0, 60.0)); assert!(sel.objects.is_empty() && sel.anchors.is_empty(), "{sel:?}"); - // Over the shadow and B's upper left corner: that anchor of B. + // Over the shadow and B's upper left corner: B whole, and not A (#8047). let sel = marquee(&mut s, "groupSelection", (90.0, 5.0), (105.0, 30.0)); assert_eq!(sel.objects, [b]); - assert_eq!(picked_points(&s, b), [Point::new(100.0, 20.0)]); + assert!(sel.partial(b).is_none(), "{sel:?}"); // With E, a marquee around B that crosses A's shadow selects B whole, and not A. run(&mut s, "select.none", json!({})); let v = ViewInfo::default(); diff --git a/crates/engine/src/tests/textedit.rs b/crates/engine/src/tests/textedit.rs index ed4a82dce6..4f1edcc62a 100644 --- a/crates/engine/src/tests/textedit.rs +++ b/crates/engine/src/tests/textedit.rs @@ -2289,6 +2289,41 @@ fn threaded_list_edited_in_its_second_frame() -> (Session, NodeId, NodeId, Strin (s, a, b, story) } +/// Type › Insert Break Character › Forced Line Break (`type.insert`) after Select All in threaded +/// text replaces the whole story, every frame's text, as one undo step. +#[test] +fn insert_character_replaces_the_whole_story_that_select_all_selected() { + let (mut s, a, b, story) = threaded_story_edited_in_its_second_frame(); + s.execute("select.all", &json!({})).unwrap(); + let steps = undo_labels(&s).len(); + s.execute("type.insert", &json!({"char": "forcedLineBreak"})).unwrap(); + assert_eq!(undo_labels(&s).len(), steps + 1, "one undo step"); + assert_eq!(format!("{}{}", obj(&s, a).plain_text(), obj(&s, b).plain_text()), "\u{2028}"); + s.execute("edit.undo", &json!({})).unwrap(); + assert_eq!(format!("{}{}", obj(&s, a).plain_text(), obj(&s, b).plain_text()), story); +} + +/// When `type.insert` at the caret in the first frame of threaded text pushes the caret's place on +/// into the next frame, the Type tool's caret goes there with it, and typing goes after the +/// insertion. +#[test] +fn insert_character_moves_the_caret_with_the_text_it_flows_on() { + let (mut s, a, b, story) = threaded_story_edited_in_its_second_frame(); + let first = obj(&s, a).plain_text(); + // Before the last word of the first frame: two line breaks there push the line after the + // first one on into the second frame. + let at = first.trim_end().rfind(' ').map_or(0, |k| k + 1); + s.execute("select.set", &json!({"ids": [a.0]})).unwrap(); + s.set_tool_option("textSelection", &json!({"editing": a.0, "anchor": at, "caret": at})); + for _ in 0..2 { + s.execute("type.insert", &json!({"char": "forcedLineBreak"})).unwrap(); + } + assert!(obj(&s, a).plain_text().len() < at + 6, "the second break flows on into the second frame"); + s.tool_text("X", ViewInfo::default()).unwrap(); + let want = format!("{}\u{2028}\u{2028}X{}", &story[..at], &story[at..]); + assert_eq!(format!("{}{}", obj(&s, a).plain_text(), obj(&s, b).plain_text()), want); +} + #[test] fn remove_breaks_takes_the_whole_story_that_select_all_selected() { let (mut s, a, b, story) = threaded_list_edited_in_its_second_frame(); diff --git a/crates/engine/src/tests/typescale.rs b/crates/engine/src/tests/typescale.rs index f96193a6c4..9aa287f601 100644 --- a/crates/engine/src/tests/typescale.rs +++ b/crates/engine/src/tests/typescale.rs @@ -369,3 +369,129 @@ fn scale_text_attributes_keeps_tracked_type_where_it_was() { assert!((*a - *b).hypot() < 1e-6, "{before:?} {after:?}"); } } + +/// What Scale Text Attributes must leave as it was: the document-space bounds of an area's frame +/// or a path type's path, each line's text, whether the text overflows, and where each glyph +/// starts on the page. +struct Placed { + outline: Option<vectorcraft_geom::Rect>, + lines: Vec<(usize, usize)>, + overflow: bool, + pens: Vec<Point>, +} + +fn placed(s: &Session, id: NodeId) -> Placed { + let t = text(s, id); + let lay = vectorcraft_text::layout(vectorcraft_text::FontDb::global(), &t); + let outline = match &t.kind { + vectorcraft_doc::TextKind::Area { frame } => Some(frame), + vectorcraft_doc::TextKind::OnPath { path, .. } => Some(path), + vectorcraft_doc::TextKind::Point => None, + }; + Placed { + outline: outline.and_then(|p| p.transformed(t.xf).bounds()), + lines: lay.lines.iter().map(|l| (l.start, l.end)).collect(), + overflow: lay.overflow, + pens: lay.glyphs.iter().map(|g| t.xf * (g.xf * Point::ZERO)).collect(), + } +} + +fn same_place(before: &Placed, after: &Placed) { + let (Some(b), Some(a)) = (before.outline, after.outline) else { panic!("no frame or path: {:?} {:?}", before.outline, after.outline) }; + for (x, y) in [(b.x0, a.x0), (b.y0, a.y0), (b.x1, a.x1), (b.y1, a.y1)] { + assert!((x - y).abs() < 1e-6, "frame {b:?} became {a:?}"); + } + assert_eq!(after.lines, before.lines, "line breaks"); + assert_eq!(after.overflow, before.overflow, "overflow"); + assert_eq!(before.pens.len(), after.pens.len()); + for (b, a) in before.pens.iter().zip(&after.pens) { + assert!((*a - *b).hypot() < 1e-6, "{:?} {:?}", before.pens, after.pens); + } +} + +/// #8297: Scale Text Attributes on scaled area type keeps the frame the scale gave it, so the +/// lines break where they did and no text becomes overset. It used to leave the frame at its +/// unscaled size, which then held two lines of the larger type and hid the rest. +#[test] +fn scale_text_attributes_keeps_an_area_frame_and_its_lines() { + for (sx, sy, size) in [(200, 200, 24.0), (200, 100, 12.0), (50, 50, 6.0)] { + let mut s = session(); + let id = NodeId( + s.execute( + "text.create", + &json!({"x": 40, "y": 60, "size": 12, "area": {"width": 120, "height": 80}, "text": "Bright river stones mark a gentle path past old trees."}), + ) + .unwrap()["id"] + .as_u64() + .unwrap(), + ); + s.execute("object.scale", &json!({"sx": sx, "sy": sy, "origin": [0, 0]})).unwrap(); + let before = placed(&s, id); + assert!(before.lines.len() >= 3 && !before.overflow, "{sx}x{sy}: {:?}", before.lines); + s.execute("type.scaleTextAttributes", &json!({})).unwrap(); + near(text(&s, id).runs[0].style.size, size); + same_place(&before, &placed(&s, id)); + if (sx, sy) == (200, 200) { + let f = before.outline.unwrap(); + assert_eq!((f.x0.round(), f.y0.round(), f.x1.round(), f.y1.round()), (80.0, 120.0, 320.0, 280.0)); + } + s.execute("edit.undo", &json!({})).unwrap(); + near(text(&s, id).runs[0].style.size, 12.0); + same_place(&before, &placed(&s, id)); + s.execute("edit.redo", &json!({})).unwrap(); + same_place(&before, &placed(&s, id)); + } +} + +/// Type on a path keeps its path: it used to shrink with the scale removed, so the type ran past +/// its end. +#[test] +fn scale_text_attributes_keeps_a_path_types_path() { + let mut s = session(); + let pid = s.execute("path.create", &json!({ "d": "M100 300 L300 300" })).unwrap()["id"].as_u64().unwrap(); + let id = NodeId( + s.execute("text.createInPath", &json!({"path": pid, "mode": "onPath", "text": "Along the way", "size": 12, "at": [100, 300]})).unwrap()["id"] + .as_u64() + .unwrap(), + ); + s.execute("select.set", &json!({"ids": [id.0]})).unwrap(); + s.execute("object.scale", &json!({"sx": 200, "origin": [0, 0]})).unwrap(); + let before = placed(&s, id); + assert!(!before.overflow); + s.execute("type.scaleTextAttributes", &json!({})).unwrap(); + near(text(&s, id).runs[0].style.size, 24.0); + same_place(&before, &placed(&s, id)); +} + +/// A non-uniform scale on type on a path: only the uniform part is baked and the stretch stays in +/// the transform, so the brackets, which sit at fractions of the path's length, stay where they +/// were. Baking the stretch into the path would move them: on this path, scaled 3 × 2, the length +/// grows from 200 to 500 and not in proportion, so the same fraction lands elsewhere. +#[test] +fn scale_text_attributes_keeps_path_type_on_a_stretched_path_where_it_was() { + let mut s = session(); + let pid = s.execute("path.create", &json!({ "d": "M0 0 L100 0 L100 100" })).unwrap()["id"].as_u64().unwrap(); + let id = NodeId( + s.execute("text.createInPath", &json!({"path": pid, "mode": "onPath", "text": "Corner", "size": 12, "at": [60, 0]})).unwrap()["id"] + .as_u64() + .unwrap(), + ); + s.execute("select.set", &json!({"ids": [id.0]})).unwrap(); + s.execute("object.scale", &json!({"sx": 300, "sy": 200, "origin": [0, 0]})).unwrap(); + let before = placed(&s, id); + let brackets = |s: &Session| match text(s, id).kind { + vectorcraft_doc::TextKind::OnPath { start, end, .. } => (start, end), + k => panic!("not path type: {k:?}"), + }; + let before_brackets = brackets(&s); + s.execute("type.scaleTextAttributes", &json!({})).unwrap(); + near(text(&s, id).runs[0].style.size, 24.0); + near(text(&s, id).runs[0].style.h_scale, 100.0); + let left = text(&s, id).style_scale().unwrap(); + near(left.points, 1.0); + near(left.horizontal, 1.5); + assert_eq!(brackets(&s), before_brackets); + same_place(&before, &placed(&s, id)); + // Only the stretch is left: there is nothing more to bake. + assert!(s.execute("type.scaleTextAttributes", &json!({})).is_err()); +} diff --git a/crates/engine/src/tests/webexport.rs b/crates/engine/src/tests/webexport.rs index ccd20e119c..a731e51aca 100644 --- a/crates/engine/src/tests/webexport.rs +++ b/crates/engine/src/tests/webexport.rs @@ -523,3 +523,215 @@ fn setting_keys_are_their_json_values() { .unwrap(); assert_eq!(serde_json::from_value::<cmd::webexport::WebSettings>(custom.to_json()).unwrap(), custom); } + +fn optimize_to(s: &mut Session, p: Value) -> Value { + run(s, "webExport.optimizeToFileSize", p) +} + +/// The size of the file the settings `p` write (the whole image, or slice `slice`). +fn written(s: &mut Session, p: &Value) -> usize { + run(s, "document.exportForWeb.preview", p.clone())["bytes"].as_u64().unwrap() as usize +} + +/// 20×20: 400 one-point squares of different colors (more than a palette holds). +fn photo_like() -> Session { + let mut s = session(20.0, 20.0); + for i in 0..400 { + let (x, y) = ((i % 20) as f64, (i / 20) as f64); + rect(&mut s, [x, y, 1.0, 1.0], &format!("#{:02x}{:02x}{:02x}", (i % 20) * 12, (i / 20) * 12, (i * 7) % 256)); + } + s +} + +#[test] +fn optimize_to_file_size_takes_the_highest_jpeg_quality_that_fits() { + let mut s = many_colours(); + let start = json!({"format": "jpg", "quality": 90}); + let full = written(&mut s, &start); + let k = (full * 3 / 4) as f64 / 1024.0; + let r = optimize_to(&mut s, merge(&start, json!({"desiredK": k}))); + let target = r["targetBytes"].as_u64().unwrap() as usize; + assert_eq!(target, (k * 1024.0).floor() as usize); + assert_eq!((r["achieved"].as_bool(), r["format"].as_str(), r["images"].as_u64()), (Some(true), Some("jpg"), Some(1)), "{r}"); + let q = r["settings"]["quality"].as_u64().unwrap(); + assert!(q < 90, "{r}"); + let bytes = r["bytes"].as_u64().unwrap() as usize; + assert!(bytes <= target, "{r}"); + // The size is the size of the file Save writes with the settings. + assert_eq!(written(&mut s, &r["settings"]), bytes); + assert_eq!(one(&mut s, r["settings"].clone()).len(), bytes); + // One quality step up is over the size. + assert!(written(&mut s, &merge(&r["settings"], json!({"quality": q + 1}))) > target); + assert!(r["trials"].as_u64().unwrap() as usize <= cmd::webexport::OPTIMIZE_TRIALS); + // The other settings stay. + assert_eq!(r["settings"]["matte"], json!("white")); + assert_eq!(r["settings"]["metadata"], json!("copyright")); +} + +#[test] +fn optimize_to_file_size_lowers_palette_colors() { + let mut s = many_colours(); + for format in ["gif", "png8"] { + let start = json!({"format": format, "dither": "none", "colors": 128}); + let full = written(&mut s, &start); + let r = optimize_to(&mut s, merge(&start, json!({"desiredK": (full * 3 / 4) as f64 / 1024.0}))); + let target = r["targetBytes"].as_u64().unwrap() as usize; + assert_eq!((r["achieved"].as_bool(), r["format"].as_str()), (Some(true), Some(format)), "{r}"); + let colors = r["settings"]["colors"].as_u64().unwrap(); + assert!(colors < 64, "{format}: {r}"); + assert_eq!((r["settings"]["lossy"].as_u64(), r["settings"]["dither"].as_str()), (Some(0), Some("none")), "{format}: {r}"); + let bytes = r["bytes"].as_u64().unwrap() as usize; + assert!(bytes <= target && written(&mut s, &r["settings"]) == bytes, "{format}: {r}"); + assert!(written(&mut s, &merge(&r["settings"], json!({"colors": colors + 1}))) > target, "{format}: {r}"); + } +} + +#[test] +fn optimize_to_file_size_auto_selects_gif_or_jpeg_by_content() { + // Flat, opaque art: GIF, from a JPEG start. + let mut flat = two_colours(); + let r = optimize_to(&mut flat, json!({"format": "jpg", "desiredK": 100, "startWith": "auto"})); + assert_eq!((r["format"].as_str(), r["achieved"].as_bool()), (Some("gif"), Some(true)), "{r}"); + // More colors than a palette holds: JPEG, from a GIF start. + let mut photo = photo_like(); + let r = optimize_to(&mut photo, json!({"format": "gif", "desiredK": 100, "startWith": "auto"})); + assert_eq!((r["format"].as_str(), r["achieved"].as_bool()), (Some("jpg"), Some(true)), "{r}"); + // Transparent pixels: GIF, which keeps them. + let mut clear = session(40.0, 30.0); + rect(&mut clear, [0.0, 0.0, 10.0, 10.0], "#000000"); + for (k, transparency, format) in [(100.0, true, "gif"), (100.0, false, "gif"), (0.01, true, "gif")] { + let r = optimize_to(&mut clear, json!({"format": "jpg", "desiredK": k, "startWith": "auto", "transparency": transparency})); + assert_eq!(r["format"].as_str(), Some(format), "{k} {transparency}: {r}"); + } + // The current format stays without auto. + let r = optimize_to(&mut photo, json!({"format": "png8", "desiredK": 100})); + assert_eq!(r["format"].as_str(), Some("png8")); +} + +#[test] +fn optimize_to_file_size_auto_counts_the_colors_blended_over_the_matte() { + // Three colors at 100 opacities: without transparency, 300 colors once blended over the matte. + let mut s = session(20.0, 15.0); + for i in 0..300 { + let (x, y) = ((i % 20) as f64, (i / 20) as f64); + let id = rect(&mut s, [x, y, 1.0, 1.0], ["#000000", "#ff0000", "#0000ff"][i % 3]); + run(&mut s, "transparency.set", json!({"ids": [id], "opacity": i / 3 + 1})); + } + let r = optimize_to(&mut s, json!({"format": "gif", "desiredK": 100, "startWith": "auto", "transparency": false, "antiAlias": "none"})); + assert_eq!((r["format"].as_str(), r["achieved"].as_bool()), (Some("jpg"), Some(true)), "{r}"); + // With transparency the pixels stay transparent: GIF. + let r = optimize_to(&mut s, json!({"format": "jpg", "desiredK": 100, "startWith": "auto", "antiAlias": "none"})); + assert_eq!(r["format"].as_str(), Some("gif"), "{r}"); +} + +#[test] +fn optimize_to_file_size_says_when_no_setting_fits() { + let mut s = many_colours(); + for format in ["jpg", "gif", "png8"] { + let start = json!({"format": format}); + let r = optimize_to(&mut s, merge(&start, json!({"desiredK": 0.01}))); + assert_eq!((r["targetBytes"].as_u64(), r["achieved"].as_bool(), r["format"].as_str()), (Some(10), Some(false), Some(format)), "{r}"); + let bytes = r["bytes"].as_u64().unwrap() as usize; + assert!(bytes > 10 && bytes <= written(&mut s, &start), "{format}: the smallest setting tried: {r}"); + assert_eq!(written(&mut s, &r["settings"]), bytes); + assert!(r["trials"].as_u64().unwrap() as usize <= cmd::webexport::OPTIMIZE_TRIALS); + } + // GIF tries lossy when 2 colors are over. + let r = optimize_to(&mut s, json!({"format": "gif", "desiredK": 0.01})); + assert_eq!(r["settings"]["lossy"], json!(100), "{r}"); + // PNG-24 has nothing to lower. + let r = optimize_to(&mut s, json!({"format": "png24", "desiredK": 0.01})); + assert_eq!((r["achieved"].as_bool(), r["trials"].as_u64()), (Some(false), Some(1)), "{r}"); + assert_eq!(r["settings"], s.web_settings(&json!({"format": "png24"})).unwrap().to_json()); + // Settings that fit stay as they are. + let p = json!({"format": "jpg", "quality": 80, "desiredK": 1000}); + let r = optimize_to(&mut s, p.clone()); + assert_eq!((r["achieved"].as_bool(), r["trials"].as_u64()), (Some(true), Some(1)), "{r}"); + assert_eq!(r["settings"], s.web_settings(&p).unwrap().to_json()); +} + +#[test] +fn optimize_to_file_size_refuses_bad_params_and_changes_nothing() { + let mut s = many_colours(); + run(&mut s, "webExport.settings", json!({"format": "jpg", "quality": 77})); + let remembered = s.last_web_settings(); + for p in [ + json!({}), + json!({"desiredK": 0}), + json!({"desiredK": -5}), + json!({"desiredK": "10"}), + json!({"desiredK": null}), + json!({"desiredK": 2_000_000}), + json!({"desiredK": 10, "startWith": "gif"}), + json!({"desiredK": 10, "startWith": 1}), + json!({"desiredK": 10, "use": "all"}), + json!({"desiredK": 10, "slice": 0}), + json!({"desiredK": 10, "slice": "1"}), + json!({"desiredK": 10, "slice": 1, "use": "eachSlice"}), + json!({"desiredK": 10, "slice": 99}), + json!({"desiredK": 10, "percent": 0}), + ] { + assert!(s.execute("webExport.optimizeToFileSize", &p).is_err(), "{p}"); + } + optimize_to(&mut s, json!({"desiredK": 0.5, "format": "jpg"})); + assert_eq!(s.last_web_settings(), remembered, "the search changes no remembered setting"); +} + +#[test] +fn optimize_to_file_size_measures_the_slices_as_use_says() { + let mut s = session(300.0, 200.0); + rect(&mut s, [0.0, 0.0, 300.0, 200.0], "#336699"); + for i in 0..40 { + rect(&mut s, [f64::from(i) * 7.0, f64::from(i) * 4.0, 30.0, 20.0], &format!("#{:02x}{:02x}40", i * 6, 255 - i * 6)); + } + let a = rect(&mut s, [20.0, 20.0, 100.0, 60.0], "#ff8800"); + run(&mut s, "object.slice.make", json!({"ids": [a]})); + let layout = run(&mut s, "slice.list", json!({}))["slices"].as_array().unwrap().clone(); + let start = json!({"format": "jpg", "quality": 95}); + let sizes = |s: &mut Session, p: &Value| files(&run(s, "document.exportForWeb", p.clone())).iter().map(|(_, b)| b.len()).collect::<Vec<_>>(); + let all = sizes(&mut s, &start); + assert_eq!(all.len(), layout.len()); + let total: usize = all.iter().sum(); + let r = optimize_to(&mut s, merge(&start, json!({"desiredK": (total * 3 / 4) as f64 / 1024.0}))); + assert_eq!((r["achieved"].as_bool(), r["images"].as_u64()), (Some(true), Some(layout.len() as u64)), "{r}"); + let after = sizes(&mut s, &r["settings"]); + assert_eq!(after.iter().sum::<usize>(), r["bytes"].as_u64().unwrap() as usize, "the slice files together"); + let largest = *all.iter().max().unwrap(); + let r = optimize_to(&mut s, merge(&start, json!({"desiredK": (largest * 3 / 4) as f64 / 1024.0, "use": "eachSlice"}))); + let after = sizes(&mut s, &r["settings"]); + assert_eq!(*after.iter().max().unwrap(), r["bytes"].as_u64().unwrap() as usize, "the largest slice file"); + assert!(r["achieved"].as_bool().unwrap() && after.iter().all(|n| *n <= r["targetBytes"].as_u64().unwrap() as usize), "{r}"); + let n = layout[0]["number"].as_u64().unwrap(); + let one_slice = written(&mut s, &merge(&start, json!({"slice": n}))); + let r = optimize_to(&mut s, merge(&start, json!({"desiredK": (one_slice / 2) as f64 / 1024.0, "slice": n}))); + assert_eq!(r["images"].as_u64(), Some(1)); + assert_eq!(written(&mut s, &merge(&r["settings"], json!({"slice": n}))), r["bytes"].as_u64().unwrap() as usize, "{r}"); +} + +#[test] +fn optimize_to_file_size_finds_a_fit_when_a_lower_setting_gives_a_larger_file() { + use cmd::webexport::{OPTIMIZE_SAMPLES, WebSettings, highest_within, set_quality}; + // Sizes that do not fall with the quality: 1 to 20 give 900 bytes, 21 to 70 give 400 to 449, + // and 71 and up give over 1000. + let size_of = |q: u8| match q { + ..=20 => 900, + 21..=70 => 400 + usize::from(q - 21), + _ => 1000 + usize::from(q), + }; + let start = WebSettings { quality: 90, ..WebSettings::default() }; + let mut measured = Vec::new(); + let mut smallest = None; + let mut size = |s: &WebSettings| { + measured.push(s.quality); + Ok(Some(size_of(s.quality))) + }; + let found = highest_within(&mut size, &start, (1, 90), set_quality, 500, &mut smallest).unwrap(); + let (settings, bytes) = found.expect("a quality within 500 bytes"); + assert_eq!((settings.quality, bytes), (70, 449), "measured {measured:?}"); + assert!(measured.len() <= usize::from(OPTIMIZE_SAMPLES) + 7, "measured {measured:?}"); + // Nothing fits: the smallest size measured is kept. + let mut smallest = None; + let mut size = |s: &WebSettings| Ok(Some(size_of(s.quality))); + assert!(highest_within(&mut size, &start, (1, 90), set_quality, 100, &mut smallest).unwrap().is_none()); + assert_eq!(smallest.map(|(s, n)| (s.quality, n)), Some((36, 415))); +} diff --git a/crates/engine/src/tests/xform.rs b/crates/engine/src/tests/xform.rs index 1a41488285..4e13e5fe02 100644 --- a/crates/engine/src/tests/xform.rs +++ b/crates/engine/src/tests/xform.rs @@ -1255,9 +1255,11 @@ fn direct_selection_shift_marquee_toggles_anchors() { let st = s.doc().unwrap(); assert_eq!(st.selection.objects, vec![a]); assert_eq!(st.selection.partial(a), None); - // Group Selection's marquee toggles the same way. + // Group Selection's marquee toggles the paths it touches whole: a leaves, b joins (#8047). gesture(&mut s, "groupSelection", &top, shift); - assert_eq!(s.doc().unwrap().selection.partial(a).map(|p| p.len()), Some(2)); + let st = s.doc().unwrap(); + assert_eq!(st.selection.objects, vec![b]); + assert_eq!(st.selection.partial(b), None); } /// The Lasso: Shift adds anchors, Alt takes them away, and neither drops the rest of the diff --git a/crates/engine/src/tooling.rs b/crates/engine/src/tooling.rs index 9250cf8030..8b8cf4628b 100644 --- a/crates/engine/src/tooling.rs +++ b/crates/engine/src/tooling.rs @@ -173,6 +173,12 @@ impl Session { let text_selection = ((id == "eyedropper" && is_type(self.tool.id())) || (self.tool.id() == "eyedropper" && is_type(id))) .then(|| self.tool.options()) .filter(|o| o.get("editing").is_some_and(|v| !v.is_null()) && o.get("start") != o.get("end")); + // The gradient mesh points the Mesh tool, Direct Selection or the Lasso picked stay picked + // for the Eyedropper, which samples into them (#8090), and for the tool after it. + let mesh_points = (id == "eyedropper" || self.tool.id() == "eyedropper") + .then(|| self.tool.options().get("meshPoints").cloned()) + .flatten() + .filter(|v| v.as_array().is_some_and(|a| !a.is_empty())); let acts = self.with_tool_cx(view, |t, cx| t.deactivate(cx)); self.apply_actions(acts)?; self.keep_tool_settings(); @@ -180,6 +186,9 @@ impl Session { if let Some(selection) = text_selection { self.tool.set_option("textSelection", &selection); } + if let Some(points) = mesh_points { + self.tool.set_option("meshPoints", &points); + } if vectorcraft_tools::catalog::is_selection_tool(id) { self.last_selection_tool = Some(self.tool.id()); self.select_whole_instance(id); @@ -258,7 +267,13 @@ impl Session { // The lending tool does not see the press: it counts as a press elsewhere for the clicks a // double-click or triple-click compares. self.tool.press_elsewhere(); - let lent = self.make_tool(id); + let mut lent = self.make_tool(id); + // The gradient mesh points the Eyedropper holds are the lent tool's picks, which a Shift + // click adds to (#8090). + if self.tool.id() == "eyedropper" { + let points = self.tool.options().get("meshPoints").cloned().unwrap_or_else(|| Value::Array(vec![])); + lent.set_option("meshPoints", &points); + } self.selection_at_lend = self.active().map(|d| (d.uid, d.selection.clone())); self.lender = Some(std::mem::replace(&mut self.tool, lent)); Ok((PointerEvent { mods: Mods { cmd: false, ..ev.mods }, ..*ev }, settled)) @@ -269,10 +284,17 @@ impl Session { /// Cmd+click that takes the type being edited out of the selection ends its edit (#3779). pub(crate) fn give_back_tool(&mut self, view: ViewInfo) -> Result<()> { let Some(lender) = self.lender.take() else { return Ok(()) }; + // The points the lent tool left picked go back to the Eyedropper, none when it unpicked + // them all (#8090). Group Selection picks no mesh points, so the Eyedropper keeps its own. + let mesh_points = + (lender.id() == "eyedropper" && self.tool.id() != "groupSelection").then(|| self.tool.options().get("meshPoints").cloned()).flatten(); let acts = self.with_tool_cx(view, |t, cx| t.deactivate(cx)); let r = self.apply_actions(acts); self.keep_tool_settings(); self.tool = lender; + if let Some(points) = mesh_points { + self.tool.set_option("meshPoints", &points); + } // A gesture that left the selection as it found it (a Shift marquee over nothing) picked // nothing: the selection keeps what it was, the Pen's last anchor or an earlier pick. let left = self.active().map(|d| (d.uid, d.selection.clone())); diff --git a/crates/engine/tests/import_fuzz.rs b/crates/engine/tests/import_fuzz.rs index 7fc7285dbb..ca766a64f4 100644 --- a/crates/engine/tests/import_fuzz.rs +++ b/crates/engine/tests/import_fuzz.rs @@ -3827,6 +3827,83 @@ fn editing_text() -> String { ) } +/// The range of [`ai_written_meshes_never_panic`]'s cuts and edits: past the end of [`meshes_text`]. +const MESHES_FUZZ_CHARS: usize = 24_000; + +/// The editing data VectorCraft writes for a document with two gradient meshes: 2 × 3 patches whose +/// rows of points are RGB, CMYK and gray, at half opacity and named; a 1 × 1 mesh with a point at +/// 40% opacity; and an instance of a symbol whose art is a 2 × 1 mesh. +fn meshes_text() -> &'static str { + static TEXT: std::sync::OnceLock<String> = std::sync::OnceLock::new(); + TEXT.get_or_init(|| { + use vectorcraft_color::Color; + use vectorcraft_doc::live::{GradientMesh, MeshPoint, grid_points, smooth_handles}; + use vectorcraft_doc::{Node, NodeKind}; + use vectorcraft_geom::Rect; + let mesh = |r: Rect, rows: u32, cols: u32, color: &dyn Fn(usize) -> Color| { + let pts = grid_points(r, rows, cols); + let handles = smooth_handles(rows, cols, &pts); + let width = cols as usize + 1; + let points = pts + .iter() + .zip(handles) + .enumerate() + .map(|(i, (p, h))| MeshPoint { p: *p, color: color(i / width), opacity: 1.0, handles: h }) + .collect(); + GradientMesh { rows, cols, points } + }; + let mut doc = Document::new(300.0, 200.0); + let layer = doc.layers[0].id; + let sheet = mesh(Rect::new(20.0, 20.0, 200.0, 120.0), 2, 3, &|row| match row { + 0 => Color::rgb(1.0, 0.5, 0.0), + 1 => Color::cmyk(0.1, 0.6, 0.2, 0.05), + _ => Color::gray(0.4), + }); + let mut sheet = Node::new(doc.alloc_id(), NodeKind::Mesh(sheet)); + (sheet.name, sheet.opacity) = (Some("Sheet".into()), 0.5); + doc.insert(Some(layer), usize::MAX, sheet).unwrap(); + let mut small = mesh(Rect::new(220.0, 20.0, 280.0, 80.0), 1, 1, &|row| Color::rgb(0.0, 0.3, 0.3 + 0.5 * row as f32)); + small.points[1].opacity = 0.4; + let small = Node::new(doc.alloc_id(), NodeKind::Mesh(small)); + doc.insert(Some(layer), usize::MAX, small).unwrap(); + let patch = mesh(Rect::new(0.0, 0.0, 40.0, 30.0), 2, 1, &|row| Color::rgb(0.2 * row as f32, 0.6, 0.1)); + let patch = Node::new(doc.alloc_id(), NodeKind::Mesh(patch)); + doc.symbols.push(vectorcraft_doc::Symbol { dynamic: false, name: "Patch".into(), art: std::sync::Arc::new(patch) }); + let instance = + Node::new(doc.alloc_id(), NodeKind::SymbolInstance { symbol: "Patch".into(), xf: vectorcraft_geom::Affine::translate((20.0, 140.0)) }); + doc.insert(Some(layer), usize::MAX, instance).unwrap(); + let out = vectorcraft_eps::export_ai_editing(&doc, &vectorcraft_eps::AiEditingOptions::default()).unwrap(); + String::from_utf8(out.program).unwrap() + }) +} + +/// The data [`ai_written_meshes_never_panic`] damages, as it is, opens with both meshes, the symbol +/// with its mesh and its instance, and the property's cuts and edits reach all of it. +#[test] +fn the_written_meshes_fuzz_data_opens_as_meshes() { + use vectorcraft_doc::NodeKind; + let text = meshes_text(); + assert!(text.chars().count() < MESHES_FUZZ_CHARS, "{}", text.chars().count()); + for mark in ["%AI14_BeginSymbol", "%AI5_BeginLayer", "/Mesh X!", "%_[2 3] /Size X#", "%_/DeviceCMYK /CS X#", "/End X!", "/SymbolInstance :"] { + assert!(text.replace("\r\n", "\n").contains(mark), "{mark}"); + } + let private = [b"%AI24_ZStandard_Data".as_slice(), &zstd(text)].concat(); + let (d, warnings, layered) = vectorcraft_eps::layered_ai(&private, Document::new(300.0, 200.0), vec![], false, true, 1.0); + assert!(layered, "{warnings:?}"); + let art = d.layers[0].children().unwrap(); + let kinds: Vec<&str> = art + .iter() + .map(|n| match n.kind { + NodeKind::Mesh(_) => "mesh", + NodeKind::SymbolInstance { .. } => "instance", + _ => "other", + }) + .collect(); + assert_eq!(kinds, ["mesh", "mesh", "instance"], "{warnings:?}"); + let patch = d.symbols.iter().find(|s| s.name == "Patch").map(|s| &s.art.kind); + assert!(matches!(patch, Some(NodeKind::Mesh(_))), "{patch:?}"); +} + fn zstd(text: &str) -> Vec<u8> { ruzstd::encoding::compress_to_vec(text.as_bytes(), ruzstd::encoding::CompressionLevel::Fastest) } @@ -4482,6 +4559,17 @@ proptest! { survive("mutated .ai editing data", || Some(vectorcraft_eps::layered_ai(&private, Document::new(100.0, 100.0), vec![], false, false, 1.0).0))?; } + /// A `.ai` whose gradient meshes, as the writer writes them, are damaged: the record's type, + /// size, places, color spaces and corners on `%_` lines, its `/Mesh X!` and `/End X!`, and the + /// mesh's transparency and name, cut short or edited. + #[test] + fn ai_written_meshes_never_panic(cut in 0usize..MESHES_FUZZ_CHARS, edits in prop::collection::vec((0usize..MESHES_FUZZ_CHARS, prop::sample::select(vec!['0', '1', '2', '9', '-', '.', 'e', ' ', '\n', '[', ']', '(', ')', '/', '%', '_', 'X', '!', '#', 'N', 'P', 'E'])), 0..12)) { + let text = mutate_text(meshes_text(), cut, &edits); + let private = [b"%AI24_ZStandard_Data".as_slice(), &zstd(&text)].concat(); + survive("mutated .ai meshes", || Some(vectorcraft_eps::layered_ai(&private, Document::new(300.0, 200.0), vec![], false, false, 1.0).0))?; + survive("mutated .ai meshes, trusted", || Some(vectorcraft_eps::layered_ai(&private, Document::new(300.0, 200.0), vec![], false, true, 1.0).0))?; + } + /// The active artboard that a restored `.ai` opens on, read from damaged or hostile editing data. #[test] fn ai_active_artboard_never_panics(cut in 0usize..600, edits in prop::collection::vec((0usize..600, prop::sample::select(vec!['0', '9', '-', ' ', '\n', '/', ':', ';', ',', '%', '_'])), 0..12)) { @@ -5066,6 +5154,81 @@ proptest! { survive("mutated .ai brushes", || Some(vectorcraft_eps::layered_ai(&private, Document::new(200.0, 100.0), vec![], false, false, 1.0).0))?; survive("mutated .ai brushes, trusted", || Some(vectorcraft_eps::layered_ai(&private, Document::new(200.0, 100.0), vec![], false, true, 1.0).0))?; } + + /// A `.ai` whose blends, as the writer writes them, are damaged: the keys and spine on `%_` + /// lines with their dictionaries, the drawn steps, the record's `XP` and its hex, and the + /// blend's transparency, cut short or edited. + #[test] + fn ai_written_blends_never_panic(cut in 0usize..BLENDS_FUZZ_CHARS, edits in prop::collection::vec((0usize..BLENDS_FUZZ_CHARS, prop::sample::select(vec!['0', '1', '2', '8', '9', 'A', 'F', '-', '.', ' ', '\n', '(', ')', '/', ',', ';', '%', '_', 'u', 'U', 'K', 'S', 'X', 'P'])), 0..12)) { + let text = mutate_text(blends_text(), cut, &edits); + let private = [b"%AI24_ZStandard_Data".as_slice(), &zstd(&text)].concat(); + survive("mutated .ai blends", || Some(vectorcraft_eps::layered_ai(&private, Document::new(300.0, 200.0), vec![], false, false, 1.0).0))?; + survive("mutated .ai blends, trusted", || Some(vectorcraft_eps::layered_ai(&private, Document::new(300.0, 200.0), vec![], false, true, 1.0).0))?; + } +} + +/// The range of [`ai_written_blends_never_panic`]'s cuts and edits: past the end of [`blends_text`]. +const BLENDS_FUZZ_CHARS: usize = 24_000; + +/// The editing data VectorCraft writes for a document with two blends: red to blue squares with +/// three steps and no spine of its own, at half opacity; and three squares 25 pt apart on a spine +/// edited on the canvas, aligned to the path. +fn blends_text() -> &'static str { + static TEXT: std::sync::OnceLock<String> = std::sync::OnceLock::new(); + TEXT.get_or_init(|| { + use std::sync::Arc; + use vectorcraft_color::{Color, Paint}; + use vectorcraft_doc::live::{BlendOrientation, BlendSpacing, BlendSpec}; + use vectorcraft_doc::{Appearance, Node, NodeKind}; + use vectorcraft_geom::{PathData, Point, Rect, SubPath, shapes}; + let mut doc = Document::new(300.0, 200.0); + let layer = doc.layers[0].id; + let square = |doc: &mut Document, x: f64, y: f64, c: Color| { + Arc::new(Node::path( + doc.alloc_id(), + shapes::rectangle(Rect::new(x, y, x + 20.0, y + 20.0)), + Appearance::basic(Paint::solid(c), Paint::None, 0.0), + )) + }; + let (red, blue, green) = (Color::rgb(1.0, 0.0, 0.0), Color::rgb(0.0, 0.0, 1.0), Color::rgb(0.0, 1.0, 0.0)); + let keys = vec![square(&mut doc, 20.0, 20.0, red), square(&mut doc, 120.0, 20.0, blue)]; + let mut fade = Node::new( + doc.alloc_id(), + NodeKind::Blend { children: keys, spec: Box::new(BlendSpec { spacing: BlendSpacing::Steps(3), ..BlendSpec::default() }) }, + ); + fade.opacity = 0.5; + doc.insert(Some(layer), usize::MAX, fade).unwrap(); + let keys = vec![square(&mut doc, 20.0, 80.0, red), square(&mut doc, 120.0, 80.0, blue), square(&mut doc, 170.0, 80.0, green)]; + let centers: Vec<Point> = [30.0, 130.0, 180.0].iter().map(|x| Point::new(*x, 90.0)).collect(); + let spec = BlendSpec { + spacing: BlendSpacing::Distance(25.0), + orientation: BlendOrientation::AlignToPath, + spine: Some(PathData::single(SubPath::polyline(¢ers, false))), + key_anchors: vec![0, 1, 2], + ..BlendSpec::default() + }; + let path = Node::new(doc.alloc_id(), NodeKind::Blend { children: keys, spec: Box::new(spec) }); + doc.insert(Some(layer), usize::MAX, path).unwrap(); + let out = vectorcraft_eps::export_ai_editing(&doc, &vectorcraft_eps::AiEditingOptions::default()).unwrap(); + String::from_utf8(out.program).unwrap() + }) +} + +/// The data [`ai_written_blends_never_panic`] damages, as it is, opens with both blends live, and +/// the property's cuts and edits reach all of it. +#[test] +fn the_written_blends_fuzz_data_opens_live() { + use vectorcraft_doc::NodeKind; + let text = blends_text(); + assert!(text.chars().count() < BLENDS_FUZZ_CHARS, "{}", text.chars().count()); + for mark in ["%AI5_BeginLayer", "%_(K) /String (ShapeBlendPathType) ,", "%_(S) /String (ShapeBlendPathType) ,", "1 0 92 XP", "1 0 116 XP"] { + assert!(text.replace("\r\n", "\n").contains(mark), "{mark}"); + } + let private = [b"%AI24_ZStandard_Data".as_slice(), &zstd(text)].concat(); + let (d, warnings, layered) = vectorcraft_eps::layered_ai(&private, Document::new(300.0, 200.0), vec![], false, true, 1.0); + assert!(layered, "{warnings:?}"); + let art = d.layers[0].children().unwrap(); + assert_eq!(art.iter().map(|n| matches!(n.kind, NodeKind::Blend { .. })).collect::<Vec<_>>(), [true, true], "{warnings:?}"); } /// The range of [`ai_written_styles_never_panic`]'s cuts and edits: past the end of [`styles_text`]. diff --git a/crates/engine/tests/it/selection_commands.rs b/crates/engine/tests/it/selection_commands.rs index 4e9b8e10b1..c5bcc1d9dd 100644 --- a/crates/engine/tests/it/selection_commands.rs +++ b/crates/engine/tests/it/selection_commands.rs @@ -61,6 +61,20 @@ fn selection_commands_report_the_resulting_selection() { } } +#[test] +fn toggle_and_add_handle_each_listed_id_in_order() { + let (mut s, a, b) = session(); + let c = NodeId(s.execute("shape.rectangle", &json!({"x": 40, "y": 0, "width": 10, "height": 10})).unwrap()["id"].as_u64().unwrap()); + s.execute("select.set", &json!({"ids": [a.0, b.0]})).unwrap(); + // `a` goes off and back on at the end, `b` goes off, and `c` comes on. + assert_eq!(s.execute("select.toggle", &json!({"ids": [a.0, b.0, c.0, a.0]})).unwrap(), json!({"count": 2, "ids": [c.0, a.0]})); + assert_eq!(s.execute("select.add", &json!({"ids": [b.0, a.0, b.0]})).unwrap(), json!({"count": 3, "ids": [c.0, a.0, b.0]})); + // Inverse selects the objects that were not selected, in document order. + s.execute("select.set", &json!({"ids": [b.0]})).unwrap(); + s.execute("select.inverse", &json!({})).unwrap(); + assert_eq!(s.active().unwrap().selection.objects, [a, c]); +} + #[test] fn single_id_toggle_validates_before_mutating() { let (mut s, a, _) = session(); diff --git a/crates/eps/src/ai_editing.rs b/crates/eps/src/ai_editing.rs index 5e63cfbc0c..17177671cf 100644 --- a/crates/eps/src/ai_editing.rs +++ b/crates/eps/src/ai_editing.rs @@ -120,7 +120,9 @@ //! and opacity mask and a state block as a group's with its opacity and blending mode (an //! instance with isolation, knockout or knockout shape of its own is written as its art). The //! definitions are at most the reader's 4,096. In a symbol's art, an instance's matrix and -//! a gradient's take the art to the canvas's space turned y up about art space's origin there. +//! a gradient's take the art to the canvas's space turned y up about art space's origin there, +//! and a gradient mesh's corners are in that space; an envelope's contents in its dictionary are +//! in the canvas's space with y down. //! - Art styles, as the reader reads them (`style.rs`, `read/ops.rs`): a path, compound path or //! group with live effects or linked to a graphic style is written as its drawn look (`u`, its //! vector art as its geometry effects leave it, without shadows, glows or feathers, `U`, its @@ -147,6 +149,19 @@ //! reader reads back as the same graph ([`crate::ai_graph`]) is written as its group between //! `%_Gs`, its functional records and `%_GS`, each series' group tagged `Go` right after its end; //! any other graph, and a graph with art left out, as its art, with a warning. +//! - Gradient meshes, as the reader reads them (`mesh.rs`): `/Mesh X!`, `2 /Version`, the grid's type +//! and size, `/Data` (the reader passes over the version and `/Data`), and each patch's place, color +//! space and four corners (color, opacity, point and handles) as `X#` entries on `%_` lines, +//! `/End X!`; the mesh's transparency before it, its name and opacity mask after it +//! (`writer::meshes`). A mesh is written as it is only when the reader reads it back so, when every +//! patch turns the same way (a reflected mesh's columns are written in reverse order), and outside +//! pattern tiles, art cut to a clipping object and a large canvas. +//! - Blends, as the reader reads them (`blend.rs`): the blend's key objects and spine as a group on +//! `%_` lines, each key's `/ArtDictionary` naming it a key and its id and the spine's naming it the +//! spine (written when the blend has a spine of its own); its steps drawn, a group; +//! the blend plugin's `1 0 n XP` line and the blend's record of its spacing, orientation and keys as hex +//! on `%` lines; its name and transparency as a group's after its end (`writer::blends`). A blend is +//! written live only when the reader reads it back with its settings. //! //! Lines end in CR LF. Strings are written in UTF-8. Art space is ruler space: y up, its origin at //! the first artboard's top-left corner. On the canvas ([`CANVAS_SIZE`] points square, y down) the @@ -176,7 +191,10 @@ //! and instances of //! symbols past 4,096 as their art (symbol art past [`vectorcraft_doc::MAX_SYMBOL_NODES`] objects //! in all left out), instances of symbols the document doesn't have as empty groups, symbols' 9-slice -//! guides, export types and dynamic type left out, live objects (placed documents included) as their art, +//! guides, export types and dynamic type left out, gradient meshes the reader wouldn't read back as +//! they are, folded meshes, meshes in pattern tiles and in art cut to a clipping object and every mesh +//! on a large canvas as their drawn look, blends the reader wouldn't read back live as +//! their steps, other live objects (placed documents included) as their art, //! strokes a plain line can't draw and the object's art style doesn't hold //! as their filled outlines, several fills or strokes as a group of a path for each, freeform //! gradient swatches, gradient swatches of more than 256 stops, swatches of patterns written as @@ -289,6 +307,8 @@ fn export_held(source: &Document, o: &AiEditingOptions, max_objects: usize, keep let links = writer::style_links(doc); // Before baking, which leaves the wrap objects that may be written as they are unchanged. let wraps_held = if keep_wraps { writer::wraps_held(doc, &styled) } else { HashSet::new() }; + // The blends baking leaves as they are, which may be written live. + let unbaked_blends = writer::unbaked_blends(doc); // Live geometry effects as their result, as the PDF part draws them. let baked = baked(doc); let doc = baked.as_ref().unwrap_or(doc); @@ -319,6 +339,9 @@ fn export_held(source: &Document, o: &AiEditingOptions, max_objects: usize, keep // On a large canvas the layers' symbol instances are written as their art. w.symbols_live = scale == 1.0; w.brushes_live = scale == 1.0; + w.meshes_live = scale == 1.0; + w.blends_live = scale == 1.0; + w.unbaked_blends = unbaked_blends; w.symbol_doc = symbol_doc; w.max_objects = max_objects; w.wraps_held = wraps_held; diff --git a/crates/eps/src/ai_editing/tests.rs b/crates/eps/src/ai_editing/tests.rs index 35d19be0eb..4a261f2582 100644 --- a/crates/eps/src/ai_editing/tests.rs +++ b/crates/eps/src/ai_editing/tests.rs @@ -386,6 +386,246 @@ fn rgb_values_are_written_again_unchanged_in_a_wide_gamut_working_space() { same_lines(&again.lines().map(String::from).collect::<Vec<_>>(), &first.lines().map(String::from).collect::<Vec<_>>()); } +/// With a working RGB space other than sRGB, type's RGB fill and stroke are written in the text +/// document with their working RGB values, so they read back as the same colors. +#[test] +fn type_rgb_paints_read_back_unchanged_in_a_wide_gamut_working_space() { + const CHILD: &str = "VECTORCRAFT_TEST_AI_EDITING_WIDE_GAMUT_TYPE"; + if std::env::var_os(CHILD).is_none() { + // Color settings are process-wide: exercise this profile in a separate test process. + let output = std::process::Command::new(std::env::current_exe().unwrap()) + .args(["--exact", "ai_editing::tests::type_rgb_paints_read_back_unchanged_in_a_wide_gamut_working_space", "--nocapture"]) + .env(CHILD, "1") + .output() + .unwrap(); + let stdout = String::from_utf8_lossy(&output.stdout); + assert!( + output.status.success() && stdout.contains("test result: ok. 1 passed; 0 failed;"), + "isolated color profile test failed:\n{stdout}\n{}", + String::from_utf8_lossy(&output.stderr), + ); + return; + } + use vectorcraft_color::cms; + use vectorcraft_doc::{CharStyle, TextObject}; + cms::set_active(&cms::ColorSettings { rgb: cms::WIDE_GAMUT_RGB.into(), ..Default::default() }).unwrap(); + assert!(!cms::active().rgb_is_srgb()); + let mut doc = Document::new(300.0, 200.0); + let layer = doc.layers[0].id; + let (fill, stroke) = (Color::rgb(0.8, 0.4, 0.2), Color::rgb(0.1, 0.7, 0.3)); + let st = CharStyle { stroke: solid(stroke), stroke_width: 1.0, ..style(14.0, fill) }; + let n = text_node(&mut doc, TextObject::point(vectorcraft_geom::Point::new(20.0, 40.0), "Wide", st)); + doc.insert(Some(layer), usize::MAX, n).unwrap(); + let back = read_back(&doc); + let paints: Vec<(Paint, Paint)> = back.layers[0] + .children() + .unwrap() + .iter() + .filter_map(|n| if let NodeKind::Text(t) = &n.kind { Some(t) } else { None }) + .flat_map(|t| t.runs.iter().map(|r| (r.style.fill.clone(), r.style.stroke.clone()))) + .collect(); + assert!(!paints.is_empty(), "the type is read back as type"); + let near = |p: &Paint, want: Color| match (p, want) { + (Paint::Solid { color: Color::Rgb { r, g, b }, .. }, Color::Rgb { r: wr, g: wg, b: wb }) => { + (r - wr).abs() < 1e-4 && (g - wg).abs() < 1e-4 && (b - wb).abs() < 1e-4 + } + _ => false, + }; + for (f, s) in &paints { + assert!(near(f, fill), "fill {f:?} reads back as {fill:?}"); + assert!(near(s, stroke), "stroke {s:?} reads back as {stroke:?}"); + } +} + +/// With a working RGB space other than sRGB, a Lab fill, a Lab gradient stop, type filled with a +/// Lab color and a freeform gradient's average color are written as RGB values in the working RGB +/// space, so they read back as RGB colors that show as the colors they were written for. +#[test] +fn lab_paints_read_back_as_the_same_color_in_a_wide_gamut_working_space() { + const CHILD: &str = "VECTORCRAFT_TEST_AI_EDITING_WIDE_GAMUT_LAB"; + if std::env::var_os(CHILD).is_none() { + // Color settings are process-wide: exercise this profile in a separate test process. + let output = std::process::Command::new(std::env::current_exe().unwrap()) + .args(["--exact", "ai_editing::tests::lab_paints_read_back_as_the_same_color_in_a_wide_gamut_working_space", "--nocapture"]) + .env(CHILD, "1") + .output() + .unwrap(); + let stdout = String::from_utf8_lossy(&output.stdout); + assert!( + output.status.success() && stdout.contains("test result: ok. 1 passed; 0 failed;"), + "isolated color profile test failed:\n{stdout}\n{}", + String::from_utf8_lossy(&output.stderr), + ); + return; + } + use vectorcraft_color::cms; + use vectorcraft_doc::TextObject; + cms::set_active(&cms::ColorSettings { rgb: cms::WIDE_GAMUT_RGB.into(), ..Default::default() }).unwrap(); + assert!(!cms::active().rgb_is_srgb()); + let (fill, stop, ink) = (Color::lab(60.0, 20.0, -30.0), Color::lab(45.0, -25.0, 15.0), Color::lab(70.0, 10.0, 40.0)); + let mut doc = Document::new(300.0, 200.0); + let layer = doc.layers[0].id; + let n = square(&mut doc, Rect::new(10.0, 10.0, 30.0, 30.0), fill); + doc.insert(Some(layer), usize::MAX, n).unwrap(); + let stops = vec![GradientStop::new(0.0, Color::rgb(0.1, 0.7, 0.3)), GradientStop::new(1.0, stop)]; + let paint = gradient_paint(Gradient::new(GradientKind::Linear, stops), None, None); + let n = painted(&mut doc, shapes::rectangle(Rect::new(40.0, 10.0, 60.0, 30.0)), vec![AppearanceItem::Fill(FillLayer::new(paint))]); + doc.insert(Some(layer), usize::MAX, n).unwrap(); + let n = text_node(&mut doc, TextObject::point(vectorcraft_geom::Point::new(20.0, 80.0), "Lab", style(14.0, ink))); + doc.insert(Some(layer), usize::MAX, n).unwrap(); + // A freeform gradient is written as the average of its stops' display colors. + let (a, b) = (Color::rgb(0.9, 0.2, 0.1), Color::lab(50.0, -40.0, -20.0)); + let free = ramp(GradientKind::Freeform, &[(0.0, a, 1.0, 0.5), (1.0, b, 1.0, 0.5)]); + let n = painted( + &mut doc, + shapes::rectangle(Rect::new(70.0, 10.0, 90.0, 30.0)), + vec![AppearanceItem::Fill(FillLayer::new(gradient_paint(free, None, None)))], + ); + doc.insert(Some(layer), usize::MAX, n).unwrap(); + let average = { + let (a, b) = (a.to_rgb(), b.to_rgb()); + [0, 1, 2].map(|i| (a[i] + b[i]) / 2.0) + }; + let back = read_back(&doc); + let shows_as = |got: Color, want: [f32; 3], what: &str| { + assert!(matches!(got, Color::Rgb { .. }), "{what} reads back as RGB: {got:?}"); + let g = got.to_rgb(); + assert!(g.iter().zip(want).all(|(a, b)| (a - b).abs() < 2e-3), "{what} {got:?} shows as {g:?}, not {want:?}"); + }; + let mut solids = vec![(fill.to_rgb(), "fill"), (average, "freeform gradient's average")].into_iter(); + let (mut stops, mut runs) = (0, 0); + for n in back.layers[0].children().unwrap() { + match (&n.kind, n.appearance.fill_paint()) { + (NodeKind::Text(t), _) => { + for r in &t.runs { + let Paint::Solid { color, .. } = r.style.fill else { panic!("type fill {:?}", r.style.fill) }; + shows_as(color, ink.to_rgb(), "type fill"); + runs += 1; + } + } + (_, Paint::Solid { color, .. }) => { + let Some((want, what)) = solids.next() else { panic!("unexpected solid {color:?}") }; + shows_as(color, want, what); + } + (_, Paint::Gradient(g)) => { + let last = g.gradient.stops.last().unwrap(); + shows_as(last.color, stop.to_rgb(), "gradient stop"); + stops += 1; + } + (_, p) => panic!("unexpected paint {p:?}"), + } + } + assert_eq!((solids.len(), stops), (0, 1)); + assert!(runs > 0, "the type is read back as type"); +} + +/// With a working RGB space other than sRGB, the average color written for a gradient along a +/// stroke and for a gradient that can't be placed, a stop of a spot color defined in Lab and type +/// stroked with a Lab color are written as RGB values in the working RGB space, so each reads back +/// as an RGB color that shows as the color it was written for. +#[test] +fn averages_lab_spot_stops_and_lab_type_strokes_read_back_as_the_same_color_in_a_wide_gamut_working_space() { + const CHILD: &str = "VECTORCRAFT_TEST_AI_EDITING_WIDE_GAMUT_AVERAGES"; + if std::env::var_os(CHILD).is_none() { + // Color settings are process-wide: exercise this profile in a separate test process. + let output = std::process::Command::new(std::env::current_exe().unwrap()) + .args([ + "--exact", + "ai_editing::tests::averages_lab_spot_stops_and_lab_type_strokes_read_back_as_the_same_color_in_a_wide_gamut_working_space", + "--nocapture", + ]) + .env(CHILD, "1") + .output() + .unwrap(); + let stdout = String::from_utf8_lossy(&output.stdout); + assert!( + output.status.success() && stdout.contains("test result: ok. 1 passed; 0 failed;"), + "isolated color profile test failed:\n{stdout}\n{}", + String::from_utf8_lossy(&output.stderr), + ); + return; + } + use vectorcraft_color::cms; + use vectorcraft_color::gradient::GradientGeom; + use vectorcraft_doc::{CharStyle, TextObject}; + cms::set_active(&cms::ColorSettings { rgb: cms::WIDE_GAMUT_RGB.into(), ..Default::default() }).unwrap(); + assert!(!cms::active().rgb_is_srgb()); + let shows_as = |got: Color, want: [f32; 3], what: &str| { + assert!(matches!(got, Color::Rgb { .. }), "{what} reads back as RGB: {got:?}"); + let g = got.to_rgb(); + assert!(g.iter().zip(want).all(|(a, b)| (a - b).abs() < 2e-3), "{what} {got:?} shows as {g:?}, not {want:?}"); + }; + let (a, b) = (Color::rgb(0.9, 0.2, 0.1), Color::lab(50.0, -40.0, -20.0)); + let average = { + let (a, b) = (a.to_rgb(), b.to_rgb()); + [0, 1, 2].map(|i| (a[i] + b[i]) / 2.0) + }; + // Every solid paint of the art read back, in order. + let solids = |doc: &Document| { + let mut out = vec![]; + read_back(doc).walk(|n| { + if matches!(n.kind, NodeKind::Path { .. } | NodeKind::Compound { .. }) { + out.extend(n.appearance.items.iter().filter_map(|i| match i.paint() { + Paint::Solid { color, .. } => Some(*color), + _ => None, + })); + } + }); + out + }; + // A gradient along a stroke: the stroke's outline in its average color. + let mut doc = Document::new(200.0, 100.0); + let layer = doc.layers[0].id; + let mut st = StrokeLayer::new(gradient_paint(ramp(GradientKind::Linear, &[(0.0, a, 1.0, 0.5), (1.0, b, 1.0, 0.5)]), None, None), 4.0); + st.gradient_mode = vectorcraft_doc::StrokeGradientMode::Along; + let n = painted(&mut doc, shapes::rectangle(Rect::new(10.0, 10.0, 30.0, 30.0)), vec![AppearanceItem::Stroke(st)]); + doc.insert(Some(layer), usize::MAX, n).unwrap(); + let [got] = solids(&doc)[..] else { panic!("one solid paint: {:?}", solids(&doc)) }; + shows_as(got, average, "a gradient along a stroke"); + // A radial gradient flattened to a line: its average color. + let flat = GradientGeom { start: (20.0, 20.0).into(), end: (40.0, 20.0).into(), aspect: 0.0, focal: None }; + let radial = ramp(GradientKind::Radial, &[(0.0, a, 1.0, 0.5), (1.0, b, 1.0, 0.5)]); + let doc = one_object( + shapes::rectangle(Rect::new(10.0, 10.0, 50.0, 50.0)), + vec![AppearanceItem::Fill(FillLayer::new(gradient_paint(radial, Some(flat), None)))], + ); + let [got] = solids(&doc)[..] else { panic!("one solid paint: {:?}", solids(&doc)) }; + shows_as(got, average, "a gradient that can't be placed"); + // A stop of a spot color defined in Lab, at full strength. + let moss = Color::lab(55.0, -30.0, 20.0); + let mut doc = Document::new(200.0, 100.0); + let mut swatches: Vec<Swatch> = doc.swatches.iter().cloned().collect(); + swatches.push(Swatch { name: "Moss".into(), paint: solid(moss), global: true, spot: true }); + doc.swatches = swatches.into(); + let layer = doc.layers[0].id; + let stops = vec![GradientStop::new(0.0, Color::rgb(0.1, 0.2, 0.3)), GradientStop { swatch: Some("Moss".into()), ..GradientStop::new(1.0, moss) }]; + let fill = gradient_paint(Gradient::new(GradientKind::Linear, stops), None, None); + let n = painted(&mut doc, shapes::rectangle(Rect::new(10.0, 10.0, 30.0, 30.0)), vec![AppearanceItem::Fill(FillLayer::new(fill))]); + doc.insert(Some(layer), usize::MAX, n).unwrap(); + let back = read_back(&doc); + let Paint::Gradient(g) = back.layers[0].children().unwrap()[0].appearance.fill_paint() else { panic!("a gradient") }; + shows_as(g.gradient.stops.last().unwrap().color, moss.to_rgb(), "a Lab spot color's stop"); + // Type stroked with a Lab color. + let ink = Color::lab(40.0, 30.0, -50.0); + let mut doc = Document::new(200.0, 100.0); + let layer = doc.layers[0].id; + let st = CharStyle { stroke: solid(ink), stroke_width: 1.0, ..style(14.0, Color::rgb(0.8, 0.4, 0.2)) }; + let n = text_node(&mut doc, TextObject::point(vectorcraft_geom::Point::new(20.0, 40.0), "Lab", st)); + doc.insert(Some(layer), usize::MAX, n).unwrap(); + let back = read_back(&doc); + let mut runs = 0; + for n in back.layers[0].children().unwrap() { + if let NodeKind::Text(t) = &n.kind { + for r in &t.runs { + let Paint::Solid { color, .. } = r.style.stroke else { panic!("type stroke {:?}", r.style.stroke) }; + shows_as(color, ink.to_rgb(), "type stroke"); + runs += 1; + } + } + } + assert!(runs > 0, "the type is read back as type"); +} + /// A gradient stop of a Lab spot color writes the RGB values of the Lab values as written (to four /// decimals, clamped to the range a reader reads), the same Lab values its CMYK equivalent and the /// palette's definition come from: for Lab values of many decimals and for Lab values out of range. @@ -1087,8 +1327,10 @@ fn counted() -> Vec<(&'static str, Document)> { ("styles", styles_document()), ("painted clips", painted_clips()), ("blend", blend_doc()), + ("blends", blends_document()), ("brushes", brushes_document()), ("envelopes", envelopes_document()), + ("meshes", meshes_document()), ("wrap bounds", wrap_bounds_doc()), ] } @@ -1111,7 +1353,27 @@ fn wrap_bounds_doc() -> Document { doc } -/// A blend of two squares 20 pt apart with a step every 10 pt, written as its steps. +/// A blend whose own art and steps don't all fit within the object limit is written as its steps, +/// as many as fit, with the limit's warning and the blends warning; it writes no part of its own +/// art or its record. +#[test] +fn a_blend_past_the_object_limit_is_written_as_its_steps() { + let doc = blend_doc(); + let all = export_ai_editing(&doc, &opts()).unwrap(); + assert!(String::from_utf8_lossy(&all.program).contains("ShapeBlendPathType"), "written live with room"); + let read = crate::import::objects_read(&all.program).unwrap(); + for max in 1..read { + let out = export_within(&doc, &opts(), max).unwrap(); + let text = String::from_utf8_lossy(&out.program); + assert!(out.warnings.iter().any(|w| w == writer::OBJECT_LIMIT), "room for {max}: {:?}", out.warnings); + assert!(out.warnings.iter().any(|w| w == writer::BLENDS), "room for {max}: {:?}", out.warnings); + assert!(!text.contains("ShapeBlendPathType") && !text.contains("Path Blends)"), "room for {max}: {text}"); + let (back, _) = crate::ai_alone(&out.program).unwrap(); + assert!(!back.layers[0].children().unwrap().iter().any(|n| matches!(n.kind, NodeKind::Blend { .. })), "room for {max}"); + } +} + +/// A blend of two squares 20 pt apart with a step every 10 pt, written live. fn blend_doc() -> Document { let mut doc = Document::new(200.0, 100.0); let layer = doc.layers[0].id; @@ -9006,6 +9268,74 @@ fn a_link_to_a_twist_style_is_kept_where_the_reader_reads_it() { } } +/// A link to a graphic style with Transform or Free Distort is kept where the reader reads the +/// effect. On a compound path of a square and a guide: Transform with the guide inside the square, +/// moving only, or with Transform Objects off (Transform Patterns on or off), and Free Distort. On a +/// group holding such a compound path: Transform with the guide inside. Transform that scales where +/// the guide reaches past the square is written without the link and warns. +#[test] +fn a_link_to_a_transform_or_free_distort_style_with_a_guide_is_kept_where_the_reader_reads_it() { + // A compound path of a filled square and a guide from `a` to `b`, with appearance `ap`. + fn guided(doc: &mut Document, ap: Appearance, a: (f64, f64), b: (f64, f64)) -> Node { + let square = Node::path(doc.alloc_id(), shapes::rectangle(Rect::new(10.0, 10.0, 50.0, 40.0)), Appearance::default()); + let path = shapes::rectangle(Rect::new(a.0, a.1, b.0, b.1)); + let guide = Node::new(doc.alloc_id(), NodeKind::Path { path, rule: FillRule::NonZero, live: None, clipping: false, guide: true }); + let mut n = Node::new(doc.alloc_id(), NodeKind::Compound { children: vec![Arc::new(square), Arc::new(guide)], rule: FillRule::NonZero }); + n.appearance = ap.into(); + n + } + // A document with that compound path (in a group when `grouped`) with effect `e`, linked to a + // graphic style of that appearance. + let make = |e: vectorcraft_doc::Effect, grouped: bool, a: (f64, f64), b: (f64, f64)| { + let mut doc = Document::new(200.0, 100.0); + let filled = Appearance::basic(black_fill(), Paint::None, 0.0); + let ap = Appearance { effects: vec![e], ..if grouped { Appearance::default() } else { filled.clone() } }; + let mut g = vectorcraft_doc::GraphicStyle::new("Moved", ap.clone()); + g.id = 9; + doc.graphic_styles.push(g); + let mut n = if grouped { + let member = guided(&mut doc, filled, a, b); + let mut n = Node::group(doc.alloc_id(), vec![Arc::new(member)]); + n.appearance = ap.into(); + n + } else { + guided(&mut doc, ap, a, b) + }; + n.extras_mut().graphic_style = Some(9); + put(&mut doc, n); + doc + }; + let scale = || fx("distort.transform", serde_json::json!({"copies": 0, "scaleH": 50.0, "scaleV": 50.0})); + let moved = || fx("distort.transform", serde_json::json!({"copies": 0, "moveH": 5.0})); + let in_place = || fx("distort.transform", serde_json::json!({"copies": 0, "scaleH": 50.0, "objects": false, "patterns": false})); + let patterns_only = || fx("distort.transform", serde_json::json!({"copies": 0, "scaleH": 50.0, "objects": false, "patterns": true})); + let slant = || fx("distort.freeDistort", serde_json::json!({"corners": [[0.2, 0.0], [1.2, 0.0], [1.0, 1.0], [0.0, 1.0]]})); + let (inside, past) = (((20.0, 20.0), (30.0, 30.0)), ((20.0, 20.0), (90.0, 30.0))); + for (what, doc, id, kept) in [ + ("a compound path scaled, its guide inside", make(scale(), false, inside.0, inside.1), "distort.transform", true), + ("a compound path moved, its guide past", make(moved(), false, past.0, past.1), "distort.transform", true), + ("a compound path scaled with Transform Objects off, its guide past", make(in_place(), false, past.0, past.1), "distort.transform", true), + ( + "a compound path scaled with Transform Objects off and Transform Patterns on, its guide past", + make(patterns_only(), false, past.0, past.1), + "distort.transform", + true, + ), + ("a compound path distorted, its guide past", make(slant(), false, past.0, past.1), "distort.freeDistort", true), + ("a group scaled, its guide inside", make(scale(), true, inside.0, inside.1), "distort.transform", true), + ("a compound path scaled, its guide past", make(scale(), false, past.0, past.1), "distort.transform", false), + ("a group scaled, its guide past", make(scale(), true, past.0, past.1), "distort.transform", false), + ] { + let out = export_ai_editing(&doc, &opts()).unwrap(); + assert_eq!(out.warnings.iter().any(|w| w == writer::STYLE_LINKS), !kept, "{what}: {:?}", out.warnings); + let back = read_back(&doc); + let n = &back.layers[0].children().unwrap()[0]; + let style = n.extras().graphic_style.and_then(|id| back.graphic_style_by_id(id)).map(|g| g.name.as_str()); + assert_eq!(style, kept.then_some("Moved"), "{what}: {n:?}"); + assert_eq!(n.appearance.effects.iter().any(|e| e.id == id), kept, "{what}: {n:?}"); + } +} + /// Twist and Transform on an object that isn't linked to a graphic style are not written as a style /// of its own: the object reads back without live effects. #[test] @@ -9423,7 +9753,8 @@ fn brushes_document() -> Document { } /// Brush art `n` as a tree to compare with [`same_tree`]: each object's kind, its anchors and handles, -/// the fills and strokes that paint (a stroke with its width), and its members in order. +/// the fills and strokes that paint (a stroke with its width), its members in order, and its opacity +/// mask's art and options when it has one. fn art_tree(n: &Node) -> serde_json::Value { let kind = match &n.kind { NodeKind::Path { .. } => "path", @@ -9448,7 +9779,11 @@ fn art_tree(n: &Node) -> serde_json::Value { }) .collect(); let members: Vec<serde_json::Value> = n.children().map(|c| c.iter().map(|m| art_tree(m)).collect()).unwrap_or_default(); - serde_json::json!({"kind": kind, "anchors": anchors, "paints": paints, "members": members}) + let mut tree = serde_json::json!({"kind": kind, "anchors": anchors, "paints": paints, "members": members}); + if let Some(m) = &n.extras().mask { + tree["mask"] = serde_json::json!({"art": art_tree(&m.art), "options": [m.clip, m.invert, m.disabled, m.linked]}); + } + tree } /// Are trees `a` and `b` ([`art_tree`]) the same but for numbers within the written numbers' @@ -9646,6 +9981,166 @@ fn an_art_brush_whose_art_doesnt_bend_keeps_its_paths_look() { assert!(same_tree(&art_tree(&got.art), &art_tree(&want.art)), "{:#?}", got.art); } +/// An opacity mask whose art is rectangle `r` filled in `paint`, with the options given. +fn rect_mask(id: u64, r: Rect, paint: Paint, clip: bool, invert: bool, linked: bool) -> OpacityMask { + let art = Node::path(vectorcraft_doc::NodeId(id), shapes::rectangle(r), Appearance::basic(paint, Paint::None, 0.0)); + OpacityMask { art: Arc::new(art), clip, invert, disabled: false, linked } +} + +/// `levels` white rectangle masks that clip, each but the last holding the next in its art. +fn mask_chain(levels: u32) -> Option<Box<OpacityMask>> { + (0..levels).fold(None, |inner, i| { + let mut m = rect_mask(100 + u64::from(i), Rect::new(0.0, 0.0, 30.0 - f64::from(i), 8.0), solid(Color::WHITE), true, false, true); + Arc::make_mut(&mut m.art).extras_mut().mask = inner; + Some(Box::new(m)) + }) +} + +/// [`brush_art_node`] with opacity masks: on the group, a mid-gray rectangle that clips; on the wide +/// block, a white rectangle inverted without clipping. Both masks are `linked` or not. +fn masked_brush_art(linked: bool) -> Node { + let mut art = brush_art_node(); + if let Some(c) = art.children_mut() { + let wide = rect_mask(10, Rect::new(0.0, 0.0, 20.0, 4.0), solid(Color::WHITE), false, true, linked); + Arc::make_mut(&mut c[0]).extras_mut().mask = Some(Box::new(wide)); + } + art.extras_mut().mask = Some(Box::new(rect_mask(11, Rect::new(0.0, 0.0, 30.0, 8.0), solid(Color::rgb(0.5, 0.5, 0.5)), true, false, linked))); + art +} + +/// Scatter and Art brushes whose art holds opacity masks come back in the Brushes panel with their +/// settings, the masks' art in place with its paint, and the masks' options: masks on the art and on +/// a member, masks that don't move with their objects, and masks seven deep in one another's art. A +/// path with the masked Art brush comes back as its drawn look, with the stroke warning. +#[test] +fn scatter_and_art_brush_mask_art_round_trips() { + use vectorcraft_brush::{ArtBrush, Brush, BrushKind, Scatter}; + let mut deep = brush_art_node(); + deep.extras_mut().mask = mask_chain(7); + let lib = vec![ + Brush { name: "Masked spray".into(), kind: BrushKind::Scatter(Scatter { art: masked_brush_art(true), ..Scatter::default() }) }, + Brush { name: "Masked ribbon".into(), kind: BrushKind::Art(ArtBrush { art: masked_brush_art(true), ..ArtBrush::default() }) }, + Brush { name: "Unlinked spray".into(), kind: BrushKind::Scatter(Scatter { art: masked_brush_art(false), ..Scatter::default() }) }, + Brush { name: "Unlinked ribbon".into(), kind: BrushKind::Art(ArtBrush { art: masked_brush_art(false), ..ArtBrush::default() }) }, + Brush { name: "Deep spray".into(), kind: BrushKind::Scatter(Scatter { art: deep.clone(), ..Scatter::default() }) }, + Brush { name: "Deep ribbon".into(), kind: BrushKind::Art(ArtBrush { art: deep, ..ArtBrush::default() }) }, + ]; + let mut doc = Document::new(300.0, 200.0); + vectorcraft_brush::store(&mut doc, &lib); + brushed(&mut doc, "Masked ribbon", (20.0, 120.0), (280.0, 150.0), 1.0); + let out = export_ai_editing(&doc, &opts()).unwrap(); + assert!(!out.warnings.iter().any(|w| w == writer::BRUSHES || w == writer::DEEP_MASKS), "{:?}", out.warnings); + assert!(out.warnings.iter().any(|w| w == writer::STROKES), "{:?}", out.warnings); + assert_eq!(program(&doc).matches("%AI8_BeginBrushPattern").count(), lib.len()); + let back = read_back(&doc); + assert!(matches!(back.layers[0].children().unwrap()[0].kind, NodeKind::Group { .. }), "the path's drawn look"); + let got = vectorcraft_brush::library(&back); + assert_eq!(got.iter().map(|b| b.name.as_str()).collect::<Vec<_>>(), lib.iter().map(|b| b.name.as_str()).collect::<Vec<_>>()); + let none = || Node::group(vectorcraft_doc::NodeId(0), vec![]); + for (g, w) in got.iter().zip(&lib) { + let name = &w.name; + let (ga, wa) = match (&g.kind, &w.kind) { + (BrushKind::Scatter(gs), BrushKind::Scatter(ws)) => { + let settings = |s: &Scatter| Scatter { art: none(), modes: Some(s.modes()), ..s.clone() }; + assert_eq!(settings(gs), settings(ws), "{name}"); + (&gs.art, &ws.art) + } + (BrushKind::Art(ga), BrushKind::Art(wa)) => { + assert_eq!(ArtBrushOptions::of(ga), ArtBrushOptions::of(wa), "{name}"); + (&ga.art, &wa.art) + } + _ => panic!("{name}: {g:?}"), + }; + let (gt, wt) = (art_tree(ga), art_tree(wa)); + assert!(same_tree(>, &wt), "{name}: {gt:#} for {wt:#}"); + } +} + +/// Brushes whose mask art the reader wouldn't read back as it is are left out with a warning, beside +/// a brush that comes back: a Scatter brush whose art's mask is a gradient, one whose art holds +/// masks eight deep in one another's art (deeper than the editing data writes masks), one whose +/// mask's art is a compound path of 26,500 members of two squares each, which the reader reads as +/// 53,000 paths, more art than it copies into one file's brushes, and one whose art is a compound +/// path with a mask on a member (a compound path is written as one path, without its members' masks). +#[test] +fn brushes_whose_mask_art_isnt_read_back_are_left_out() { + use vectorcraft_brush::{Brush, BrushKind, Scatter}; + let keep = Brush { name: "Masked spray".into(), kind: BrushKind::Scatter(Scatter { art: masked_brush_art(true), ..Scatter::default() }) }; + let mut gradient = brush_art_node(); + let ramp = gradient_paint(sunset(), None, None); + gradient.extras_mut().mask = Some(Box::new(rect_mask(11, Rect::new(0.0, 0.0, 30.0, 8.0), ramp, true, false, true))); + let mut deep = brush_art_node(); + deep.extras_mut().mask = mask_chain(8); + let square = |i: u32| { + let (x, y) = (f64::from(i % 400) * 2.0, f64::from(i / 400) * 2.0); + shapes::rectangle(Rect::new(x, y, x + 1.0, y + 1.0)).subpaths + }; + let members = (0..26_500) + .map(|m| { + let path = PathData::new((0..2).flat_map(|k| square(m * 2 + k)).collect()); + Arc::new(Node::path(vectorcraft_doc::NodeId(21), path, Appearance::basic(solid(Color::WHITE), Paint::None, 0.0))) + }) + .collect(); + let mut squares = Node::path(vectorcraft_doc::NodeId(20), PathData::default(), Appearance::basic(solid(Color::WHITE), Paint::None, 0.0)); + squares.kind = NodeKind::Compound { children: members, rule: FillRule::NonZero }; + let mut heavy = brush_art_node(); + heavy.extras_mut().mask = Some(Box::new(OpacityMask { art: Arc::new(squares), clip: true, invert: false, disabled: false, linked: true })); + let mut member = brush_art_node(); + member.kind = match member.kind { + NodeKind::Group { mut children, .. } => { + let mask = rect_mask(10, Rect::new(0.0, 0.0, 20.0, 4.0), solid(Color::WHITE), true, false, true); + Arc::make_mut(&mut children[0]).extras_mut().mask = Some(Box::new(mask)); + NodeKind::Compound { children, rule: FillRule::NonZero } + } + kind => kind, + }; + member.appearance = Appearance::basic(black_fill(), Paint::None, 0.0).into(); + let cases = [ + ("gradient mask", gradient), + ("masks eight deep", deep), + ("mask art past the reader's limit", heavy), + ("mask on a compound path's member", member), + ]; + for (why, art) in cases { + let mut doc = Document::new(300.0, 200.0); + let lib = vec![keep.clone(), Brush { name: why.into(), kind: BrushKind::Scatter(Scatter { art, ..Scatter::default() }) }]; + vectorcraft_brush::store(&mut doc, &lib); + let out = export_ai_editing(&doc, &opts()).unwrap(); + assert!(out.warnings.iter().any(|w| w == writer::BRUSHES), "{why}: {:?}", out.warnings); + assert!(!out.warnings.iter().any(|w| w == writer::DEEP_MASKS), "{why}: {:?}", out.warnings); + let names: Vec<String> = vectorcraft_brush::library(&read_back(&doc)).into_iter().map(|b| b.name).collect(); + assert_eq!(names, ["Masked spray"], "{why}"); + assert_eq!(program(&doc).matches("%AI8_BeginBrushPattern").count(), 1, "{why}"); + } +} + +/// A brush's mask art is written as the brush holds it when an object of the layers' mask art with +/// the same id keeps a live effect as an art style: the brush's mask comes back as its own plain +/// rectangle, without the layers' object's effect or geometry. +#[test] +fn a_brushs_mask_art_isnt_written_as_a_styled_object_with_its_id() { + use vectorcraft_brush::{Brush, BrushKind, Scatter}; + let offset = fx("path.offsetPath", serde_json::json!({"offset": 8.0, "joins": "miter", "miterLimit": 4.0})); + let mut id = None; + let mut doc = masked_image(|doc| { + let grown = styled_rect(doc, "Grown", Rect::new(60.0, 30.0, 110.0, 70.0), solid(Color::rgb(0.0, 0.0, 0.0)), Paint::None, vec![offset]); + id = Some(grown.id); + grown + }); + let id = id.expect("the mask's art"); + let mut art = brush_art_node(); + art.extras_mut().mask = Some(Box::new(rect_mask(id.0, Rect::new(0.0, 0.0, 30.0, 8.0), solid(Color::WHITE), true, false, true))); + let lib = vec![Brush { name: "Masked spray".into(), kind: BrushKind::Scatter(Scatter { art, ..Scatter::default() }) }]; + vectorcraft_brush::store(&mut doc, &lib); + let got = vectorcraft_brush::library(&read_back(&doc)); + let [Brush { kind: BrushKind::Scatter(s), .. }] = got.as_slice() else { panic!("{got:?}") }; + let BrushKind::Scatter(want) = &lib[0].kind else { panic!("a Scatter brush") }; + let m = s.art.extras().mask.as_deref().unwrap_or_else(|| panic!("the mask is read: {:#?}", s.art)); + assert!(m.art.appearance.effects.is_empty(), "{:?}", m.art.appearance.effects); + let (gt, wt) = (art_tree(&s.art), art_tree(&want.art)); + assert!(same_tree(>, &wt), "{gt:#} for {wt:#}"); +} + /// Settings the other tests don't use come back: a Calligraphic brush varying with tilt and bearing, /// a Scatter brush keeping its art's colors whose rotation doesn't follow the path, and brushes whose /// modes aren't given (the reader gives them, the same ones). @@ -10904,7 +11399,7 @@ fn envelopes_are_read_back_live() { } /// An envelope that is a symbol's art is written live in the symbol's definition, and the symbol -/// opens with it as a live envelope. +/// opens with it as a live envelope, its contents where they were. #[test] fn an_envelope_in_a_symbol_is_read_back_live() { use vectorcraft_doc::live::EnvelopeOptions; @@ -10921,15 +11416,103 @@ fn an_envelope_in_a_symbol_is_read_back_live() { let (back, notes) = crate::ai_alone(&p.data).unwrap(); let symbol = back.symbols.iter().find(|s| s.name == "Bent").unwrap_or_else(|| panic!("{name}: {:?}", back.symbols)); let mut envelopes = vec![]; + let mut boxes = vec![]; symbol.art.walk(&mut |n| { - if let NodeKind::Envelope { kind, .. } = &n.kind { + if let NodeKind::Envelope { kind, content, .. } = &n.kind { envelopes.push((**kind).clone()); + boxes.extend(content.iter().map(|c| c.geometric_bounds())); } }); assert!(matches!(envelopes.as_slice(), [k] if same_envelope_kind(&kind, k)), "{name}: {envelopes:?} {notes:?}"); + let near = |a: Option<Rect>, b: Rect| { + a.is_some_and(|a| (a.x0 - b.x0).abs() + (a.y0 - b.y0).abs() + (a.x1 - b.x1).abs() + (a.y1 - b.y1).abs() < 1e-6) + }; + let want = [Rect::new(40.0, 20.0, 100.0, 80.0), Rect::new(100.0, 20.0, 160.0, 80.0)]; + assert!(boxes.len() == 2 && boxes.iter().zip(want).all(|(a, b)| near(*a, b)), "{name}: {boxes:?}"); } } +/// A gradient-filled path in the contents of an envelope in a symbol's art opens with its gradient +/// where it was on the path. +#[test] +fn a_gradient_in_an_envelopes_contents_in_a_symbol_keeps_its_place() { + use vectorcraft_color::gradient::GradientGeom; + use vectorcraft_doc::live::{EnvelopeKind, EnvelopeOptions}; + let mut doc = Document::new(200.0, 100.0); + let kind = EnvelopeKind::Mesh { rows: 2, cols: 3, points: envelope_points(2, 3), handles: vec![] }; + let mut art = envelope_node(&mut doc, kind, 50.0, false, EnvelopeOptions::NEW); + let geom = GradientGeom { start: (50.0, 30.0).into(), end: (90.0, 70.0).into(), aspect: 1.0, focal: None }; + let fill = gradient_paint(sunset(), Some(geom), None); + let shaded = painted(&mut doc, shapes::rectangle(Rect::new(40.0, 20.0, 100.0, 80.0)), vec![AppearanceItem::Fill(FillLayer::new(fill))]); + if let NodeKind::Envelope { content, .. } = &mut art.kind { + content[0] = Arc::new(shaded); + } + doc.symbols.push(Symbol { dynamic: false, name: "Bent".into(), art: Arc::new(art) }); + let instance = Node::new(doc.alloc_id(), NodeKind::SymbolInstance { symbol: "Bent".into(), xf: Affine::translate((10.0, 5.0)) }); + let layer = doc.layers[0].id; + doc.insert(Some(layer), usize::MAX, instance).unwrap(); + let back = read_back(&doc); + let symbol = back.symbols.iter().find(|s| s.name == "Bent").unwrap_or_else(|| panic!("{:?}", back.symbols)); + let mut geoms = vec![]; + symbol.art.walk(&mut |n| { + if let NodeKind::Envelope { content, .. } = &n.kind { + for c in content { + if let Paint::Gradient(g) = c.appearance.fill_paint() { + geoms.push(g.geom); + } + } + } + }); + let near = |a: vectorcraft_geom::Point, b: vectorcraft_geom::Point| (a - b).hypot() < 1e-6; + assert!(matches!(geoms.as_slice(), [Some(g)] if near(g.start, geom.start) && near(g.end, geom.end)), "{geoms:?}, want {geom:?}"); +} + +/// The contents of an envelope in a symbol's art are written in the canvas's space with y down: +/// about the canvas point of art space's origin. +#[test] +fn an_envelopes_contents_in_a_symbol_are_written_in_the_canvas_space() { + use vectorcraft_doc::live::{EnvelopeKind, EnvelopeOptions}; + let mut doc = Document::new(200.0, 100.0); + let kind = EnvelopeKind::Mesh { rows: 2, cols: 3, points: envelope_points(2, 3), handles: vec![] }; + let art = envelope_node(&mut doc, kind, 50.0, false, EnvelopeOptions::NEW); + doc.symbols.push(Symbol { dynamic: false, name: "Bent".into(), art: Arc::new(art) }); + let instance = Node::new(doc.alloc_id(), NodeKind::SymbolInstance { symbol: "Bent".into(), xf: Affine::translate((10.0, 5.0)) }); + let layer = doc.layers[0].id; + doc.insert(Some(layer), usize::MAX, instance).unwrap(); + let p = program(&doc); + let t: Vec<f64> = p.lines().find_map(|l| l.strip_prefix("%AI3_TemplateBox: ")).unwrap().split(' ').map(|v| v.parse().unwrap()).collect(); + let (ox, oy) = (f64::from(CANVAS_SIZE) / 2.0 - t[0], f64::from(CANVAS_SIZE) / 2.0 + t[1]); + let def = &p[p.find("%AI14_BeginSymbol\n(Bent)\n").unwrap()..]; + let block = &def[def.find("%_X=\n").unwrap()..]; + let moves: Vec<&str> = block.lines().filter_map(|l| l.trim_start_matches("%_").strip_suffix(" m")).collect(); + // The red square's points are the rectangle 40 20 to 100 80, in the symbol's space. + let xs: Vec<f64> = moves.first().unwrap().split(' ').map(|v| v.parse().unwrap()).collect(); + assert!([40.0, 100.0].iter().any(|x| (xs[0] - (x + ox)).abs() < 1e-6), "{xs:?}, origin {ox} {oy}"); + assert!([20.0, 80.0].iter().any(|y| (xs[1] - (y + oy)).abs() < 1e-6), "{xs:?}, origin {ox} {oy}"); +} + +/// The grid of an envelope in a symbol's art is written in the space a gradient mesh's corners are +/// written in there: about the canvas point of art space's origin, y up. +#[test] +fn an_envelopes_grid_in_a_symbol_is_written_about_the_canvas_point_of_the_origin() { + use vectorcraft_doc::live::{EnvelopeKind, EnvelopeOptions}; + let mut doc = Document::new(200.0, 100.0); + let kind = EnvelopeKind::Mesh { rows: 2, cols: 3, points: envelope_points(2, 3), handles: vec![] }; + let art = envelope_node(&mut doc, kind, 50.0, false, EnvelopeOptions::NEW); + doc.symbols.push(Symbol { dynamic: false, name: "Bent".into(), art: Arc::new(art) }); + let instance = Node::new(doc.alloc_id(), NodeKind::SymbolInstance { symbol: "Bent".into(), xf: Affine::translate((10.0, 5.0)) }); + let layer = doc.layers[0].id; + doc.insert(Some(layer), usize::MAX, instance).unwrap(); + let p = program(&doc); + let t: Vec<f64> = p.lines().find_map(|l| l.strip_prefix("%AI3_TemplateBox: ")).unwrap().split(' ').map(|v| v.parse().unwrap()).collect(); + let (ox, oy) = (f64::from(CANVAS_SIZE) / 2.0 - t[0], f64::from(CANVAS_SIZE) / 2.0 + t[1]); + let def = &p[p.find("%AI14_BeginSymbol\n(Bent)\n").unwrap()..]; + let first = def.lines().find(|l| l.ends_with(" /N X#")).unwrap(); + // The grid's top left point, at 30 10. + let want = format!("[0 1 {} {} ", ps::num(30.0 - ox), ps::num(oy - 10.0)); + assert!(first.trim_start_matches("%_").starts_with(&want), "{first}, want {want}"); +} + /// An envelope with an opacity mask comes back live with its mask, and the plugin's `XP` follows /// the envelope's dictionary rather than its mask's art. #[test] @@ -11391,8 +11974,13 @@ fn envelopes_the_reader_cannot_open_live_are_written_as_their_art() { assert!(!warnings.iter().any(|w| w == writer::LIVE), "{what}: {warnings:?}"); assert!(matches!(back.kind, NodeKind::Group { .. }), "{what}: {back:#?}"); } - let blend = export_ai_editing(&blend_doc(), &opts()).unwrap(); - assert!(blend.warnings.iter().any(|w| w == writer::LIVE) && !blend.warnings.iter().any(|w| w == writer::ENVELOPES), "{:?}", blend.warnings); + let mut doc = Document::new(200.0, 100.0); + let a = Arc::new(square(&mut doc, Rect::new(10.0, 10.0, 20.0, 20.0), Color::gray(0.5))); + let repeat = Node::new(doc.alloc_id(), NodeKind::Repeat(vectorcraft_doc::RepeatSpec::grid(vec![a], 8.0, 12.0))); + let layer = doc.layers[0].id; + doc.insert(Some(layer), usize::MAX, repeat).unwrap(); + let repeat = export_ai_editing(&doc, &opts()).unwrap(); + assert!(repeat.warnings.iter().any(|w| w == writer::LIVE) && !repeat.warnings.iter().any(|w| w == writer::ENVELOPES), "{:?}", repeat.warnings); } /// `points`, a grid of `rows + 1` rows of `cols + 1` points, as `cols + 1` rows of `rows + 1`. @@ -11818,9 +12406,9 @@ fn text_wrap_options_are_written_and_read_back() { same_wraps(&wraps(read_back(&doc).layers[0].children().unwrap()), &[(None, 6.0, true), (None, 1000.0, false), (None, -1000.0, false)]); } -/// The art drawn for an object (a blend's steps, a stained symbol instance's art) is written -/// without the text wrap options of the objects it is made from, which wrap no type; the object -/// keeps its own. A symbol's art and a live instance keep theirs. +/// The art drawn for an object (the steps of a blend written as its steps, a stained symbol +/// instance's art) is written without the text wrap options of the objects it is made from, which +/// wrap no type; the object keeps its own. A symbol's art and a live instance keep theirs. #[test] fn drawn_art_keeps_only_its_objects_text_wrap() { let mut doc = Document::new(200.0, 100.0); @@ -11829,7 +12417,12 @@ fn drawn_art_keeps_only_its_objects_text_wrap() { Arc::new(wrapped(square(&mut doc, Rect::new(10.0, 10.0, 12.0, 12.0), Color::gray(0.5)), 2.0, true)), Arc::new(wrapped(square(&mut doc, Rect::new(30.0, 10.0, 32.0, 12.0), Color::gray(0.5)), 2.0, true)), ]; - let spec = vectorcraft_doc::BlendSpec { spacing: vectorcraft_doc::BlendSpacing::Distance(10.0), ..Default::default() }; + // With easing, written as its steps. + let spec = vectorcraft_doc::BlendSpec { + spacing: vectorcraft_doc::BlendSpacing::Distance(10.0), + ease: BlendEase { kind: BlendEaseType::InOut, ramp: 0.5 }, + ..Default::default() + }; let blend = wrapped(Node::new(doc.alloc_id(), NodeKind::Blend { children: keys, spec: Box::new(spec) }), 8.0, false); let art = wrapped(square(&mut doc, Rect::new(0.0, 0.0, 10.0, 10.0), LEAF), 4.0, true); doc.symbols.push(Symbol { dynamic: false, name: "Leaf".into(), art: Arc::new(art) }); @@ -12426,8 +13019,8 @@ fn two_leaves(doc: &mut Document) { doc.symbols.push(Symbol { dynamic: false, name: "Leaf".into(), art: Arc::new(art) }); } -/// A symbol instance written as its art (its isolation is a group's), a blend and an intertwine, -/// each written as a group of its art, wrap area type below them by their bounds after reopening, +/// A symbol instance written as its art (its isolation is a group's), a blend with easing and an +/// intertwine, each written as a group of its art, wrap area type below them by their bounds after reopening, /// as they did before saving, not by the members of that art: the text wrap options go on an /// unpainted rectangle of the bounds, the group's first member, and the group, which keeps the /// object's name, isolation, lock and visibility, has none. A positive offset, a negative offset @@ -12448,7 +13041,11 @@ fn live_art_written_as_a_group_keeps_wrapping_by_its_bounds() { Arc::new(square(doc, Rect::new(60.0, 80.0, 70.0, 90.0), Color::gray(0.5))), Arc::new(square(doc, Rect::new(220.0, 110.0, 230.0, 120.0), Color::gray(0.5))), ]; - let spec = vectorcraft_doc::BlendSpec { spacing: vectorcraft_doc::BlendSpacing::Distance(60.0), ..Default::default() }; + let spec = vectorcraft_doc::BlendSpec { + spacing: vectorcraft_doc::BlendSpacing::Distance(60.0), + ease: BlendEase { kind: BlendEaseType::InOut, ramp: 0.5 }, + ..Default::default() + }; wrapped(named(Node::new(doc.alloc_id(), NodeKind::Blend { children: keys, spec: Box::new(spec) }), "Thing"), 4.5, false) }; let intertwine = |doc: &mut Document| { @@ -12501,21 +13098,32 @@ fn live_art_written_as_a_group_keeps_wrapping_by_its_bounds() { assert!([b.x0 - want.x0, b.y0 - want.y0, b.x1 - want.x1, b.y1 - want.y1].iter().all(|d| d.abs() < 1e-3), "{name}: {b:?} {want:?}"); } - // An envelope written live opens live and wraps by its bounds, its options its own. - let live = |doc: &mut Document| { + // An envelope and a blend written live open live and wrap by their bounds, their options their + // own. + let envelope = |doc: &mut Document| { use vectorcraft_doc::live::{EnvelopeKind, EnvelopeOptions}; let kind = EnvelopeKind::Mesh { rows: 2, cols: 3, points: envelope_points(2, 3), handles: vec![] }; wrapped(named(envelope_node(doc, kind, 50.0, false, EnvelopeOptions::NEW), "Thing"), -3.0, true) }; - let doc = over_area_type(live); - let text_out = program(&doc); - let back = read_back(&doc); - let (before, after) = (area_wrap_region(&doc), area_wrap_region(&back)); - assert_eq!(before.len(), 1); - assert!(same_region(&before, &after), "{before:?}\n{after:?}\n{text_out}"); - let top = back.layers[0].children().unwrap(); - assert!(matches!(top[1].kind, NodeKind::Envelope { .. }), "{text_out}"); - same_wraps(&wraps(top), &[(Some("Thing".into()), -3.0, true)]); + let blend = |doc: &mut Document| { + let keys = vec![ + Arc::new(square(doc, Rect::new(60.0, 80.0, 70.0, 90.0), Color::gray(0.5))), + Arc::new(square(doc, Rect::new(220.0, 110.0, 230.0, 120.0), Color::gray(0.5))), + ]; + let spec = vectorcraft_doc::BlendSpec { spacing: vectorcraft_doc::BlendSpacing::Distance(60.0), ..Default::default() }; + wrapped(named(Node::new(doc.alloc_id(), NodeKind::Blend { children: keys, spec: Box::new(spec) }), "Thing"), -3.0, true) + }; + for (name, doc) in [("envelope", over_area_type(envelope)), ("blend", over_area_type(blend))] { + let text_out = program(&doc); + let back = read_back(&doc); + let (before, after) = (area_wrap_region(&doc), area_wrap_region(&back)); + assert_eq!(before.len(), 1, "{name}"); + assert!(same_region(&before, &after), "{name}\n{before:?}\n{after:?}\n{text_out}"); + let top = back.layers[0].children().unwrap(); + assert!(matches!(top[1].kind, NodeKind::Envelope { .. } | NodeKind::Blend { .. }), "{name}: {text_out}"); + assert_eq!(std::mem::discriminant(&top[1].kind), std::mem::discriminant(&doc.layers[0].children().unwrap()[1].kind), "{name}"); + same_wraps(&wraps(top), &[(Some("Thing".into()), -3.0, true)]); + } } /// The rectangle that keeps a blend written as its art wrapping by its bounds counts toward the @@ -12529,13 +13137,17 @@ fn live_art_written_as_a_group_keeps_wrapping_by_its_bounds() { fn wrap_bounds_of_live_art_fit_the_object_limit_and_leave_area_type_in_the_art_unwrapped() { use vectorcraft_doc::{TextKind, TextObject, TextRun}; // A blend alone, without a symbol definition, so the objects are the group, the rectangle and - // the steps. + // the steps (with easing, written as its steps). let mut doc = Document::new(300.0, 200.0); let keys = vec![ Arc::new(square(&mut doc, Rect::new(60.0, 80.0, 70.0, 90.0), Color::gray(0.5))), Arc::new(square(&mut doc, Rect::new(220.0, 110.0, 230.0, 120.0), Color::gray(0.5))), ]; - let spec = vectorcraft_doc::BlendSpec { spacing: vectorcraft_doc::BlendSpacing::Distance(60.0), ..Default::default() }; + let spec = vectorcraft_doc::BlendSpec { + spacing: vectorcraft_doc::BlendSpacing::Distance(60.0), + ease: BlendEase { kind: BlendEaseType::InOut, ramp: 0.5 }, + ..Default::default() + }; let thing = wrapped(named(Node::new(doc.alloc_id(), NodeKind::Blend { children: keys, spec: Box::new(spec) }), "Thing"), 4.5, false); let layer = doc.layers[0].id; doc.insert(Some(layer), usize::MAX, thing).unwrap(); @@ -13128,3 +13740,1517 @@ fn a_cut_clipping_object_without_room_for_its_mask_gets_no_carrier() { } } } + +// ---------- blends ---------- + +use vectorcraft_doc::live::{BlendEase, BlendEaseType, BlendOrientation, BlendSpacing, BlendSpec}; + +/// A square `s` wide at (x, y) filled with `c`, as a blend's key. +fn key_square(doc: &mut Document, x: f64, y: f64, s: f64, c: Color) -> Arc<Node> { + Arc::new(Node::path(doc.alloc_id(), shapes::rectangle(Rect::new(x, y, x + s, y + s)), Appearance::basic(solid(c), Paint::None, 0.0))) +} + +fn blend_of(doc: &mut Document, keys: Vec<Arc<Node>>, spec: BlendSpec) -> Node { + Node::new(doc.alloc_id(), NodeKind::Blend { children: keys, spec: Box::new(spec) }) +} + +/// The straight lines through the centers of 20 pt squares at `xs` on y 50 (a spine edited on the +/// canvas, its keys on its anchors). +fn spine_through(xs: &[f64], y: f64) -> PathData { + let points: Vec<vectorcraft_geom::Point> = xs.iter().map(|x| vectorcraft_geom::Point::new(x + 10.0, y + 10.0)).collect(); + PathData::single(vectorcraft_geom::SubPath::polyline(&points, false)) +} + +/// A 400 × 400 document with blends: `Fade`, red to blue squares, three steps, no spine of its own, +/// at half opacity in Multiply, followed by a path at 80%; `Path`, three keys (red, blue, green) on a +/// spine edited on the canvas, 25 pt apart, aligned to the path; `Smooth`, two close blues in Smooth +/// Color; `Curve` and `Bow`, two keys on a replaced curved spine with four steps; `Diagonal`, two +/// keys 45 degrees apart with no spine of their own, aligned to the path; and a hidden, locked blend +/// in a group `Box`. (Turning the steps along the spine leaves their centers in place, so the +/// orientation comes from the record.) +fn blends_document() -> Document { + let mut doc = Document::new(400.0, 400.0); + let (red, blue, green) = (Color::rgb(1.0, 0.0, 0.0), Color::rgb(0.0, 0.0, 1.0), Color::rgb(0.0, 1.0, 0.0)); + let layer = doc.layers[0].id; + let keys = vec![key_square(&mut doc, 20.0, 20.0, 20.0, red), key_square(&mut doc, 120.0, 20.0, 20.0, blue)]; + let mut fade = blend_of(&mut doc, keys, BlendSpec { spacing: BlendSpacing::Steps(3), ..BlendSpec::default() }); + (fade.name, fade.opacity, fade.blend) = (Some("Fade".into()), 0.5, BlendMode::Multiply); + doc.insert(Some(layer), usize::MAX, fade).unwrap(); + let mut after = (*key_square(&mut doc, 200.0, 20.0, 20.0, green)).clone(); + after.opacity = 0.8; + doc.insert(Some(layer), usize::MAX, after).unwrap(); + let keys = vec![ + key_square(&mut doc, 20.0, 80.0, 20.0, red), + key_square(&mut doc, 120.0, 80.0, 20.0, blue), + key_square(&mut doc, 170.0, 80.0, 20.0, green), + ]; + let spec = BlendSpec { + spacing: BlendSpacing::Distance(25.0), + orientation: BlendOrientation::AlignToPath, + spine: Some(spine_through(&[20.0, 120.0, 170.0], 80.0)), + key_anchors: vec![0, 1, 2], + ..BlendSpec::default() + }; + let mut path = blend_of(&mut doc, keys, spec); + path.name = Some("Path".into()); + doc.insert(Some(layer), usize::MAX, path).unwrap(); + let keys = + vec![key_square(&mut doc, 20.0, 140.0, 20.0, Color::rgb(0.0, 0.0, 0.8)), key_square(&mut doc, 140.0, 140.0, 20.0, Color::rgb(0.0, 0.0, 1.0))]; + let mut smooth = blend_of(&mut doc, keys, BlendSpec { spacing: BlendSpacing::SmoothColor, ..BlendSpec::default() }); + smooth.name = Some("Smooth".into()); + doc.insert(Some(layer), usize::MAX, smooth).unwrap(); + let keys = vec![key_square(&mut doc, 20.0, 220.0, 20.0, red), key_square(&mut doc, 220.0, 220.0, 20.0, blue)]; + let curve = PathData::from_bezpath(&kurbo::BezPath::from_vec(vec![ + kurbo::PathEl::MoveTo((30.0, 230.0).into()), + kurbo::PathEl::CurveTo((80.0, 180.0).into(), (180.0, 180.0).into(), (230.0, 230.0).into()), + ])); + let mut curved = blend_of(&mut doc, keys, BlendSpec { spacing: BlendSpacing::Steps(4), spine: Some(curve), ..BlendSpec::default() }); + curved.name = Some("Curve".into()); + doc.insert(Some(layer), usize::MAX, curved).unwrap(); + let keys = vec![key_square(&mut doc, 40.0, 260.0, 20.0, red), key_square(&mut doc, 340.0, 260.0, 20.0, blue)]; + let bow = PathData::from_bezpath(&kurbo::BezPath::from_vec(vec![ + kurbo::PathEl::MoveTo((50.0, 270.0).into()), + kurbo::PathEl::CurveTo((50.0, 270.0).into(), (250.0, 200.0).into(), (350.0, 270.0).into()), + ])); + let mut bowed = blend_of(&mut doc, keys, BlendSpec { spacing: BlendSpacing::Steps(4), spine: Some(bow), ..BlendSpec::default() }); + bowed.name = Some("Bow".into()); + doc.insert(Some(layer), usize::MAX, bowed).unwrap(); + let keys = vec![key_square(&mut doc, 300.0, 20.0, 20.0, red), key_square(&mut doc, 380.0, 100.0, 20.0, blue)]; + let mut diagonal = + blend_of(&mut doc, keys, BlendSpec { spacing: BlendSpacing::Steps(2), orientation: BlendOrientation::AlignToPath, ..BlendSpec::default() }); + diagonal.name = Some("Diagonal".into()); + doc.insert(Some(layer), usize::MAX, diagonal).unwrap(); + let keys = vec![key_square(&mut doc, 20.0, 320.0, 20.0, red), key_square(&mut doc, 100.0, 320.0, 20.0, green)]; + let mut shy = blend_of(&mut doc, keys, BlendSpec { spacing: BlendSpacing::Steps(1), ..BlendSpec::default() }); + (shy.visible, shy.locked) = (false, true); + let mut boxed = Node::group(doc.alloc_id(), vec![Arc::new(shy)]); + boxed.name = Some("Box".into()); + doc.insert(Some(layer), usize::MAX, boxed).unwrap(); + doc +} + +/// Every blend of `doc`, in paint order. +fn blends_in(doc: &Document) -> Vec<Arc<Node>> { + let mut out = vec![]; + fn walk(n: &Arc<Node>, out: &mut Vec<Arc<Node>>) { + if matches!(n.kind, NodeKind::Blend { .. }) { + out.push(n.clone()); + } else { + n.children().into_iter().flatten().for_each(|c| walk(c, out)); + } + } + doc.layers.iter().for_each(|l| walk(l, &mut out)); + out +} + +/// Do the objects `got` lay out as `want` do: as many, each one's bounds within 0.01 pt and its +/// first fill's color within 0.002 a channel, and a group's members the same way? +fn assert_same_objects(got: &[Node], want: &[Node], what: &str) { + assert_eq!(got.len(), want.len(), "{what}: how many"); + for (i, (g, w)) in got.iter().zip(want).enumerate() { + let bounds = |n: &Node| n.geometric_bounds().map(|b| [b.x0, b.y0, b.x1, b.y1]); + match (bounds(g), bounds(w)) { + (Some(a), Some(b)) => assert!(a.iter().zip(b).all(|(x, y)| (x - y).abs() <= 0.01), "{what}, object {i}: {a:?} for {b:?}"), + (a, b) => assert_eq!(a, b, "{what}, object {i}"), + } + let fill = |n: &Node| match n.appearance.fill_paint() { + Paint::Solid { color, .. } => Some(color.to_rgb()), + _ => None, + }; + match (fill(g), fill(w)) { + (Some(a), Some(b)) => assert!(a.iter().zip(b).all(|(x, y)| (x - y).abs() <= 0.002), "{what}, object {i}: {a:?} for {b:?}"), + (a, b) => assert_eq!(a, b, "{what}, object {i}"), + } + let members = |n: &Node| n.children().map(|c| c.iter().map(|m| (**m).clone()).collect::<Vec<Node>>()).unwrap_or_default(); + assert_same_objects(&members(g), &members(w), &format!("{what}, object {i}")); + } +} + +/// The blends of `doc` come back live: each with its keys (their points and paint), its spacing +/// and orientation, its name, opacity, blending mode, hidden and locked state, and laying out the +/// same steps (where they sit, how they turn, their colors). A blend with no spine of its own comes +/// back with none, one with a spine edited on the canvas with that spine and its keys' anchors, and +/// one with a replaced spine with a spine anchored at each key (anchors 0 and 1 for two keys). +fn assert_blends_read_back_live(doc: &Document) { + let back = read_back(doc); + let (ours, theirs) = (blends_in(doc), blends_in(&back)); + assert_eq!(theirs.len(), ours.len(), "{:#?}", back.layers[0]); + for (a, b) in ours.iter().zip(&theirs) { + let (NodeKind::Blend { children: ka, spec: sa }, NodeKind::Blend { children: kb, spec: sb }) = (&a.kind, &b.kind) else { panic!() }; + let what = format!("{:?}", a.name); + assert_eq!(kb.len(), ka.len(), "{what}"); + for (x, y) in ka.iter().zip(kb) { + let (g, w) = (art_tree(y), art_tree(x)); + assert!(same_tree(&g, &w), "{what}: {g:#} for {w:#}"); + } + assert_eq!( + (&sb.spacing, sb.orientation, &sb.ease, sb.color_shift, &sb.starts), + (&sa.spacing, sa.orientation, &sa.ease, sa.color_shift, &sa.starts), + "{what}" + ); + match (&sa.spine, sa.key_anchors.is_empty()) { + (None, _) => assert_eq!((&sb.spine, sb.key_anchors.len()), (&None, 0), "{what}: no spine of its own"), + (Some(_), false) => assert!(same_blend_spec(sb, sa), "{what}: {sb:#?} for {sa:#?}"), + (Some(_), true) => { + assert!(sb.spine.is_some(), "{what}"); + assert_eq!(sb.key_anchors, (0..ka.len() as u32).collect::<Vec<u32>>(), "{what}: an anchor at each key"); + } + } + assert_eq!((&b.name, b.opacity, b.blend, b.visible, b.locked), (&a.name, a.opacity, a.blend, a.visible, a.locked)); + let steps = |k: &[Arc<Node>], s: &BlendSpec| vectorcraft_doc::blend::blend_expand(k, s); + assert_same_objects(&steps(kb, sb), &steps(ka, sa), &what); + } +} + +/// Are two blends' settings the same, the spines' points within the written precision? +fn same_blend_spec(got: &BlendSpec, want: &BlendSpec) -> bool { + let points = |s: &Option<PathData>| { + s.as_ref().map(|p| { + let a: Vec<[f64; 6]> = + p.subpaths.iter().flat_map(|sp| sp.anchors.iter().map(|a| [a.h_in.x, a.h_in.y, a.p.x, a.p.y, a.h_out.x, a.h_out.y])).collect(); + serde_json::json!(a) + }) + }; + let spines = match (points(&got.spine), points(&want.spine)) { + (Some(a), Some(b)) => same_tree(&a, &b), + (None, None) => true, + _ => false, + }; + spines + && (&got.spacing, got.orientation, &got.key_anchors, &got.ease, got.color_shift, &got.starts) + == (&want.spacing, want.orientation, &want.key_anchors, &want.ease, want.color_shift, &want.starts) +} + +/// Each blend comes back live ([`assert_blends_read_back_live`]): no spine of its own, a spine +/// edited on the canvas, replaced curved spines; Specified Steps, Specified Distance, Smooth Color; +/// aligned to the page or the path; named, at half opacity, hidden and locked. The path after the +/// first blend keeps its own opacity. +#[test] +fn blends_are_read_back_live() { + let doc = blends_document(); + let out = export_ai_editing(&doc, &opts()).unwrap(); + assert!(!out.warnings.iter().any(|w| w == writer::BLENDS || w == writer::LIVE), "{:?}", out.warnings); + let text = program(&doc); + assert_eq!(text.matches("(Adobe Path Blends) 1 0 ").count(), 7); // brand-ok: the plugin name the files use + assert_blends_read_back_live(&doc); + let back = read_back(&doc); + let art = back.layers[0].children().unwrap(); + assert_eq!((art[1].opacity, matches!(art[1].kind, NodeKind::Path { .. })), (0.8, true), "the path after the blend keeps its own opacity"); +} + +/// The record names the keys in their order with the anchors they sit on and the steps before each, +/// the spacing and distance, and the orientation (8 and the spine's starting angle for Align to +/// Path); a key's dictionary names it a key and its id, the spine's names it the spine, and a blend +/// with no spine of its own has no spine part; the blend's name follows its record, before its +/// transparency. +#[test] +fn blends_are_written_in_their_form() { + let doc = blends_document(); + let text = program(&doc); + let words = |at: usize| -> Vec<u32> { + let head = text.match_indices("(Adobe Path Blends) 1 0 ").nth(at).unwrap().0; // brand-ok: the plugin name the files use + let hex: String = text[head..].lines().skip(1).take_while(|l| l.starts_with('%') && !l.starts_with("%_")).map(|l| &l[1..]).collect(); + let bytes: Vec<u8> = (0..hex.len()).step_by(2).map(|i| u8::from_str_radix(&hex[i..i + 2], 16).unwrap()).collect(); + bytes.chunks(4).map(|c| u32::from_le_bytes([c[0], c[1], c[2], c[3]])).collect() + }; + let fade = words(0); + let magic = u32::from_le_bytes(*b"DCBA"); + let f = |x: f32| x.to_bits(); + let ff = u32::MAX; + assert_eq!(fade, [magic, 1, f(25.0), 0, 3, 0, 'C' as u32, 0, 0, 1, 2, 'A' as u32, 0, f(0.0), ff, ff, 0, 'B' as u32, 0, f(1.0), ff, ff, 3]); + let path = words(1); + assert_eq!(path.len(), 11 + 3 * 6); + assert_eq!(&path[..7], [magic, 2, f(25.0), 0, 3, f(8.0), 'D' as u32]); + assert_eq!((path[23], path[25], path[28]), ('C' as u32, f(2.0), 1)); + assert_eq!(words(2)[..3], [magic, 0, f(4.0)]); + // Diagonal runs down to the right on the canvas: 45 degrees below level in art space, whose y + // runs up, so its spine starts at 7π/4. + assert_eq!(words(5)[5], f((8.0 + 7.0 * std::f64::consts::FRAC_PI_4) as f32), "Diagonal's orientation"); + let fade_art = &text[..text.find("(Adobe Path Blends) 1 0 ").unwrap()]; // brand-ok: the plugin name the files use + assert!(fade_art.contains("%_(K) /String (ShapeBlendPathType) ,\n%_(A) /String (ShapeBlendPathID) ,"), "{fade_art}"); + assert!(!fade_art.contains("(S) /String (ShapeBlendPathType)"), "no spine part for a blend with no spine of its own"); + assert!(!fade_art.contains("(Fade)"), "the name follows the record"); + let after = &text[text.find("(Adobe Path Blends) 1 0 ").unwrap()..]; // brand-ok: the plugin name the files use + let state = after.find("\n0 0 Xd\n6 () XW").unwrap(); + assert!( + after[..state].contains("%_/ArtDictionary :\n%_/XMLUID : (Fade) ; (AI10_ArtUID) ,"), + "the name before the state block: {}", + &after[..state] + ); + assert_eq!(text.matches("%_(S) /String (ShapeBlendPathType) ,").count(), 3, "the edited spine and the two replaced ones"); +} + +/// Blends of compound paths, of groups, and of 62 keys (the most the ids name; the record's next +/// free id is then 0) come back live, laying out the same steps. +#[test] +fn blends_of_compound_paths_groups_and_62_keys_are_read_back_live() { + let mut doc = Document::new(400.0, 300.0); + let layer = doc.layers[0].id; + let (red, blue) = (Color::rgb(1.0, 0.0, 0.0), Color::rgb(0.0, 0.0, 1.0)); + // The members carry the compound path's paint, as the reader gives them. + let ring = |doc: &mut Document, x: f64, c: Color| { + let paint = || Appearance::basic(solid(c), Paint::None, 0.0); + let outer = Node::path(doc.alloc_id(), shapes::rectangle(Rect::new(x, 20.0, x + 20.0, 40.0)), paint()); + let inner = Node::path(doc.alloc_id(), shapes::rectangle(Rect::new(x + 5.0, 25.0, x + 15.0, 35.0)), paint()); + let mut ring = Node::new(doc.alloc_id(), NodeKind::Compound { children: vec![Arc::new(outer), Arc::new(inner)], rule: FillRule::EvenOdd }); + ring.appearance = paint().into(); + Arc::new(ring) + }; + let keys = vec![ring(&mut doc, 20.0, red), ring(&mut doc, 120.0, blue)]; + let mut rings = blend_of(&mut doc, keys, BlendSpec { spacing: BlendSpacing::Steps(3), ..BlendSpec::default() }); + rings.name = Some("Rings".into()); + doc.insert(Some(layer), usize::MAX, rings).unwrap(); + let pair = |doc: &mut Document, x: f64, c: Color| { + let members = vec![key_square(doc, x, 80.0, 10.0, c), key_square(doc, x + 15.0, 80.0, 10.0, Color::gray(0.5))]; + Arc::new(Node::group(doc.alloc_id(), members)) + }; + let keys = vec![pair(&mut doc, 20.0, red), pair(&mut doc, 120.0, blue)]; + let mut pairs = blend_of(&mut doc, keys, BlendSpec { spacing: BlendSpacing::Steps(2), ..BlendSpec::default() }); + pairs.name = Some("Pairs".into()); + doc.insert(Some(layer), usize::MAX, pairs).unwrap(); + let keys = (0..62).map(|i| key_square(&mut doc, f64::from(i) * 6.0, 150.0, 2.0, Color::gray(f32::from(i as u8) / 62.0))).collect(); + let mut many = blend_of(&mut doc, keys, BlendSpec { spacing: BlendSpacing::Steps(1), ..BlendSpec::default() }); + many.name = Some("Many".into()); + doc.insert(Some(layer), usize::MAX, many).unwrap(); + let out = export_ai_editing(&doc, &opts()).unwrap(); + assert!(!out.warnings.iter().any(|w| w == writer::BLENDS), "{:?}", out.warnings); + let text = program(&doc); + let last = text.match_indices("(Adobe Path Blends) 1 0 ").nth(2).unwrap().0; // brand-ok: the plugin name the files use + let hex: String = text[last..].lines().skip(1).take_while(|l| l.starts_with('%') && !l.starts_with("%_")).map(|l| &l[1..]).collect(); + assert_eq!(&hex[6 * 8..7 * 8], "00000000", "the next free id after the 62nd"); + assert_blends_read_back_live(&doc); +} + +/// After a path at half opacity, a blend's steps set their own transparency and lock and hidden +/// state on plain lines: readers of the printed form skip the blend's keys on `%_` lines. +#[test] +fn a_blends_steps_set_their_own_state() { + let mut doc = Document::new(300.0, 100.0); + let layer = doc.layers[0].id; + let mut faint = (*key_square(&mut doc, 250.0, 20.0, 20.0, Color::gray(0.5))).clone(); + faint.opacity = 0.5; + doc.insert(Some(layer), usize::MAX, faint).unwrap(); + let keys = + vec![key_square(&mut doc, 20.0, 20.0, 20.0, Color::rgb(1.0, 0.0, 0.0)), key_square(&mut doc, 120.0, 20.0, 20.0, Color::rgb(0.0, 0.0, 1.0))]; + let n = blend_of(&mut doc, keys, BlendSpec { spacing: BlendSpacing::Steps(3), ..BlendSpec::default() }); + doc.insert(Some(layer), usize::MAX, n).unwrap(); + let text = program(&doc); + let hidden_end = text.find("%_U\n%_9 () XW\n").unwrap(); + let steps = &text[hidden_end..text.find("(Adobe Path Blends) 1 0 ").unwrap()]; // brand-ok: the plugin name the files use + for line in ["\n0 A\n", "\n0 Xw\n", "\n0 1 0 0 0 Xy\n"] { + assert!(steps.contains(line), "{line:?} in {steps}"); + } +} + +/// A live blend's key objects keep their text wrap options on the hidden lines and the blend keeps +/// its own after its record; the steps, drawn art, carry none. +#[test] +fn a_live_blends_steps_carry_no_text_wrap_options() { + let mut doc = Document::new(300.0, 100.0); + let layer = doc.layers[0].id; + let keys = vec![ + Arc::new(wrapped((*key_square(&mut doc, 20.0, 20.0, 20.0, Color::rgb(1.0, 0.0, 0.0))).clone(), 2.0, true)), + Arc::new(wrapped((*key_square(&mut doc, 120.0, 20.0, 20.0, Color::rgb(0.0, 0.0, 1.0))).clone(), 3.0, false)), + ]; + let n = wrapped(blend_of(&mut doc, keys, BlendSpec { spacing: BlendSpacing::Steps(3), ..BlendSpec::default() }), 8.0, false); + doc.insert(Some(layer), usize::MAX, n).unwrap(); + let out = export_ai_editing(&doc, &opts()).unwrap(); + assert!(!out.warnings.iter().any(|w| w == writer::BLENDS), "{:?}", out.warnings); + let text = program(&doc); + let hidden_end = text.find("%_U\n%_9 () XW\n").unwrap(); + let record = text.find("(Adobe Path Blends) 1 0 ").unwrap(); // brand-ok: the plugin name the files use + assert_eq!(text[..hidden_end].matches("(AI11TextWrapOffset)").count(), 2, "the keys' own: {text}"); + assert!(!text[hidden_end..record].contains("AI11TextWrap"), "the steps: {}", &text[hidden_end..record]); + assert_eq!(text[record..].matches("(AI11TextWrapOffset)").count(), 1, "the blend's own: {text}"); + let back = read_back(&doc); + let [blend] = blends_in(&back).try_into().unwrap(); + assert_eq!(blend.extras().wrap, Some(vectorcraft_doc::TextWrap { offset: 8.0, invert: false })); + let NodeKind::Blend { children, .. } = &blend.kind else { panic!() }; + same_wraps(&wraps(children), &[(None, 2.0, true), (None, 3.0, false)]); +} + +/// A Specified Distance that a 32-bit float doesn't hold exactly (10 mm in points) is written +/// live, and comes back as the float's shortest decimal, laying out the same steps. +#[test] +fn a_blend_spaced_in_millimeters_is_written_live() { + let mut doc = Document::new(300.0, 100.0); + let layer = doc.layers[0].id; + let keys = + vec![key_square(&mut doc, 20.0, 20.0, 20.0, Color::rgb(1.0, 0.0, 0.0)), key_square(&mut doc, 220.0, 20.0, 20.0, Color::rgb(0.0, 0.0, 1.0))]; + let mm = 72.0 / 25.4 * 10.0; + let n = blend_of(&mut doc, keys, BlendSpec { spacing: BlendSpacing::Distance(mm), ..BlendSpec::default() }); + doc.insert(Some(layer), usize::MAX, n).unwrap(); + let out = export_ai_editing(&doc, &opts()).unwrap(); + assert!(!out.warnings.iter().any(|w| w == writer::BLENDS), "{:?}", out.warnings); + let back = read_back(&doc); + let [blend] = blends_in(&back).try_into().unwrap(); + let NodeKind::Blend { children, spec } = &blend.kind else { panic!() }; + assert_eq!(spec.spacing, BlendSpacing::Distance((mm as f32).to_string().parse().unwrap())); + let [ours] = blends_in(&doc).try_into().unwrap(); + let NodeKind::Blend { children: keys, spec: want } = &ours.kind else { panic!() }; + let steps = |k: &[Arc<Node>], s: &BlendSpec| vectorcraft_doc::blend::blend_expand(k, s); + assert_same_objects(&steps(children, spec), &steps(keys, want), "10 mm"); +} + +/// The lines of the layers, `%AI5_BeginLayer` to the end. +fn layer_lines(program: &str) -> Vec<&str> { + program.lines().skip_while(|l| !l.starts_with("%AI5_BeginLayer")).collect() +} + +/// A document with blends is written as the same bytes again, and what the reader reads back is +/// written with the same layers, every blend live both times. +#[test] +fn blends_write_the_same_bytes_again() { + let doc = blends_document(); + let first = export_ai_editing(&doc, &opts()).unwrap(); + assert_eq!(first.program, export_ai_editing(&doc, &opts()).unwrap().program); + let again = String::from_utf8(export_ai_editing(&read_back(&doc), &opts()).unwrap().program).unwrap(); + let first = String::from_utf8(first.program).unwrap(); + // Every blend is written live both times. + for text in [&first, &again] { + assert_eq!(text.matches("(Adobe Path Blends) 1 0 ").count(), 7); // brand-ok: the plugin name the files use + } + let (again, first) = (layer_lines(&again), layer_lines(&first)); + let differ = again.iter().zip(&first).enumerate().find(|(_, (a, b))| a != b); + assert_eq!(differ, None, "the first line that differs"); + assert_eq!(again.len(), first.len()); +} + +/// Blends the reader wouldn't read back as they are are written as their steps with a warning, as +/// many as the PDF part draws, each where it draws it. Each is changed from a blend that comes back +/// live by one thing: easing, a color shift, start points, an opacity mask, an effect or a fill of +/// its own; more objects than the reader lays out for one blend (5,006); a key that is type; a key +/// with a width profile, two fills, a hidden stroke or a gradient stroke, a drop shadow, a Lab +/// color, an opacity mask, a fill at half opacity or in Multiply, or a stroke under its fill (which +/// the editing copy writes otherwise); a key with Offset Path or Roughen, a group key with a fill of its own, or a +/// compound shape key (which baking changes); a group key holding an empty path, path keys of two +/// subpaths, a compound path key with a member of two subpaths (which the editing copy writes +/// otherwise); a clipping group +/// key; a hidden key; a key holding a +/// blend; keys with gradient fills (whose steps the reader can't compare); more than 62 keys; a +/// spine of two parts; and step counts on the edge of rounding (Smooth Color of one color with +/// edges four and a half key widths apart, Specified Distance of two and a half steps, and 0.03 pt +/// past them on a spine of 200 segments). Smooth Color of one color with edges five key widths +/// apart comes back live, and so does that Specified Distance blend on a spine of two segments. +#[test] +fn blends_the_reader_cant_read_are_written_as_their_steps() { + let live = |doc: &mut Document| { + let keys = vec![key_square(doc, 20.0, 20.0, 20.0, Color::rgb(1.0, 0.0, 0.0)), key_square(doc, 120.0, 20.0, 20.0, Color::rgb(0.0, 0.0, 1.0))]; + blend_of(doc, keys, BlendSpec { spacing: BlendSpacing::Steps(3), ..BlendSpec::default() }) + }; + let with_spec = |change: fn(&mut BlendSpec)| { + move |doc: &mut Document| { + let mut n = live(doc); + if let NodeKind::Blend { spec, .. } = &mut n.kind { + change(spec); + } + n + } + }; + let with_keys = |make: fn(&mut Document) -> Vec<Arc<Node>>| { + move |doc: &mut Document| { + let keys = make(doc); + blend_of(doc, keys, BlendSpec { spacing: BlendSpacing::Steps(1), ..BlendSpec::default() }) + } + }; + type Make = Box<dyn Fn(&mut Document) -> Node>; + let cases: Vec<(&str, Make)> = vec![ + ("live", Box::new(live)), + ("easing", Box::new(with_spec(|s| s.ease = BlendEase { kind: BlendEaseType::InOut, ramp: 0.5 }))), + ("color shift", Box::new(with_spec(|s| s.color_shift = 30.0))), + ("start points", Box::new(with_spec(|s| s.starts = vec![Some(1), None]))), + ( + "opacity mask", + Box::new(move |doc: &mut Document| { + let mut n = live(doc); + let art = (*key_square(doc, 0.0, 0.0, 200.0, Color::gray(1.0))).clone(); + n.extras_mut().mask = Some(Box::new(OpacityMask { art: Arc::new(art), clip: false, invert: false, disabled: false, linked: true })); + n + }), + ), + ( + "type key", + Box::new(with_keys(|doc| { + let t = vectorcraft_doc::TextObject::point(vectorcraft_geom::Point::new(150.0, 40.0), "A", vectorcraft_doc::CharStyle::default()); + let text = Node::new(doc.alloc_id(), NodeKind::Text(Box::new(t))); + vec![key_square(doc, 20.0, 20.0, 20.0, Color::rgb(1.0, 0.0, 0.0)), Arc::new(text)] + })), + ), + ( + "more than 5,000 objects", + Box::new(move |doc: &mut Document| { + let keys = (0..6).map(|i| key_square(doc, f64::from(i) * 60.0, 20.0, 10.0, Color::gray(f32::from(i as u8) / 6.0))).collect(); + blend_of(doc, keys, BlendSpec { spacing: BlendSpacing::Steps(1000), ..BlendSpec::default() }) + }), + ), + ( + "key with a width profile", + Box::new(with_keys(|doc| { + let mut a = (*key_square(doc, 20.0, 20.0, 20.0, Color::rgb(1.0, 0.0, 0.0))).clone(); + let mut st = StrokeLayer::new(solid(Color::BLACK), 4.0); + st.profile = Some(vectorcraft_doc::WidthProfile { points: vec![(0.0, 1.0, 0.5), (1.0, 0.0, 1.0)] }); + a.appearance.items.retain(|i| matches!(i, AppearanceItem::Fill(_))); + a.appearance.items.push(AppearanceItem::Stroke(st)); + vec![Arc::new(a), key_square(doc, 120.0, 20.0, 20.0, Color::rgb(0.0, 0.0, 1.0))] + })), + ), + ( + "key with two fills", + Box::new(with_keys(|doc| { + let mut a = (*key_square(doc, 20.0, 20.0, 20.0, Color::rgb(1.0, 0.0, 0.0))).clone(); + a.appearance.items.push(AppearanceItem::Fill(FillLayer::new(solid(Color::rgb(0.0, 1.0, 0.0))))); + vec![Arc::new(a), key_square(doc, 120.0, 20.0, 20.0, Color::rgb(0.0, 0.0, 1.0))] + })), + ), + ( + "key with a hidden stroke", + Box::new(with_keys(|doc| { + let mut a = (*key_square(doc, 20.0, 20.0, 20.0, Color::rgb(1.0, 0.0, 0.0))).clone(); + let st = StrokeLayer { visible: false, ..StrokeLayer::new(solid(Color::BLACK), 2.0) }; + a.appearance.items.retain(|i| matches!(i, AppearanceItem::Fill(_))); + a.appearance.items.push(AppearanceItem::Stroke(st)); + vec![Arc::new(a), key_square(doc, 120.0, 20.0, 20.0, Color::rgb(0.0, 0.0, 1.0))] + })), + ), + ( + "key with a gradient stroke", + Box::new(with_keys(|doc| { + let mut a = (*key_square(doc, 20.0, 20.0, 20.0, Color::rgb(1.0, 0.0, 0.0))).clone(); + let stops = vec![GradientStop::new(0.0, Color::rgb(1.0, 1.0, 1.0)), GradientStop::new(1.0, Color::rgb(0.0, 0.0, 0.0))]; + let grad = Paint::Gradient(Box::new(GradientPaint::new(Gradient::new(GradientKind::Linear, stops)))); + a.appearance.items.retain(|i| matches!(i, AppearanceItem::Fill(_))); + a.appearance.items.push(AppearanceItem::Stroke(StrokeLayer::new(grad, 2.0))); + vec![Arc::new(a), key_square(doc, 120.0, 20.0, 20.0, Color::rgb(0.0, 0.0, 1.0))] + })), + ), + ( + "hidden key", + Box::new(with_keys(|doc| { + let mut a = (*key_square(doc, 20.0, 20.0, 20.0, Color::rgb(1.0, 0.0, 0.0))).clone(); + a.visible = false; + vec![Arc::new(a), key_square(doc, 120.0, 20.0, 20.0, Color::rgb(0.0, 0.0, 1.0))] + })), + ), + ( + "nested blend", + Box::new(with_keys(|doc| { + let inner = + vec![key_square(doc, 20.0, 20.0, 10.0, Color::rgb(1.0, 0.0, 0.0)), key_square(doc, 40.0, 20.0, 10.0, Color::rgb(0.0, 1.0, 0.0))]; + let inner = blend_of(doc, inner, BlendSpec { spacing: BlendSpacing::Steps(1), ..BlendSpec::default() }); + vec![Arc::new(inner), key_square(doc, 120.0, 20.0, 20.0, Color::rgb(0.0, 0.0, 1.0))] + })), + ), + ( + "gradient keys", + Box::new(with_keys(|doc| { + let stops = vec![GradientStop::new(0.0, Color::rgb(1.0, 0.0, 0.0)), GradientStop::new(1.0, Color::rgb(0.0, 0.0, 1.0))]; + let grad = Paint::Gradient(Box::new(GradientPaint::new(Gradient::new(GradientKind::Linear, stops)))); + let mut a = (*key_square(doc, 20.0, 20.0, 20.0, Color::gray(0.0))).clone(); + a.appearance = Appearance::basic(grad, Paint::None, 0.0).into(); + vec![Arc::new(a), key_square(doc, 120.0, 20.0, 20.0, Color::rgb(0.0, 0.0, 1.0))] + })), + ), + ( + "63 keys", + Box::new(with_keys(|doc| { + (0..63).map(|i| key_square(doc, f64::from(i) * 6.0, 20.0, 2.0, Color::gray(f32::from(i as u8) / 63.0))).collect() + })), + ), + ("an effect of its own", Box::new(move |doc: &mut Document| with_own(live(doc), |n| n.appearance.effects.push(drop_shadow())))), + ( + "a fill of its own", + Box::new(move |doc: &mut Document| { + with_own(live(doc), |n| n.appearance.items.push(AppearanceItem::Fill(FillLayer::new(solid(Color::rgb(0.0, 1.0, 0.0)))))) + }), + ), + ( + "key with Offset Path", + Box::new(with_keys(|doc| changed_key(doc, |a| a.appearance.effects.push(fx("path.offsetPath", serde_json::json!({"offset": 3})))))), + ), + ( + "key with Roughen", + Box::new(with_keys(|doc| changed_key(doc, |a| a.appearance.effects.push(fx("distort.roughen", serde_json::json!({})))))), + ), + ("key with a drop shadow", Box::new(with_keys(|doc| changed_key(doc, |a| a.appearance.effects.push(drop_shadow()))))), + ( + "key in a Lab color", + Box::new(with_keys(|doc| { + changed_key(doc, |a| a.appearance = Appearance::basic(solid(Color::Lab { l: 50.0, a: 60.0, b: -40.0 }), Paint::None, 0.0).into()) + })), + ), + ( + // The other key's stroke of no paint is left out, so the steps' strokes would blend from + // none. + "stroked key against a key with a stroke left out", + Box::new(with_keys(|doc| { + changed_key(doc, |a| a.appearance = Appearance::basic(solid(Color::rgb(1.0, 0.0, 0.0)), solid(Color::BLACK), 10.0).into()) + })), + ), + ( + // The reader reads at most 64 dash lengths; with more the stroke opens solid. + "key with a dash of 65 lengths", + Box::new(with_keys(|doc| { + let stroked = |dash: Option<Dash>| { + move |a: &mut Node| { + let mut look = Appearance::basic(solid(Color::rgb(1.0, 0.0, 0.0)), solid(Color::BLACK), 2.0); + if let Some(AppearanceItem::Stroke(s)) = look.items.get_mut(1) { + s.dash = dash; + } + a.appearance = look.into(); + } + }; + let mut keys = changed_key(doc, stroked(Some(Dash { pattern: vec![2.0; 65], offset: 0.0, align_corners: false }))); + let mut b = (*keys[1]).clone(); + stroked(None)(&mut b); + keys[1] = Arc::new(b); + keys + })), + ), + ( + "key with a fill of no paint against a filled key", + Box::new(with_keys(|doc| changed_key(doc, |a| a.appearance = Appearance::basic(Paint::None, Paint::None, 0.0).into()))), + ), + ( + "key with an opacity mask", + Box::new(with_keys(|doc| { + let art = (*key_square(doc, 0.0, 0.0, 200.0, Color::gray(1.0))).clone(); + changed_key(doc, move |a| { + a.extras_mut().mask = + Some(Box::new(OpacityMask { art: Arc::new(art), clip: false, invert: false, disabled: false, linked: true })) + }) + })), + ), + ( + "key fill at half opacity", + Box::new(with_keys(|doc| { + changed_key(doc, |a| { + if let Some(AppearanceItem::Fill(f)) = a.appearance.items.first_mut() { + f.opacity = 0.5; + } + }) + })), + ), + ( + "key fill in Multiply", + Box::new(with_keys(|doc| { + changed_key(doc, |a| { + if let Some(AppearanceItem::Fill(f)) = a.appearance.items.first_mut() { + f.blend = BlendMode::Multiply; + } + }) + })), + ), + ( + "key stroke under its fill", + Box::new(with_keys(|doc| { + changed_key(doc, |a| { + a.appearance.items.retain(|i| matches!(i, AppearanceItem::Fill(_))); + a.appearance.items.insert(0, AppearanceItem::Stroke(StrokeLayer::new(solid(Color::BLACK), 2.0))); + }) + })), + ), + ( + "group key with a fill of its own", + Box::new(with_keys(|doc| { + let mut g = Node::group(doc.alloc_id(), vec![key_square(doc, 20.0, 20.0, 20.0, Color::rgb(1.0, 0.0, 0.0))]); + g.appearance.items.push(AppearanceItem::Fill(FillLayer::new(solid(Color::rgb(0.0, 1.0, 0.0))))); + let h = Node::group(doc.alloc_id(), vec![key_square(doc, 120.0, 20.0, 20.0, Color::rgb(0.0, 0.0, 1.0))]); + vec![Arc::new(g), Arc::new(h)] + })), + ), + ( + "compound shape key", + Box::new(with_keys(|doc| { + let members = + vec![key_square(doc, 20.0, 20.0, 20.0, Color::rgb(1.0, 0.0, 0.0)), key_square(doc, 30.0, 30.0, 20.0, Color::rgb(1.0, 0.0, 0.0))]; + let mut g = Node::group(doc.alloc_id(), members); + g.extras_mut().compound_shape = true; + vec![Arc::new(g), key_square(doc, 120.0, 20.0, 20.0, Color::rgb(0.0, 0.0, 1.0))] + })), + ), + ( + "group key holding an empty path", + Box::new(with_keys(|doc| { + let empty = Node::path(doc.alloc_id(), PathData::default(), Appearance::basic(solid(Color::rgb(1.0, 0.0, 0.0)), Paint::None, 0.0)); + let g = Node::group(doc.alloc_id(), vec![key_square(doc, 20.0, 20.0, 20.0, Color::rgb(1.0, 0.0, 0.0)), Arc::new(empty)]); + let h = Node::group( + doc.alloc_id(), + vec![ + key_square(doc, 120.0, 20.0, 20.0, Color::rgb(0.0, 0.0, 1.0)), + key_square(doc, 150.0, 20.0, 20.0, Color::rgb(0.0, 0.0, 1.0)), + ], + ); + vec![Arc::new(g), Arc::new(h)] + })), + ), + ( + "path key of two subpaths", + Box::new(with_keys(|doc| { + let mut ring = shapes::rectangle(Rect::new(20.0, 20.0, 40.0, 40.0)); + ring.subpaths.extend(shapes::rectangle(Rect::new(25.0, 25.0, 35.0, 35.0)).subpaths); + let a = Node::path(doc.alloc_id(), ring, Appearance::basic(solid(Color::rgb(1.0, 0.0, 0.0)), Paint::None, 0.0)); + let mut ring = shapes::rectangle(Rect::new(120.0, 20.0, 140.0, 40.0)); + ring.subpaths.extend(shapes::rectangle(Rect::new(125.0, 25.0, 135.0, 35.0)).subpaths); + let b = Node::path(doc.alloc_id(), ring, Appearance::basic(solid(Color::rgb(0.0, 0.0, 1.0)), Paint::None, 0.0)); + vec![Arc::new(a), Arc::new(b)] + })), + ), + ( + "compound path key with a member of two subpaths", + Box::new(with_keys(|doc| { + let mut two = shapes::rectangle(Rect::new(20.0, 20.0, 40.0, 40.0)); + two.subpaths.extend(shapes::rectangle(Rect::new(25.0, 25.0, 35.0, 35.0)).subpaths); + let paint = || Appearance::basic(solid(Color::rgb(1.0, 0.0, 0.0)), Paint::None, 0.0); + let a = Node::path(doc.alloc_id(), two, paint()); + let b = Node::path(doc.alloc_id(), shapes::rectangle(Rect::new(45.0, 20.0, 50.0, 25.0)), paint()); + let mut c = Node::new(doc.alloc_id(), NodeKind::Compound { children: vec![Arc::new(a), Arc::new(b)], rule: FillRule::EvenOdd }); + c.appearance = paint().into(); + vec![Arc::new(c), key_square(doc, 120.0, 20.0, 20.0, Color::rgb(0.0, 0.0, 1.0))] + })), + ), + ( + "clipping group key", + Box::new(with_keys(|doc| { + let clip = Node::path(doc.alloc_id(), shapes::rectangle(Rect::new(20.0, 20.0, 40.0, 40.0)), Appearance::default()); + let inside = key_square(doc, 15.0, 15.0, 30.0, Color::rgb(1.0, 0.0, 0.0)); + let g = Node::new(doc.alloc_id(), NodeKind::Group { children: vec![Arc::new(clip), inside], clip: true }); + vec![Arc::new(g), key_square(doc, 120.0, 20.0, 20.0, Color::rgb(0.0, 0.0, 1.0))] + })), + ), + ( + "a spine of two parts", + Box::new(move |doc: &mut Document| { + let mut n = live(doc); + if let NodeKind::Blend { spec, .. } = &mut n.kind { + let mut spine = spine_through(&[20.0, 120.0], 20.0); + let (p, q) = (vectorcraft_geom::Point::new(0.0, 100.0), vectorcraft_geom::Point::new(50.0, 150.0)); + spine.subpaths.push(vectorcraft_geom::SubPath::polyline(&[p, q], false)); + (spec.spine, spec.key_anchors) = (Some(spine), vec![0, 1]); + } + n + }), + ), + ( + "Smooth Color of one color, four and a half key widths apart", + Box::new(move |doc: &mut Document| { + let keys = + vec![key_square(doc, 20.0, 20.0, 20.0, Color::rgb(1.0, 0.0, 0.0)), key_square(doc, 110.0, 20.0, 20.0, Color::rgb(1.0, 0.0, 0.0))]; + blend_of(doc, keys, BlendSpec { spacing: BlendSpacing::SmoothColor, ..BlendSpec::default() }) + }), + ), + ( + "live", + Box::new(move |doc: &mut Document| { + let keys = + vec![key_square(doc, 20.0, 20.0, 20.0, Color::rgb(1.0, 0.0, 0.0)), key_square(doc, 120.0, 20.0, 20.0, Color::rgb(1.0, 0.0, 0.0))]; + blend_of(doc, keys, BlendSpec { spacing: BlendSpacing::SmoothColor, ..BlendSpec::default() }) + }), + ), + ( + "Specified Distance of two and a half steps", + Box::new(move |doc: &mut Document| { + let keys = + vec![key_square(doc, 20.0, 20.0, 20.0, Color::rgb(1.0, 0.0, 0.0)), key_square(doc, 120.0, 20.0, 20.0, Color::rgb(0.0, 0.0, 1.0))]; + blend_of(doc, keys, BlendSpec { spacing: BlendSpacing::Distance(40.0), ..BlendSpec::default() }) + }), + ), + ( + "Specified Distance 0.03 pt past two and a half steps on a spine of 200 segments", + Box::new(move |doc: &mut Document| distance_on_segments(doc, 200)), + ), + ("live", Box::new(move |doc: &mut Document| distance_on_segments(doc, 2))), + ]; + /// Red to blue squares whose centers are 100.03 pt apart, on a straight spine of `segments` + /// equal segments between them, in Specified Distance of 40 pt. + fn distance_on_segments(doc: &mut Document, segments: u32) -> Node { + let keys = vec![key_square(doc, 20.0, 20.0, 20.0, Color::rgb(1.0, 0.0, 0.0)), key_square(doc, 120.03, 20.0, 20.0, Color::rgb(0.0, 0.0, 1.0))]; + let points: Vec<vectorcraft_geom::Point> = + (0..=segments).map(|i| vectorcraft_geom::Point::new(30.0 + 100.03 * f64::from(i) / f64::from(segments), 30.0)).collect(); + let spine = PathData::single(vectorcraft_geom::SubPath::polyline(&points, false)); + let spec = BlendSpec { spacing: BlendSpacing::Distance(40.0), spine: Some(spine), key_anchors: vec![0, segments], ..BlendSpec::default() }; + blend_of(doc, keys, spec) + } + // Every case runs, and the cases that fail are listed together. + let failed: Vec<&str> = cases + .into_iter() + .filter(|(what, make)| std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| written_as_steps(what, make))).is_err()) + .map(|(what, _)| what) + .collect(); + assert!(failed.is_empty(), "failed: {failed:?}"); +} + +/// The blend `make` makes, alone on a layer: written live when `what` is "live", else written as its +/// steps with a warning, as many as the PDF part draws, each where it draws it. +fn written_as_steps(what: &str, make: &dyn Fn(&mut Document) -> Node) { + let mut doc = Document::new(400.0, 200.0); + let n = make(&mut doc); + let id = n.id; + let layer = doc.layers[0].id; + doc.insert(Some(layer), usize::MAX, n).unwrap(); + let out = export_ai_editing(&doc, &opts()).unwrap(); + let first = read_back(&doc).layers[0].children().unwrap()[0].clone(); + if what == "live" { + assert!(!out.warnings.iter().any(|w| w == writer::BLENDS), "{what}: {:?}", out.warnings); + assert!(matches!(first.kind, NodeKind::Blend { .. }), "{what}: {:?}", first.kind); + return; + } + assert!(out.warnings.iter().any(|w| w == writer::BLENDS), "{what}: {:?}", out.warnings); + assert!(matches!(first.kind, NodeKind::Group { .. }), "{what}: its steps, as a group: {:?}", first.kind); + assert!(!program(&doc).contains("ShapeBlendPathType"), "{what}"); + // The steps the PDF part draws: the blend as baking left it, laid out. + let baked = vectorcraft_effects::bake_document(&doc).unwrap_or_else(|| doc.clone()); + let blend = baked.layers[0].children().unwrap()[0].clone(); + assert_eq!(blend.id, id, "{what}"); + let steps = vectorcraft_effects::expand_live_deep(Some(&baked), &blend); + let want: Vec<Node> = steps.children().unwrap().iter().map(|s| (**s).clone()).collect(); + let got: Vec<Node> = first.children().unwrap().iter().map(|s| (**s).clone()).collect(); + // As many, each where the PDF part draws it (strokes written as outlines may move a step's + // bounds by up to half their width). + assert_eq!(got.len(), want.len(), "{what}: how many steps"); + let center = |n: &Node| n.geometric_bounds().map(|b| b.center()).unwrap(); + for (i, (g, w)) in got.iter().zip(&want).enumerate() { + assert!((center(g) - center(w)).hypot() <= 2.5, "{what}, step {i}: {:?} for {:?}", center(g), center(w)); + } +} + +/// `n` changed by `change`. +fn with_own(mut n: Node, change: impl FnOnce(&mut Node)) -> Node { + change(&mut n); + n +} + +/// Two keys, red and blue squares, the red one changed by `change`. +fn changed_key(doc: &mut Document, change: impl FnOnce(&mut Node)) -> Vec<Arc<Node>> { + let mut a = (*key_square(doc, 20.0, 20.0, 20.0, Color::rgb(1.0, 0.0, 0.0))).clone(); + change(&mut a); + vec![Arc::new(a), key_square(doc, 120.0, 20.0, 20.0, Color::rgb(0.0, 0.0, 1.0))] +} + +/// A document with `blend` (two squares, three steps) in a context the reader doesn't read a blend +/// in, or one the writer writes as hidden lines. +fn blend_in_context(context: &str) -> Document { + let mut doc = Document::new(400.0, 200.0); + let layer = doc.layers[0].id; + let blend = |doc: &mut Document, x: f64| { + let keys = vec![key_square(doc, x, 20.0, 20.0, Color::rgb(1.0, 0.0, 0.0)), key_square(doc, x + 100.0, 20.0, 20.0, Color::rgb(0.0, 0.0, 1.0))]; + blend_of(doc, keys, BlendSpec { spacing: BlendSpacing::Steps(3), ..BlendSpec::default() }) + }; + let square_with = |doc: &mut Document, fill: Paint| { + Node::path(doc.alloc_id(), shapes::rectangle(Rect::new(20.0, 100.0, 180.0, 180.0)), Appearance::basic(fill, Paint::None, 0.0)) + }; + let n = match context { + "pattern tile" => { + let b = blend(&mut doc, 0.0); + doc.patterns.push(vectorcraft_doc::PatternDef { + tile: Rect::new(0.0, 0.0, 150.0, 60.0), + ..vectorcraft_doc::PatternDef::new("Fades", vec![Arc::new(b)]) + }); + square_with(&mut doc, Paint::Pattern { pattern: "Fades".into(), xf: Affine::IDENTITY }) + } + "opacity mask" => { + let b = blend(&mut doc, 20.0); + let mut n = square_with(&mut doc, solid(Color::BLACK)); + n.extras_mut().mask = Some(Box::new(OpacityMask { art: Arc::new(b), clip: false, invert: false, disabled: false, linked: true })); + n + } + "symbol" => { + let b = blend(&mut doc, 0.0); + doc.symbols.push(Symbol { dynamic: false, name: "Fade".into(), art: Arc::new(b) }); + instance(&mut doc, "Fade", Affine::translate((20.0, 20.0))) + } + "art cut to a clipping object" => { + let clipper = Node::group(doc.alloc_id(), vec![Arc::new(square_with(&mut doc, Paint::None))]); + let b = blend(&mut doc, 20.0); + Node::new(doc.alloc_id(), NodeKind::Group { children: vec![Arc::new(clipper), Arc::new(b)], clip: true }) + } + // Eight symbols' art inside each other, each instance written as its art (isolated): the + // blend is written eight levels down. + "eight levels down" => { + let b = blend(&mut doc, 0.0); + doc.symbols.push(Symbol { dynamic: false, name: "S0".into(), art: Arc::new(b) }); + for i in 1..8 { + let mut inner = instance(&mut doc, &format!("S{}", i - 1), Affine::IDENTITY); + inner.isolate = true; + doc.symbols.push(Symbol { dynamic: false, name: format!("S{i}"), art: Arc::new(inner) }); + } + let mut top = instance(&mut doc, "S7", Affine::translate((20.0, 20.0))); + top.isolate = true; + top + } + _ => panic!("{context}"), + }; + doc.insert(Some(layer), usize::MAX, n).unwrap(); + doc +} + +/// Blends in pattern tiles, opacity masks and symbols (written as hidden lines or in a symbol's +/// definition), in art cut to a clipping object and eight levels down in art written in place of +/// symbol instances are written as their steps, with a warning. +#[test] +fn blends_in_other_art_are_written_as_their_steps() { + let live = |context: &str| { + let doc = blend_in_context(context); + let out = export_ai_editing(&doc, &opts()).unwrap(); + !out.warnings.iter().any(|w| w == writer::BLENDS) || program(&doc).contains("ShapeBlendPathType") + }; + let contexts = ["pattern tile", "opacity mask", "symbol", "art cut to a clipping object", "eight levels down"]; + let failed: Vec<&str> = contexts.into_iter().filter(|c| live(c)).collect(); + assert!(failed.is_empty(), "written live: {failed:?}"); +} + +/// Blends past what the reader lays out in one file (50,000 objects, each blend counted twice) are +/// written as their steps, with a warning; the blends before them are written live. +#[test] +fn blends_past_the_readers_budget_are_written_as_their_steps() { + let mut doc = Document::new(400.0, 400.0); + let layer = doc.layers[0].id; + // Three keys and 2,003 objects each: twelve take 48,072 and the thirteenth would pass 50,000. + for i in 0..13 { + let y = f64::from(i) * 25.0; + let keys = vec![ + key_square(&mut doc, 20.0, y, 10.0, Color::rgb(1.0, 0.0, 0.0)), + key_square(&mut doc, 120.0, y, 10.0, Color::rgb(0.0, 0.0, 1.0)), + key_square(&mut doc, 220.0, y, 10.0, Color::rgb(0.0, 1.0, 0.0)), + ]; + let n = blend_of(&mut doc, keys, BlendSpec { spacing: BlendSpacing::Steps(1000), ..BlendSpec::default() }); + doc.insert(Some(layer), usize::MAX, n).unwrap(); + } + let out = export_ai_editing(&doc, &opts()).unwrap(); + assert!(out.warnings.iter().any(|w| w == writer::BLENDS), "{:?}", out.warnings); + let back = read_back(&doc); + let art = back.layers[0].children().unwrap(); + let live: Vec<bool> = art.iter().map(|n| matches!(n.kind, NodeKind::Blend { .. })).collect(); + assert_eq!(live, [vec![true; 12], vec![false]].concat()); +} + +/// On a large canvas every blend is written as its steps, with a warning. +#[test] +fn a_large_canvas_writes_blends_as_their_steps() { + let mut doc = Document::new(20000.0, 100.0); + let keys = + vec![key_square(&mut doc, 20.0, 20.0, 20.0, Color::rgb(1.0, 0.0, 0.0)), key_square(&mut doc, 120.0, 20.0, 20.0, Color::rgb(0.0, 0.0, 1.0))]; + let n = blend_of(&mut doc, keys, BlendSpec { spacing: BlendSpacing::Steps(3), ..BlendSpec::default() }); + let layer = doc.layers[0].id; + doc.insert(Some(layer), usize::MAX, n).unwrap(); + let out = export_ai_editing(&doc, &opts()).unwrap(); + assert!(out.warnings.iter().any(|w| w == writer::BLENDS), "{:?}", out.warnings); + assert!(matches!(read_back(&doc).layers[0].children().unwrap()[0].kind, NodeKind::Group { .. })); +} + +// ---------- gradient meshes ---------- + +use vectorcraft_doc::live::{GradientMesh, H_DOWN, H_RIGHT, MeshPoint, grid_points, smooth_handles}; + +/// A mesh over `r` of `rows` × `cols` patches: its points on a grid with smooth handles, each +/// colored `color(row, col)` and opaque. +fn grid_mesh(r: Rect, rows: u32, cols: u32, color: impl Fn(usize, usize) -> Color) -> GradientMesh { + let pts = grid_points(r, rows, cols); + let handles = smooth_handles(rows, cols, &pts); + let width = cols as usize + 1; + let points = pts + .iter() + .zip(handles) + .enumerate() + .map(|(i, (p, h))| MeshPoint { p: *p, color: color(i / width, i % width), opacity: 1.0, handles: h }) + .collect(); + GradientMesh { rows, cols, points } +} + +fn mesh_node(doc: &mut Document, m: GradientMesh) -> Node { + Node::new(doc.alloc_id(), NodeKind::Mesh(m)) +} + +/// The gradient meshes in `doc`'s layers, in order (groups and clipping groups included). +fn meshes_in(doc: &Document) -> Vec<Arc<Node>> { + fn walk(nodes: &[Arc<Node>], out: &mut Vec<Arc<Node>>) { + for n in nodes { + if matches!(n.kind, NodeKind::Mesh(_)) { + out.push(n.clone()); + } else if let Some(c) = n.children() { + walk(c, out); + } + } + } + let mut out = vec![]; + walk(&doc.layers, &mut out); + out +} + +fn mesh_of(n: &Node) -> &GradientMesh { + match &n.kind { + NodeKind::Mesh(m) => m, + _ => panic!("not a mesh: {n:?}"), + } +} + +/// A 400 × 400 document with gradient meshes: `Sheet`, 2 × 3 patches over 20 20 200 120, its top row +/// of points RGB, its middle row CMYK and its bottom row gray, its middle point moved with handles of +/// its own, its top left point's handle to the right bent up, two points part transparent, at 60% +/// in Multiply, followed by a path at 80%; a hidden, locked 1 × 1 gray mesh `Shy` in a group `Box`; +/// `Masked`, 1 × 2 with an inverted, unlinked opacity mask, knockout shape, isolation and knockout; +/// and a mesh in a clipping group. +fn meshes_document() -> Document { + let mut doc = Document::new(400.0, 400.0); + let layer = doc.layers[0].id; + let mut sheet = grid_mesh(Rect::new(20.0, 20.0, 200.0, 120.0), 2, 3, |r, c| match r { + 0 => Color::rgb(1.0, 0.5 * c as f32 / 3.0, 0.0), + 1 => Color::cmyk(0.1 * c as f32, 0.6, 0.2, 0.05), + _ => Color::gray(0.2 + 0.2 * c as f32), + }); + let middle = &mut sheet.points[5]; + middle.p += vectorcraft_geom::Vec2::new(7.0, -5.0); + middle.handles[H_RIGHT] = vectorcraft_geom::Vec2::new(20.0, 8.0); + middle.handles[H_DOWN] = vectorcraft_geom::Vec2::new(-4.0, 12.0); + sheet.points[0].handles[H_RIGHT] = vectorcraft_geom::Vec2::new(15.0, -10.0); + sheet.points[2].opacity = 0.4; + sheet.points[11].opacity = 0.0; + let mut sheet = mesh_node(&mut doc, sheet); + (sheet.name, sheet.opacity, sheet.blend) = (Some("Sheet".into()), 0.6, BlendMode::Multiply); + doc.insert(Some(layer), usize::MAX, sheet).unwrap(); + let mut after = Node::path( + doc.alloc_id(), + shapes::rectangle(Rect::new(240.0, 20.0, 260.0, 40.0)), + Appearance::basic(solid(Color::rgb(0.0, 1.0, 0.0)), Paint::None, 0.0), + ); + after.opacity = 0.8; + doc.insert(Some(layer), usize::MAX, after).unwrap(); + let mut shy = mesh_node(&mut doc, grid_mesh(Rect::new(20.0, 150.0, 80.0, 190.0), 1, 1, |_, c| Color::gray(0.25 + 0.5 * c as f32))); + (shy.name, shy.visible, shy.locked) = (Some("Shy".into()), false, true); + let mut group = Node::group(doc.alloc_id(), vec![Arc::new(shy)]); + group.name = Some("Box".into()); + doc.insert(Some(layer), usize::MAX, group).unwrap(); + let mut masked = mesh_node(&mut doc, grid_mesh(Rect::new(120.0, 150.0, 220.0, 190.0), 1, 2, |r, _| Color::rgb(0.0, 0.3, 0.3 + 0.5 * r as f32))); + masked.name = Some("Masked".into()); + // Knockout shape is a mesh's own; isolation and knockout are a group's. + (masked.knockout_shape, masked.isolate, masked.knockout) = (true, true, vectorcraft_doc::Knockout::On); + let mask_art = Node::path( + doc.alloc_id(), + shapes::rectangle(Rect::new(120.0, 150.0, 170.0, 190.0)), + Appearance::basic(solid(Color::WHITE), Paint::None, 0.0), + ); + masked.extras_mut().mask = Some(Box::new(OpacityMask { art: Arc::new(mask_art), clip: true, invert: true, disabled: false, linked: false })); + doc.insert(Some(layer), usize::MAX, masked).unwrap(); + let clip = Node::path(doc.alloc_id(), shapes::ellipse(Rect::new(250.0, 150.0, 350.0, 250.0)), Appearance::default()); + let inside = mesh_node(&mut doc, grid_mesh(Rect::new(250.0, 150.0, 350.0, 250.0), 2, 2, |r, c| Color::rgb(0.5 * r as f32, 0.5 * c as f32, 1.0))); + let clipped = Node::new(doc.alloc_id(), NodeKind::Group { children: vec![Arc::new(clip), Arc::new(inside)], clip: true }); + doc.insert(Some(layer), usize::MAX, clipped).unwrap(); + doc +} + +/// How far a coordinate, color channel or opacity written to 4 decimals may move: half the last +/// decimal, and a little for the arithmetic. +const MESH_ROUNDING: f64 = 5e-5 + 1e-9; + +/// `read` is `want` as written, checked without the writer's own test: the same grid; each point +/// within [`MESH_ROUNDING`] of its place along each axis; each handle that points into the grid +/// ending within it of where `want`'s ends, and each handle on the mesh's outside edge read as +/// none (the reader gives those none, and they draw nothing); each color in the same model with +/// each channel within it of `want`'s clamped to 0 to 1; each opacity within it. +fn assert_mesh_exact(read: &GradientMesh, want: &GradientMesh, what: &str) { + use vectorcraft_doc::live::H_LEFT; + use vectorcraft_doc::live::H_UP; + assert_eq!((read.rows, read.cols, read.points.len()), (want.rows, want.cols, want.points.len()), "{what}: the grid"); + let (rows, cols) = (want.rows as usize, want.cols as usize); + let close = |a: f64, b: f64| (a - b).abs() <= MESH_ROUNDING; + let channels = |c: &Color| -> (u8, Vec<f64>) { + match *c { + Color::Gray { k } => (0, vec![f64::from(k)]), + Color::Rgb { r, g, b } => (1, vec![f64::from(r), f64::from(g), f64::from(b)]), + Color::Cmyk { c, m, y, k } => (2, vec![f64::from(c), f64::from(m), f64::from(y), f64::from(k)]), + Color::Lab { .. } => (3, vec![]), + } + }; + for (i, (a, b)) in read.points.iter().zip(&want.points).enumerate() { + let (r, c) = (i / (cols + 1), i % (cols + 1)); + assert!(close(a.p.x, b.p.x) && close(a.p.y, b.p.y), "{what}: point {i} at {:?}, want {:?}", a.p, b.p); + for (h, inside) in [(H_RIGHT, c < cols), (H_LEFT, c > 0), (H_DOWN, r < rows), (H_UP, r > 0)] { + if inside { + let (ea, eb) = (a.p + a.handles[h], b.p + b.handles[h]); + assert!(close(ea.x, eb.x) && close(ea.y, eb.y), "{what}: point {i}'s handle {h} ends at {ea:?}, want {eb:?}"); + } else { + assert_eq!(a.handles[h], vectorcraft_geom::Vec2::ZERO, "{what}: point {i}'s outside handle {h}"); + } + } + let ((ma, ca), (mb, cb)) = (channels(&a.color), channels(&b.color)); + assert_eq!(ma, mb, "{what}: point {i}'s color model: {:?}, want {:?}", a.color, b.color); + assert!(ca.iter().zip(&cb).all(|(x, y)| close(*x, y.clamp(0.0, 1.0))), "{what}: point {i}'s color {:?}, want {:?}", a.color, b.color); + assert!(close(f64::from(a.opacity), f64::from(b.opacity.clamp(0.0, 1.0))), "{what}: point {i}'s opacity {}, want {}", a.opacity, b.opacity); + } +} + +/// Each mesh of `doc` comes back from the editing data alone as a mesh: the same grid, points, +/// handles, colors in their own models and opacities ([`assert_mesh_exact`]), name, transparency +/// (opacity, blending mode and knockout shape; isolation and knockout are a group's and are written +/// off, as for a path), lock and hidden state, and opacity mask (its flags and its art's kind and +/// box). +fn assert_meshes_read_back(doc: &Document) { + let back = read_back(doc); + let (ours, theirs) = (meshes_in(doc), meshes_in(&back)); + assert_eq!(theirs.len(), ours.len(), "{:#?}", back.layers[0]); + for (a, b) in ours.iter().zip(&theirs) { + assert_mesh_exact(mesh_of(b), mesh_of(a), &format!("{:?}", a.name)); + assert_eq!((&b.name, b.opacity, b.blend, b.visible, b.locked), (&a.name, a.opacity, a.blend, a.visible, a.locked)); + // Isolation and knockout are written off (`Xy`); a mesh read keeps a new object's. + let fresh = Node::new(b.id, NodeKind::Mesh(mesh_of(b).clone())); + assert_eq!((b.knockout_shape, b.isolate, b.knockout), (a.knockout_shape, fresh.isolate, fresh.knockout), "{:?}'s knockout", a.name); + match (&a.extras().mask, &b.extras().mask) { + (None, None) => {} + (Some(ma), Some(mb)) => { + assert_eq!((mb.clip, mb.invert, mb.disabled, mb.linked), (ma.clip, ma.invert, ma.disabled, ma.linked), "{:?}'s mask flags", a.name); + assert_eq!(std::mem::discriminant(&mb.art.kind), std::mem::discriminant(&ma.art.kind), "{:?}'s mask art", a.name); + let (ba, bb) = (ma.art.geometric_bounds().unwrap(), mb.art.geometric_bounds().unwrap()); + assert!( + (ba.x0 - bb.x0).abs() < 1e-3 && (ba.y0 - bb.y0).abs() < 1e-3 && (ba.x1 - bb.x1).abs() < 1e-3 && (ba.y1 - bb.y1).abs() < 1e-3, + "{:?}'s mask art box {bb:?}, want {ba:?}", + a.name + ); + } + (want, got) => panic!("{:?}'s opacity mask: {} read back, want {}", a.name, got.is_some(), want.is_some()), + } + } +} + +#[test] +fn meshes_are_read_back_as_they_are() { + let doc = meshes_document(); + let out = export_ai_editing(&doc, &opts()).unwrap(); + assert!(!out.warnings.iter().any(|w| w == writer::MESHES || w == writer::LIVE), "{:?}", out.warnings); + assert_eq!(program(&doc).matches("/Mesh X!\n").count(), 4); + assert_meshes_read_back(&doc); + let back = read_back(&doc); + let art = back.layers[0].children().unwrap(); + assert_eq!((art[1].opacity, matches!(art[1].kind, NodeKind::Path { .. })), (0.8, true), "the path after the mesh keeps its own opacity"); + // The moved point keeps its place and handles exactly (to the 4 decimals written). + let sheet = mesh_of(&art[0]); + assert!((sheet.points[5].p - vectorcraft_geom::Point::new(87.0, 65.0)).hypot() < 1e-4, "{:?}", sheet.points[5].p); + assert!((sheet.points[5].handles[H_RIGHT] - vectorcraft_geom::Vec2::new(20.0, 8.0)).hypot() < 1e-4); +} + +/// A mesh is `/Mesh X!`, its version (2: corners with an opacity), type and size, `/Data`, each +/// patch row by row with its place, the color space where it changes and four corners (from the +/// top left point down, right and up: color, opacity, point, the handle towards the next corner and +/// the one before it, in art space), `/End X!`; its transparency before it, its name after it, then +/// `0 0 Xd` and `6 () XW`. Gray is written as lightness. +#[test] +fn meshes_are_written_in_their_form() { + let doc = meshes_document(); + let text = program(&doc); + let start = text.find("/Mesh X!\n").unwrap(); + let end = start + text[start..].find("/End X!\n").unwrap() + "/End X!\n".len(); + let sheet = &text[start..end]; + assert!( + sheet.starts_with("/Mesh X!\n%_2 /Version X#\n%_/Cartesian /Type X#\n%_[2 3] /Size X#\n%_/Data X#\n%_[0 0] /P X#\n%_/DeviceRGB /CS X#\n"), + "{sheet}" + ); + let places: Vec<&str> = sheet.lines().filter(|l| l.ends_with(" /P X#")).collect(); + assert_eq!(places, ["%_[0 0] /P X#", "%_[0 1] /P X#", "%_[0 2] /P X#", "%_[1 0] /P X#", "%_[1 1] /P X#", "%_[1 2] /P X#"]); + // The top left point, at 20 20 (art 20 -20): its handle down a third of the way to the next row, + // its handle to the right bent up. + let corners: Vec<&str> = sheet.lines().filter(|l| l.ends_with(" /N X#")).collect(); + assert_eq!(corners.len(), 24); + assert_eq!(corners[0], "%_[1 0 0 1 20 -20 20 -36.6667 1 35 -10 1] /N X#"); + // The color space only where it changes. + let spaces: Vec<&str> = sheet.lines().filter(|l| l.ends_with(" /CS X#")).collect(); + assert!(spaces.windows(2).all(|w| w[0] != w[1]), "{spaces:?}"); + assert!(spaces.contains(&"%_/DeviceCMYK /CS X#") && spaces.contains(&"%_/DeviceGray /CS X#"), "{spaces:?}"); + // Gray 0.2 of ink is 0.8 of lightness: the bottom left point, the second corner of the second row's first patch. + assert!(corners[13].starts_with("%_[0.8 1 20 -120 "), "{}", corners[13]); + // Only what the reader reads: no `/R` entries. + assert!(!sheet.contains("/R X#"), "{sheet}"); + // Its transparency before it; its name, then its state block, after it. + assert!(text[..start].ends_with("0 XR\n1 0.6 0 0 0 Xy\n"), "{}", &text[start.saturating_sub(80)..start]); + let rest = &text[end..]; + assert!(rest.starts_with("%_/ArtDictionary :\n%_/XMLUID : (Sheet) ; (AI10_ArtUID) ,\n%_;\n%_\n0 0 Xd\n6 () XW\n"), "{}", &rest[..200]); +} + +/// A document with meshes is written as the same bytes again, and what the reader reads back is +/// written with the same layers. +#[test] +fn meshes_write_the_same_bytes_again() { + let doc = meshes_document(); + let first = export_ai_editing(&doc, &opts()).unwrap(); + assert_eq!(first.program, export_ai_editing(&doc, &opts()).unwrap().program); + let again = String::from_utf8(export_ai_editing(&read_back(&doc), &opts()).unwrap().program).unwrap(); + let first = String::from_utf8(first.program).unwrap(); + let (again, first) = (mesh_layer_lines(&again), mesh_layer_lines(&first)); + let differ = again.iter().zip(&first).enumerate().find(|(_, (a, b))| a != b); + assert_eq!(differ, None, "the first line that differs"); + assert_eq!(again.len(), first.len()); +} + +/// The lines of the layers, `%AI5_BeginLayer` to the end. +fn mesh_layer_lines(program: &str) -> Vec<&str> { + program.lines().skip_while(|l| !l.starts_with("%AI5_BeginLayer")).collect() +} + +/// A document holding one mesh made by `make`, on a 400 × 400 page. +fn mesh_document(make: impl FnOnce(&mut Document) -> Node) -> Document { + let mut doc = Document::new(400.0, 400.0); + let layer = doc.layers[0].id; + let n = make(&mut doc); + doc.insert(Some(layer), usize::MAX, n).unwrap(); + doc +} + +/// Whether `doc` holds a gradient mesh anywhere: on its layers (opacity masks' art included), in a +/// symbol's art or in a pattern's tile. +fn holds_a_mesh(doc: &Document) -> bool { + fn any(n: &Node) -> bool { + matches!(n.kind, NodeKind::Mesh(_)) + || n.extras().mask.as_ref().is_some_and(|m| any(&m.art)) + || n.children().is_some_and(|c| c.iter().any(|c| any(c))) + } + doc.layers.iter().any(|n| any(n)) || doc.symbols.iter().any(|s| any(&s.art)) || doc.patterns.iter().any(|p| p.art.iter().any(|n| any(n))) +} + +/// The box and color of each path with a solid fill in `nodes` and what they hold. +fn filled_paths(nodes: &[Arc<Node>], out: &mut Vec<(Rect, Color)>) { + for n in nodes { + if let NodeKind::Path { .. } = n.kind { + for item in &n.appearance.items { + if let AppearanceItem::Fill(f) = item + && let Paint::Solid { color, .. } = &f.paint + && let Some(b) = n.geometric_bounds() + { + out.push((b, *color)); + } + } + } else if let Some(c) = n.children() { + filled_paths(c, out); + } + } +} + +/// Meshes the reader wouldn't read back as they are, and meshes in places where the writer doesn't +/// write them as meshes, are written as their drawn look, with a warning: a point in a Lab color; +/// more than 128 rows (129); more than 128 columns (129); a mesh whose points all lie in one place +/// (the reader takes its rows for columns); a folded mesh, whose patches turn different ways; a +/// patch folded at one corner, by a point dragged across it or by handles that cross; a mesh +/// in art cut to a clipping object; and a mesh on a large canvas. The drawn look reads back as +/// filled paths in more than one color covering the mesh's box, and no mesh. +#[test] +fn meshes_the_reader_cant_read_are_written_as_their_drawn_look() { + let r = Rect::new(20.0, 20.0, 120.0, 120.0); + let mut cases: Vec<(&str, Document)> = vec![ + ( + "Lab point", + mesh_document(|doc| { + let mut m = grid_mesh(r, 1, 1, |_, _| Color::rgb(0.2, 0.4, 0.6)); + m.points[3].color = MINT; + mesh_node(doc, m) + }), + ), + ( + "129 rows", + mesh_document(|doc| mesh_node(doc, grid_mesh(Rect::new(20.0, 20.0, 120.0, 300.0), 129, 1, |r, _| Color::gray(r as f32 / 129.0)))), + ), + ( + "129 columns", + mesh_document(|doc| mesh_node(doc, grid_mesh(Rect::new(20.0, 20.0, 300.0, 120.0), 1, 129, |_, c| Color::gray(c as f32 / 129.0)))), + ), + ( + "folded", + mesh_document(|doc| { + let mut m = grid_mesh(r, 1, 2, |_, c| Color::rgb(0.5 * c as f32, 0.0, 0.0)); + // The right column's points fold back over the left patch; the edges are straight. + for row in 0..2 { + m.points[row * 3 + 2].p = vectorcraft_geom::Point::new(40.0, m.points[row * 3 + 2].p.y); + } + for p in &mut m.points { + p.handles = [vectorcraft_geom::Vec2::ZERO; 4]; + } + mesh_node(doc, m) + }), + ), + ( + "folded at a corner", + mesh_document(|doc| { + let mut m = grid_mesh(r, 1, 1, |_, c| Color::rgb(0.5 * c as f32, 0.0, 0.0)); + // The bottom right point is dragged across the patch's diagonal; its top left corner + // still turns as before. + m.points[3].p = vectorcraft_geom::Point::new(30.0, 30.0); + for p in &mut m.points { + p.handles = [vectorcraft_geom::Vec2::ZERO; 4]; + } + mesh_node(doc, m) + }), + ), + ( + "handles crossed", + mesh_document(|doc| { + let mut m = grid_mesh(r, 1, 1, |_, c| Color::rgb(0.5 * c as f32, 0.0, 0.0)); + // The top left point's handles cross inside the patch: the one towards the point + // below leans right of the one towards the point beside it. The corners stay put. + for p in &mut m.points { + p.handles = [vectorcraft_geom::Vec2::ZERO; 4]; + } + m.points[0].handles[vectorcraft_doc::live::H_DOWN] = vectorcraft_geom::Vec2::new(30.0, 10.0); + m.points[0].handles[vectorcraft_doc::live::H_RIGHT] = vectorcraft_geom::Vec2::new(10.0, 30.0); + mesh_node(doc, m) + }), + ), + ( + "collapsed", + mesh_document(|doc| { + let mut m = grid_mesh(r, 2, 2, |r, c| Color::rgb(0.5 * r as f32, 0.5 * c as f32, 0.0)); + for p in &mut m.points { + (p.p, p.handles) = (vectorcraft_geom::Point::new(50.0, 50.0), [vectorcraft_geom::Vec2::ZERO; 4]); + } + mesh_node(doc, m) + }), + ), + ( + "art cut to a clipping object", + mesh_document(|doc| { + let square = Node::path(doc.alloc_id(), shapes::rectangle(Rect::new(20.0, 20.0, 80.0, 80.0)), Appearance::default()); + let clipper = Node::group(doc.alloc_id(), vec![Arc::new(square)]); + let m = mesh_node(doc, grid_mesh(r, 1, 1, |_, c| Color::rgb(c as f32, 0.0, 0.0))); + Node::new(doc.alloc_id(), NodeKind::Group { children: vec![Arc::new(clipper), Arc::new(m)], clip: true }) + }), + ), + ]; + let mut large = Document::new(20000.0, 400.0); + let layer = large.layers[0].id; + let m = mesh_node(&mut large, grid_mesh(Rect::new(1000.0, 20.0, 1600.0, 320.0), 2, 2, |r, c| Color::rgb(0.5 * r as f32, 0.5 * c as f32, 0.5))); + large.insert(Some(layer), usize::MAX, m).unwrap(); + cases.push(("large canvas", large)); + let mut failed = vec![]; + for (name, doc) in &cases { + let out = export_ai_editing(doc, &opts()).unwrap(); + let warned = out.warnings.iter().any(|w| w == writer::MESHES); + let written = String::from_utf8(out.program).unwrap(); + let back = read_back(doc); + let mut paths = vec![]; + filled_paths(&back.layers, &mut paths); + let mut want = mesh_of(&meshes_in(doc)[0]).bounds().unwrap(); + if *name == "art cut to a clipping object" { + // Its drawn look is cut to the clipping object. + want = want.intersect(Rect::new(20.0, 20.0, 80.0, 80.0)); + } + let got = paths.iter().fold(None, |acc: Option<Rect>, (b, _)| Some(acc.map_or(*b, |a| a.union(*b)))); + let colors = paths.iter().map(|(_, c)| format!("{c:?}")).collect::<std::collections::HashSet<_>>().len(); + // The collapsed mesh has no area to cover. + let covers = *name == "collapsed" + || got.is_some_and(|g| { + (g.x0 - want.x0).abs() < 0.5 && (g.y0 - want.y0).abs() < 0.5 && (g.x1 - want.x1).abs() < 0.5 && (g.y1 - want.y1).abs() < 0.5 + }); + if !(warned && !written.contains("/Mesh X!") && !holds_a_mesh(&back) && covers && (*name == "collapsed" || colors > 1)) { + failed.push(format!("{name}: warned {warned}, box {got:?} want {want:?}, {colors} colors")); + } + } + assert!(failed.is_empty(), "written as meshes, without a warning or not as their drawn look: {failed:#?}"); +} + +/// A reflected mesh, mirrored across or along, is written as a mesh with its columns in reverse +/// order, without a warning, and reads back as that mesh: each row's points from the last to the +/// first, with their handles to the right and left swapped. +#[test] +fn a_reflected_mesh_is_written_with_its_columns_reversed() { + use vectorcraft_doc::live::{H_LEFT, H_RIGHT}; + let r = Rect::new(20.0, 20.0, 120.0, 120.0); + for (name, mirror) in [("across", Affine::new([-1.0, 0.0, 0.0, 1.0, 140.0, 0.0])), ("along", Affine::new([1.0, 0.0, 0.0, -1.0, 0.0, 140.0]))] { + let mut m = grid_mesh(r, 2, 3, |r, c| Color::rgb(0.5 * r as f32, c as f32 / 3.0, 0.2)); + m.points[5].p += vectorcraft_geom::Vec2::new(4.0, -3.0); + m.points[5].opacity = 0.5; + m.transform(mirror); + let doc = mesh_document(|doc| mesh_node(doc, m.clone())); + let out = export_ai_editing(&doc, &opts()).unwrap(); + assert!(!out.warnings.iter().any(|w| w == writer::MESHES), "{name}: {:?}", out.warnings); + let back = meshes_in(&read_back(&doc)); + assert_eq!(back.len(), 1, "{name}: {back:#?}"); + let width = m.cols as usize + 1; + let mut want = m.clone(); + want.points = m + .points + .chunks(width) + .flat_map(|row| { + row.iter().rev().map(|p| { + let mut p = p.clone(); + p.handles.swap(H_RIGHT, H_LEFT); + p + }) + }) + .collect(); + assert_mesh_exact(mesh_of(&back[0]), &want, name); + // It draws the same mesh: each patch's points and opacity, sampled across it, are where they + // were, in the patch at the other end of its row with u running the other way. + let got = mesh_of(&back[0]); + let cols = m.cols as usize; + let steps = [0.0, 0.25, 0.5, 0.75, 1.0]; + for r in 0..m.rows as usize { + for c in 0..cols { + for (u, v) in steps.iter().flat_map(|u| steps.iter().map(move |v| (*u, *v))) { + let (a, b) = (m.eval(r, c, u, v), got.eval(r, cols - 1 - c, 1.0 - u, v)); + assert!((a - b).hypot() < 1e-3, "{name}: patch ({r}, {c}) at ({u}, {v}): {a:?} read back as {b:?}"); + let (oa, ob) = (m.color_at(r, c, u, v).1, got.color_at(r, cols - 1 - c, 1.0 - u, v).1); + assert!((oa - ob).abs() < 1e-3, "{name}: patch ({r}, {c}) at ({u}, {v}): opacity {oa} read back as {ob}"); + } + } + } + } +} + +/// Meshes in pattern tiles, a symbol's pattern tile among them, are written as their drawn look with +/// a warning: the tile reads back with filled paths and no mesh. +#[test] +fn meshes_in_pattern_tiles_are_written_as_their_drawn_look() { + let tile = |doc: &mut Document| { + let m = mesh_node(doc, grid_mesh(Rect::new(0.0, 0.0, 60.0, 40.0), 1, 1, |_, c| Color::rgb(0.5 * c as f32, 0.2, 0.5))); + doc.patterns.push(vectorcraft_doc::PatternDef { + tile: Rect::new(0.0, 0.0, 60.0, 40.0), + ..vectorcraft_doc::PatternDef::new("Patches", vec![Arc::new(m)]) + }); + Node::path( + doc.alloc_id(), + shapes::rectangle(Rect::new(20.0, 100.0, 180.0, 180.0)), + Appearance::basic(Paint::Pattern { pattern: "Patches".into(), xf: Affine::IDENTITY }, Paint::None, 0.0), + ) + }; + let on_layer = mesh_document(tile); + let in_symbol = mesh_document(|doc| { + let art = tile(doc); + doc.symbols.push(Symbol { dynamic: false, name: "Tiled".into(), art: Arc::new(art) }); + instance(doc, "Tiled", Affine::translate((20.0, 20.0))) + }); + for (name, doc) in [("on a layer", &on_layer), ("in a symbol", &in_symbol)] { + let out = export_ai_editing(doc, &opts()).unwrap(); + assert!(out.warnings.iter().any(|w| w == writer::MESHES), "{name}: {:?}", out.warnings); + let written = String::from_utf8(out.program).unwrap(); + assert!(!written.contains("/Mesh X!"), "{name}"); + // The reader doesn't read a symbol whose art has a pattern fill whole, whatever the tile + // holds: the drawn look is checked in the program there. + if name == "in a symbol" { + assert!(written.contains("%AI3_BeginPattern: (Patches)"), "{name}"); + continue; + } + let back = read_back(doc); + assert!(!holds_a_mesh(&back), "{name}"); + let tile = back.patterns.iter().find(|p| p.name == "Patches").unwrap(); + let mut paths = vec![]; + filled_paths(&tile.art, &mut paths); + assert!(!paths.is_empty(), "{name}: {:#?}", tile.art); + } +} + +/// Meshes in an opacity mask's art, a symbol's art, an opacity mask in a symbol's art, and a +/// symbol's art in a document of several artboards (which moves the canvas's center) are written +/// as meshes and come back as meshes. +#[test] +fn meshes_in_masks_and_symbols_are_read_back() { + let r = Rect::new(0.0, 0.0, 60.0, 40.0); + let colors = |r: usize, c: usize| Color::rgb(0.5 * c as f32, 0.2, 0.5 * r as f32); + let square_with = |doc: &mut Document, fill: Paint| { + Node::path(doc.alloc_id(), shapes::rectangle(Rect::new(20.0, 100.0, 180.0, 180.0)), Appearance::basic(fill, Paint::None, 0.0)) + }; + let mask_of = |n: &Node| n.extras().mask.as_ref().unwrap().art.clone(); + // Opacity mask. + let doc = mesh_document(|doc| { + let m = mesh_node(doc, grid_mesh(Rect::new(20.0, 100.0, 180.0, 180.0), 1, 2, colors)); + let mut n = square_with(doc, solid(Color::BLACK)); + n.extras_mut().mask = Some(Box::new(OpacityMask { art: Arc::new(m), clip: false, invert: false, disabled: false, linked: true })); + n + }); + assert!(!export_ai_editing(&doc, &opts()).unwrap().warnings.iter().any(|w| w == writer::MESHES)); + let back = read_back(&doc); + assert_mesh_exact(mesh_of(&mask_of(&back.layers[0].children().unwrap()[0])), mesh_of(&mask_of(&doc.layers[0].children().unwrap()[0])), "mask"); + // Symbol, on one artboard and with a second artboard far to the right and below. + for boards in [1, 2] { + let mut doc = mesh_document(|doc| { + let m = mesh_node(doc, grid_mesh(r, 2, 1, colors)); + doc.symbols.push(Symbol { dynamic: false, name: "Patch".into(), art: Arc::new(m) }); + instance(doc, "Patch", Affine::translate((20.0, 20.0))) + }); + if boards == 2 { + let id = doc.artboards[0].id + 1; + doc.artboards.push(Artboard { id, rect: Rect::new(3000.0, 2000.0, 3400.0, 2600.0), ..doc.artboards[0].clone() }); + } + assert!(!export_ai_editing(&doc, &opts()).unwrap().warnings.iter().any(|w| w == writer::MESHES)); + let back = read_back(&doc); + let sym = back.symbols.iter().find(|s| s.name == "Patch").unwrap(); + assert_mesh_exact(mesh_of(&sym.art), mesh_of(&doc.symbols[0].art), &format!("symbol, {boards} artboards")); + } + // An opacity mask in a symbol's art. + let doc = mesh_document(|doc| { + let m = mesh_node(doc, grid_mesh(r, 1, 2, colors)); + let mut n = square_with(doc, solid(Color::BLACK)); + n.extras_mut().mask = Some(Box::new(OpacityMask { art: Arc::new(m), clip: false, invert: false, disabled: false, linked: true })); + doc.symbols.push(Symbol { dynamic: false, name: "Masked".into(), art: Arc::new(n) }); + instance(doc, "Masked", Affine::translate((20.0, 20.0))) + }); + assert!(!export_ai_editing(&doc, &opts()).unwrap().warnings.iter().any(|w| w == writer::MESHES)); + let back = read_back(&doc); + let sym = back.symbols.iter().find(|s| s.name == "Masked").unwrap(); + assert_mesh_exact(mesh_of(&mask_of(&sym.art)), mesh_of(&mask_of(&doc.symbols[0].art)), "mask in a symbol"); +} + +/// In a symbol's art a mesh's corners are written about the canvas point of art space's origin, y +/// up, as an image's matrix there is (the template box's center is the canvas's). +#[test] +fn a_mesh_in_a_symbol_is_written_about_the_canvas_point_of_the_origin() { + let doc = mesh_document(|doc| { + let m = mesh_node(doc, grid_mesh(Rect::new(0.0, 0.0, 60.0, 40.0), 2, 1, |r, c| Color::rgb(0.5 * c as f32, 0.2, 0.5 * r as f32))); + doc.symbols.push(Symbol { dynamic: false, name: "Patch".into(), art: Arc::new(m) }); + instance(doc, "Patch", Affine::translate((20.0, 20.0))) + }); + let p = program(&doc); + let t: Vec<f64> = p.lines().find_map(|l| l.strip_prefix("%AI3_TemplateBox: ")).unwrap().split(' ').map(|v| v.parse().unwrap()).collect(); + let (ox, oy) = (f64::from(CANVAS_SIZE) / 2.0 - t[0], f64::from(CANVAS_SIZE) / 2.0 + t[1]); + let def = &p[p.find("%AI14_BeginSymbol\n(Patch)\n").unwrap()..]; + let first = def.lines().find(|l| l.ends_with(" /N X#")).unwrap(); + // The top left point, at 0 0: its handle down a third of the way to the next row, its handle + // to the right a third of the way to the next column. + let want = format!( + "%_[0 0.2 0 1 {} {} {} {} 1 {} {} 1] /N X#", + ps::num(-ox), + ps::num(oy), + ps::num(-ox), + ps::num(oy - 20.0 / 3.0), + ps::num(20.0 - ox), + ps::num(oy) + ); + assert_eq!(first, want); +} + +/// A mesh eight levels down in art written in place of symbol instances (where deeper art is left +/// out) is written as a mesh: it holds no objects of its own. A folded one there is written as its +/// drawn look, whose paths hold nothing either. +#[test] +fn a_mesh_eight_levels_down_is_written_as_a_mesh() { + let nested = |fold: bool| { + mesh_document(|doc| { + let mut m = grid_mesh(Rect::new(0.0, 0.0, 60.0, 40.0), 1, 2, |_, c| Color::rgb(0.5 * c as f32, 0.0, 0.0)); + if fold { + // The right column's points fold back over the left patch. + for row in 0..2 { + m.points[row * 3 + 2].p.x = 10.0; + } + } + let m = mesh_node(doc, m); + doc.symbols.push(Symbol { dynamic: false, name: "S0".into(), art: Arc::new(m) }); + for i in 1..8 { + let mut inner = instance(doc, &format!("S{}", i - 1), Affine::IDENTITY); + inner.isolate = true; + doc.symbols.push(Symbol { dynamic: false, name: format!("S{i}"), art: Arc::new(inner) }); + } + let mut top = instance(doc, "S7", Affine::translate((20.0, 20.0))); + top.isolate = true; + top + }) + }; + let folded = nested(true); + let out = export_ai_editing(&folded, &opts()).unwrap(); + assert!(out.warnings.iter().any(|w| w == writer::MESHES), "{:?}", out.warnings); + let back = read_back(&folded); + let mut paths = vec![]; + filled_paths(&back.layers, &mut paths); + assert!(!holds_a_mesh(&back) && paths.len() > 1, "{:#?}", back.layers); + let doc = nested(false); + let out = export_ai_editing(&doc, &opts()).unwrap(); + assert!(!out.warnings.iter().any(|w| w == writer::MESHES), "{:?}", out.warnings); + assert!(mesh_layer_lines(std::str::from_utf8(&out.program).unwrap()).contains(&"/Mesh X!")); + let back = meshes_in(&read_back(&doc)); + let mut want = mesh_of(&doc.symbols[0].art).clone(); + want.transform(Affine::translate((20.0, 20.0))); + assert_eq!(back.len(), 1, "{back:#?}"); + assert_mesh_exact(mesh_of(&back[0]), &want, "eight levels down"); +} diff --git a/crates/eps/src/ai_editing/writer.rs b/crates/eps/src/ai_editing/writer.rs index 38f5b0fe64..f268bcbaf6 100644 --- a/crates/eps/src/ai_editing/writer.rs +++ b/crates/eps/src/ai_editing/writer.rs @@ -15,19 +15,26 @@ use vectorcraft_pathops::BoolOp; use crate::ai_ops::{self, unit}; use crate::ps; +mod blends; mod brushes; mod envelopes; mod images; +mod meshes; mod paints; mod styles; mod symbols; mod texts; mod variables; +#[cfg(test)] +pub(super) use blends::BLENDS; +pub(super) use blends::unbaked_blends; #[cfg(test)] pub(super) use brushes::BRUSHES; #[cfg(test)] pub(super) use envelopes::ENVELOPES; +#[cfg(test)] +pub(super) use meshes::MESHES; pub(super) use styles::{LARGE_CANVAS_STYLES, style_links, styled_definitions, styled_objects}; #[cfg(test)] pub(super) use styles::{PANEL_EMPTY, PANEL_STYLES, STYLE_LINKS, WARPED_IMAGES, same_appearance}; @@ -58,7 +65,7 @@ pub(super) const PATTERN_TILES: &str = "pattern fills with more tiles than a fil pub(super) const CLIPPING: &str = "clipping groups and clipping layers whose clipping object isn't a path, and the clipping groups inside them, are written as their art cut to that object in the editing data for other apps"; pub(super) const CLIP_PAINT: &str = "the fills and strokes of clipping paths that a plain fill and line can't draw are written as paths of their own inside the clipping (fills under the clipped art, strokes over it) in the editing data for other apps"; pub(super) const CLIP_PAINT_MASKS: &str = "the opacity masks of clipping paths whose fills and strokes are written as paths of their own stay on the clipping path, not on those paths, in the editing data for other apps"; -pub(super) const LIVE: &str = "blends, meshes, repeats, placed documents and intertwines are written as their art in the editing data for other apps"; +pub(super) const LIVE: &str = "repeats, placed documents and intertwines are written as their art in the editing data for other apps"; pub(super) const GRAPHS: &str = "graphs are written as their art, without their data or settings, in the editing data for other apps"; pub(super) const STROKES: &str = "strokes a plain line can't draw (inside or outside the path, variable width, dots, dashes fitted to corners, gradients, patterns, arrowheads) are written as filled outlines, and brushed strokes as their brush's art, in the editing data for other apps"; pub(super) const ITEM_TRANSPARENCY: &str = @@ -304,6 +311,9 @@ pub(super) struct Writer<'a> { brush_set: brushes::Brushes, /// Brushes may be written; false on a large canvas, where they are left out. pub(super) brushes_live: bool, + /// Gradient meshes may be written as meshes; false on a large canvas, where they are written as + /// their drawn look. + pub(super) meshes_live: bool, /// The object just written is an envelope's distorted art, which the plugin's `XP` follows /// ([`Self::envelope`]). deform: bool, @@ -328,6 +338,14 @@ pub(super) struct Writer<'a> { series_tag: Option<String>, /// Where the `Go` lines of the graph being written start in [`Self::body`]. graph_tags: Vec<usize>, + /// Blends may be written live; false on a large canvas, where they are written as their steps. + pub(super) blends_live: bool, + /// How many more objects the reader's blends may lay out ([`crate::import::BLEND_BUDGET`]). + blend_budget: usize, + /// The entries naming a blend's key object in its dictionary, and the key's id. + blend_role: Option<(NodeId, String)>, + /// The blends baking left as they are ([`blends::unbaked_blends`]); only these are written live. + pub(super) unbaked_blends: HashSet<NodeId>, } impl<'a> Writer<'a> { @@ -395,6 +413,7 @@ impl<'a> Writer<'a> { wrap_moved: false, brush_set: brushes::Brushes::default(), brushes_live: true, + meshes_live: true, deform: false, checks_left: crate::import::ENVELOPE_CHECKS, objects: 0, @@ -410,6 +429,10 @@ impl<'a> Writer<'a> { in_graph: false, series_tag: None, graph_tags: vec![], + blends_live: true, + blend_budget: crate::import::BLEND_BUDGET, + blend_role: None, + unbaked_blends: HashSet::new(), } } @@ -723,6 +746,11 @@ impl<'a> Writer<'a> { return self.styled_object(n, &orig, &name); } self.effects(n); + // A gradient mesh the reader reads as it is; else it is written as its drawn look. + let mut mesh = match &n.kind { + NodeKind::Mesh(m) => self.mesh_record(m), + _ => None, + }; self.state(n.locked, !n.visible); let mut xy = Xy::of(n); if masked_warp_pieces(n) { @@ -738,6 +766,11 @@ impl<'a> Writer<'a> { let charged = self.charges(); match &n.kind { NodeKind::Layer { .. } => {} + NodeKind::Mesh(_) if mesh.is_some() => { + if let Some(record) = mesh.take() { + self.write_mesh(&record, xy); + } + } NodeKind::Group { children, clip: true } => self.clip_group(children, xy), NodeKind::Group { children, clip: false } => { if self.open_group("u") { @@ -840,7 +873,10 @@ impl<'a> Writer<'a> { } NodeKind::Envelope { .. } if self.envelope(n, xy) => {} NodeKind::Envelope { .. } => self.drawn_art(n, xy, Some(envelopes::ENVELOPES), true), - NodeKind::Blend { .. } | NodeKind::Mesh(_) | NodeKind::Repeat(_) | NodeKind::PlacedDocument(_) | NodeKind::Intertwine { .. } => { + NodeKind::Mesh(_) => self.drawn_art(n, xy, Some(meshes::MESHES), true), + NodeKind::Blend { .. } if self.blend(n, xy) => {} + NodeKind::Blend { .. } => self.drawn_art(n, xy, Some(blends::BLENDS), true), + NodeKind::Repeat(_) | NodeKind::PlacedDocument(_) | NodeKind::Intertwine { .. } => { self.drawn_art(n, xy, Some(LIVE), true); } // Ruler guides are kept in the document's native copy only. @@ -919,7 +955,8 @@ impl<'a> Writer<'a> { self.warn(w); } let moved = bounds && self.wrap_on_bounds(n, state); - if self.nest < MAX_NEST { + // A gradient mesh's drawn look is paths, which hold nothing: it is written at any depth. + if self.nest < MAX_NEST || matches!(n.kind, NodeKind::Mesh(_)) { let g = vectorcraft_effects::expand_live_deep(Some(self.doc), n); self.nest += 1; self.drawn += 1; @@ -955,9 +992,10 @@ impl<'a> Writer<'a> { /// `n`'s `/ArtDictionary`, after it, when it has a name (`AI10_ArtUID`, see [`Self::take_id`]), /// is bound to variables ([`Self::bound_variables`]; without a name, it gets an XML id and an /// empty `AIArtName`), has text wrap options ([`Self::text_wrap`]), has an opacity mask - /// (`AI9_Mask`, see [`Self::mask`]), or is a symbol's art (its symbol's entries first, see - /// [`Self::define_symbol`]). False when `n` has an opacity mask that is left out: nested too - /// deep, or its art doesn't fit. + /// (`AI9_Mask`, see [`Self::mask`]), is a symbol's art (its symbol's entries first, see + /// [`Self::define_symbol`]), or is a blend's key object (its part and id after the name, see + /// [`blends`]). False when `n` has an opacity mask that is left out: nested too deep, or its art + /// doesn't fit. fn dictionary(&mut self, n: &Node) -> bool { let name = n.name.as_deref().filter(|s| !s.is_empty()); let moved = std::mem::take(&mut self.wrap_moved); @@ -977,7 +1015,11 @@ impl<'a> Writer<'a> { Some((id, _)) if *id == n.id => self.root_entries.take().map(|(_, e)| e), _ => None, }; - if name.is_none() && mask.is_none() && bound.is_empty() && entries.is_none() && wrap.is_none() { + let role = match &self.blend_role { + Some((id, _)) if *id == n.id => self.blend_role.take().map(|(_, e)| e), + _ => None, + }; + if name.is_none() && mask.is_none() && bound.is_empty() && entries.is_none() && wrap.is_none() && role.is_none() { return mask_written; } let start = self.body.len(); @@ -998,6 +1040,10 @@ impl<'a> Writer<'a> { self.bound.push((n.id, id, bound)); } } + let has_role = role.is_some(); + if let Some(r) = role { + self.body.push_str(&r); + } if let Some(w) = wrap { self.text_wrap(w); } @@ -1005,7 +1051,7 @@ impl<'a> Writer<'a> { if let Some(m) = mask && !self.mask(m) { - if !has_id && !has_entries && wrap.is_none() { + if !has_id && !has_entries && wrap.is_none() && !has_role { self.body.truncate(start); return false; } @@ -1701,8 +1747,8 @@ impl<'a> Writer<'a> { self.plain_color(*color, stroke); } - /// A color that names no swatch: `g` (gray), `k` (CMYK), else `c m y k r g b Xa` (RGB in the - /// working RGB space, and Lab as display RGB), with its CMYK equivalent (an RGB color's from its + /// A color that names no swatch: `g` (gray), `k` (CMYK), else `c m y k r g b Xa` (RGB, and Lab + /// as RGB, in the working RGB space), with its CMYK equivalent (an RGB color's from its /// values as written, a Lab color's from its Lab values). fn plain_color(&mut self, color: Color, stroke: bool) { let s = &mut self.body; diff --git a/crates/eps/src/ai_editing/writer/blends.rs b/crates/eps/src/ai_editing/writer/blends.rs new file mode 100644 index 0000000000..b73749b214 --- /dev/null +++ b/crates/eps/src/ai_editing/writer/blends.rs @@ -0,0 +1,372 @@ +//! Blends: a live blend as the `.ai` reader reads one ([`crate::import`]'s `.ai` reader, `blend.rs` +//! and `read/containers.rs`' `end_blend`). +//! +//! The blend's own art on `%_` lines: `0 Ae`, a group of its key objects, each with an +//! `/ArtDictionary` naming it a key (`ShapeBlendPathType` `K`) and its id (`ShapeBlendPathID`, a +//! letter or digit), and its spine as an unpainted path named the spine (`S`), written only when the +//! blend has a spine of its own; then its steps drawn, a group on plain lines; then `0 Ae`, +//! the `XP` line of the blend plugin ([`BLEND_PLUGIN`], `1 0 n XP`) and the blend's record, `n` bytes +//! as hex on `%` lines; then the blend's name in an `/ArtDictionary` and its transparency, as a +//! group's after its end. The record +//! is `DCBA` and little-endian 32-bit words: 1, the spacing (0 Smooth Color, 1 Specified Steps, 2 +//! Specified Distance); 2, the distance as a float (Specified Steps: the spine's length shared out +//! between the steps; Smooth Color: 4); 4, the steps between the first two keys; 5, the orientation +//! (0 Align to Page, a float of 8 and the spine's starting angle in radians for Align to Path); 6, +//! the next free id (0 after the 62nd); 9, 1; 10, the number of keys; then six words a key: its id, +//! 0, the anchor of the spine it sits on as a float, two words of all ones, and the steps between +//! it and the key before it. The reader reads words 1, 2 (for Specified Distance), 5 (0, or 8 or +//! more), 10 and the keys' ids; the others are written as the record's form has them. +//! +//! Each blend is checked with the reader's own reading ([`crate::import::blend_reads`]) before it is +//! written: one the reader would read with other settings is written as its steps. + +use std::collections::HashSet; +use std::fmt::Write; +use std::sync::Arc; + +use vectorcraft_color::{BlendMode, Color, Paint}; +use vectorcraft_doc::blend::{blend_spine, blend_steps, blend_steps_settled, pin_spine}; +use vectorcraft_doc::live::{BlendOrientation, BlendSpacing, BlendSpec}; +use vectorcraft_doc::{AppearanceItem, Document, Node, NodeId, NodeKind, StrokeLayer}; +use vectorcraft_geom::{FillRule, PathData}; + +use super::{MAX_NEST, Writer, Xy, hide}; +use crate::import::{BLEND_PLUGIN, MAX_BLEND_KEYS, MAX_BLEND_OBJECTS, blend_reads}; + +pub(in crate::ai_editing) const BLENDS: &str = "blends with easing, a color shift or start points of their own, blends with effects, an appearance or an opacity mask of their own, blends of objects other than paths, compound paths and groups, of clipping groups, of more than 62 key objects, of hidden key objects, of key objects that hold a blend, of key objects with geometry or Pathfinder effects or a group's own fills and strokes, or of key objects the editing copy would change (empty paths or subpaths, paths and compound path members of several subpaths, several fills or strokes, strokes a plain line can't draw, dashes of more than 64 lengths, hidden fills or strokes, fills or strokes other than a color, in a Lab color or with transparency or effects of their own, effects or opacity masks), blends where one key object has a fill or stroke of no paint or a stroke of no width and another has one that draws, blends inside objects with geometry or Pathfinder effects or a group's own fills and strokes, blends whose spine has more than one part, blends whose step count is close to where rounding changes it, blends that would open with other settings or not as they are drawn, blends in opacity masks, pattern tiles, symbols and art cut to a clipping object or nested eight levels deep in art written in place of other objects (symbol instances, live objects, brushed strokes), blends whose art would pass the most objects the reader reads, and every blend on a large canvas are written as their steps in the editing data for other apps"; + +/// How far (pt) the lengths a blend counts its steps from may move when written (coordinates are +/// written to 4 decimals and read back through art space) without changing a count. +const SETTLE_LENGTH: f64 = 0.01; +/// How far (pt) each segment of a spine may add to [`SETTLE_LENGTH`]: rounding moves each of its +/// points by up to 0.00005 √2 pt, which moves the segment's length by up to six times that. +const SETTLE_SEGMENT: f64 = 5e-4; +/// How far a key's color (each channel, 0 to 1) may move when written without changing a Smooth +/// Color count. +const SETTLE_COLOR: f64 = 0.001; + +/// The most dash lengths the reader reads; a stroke with more opens solid. +const MAX_DASH_LENGTHS: usize = 64; + +/// The ids the keys take, in their order (letters and digits, as the reader reads them). +const IDS: &[u8] = b"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"; + +/// Hex digits on one `%` line of a record. +const HEX_LINE: usize = 60; + +/// A blend to write live. +pub(super) struct LiveBlend { + keys: Vec<Arc<Node>>, + ids: Vec<String>, + /// Its spine part; `None`: the blend has no spine of its own. + spine: Option<PathData>, + record: Vec<u8>, + steps: Vec<Arc<Node>>, +} + +impl Writer<'_> { + /// Blend `n` as the reader reads it live, or `None` when it would read other settings or none + /// (the blend is then written as its steps). + pub(super) fn live_blend(&mut self, n: &Node) -> Option<LiveBlend> { + let NodeKind::Blend { children: keys, spec } = &n.kind else { return None }; + // Hidden lines (pattern tiles, opacity masks), symbols' definitions and art cut to a + // clipping object aren't read as live blends. (No blend is drawn in a look: styled objects + // hold only paths, compound paths and groups of them.) + if !self.blends_live || self.hidden > 0 || self.in_symbol || self.clip.is_some() || self.nest >= MAX_NEST { + return None; + } + // Baking changes its keys, or the art it sits in ([`unbaked_blends`]). + if !self.unbaked_blends.contains(&n.id) { + return None; + } + if !spec.ease.is_default() || spec.color_shift != 0.0 || !spec.starts.is_empty() { + return None; + } + let own = &n.appearance; + if !own.items.is_empty() || !own.effects.is_empty() || n.extras().mask.is_some() { + return None; + } + // The reader shows every key object it reads. + if keys.len() < 2 || keys.len() > IDS.len().min(MAX_BLEND_KEYS) || !keys.iter().all(|k| k.visible && plain_key(k)) { + return None; + } + // A fill or stroke the editing copy leaves out is read back as none at all, and the steps + // blend from it to another key's otherwise. + if left_out_against_drawn(keys) { + return None; + } + // The spine written: a replaced spine (no key anchors) with an anchor where each key sits, a + // spine edited on the canvas with its keys' anchors moved onto them. + let spec: &BlendSpec = spec; + // The blend lays out along the spine's first subpath, and only that part is written: a + // spine of more parts would open without the others. + if spec.spine.as_ref().is_some_and(|s| s.subpaths.len() > 1) { + return None; + } + let written = match &spec.spine { + None => BlendSpec { key_anchors: vec![], ..spec.clone() }, + Some(_) if spec.key_anchors.is_empty() => { + let (path, anchors) = pin_spine(keys, spec)?; + let anchors = anchors.into_iter().map(u32::try_from).collect::<Result<Vec<u32>, _>>().ok()?; + BlendSpec { spine: Some(path), key_anchors: anchors, ..spec.clone() } + } + Some(_) => BlendSpec { spine: Some(blend_spine(keys, spec)?.0), ..spec.clone() }, + }; + // The record holds Specified Distance as a 32-bit float, which the reader reads back as its + // shortest decimal (10 mm comes back as 28.346457 pt): the blend is compared with that + // distance, and kept live only when it lays out as many steps with it. + let written = match written.spacing { + BlendSpacing::Distance(d) => { + let read: f64 = (d as f32).to_string().parse().ok().filter(|r: &f64| r.is_finite() && *r > 0.0)?; + let stored = BlendSpec { spacing: BlendSpacing::Distance(read), ..written.clone() }; + if blend_steps(keys, &stored) != blend_steps(keys, &written) { + return None; + } + stored + } + _ => written, + }; + // As many objects as the reader lays out for one blend, twice within what its budget has left, + // counted before the steps are drawn. + let objects = blend_steps(keys, &written).into_iter().fold(keys.len(), usize::saturating_add); + if objects > MAX_BLEND_OBJECTS || objects.saturating_mul(2) > self.blend_budget { + return None; + } + // The reader counts the steps from the keys as written, rounded: a count that rounding can + // change may come back other than drawn. Specified Distance counts from the spine's length, + // and every segment of the spine adds to how far that may move. + let segments = written.spine.as_ref().and_then(|s| s.subpaths.first()).map_or(0, |s| s.segment_count()); + let settle = match written.spacing { + BlendSpacing::Distance(_) => SETTLE_LENGTH + segments as f64 * SETTLE_SEGMENT, + _ => SETTLE_LENGTH, + }; + if !blend_steps_settled(keys, &written, settle, SETTLE_COLOR) { + return None; + } + let ids: Vec<String> = IDS.iter().take(keys.len()).map(|c| char::from(*c).to_string()).collect(); + let record = self.record(keys, &written)?; + let steps: Vec<Arc<Node>> = vectorcraft_effects::expand_live_deep(Some(self.doc), n).children().cloned().unwrap_or_default(); + let drawn: Vec<Node> = steps.iter().map(|s| (**s).clone()).collect(); + // The spine part as written: the first subpath of the spine laid out. + let part = written.spine.as_ref().and_then(|s| s.subpaths.first()).map(|sp| PathData::single(sp.clone())); + let mut budget = self.blend_budget; + let read = blend_reads(keys, &ids, part.as_ref(), &record, &drawn, &mut budget)?; + if read != written { + return None; + } + self.blend_budget = budget; + Some(LiveBlend { keys: keys.clone(), ids, spine: part, record, steps }) + } + + /// The record of a blend of `keys` with the settings `spec` (its spine as written). + fn record(&self, keys: &[Arc<Node>], spec: &BlendSpec) -> Option<Vec<u8>> { + let (spine, anchors) = blend_spine(keys, spec)?; + let steps = blend_steps(keys, spec); + let first = u32::try_from(*steps.first()?).ok()?; + let (spacing, value) = match spec.spacing { + BlendSpacing::SmoothColor => (0, 4.0), + BlendSpacing::Steps(n) => (1, spine.length() / (f64::from(n) + 1.0)), + BlendSpacing::Distance(d) => (2, d), + }; + let orientation = match spec.orientation { + BlendOrientation::AlignToPage => 0.0, + BlendOrientation::AlignToPath => 8.0 + self.starting_angle(&spine)?, + }; + let count = u32::try_from(keys.len()).ok()?; + let next = IDS.get(keys.len()).copied().map_or(0, u32::from); + let mut words: Vec<u32> = vec![u32::from_le_bytes(*b"DCBA"), spacing, (value as f32).to_bits(), 0, first, (orientation as f32).to_bits()]; + words.extend([next, 0, 0, 1, count]); + for (i, id) in IDS.iter().take(keys.len()).enumerate() { + let anchor = anchors.as_ref().and_then(|a| a.get(i)).copied().unwrap_or(i); + let before = i.checked_sub(1).and_then(|j| steps.get(j)).copied().unwrap_or(0); + words.extend([u32::from(*id), 0, (anchor as f32).to_bits(), u32::MAX, u32::MAX, u32::try_from(before).ok()?]); + } + Some(words.iter().flat_map(|w| w.to_le_bytes()).collect()) + } + + /// The angle in art space (radians, from 0 to 2π) at which `spine` starts. + fn starting_angle(&self, spine: &PathData) -> Option<f64> { + let sp = spine.subpaths.first()?; + let first = sp.anchors.first()?; + let towards = if (first.h_out - first.p).hypot() > 1e-9 { first.h_out } else { sp.anchors.get(1)?.p }; + let (a, b) = (self.to_art * first.p, self.to_art * towards); + let angle = (b.y - a.y).atan2(b.x - a.x); + Some(if angle < 0.0 { angle + std::f64::consts::TAU } else { angle }) + } + + /// Blend `n`, of transparency `xy`, written live ([`Self::live_blend`]): its own art on `%_` + /// lines, its steps and its record, then the state block of its transparency, before which the + /// object's dictionary (its name, text wrap options and variables) goes. False, writing + /// nothing, when it is written as its steps: the reader would read it otherwise, or art in it + /// would be left out at the object limit ([`Self::take_objects`]). + pub(super) fn blend(&mut self, n: &Node, xy: Xy) -> bool { + let budget = self.blend_budget; + let Some(b) = self.live_blend(n) else { return false }; + let start = self.body.len(); + let (state, gs, charges, bound, warnings) = (self.state, self.gs, self.charges(), self.bound.len(), self.warnings.len()); + let outer = std::mem::take(&mut self.body); + self.hidden += 1; + self.line("0 Ae"); + let opened = self.open_group("u"); + if opened { + for (k, id) in b.keys.iter().zip(&b.ids) { + self.blend_role = Some((k.id, format!("%_(K) /String (ShapeBlendPathType) ,\n%_({id}) /String (ShapeBlendPathID) ,\n"))); + self.node(k); + self.blend_role = None; + } + if let Some(spine) = &b.spine { + self.plain_object(spine, FillRule::NonZero, None, None, Xy::OPAQUE); + self.body.push_str("%_/ArtDictionary :\n%_(S) /String (ShapeBlendPathType) ,\n%_;\n%_\n"); + } + self.line("U"); + self.line("9 () XW"); + } + self.hidden -= 1; + let part = std::mem::replace(&mut self.body, outer); + hide(&part, &mut self.body); + // Readers of the printed form skip the hidden lines: the steps set their own state. + (self.state, self.gs) = (None, None); + self.state(n.locked, !n.visible); + let steps = self.open_group("u"); + if steps { + // The steps are drawn art: copies of the keys carry no text wrap options of their own. + self.nest += 1; + self.drawn += 1; + for s in &b.steps { + self.node(s); + } + self.drawn -= 1; + self.nest -= 1; + self.state(n.locked, !n.visible); + self.line("U"); + self.line("9 () XW"); + } + if !opened || !steps || self.left_out_since(charges) { + let lines = self.body.split_off(start); + self.give_back(charges, &lines); + self.bound.truncate(bound); + // The warnings of art written as its steps again are those steps'. + if !self.left_out_since(charges) { + self.warnings.truncate(warnings); + } + (self.state, self.gs, self.block_end, self.blend_budget) = (state, gs, usize::MAX, budget); + return false; + } + self.line("0 Ae"); + let hex: String = b.record.iter().map(|x| format!("{x:02X}")).collect(); + let _ = writeln!(self.body, "({BLEND_PLUGIN}) 1 0 {} XP", b.record.len()); + for chunk in hex.as_bytes().chunks(HEX_LINE) { + self.body.push('%'); + self.body.push_str(&String::from_utf8_lossy(chunk)); + self.body.push('\n'); + } + // The blend's dictionary goes after the record and before this block ([`Self::node`]). + self.state_block(xy); + true + } +} + +/// The blends on `doc`'s layers that baking leaves as they are: blends with nothing in them that +/// [`vectorcraft_effects::needs_bake`] evaluates (geometry and Pathfinder effects, a group's own +/// fills and strokes), inside no object that has such things of its own. Baking changes the keys +/// of the others, so they are written as their steps. +pub(in crate::ai_editing) fn unbaked_blends(doc: &Document) -> HashSet<NodeId> { + fn walk(nodes: &[Arc<Node>], out: &mut HashSet<NodeId>) { + for n in nodes { + if matches!(n.kind, NodeKind::Blend { .. }) { + if !vectorcraft_effects::needs_bake(n) { + out.insert(n.id); + } + continue; + } + let Some(children) = n.children() else { continue }; + let mut own = (**n).clone(); + if let Some(c) = own.children_mut() { + c.clear(); + } + if !vectorcraft_effects::needs_bake(&own) { + walk(children, out); + } + } + } + let mut out = HashSet::new(); + walk(&doc.layers, &mut out); + out +} + +/// Does the reader read stroke `s`'s dashes back as they are (`read/ops.rs`' `d`): at most 64 +/// lengths, each finite and not negative, and a finite offset? It reads other dashes as a solid +/// line. +fn dash_read_back(s: &StrokeLayer) -> bool { + s.dash + .as_ref() + .is_none_or(|d| d.pattern.len() <= MAX_DASH_LENGTHS && d.pattern.iter().all(|v| v.is_finite() && *v >= 0.0) && d.offset.is_finite()) +} + +/// Do the keys hold a fill or stroke that the editing copy leaves out (a fill of no paint; a stroke +/// of no paint or of no width, as `visible_items` leaves them out) where another holds one of the +/// same kind that it writes? The steps blend the width, paint and settings of the one left out, and +/// the keys read back blend from no fill or stroke, so the steps would open otherwise. +fn left_out_against_drawn(keys: &[Arc<Node>]) -> bool { + // [fill, stroke]: is one left out somewhere, is one written somewhere. + let mut left_out = [false; 2]; + let mut drawn = [false; 2]; + for k in keys { + k.walk(&mut |n| { + for i in &n.appearance.items { + let (kind, out) = match i { + AppearanceItem::Fill(f) => (0, f.paint.is_none()), + AppearanceItem::Stroke(s) => (1, s.paint.is_none() || !(s.width > 0.0 && s.width.is_finite())), + }; + if out { + left_out[kind] = true; + } else { + drawn[kind] = true; + } + } + }); + } + (left_out[0] && drawn[0]) || (left_out[1] && drawn[1]) +} + +/// Can `k` be a key object written live, as the reader reads it back: paths, compound paths and +/// groups other than clipping groups (holding no blend), without effects or opacity masks, each with +/// at most one fill and one plain stroke over it (a line the data draws as it is), each fill and +/// stroke shown, in a color other than Lab or none, opaque in the normal blending mode? (A group's own fills and +/// strokes are baked into art of their own, and such blends aren't [`unbaked_blends`].) +fn plain_key(k: &Node) -> bool { + let mut plain = true; + k.walk(&mut |n| { + // A clipping group may be written as its art cut to the clipping object. + let kind = match &n.kind { + // The writer leaves out a path with nothing to draw and subpaths without anchors, and + // writes a path of several subpaths as a compound path. + NodeKind::Path { path, guide: false, .. } => matches!(path.subpaths.as_slice(), [one] if !one.anchors.is_empty()), + // A compound path is written as one path, and read back with a member for each + // subpath. + NodeKind::Compound { children, .. } => { + !children.is_empty() + && children.iter().all(|c| matches!(&c.kind, NodeKind::Path { path, guide: false, .. } if path.subpaths.len() == 1)) + } + NodeKind::Group { clip: false, .. } => true, + _ => false, + }; + let items = &n.appearance.items; + let fills = items.iter().filter(|i| matches!(i, AppearanceItem::Fill(_))).count(); + let strokes = items.iter().filter(|i| matches!(i, AppearanceItem::Stroke(_))).count(); + let order = !matches!(items.as_slice(), [AppearanceItem::Stroke(_), AppearanceItem::Fill(_)]); + let quiet = items.iter().all(|i| { + i.visible() + && matches!(i.paint(), Paint::Solid { .. } | Paint::None) + // A color that names no global or spot swatch is written in RGB, so a Lab color + // would come back as another. + && !matches!(i.paint(), Paint::Solid { color: Color::Lab { .. }, .. }) + && i.effects().is_empty() + && i.opacity() >= 1.0 + && i.blend() == BlendMode::Normal + && !matches!(i, AppearanceItem::Stroke(s) if !vectorcraft_effects::stroke::is_plain(s) || !dash_read_back(s)) + }); + plain &= kind && fills <= 1 && strokes <= 1 && order && quiet && n.appearance.effects.is_empty() && n.extras().mask.is_none(); + }); + plain +} diff --git a/crates/eps/src/ai_editing/writer/brushes.rs b/crates/eps/src/ai_editing/writer/brushes.rs index 029b37597f..986d60ef9c 100644 --- a/crates/eps/src/ai_editing/writer/brushes.rs +++ b/crates/eps/src/ai_editing/writer/brushes.rs @@ -23,7 +23,7 @@ use super::{Writer, Xy}; use crate::ai_ops; use crate::ps; -pub(in crate::ai_editing) const BRUSHES: &str = "Pattern and Bristle brushes, Art brushes that don't run their art from left to right, that overlap or whose width follows the pen, Scatter and Art brushes in Tints and Shades or Hue Shift, brushes whose art holds an empty path or group or more than paths, compound paths and groups with one solid fill and one plain stroke each, brushes whose names hold a slash or repeat an earlier brush's name, brushes that would open with other settings, brushes past the number or the amount of art one file's brushes can hold, and every brush on a large canvas are left out of the Brushes panel in the editing data for other apps"; +pub(in crate::ai_editing) const BRUSHES: &str = "Pattern and Bristle brushes, Art brushes that don't run their art from left to right, that overlap or whose width follows the pen, Scatter and Art brushes in Tints and Shades or Hue Shift, brushes whose art or its opacity masks' art holds an empty path or group or more than paths, compound paths and groups with one solid fill and one plain stroke each, or opacity masks on a compound path's members or more than seven deep in one another's art, brushes whose names hold a slash or repeat an earlier brush's name, brushes that would open with other settings, brushes past the number or the amount of art one file's brushes can hold, and every brush on a large canvas are left out of the Brushes panel in the editing data for other apps"; /// Most brushes written (the reader's limit). const MAX_BRUSHES: usize = 4096; @@ -213,17 +213,38 @@ fn art_params(a: &ArtBrush, art: &str) -> Option<String> { Some(format!("2 / {art}/ / / / / 0 0/ 5 0 0 0 / {}", nums6(&numbers))) } +/// Most opacity masks in one another's art in a brush's art: a brush's art section writes its art +/// one level inside, and masks at [`super::MAX_NEST`] levels are left out ([`super::DEEP_MASKS`]). +const MAX_MASK_NEST: u32 = super::MAX_NEST - 1; + /// Is `art` written as the reader reads it back, within a brush: paths and compound paths with /// points and groups with members (not clipping, without paint of their own), each opaque in the -/// normal blending mode, without effects or opacity masks, with at most one fill and one plain -/// stroke (no brush, width profile, arrowheads, alignment off the path or dashes fitted to corners) -/// over it, each in a color or none? A path without points isn't written ([`Writer::plain_object`]). +/// normal blending mode, without effects, with at most one fill and one plain stroke (no brush, +/// width profile, arrowheads, alignment off the path or dashes fitted to corners) over it, each in a +/// color or none, and opacity masks whose art is such art too, at most [`MAX_MASK_NEST`] deep and +/// none on a compound path's members? A path without points isn't written +/// ([`Writer::plain_object`]). fn plain_art(art: &Node) -> bool { + plain_within(art, MAX_MASK_NEST) +} + +/// Does no object of `art` have an opacity mask? +fn unmasked(art: &Node) -> bool { + let mut unmasked = true; + art.walk(&mut |n| unmasked &= n.extras().mask.is_none()); + unmasked +} + +/// [`plain_art`] with at most `masks` opacity masks in one another's art. +fn plain_within(art: &Node, masks: u32) -> bool { let mut plain = true; art.walk(&mut |n| { let kind = match &n.kind { NodeKind::Path { path, guide: false, clipping: false, .. } => path.subpaths.iter().any(|sp| !sp.anchors.is_empty()), - NodeKind::Compound { .. } => super::compound_path(n).subpaths.iter().any(|sp| !sp.anchors.is_empty()), + // A compound path is written as one path of its members' subpaths, without their masks. + NodeKind::Compound { children, .. } => { + children.iter().all(|c| unmasked(c)) && super::compound_path(n).subpaths.iter().any(|sp| !sp.anchors.is_empty()) + } NodeKind::Group { children, clip: false } => !children.is_empty(), _ => false, }; @@ -247,7 +268,7 @@ fn plain_art(art: &Node) -> bool { && order && quiet && n.appearance.effects.is_empty() - && n.extras().mask.is_none() + && n.extras().mask.as_deref().is_none_or(|m| masks > 0 && plain_within(&m.art, masks - 1)) && n.opacity >= 1.0 && n.blend == BlendMode::Normal; }); @@ -258,8 +279,13 @@ fn plain_art(art: &Node) -> bool { /// compound path with the subpaths of all its members as one path ([`super::compound_path`]), is /// written as one path when it has one subpath with points and as a compound path when it has more /// ([`Writer::plain_object`]); the reader reads that compound path as one path for each subpath, -/// each with the object's paint. +/// each with the object's paint. An opacity mask's art is written shown ([`Writer::mask`]). fn as_read(art: &mut Node) { + if let Some(m) = art.extras_if_any().and_then(|e| e.mask.as_mut()) { + let mask_art = Arc::make_mut(&mut m.art); + mask_art.visible = true; + as_read(mask_art); + } let (subpaths, rule) = match &art.kind { NodeKind::Path { path, rule, .. } => (path.subpaths.clone(), *rule), NodeKind::Compound { rule, .. } => (super::compound_path(art).subpaths, *rule), @@ -390,7 +416,7 @@ impl Writer<'_> { } let mut read = a.clone(); if *to_section == Affine::IDENTITY { - read.transform(Affine::FLIP_Y, false); + crate::import::turn_brush_art_over(&mut read); } as_read(&mut read); Some(read) @@ -427,6 +453,9 @@ impl Writer<'_> { // The art is the brush's own: not on `%_` lines, in a drawn look or in a symbol that // first uses the brush. (std::mem::take(&mut self.hidden), std::mem::take(&mut self.in_look), std::mem::take(&mut self.in_symbol)), + // The layers' objects written with art styles, by id: none of them is the brush's art, + // which may hold objects with the same ids. + std::mem::take(&mut self.styled), ); (self.to_art, self.grad_space, self.canvas, self.block_end) = (to_section, to_section, to_section, usize::MAX); self.state(false, false); @@ -462,6 +491,7 @@ impl Writer<'_> { (self.clip, self.shown), (self.block_start, self.block_end), (self.hidden, self.in_look, self.in_symbol), + self.styled, ) = saved; let text = std::mem::replace(&mut self.body, body); if !std::mem::replace(&mut self.warnings, warnings).is_empty() { diff --git a/crates/eps/src/ai_editing/writer/envelopes.rs b/crates/eps/src/ai_editing/writer/envelopes.rs index 8b4ebc880d..72966faf81 100644 --- a/crates/eps/src/ai_editing/writer/envelopes.rs +++ b/crates/eps/src/ai_editing/writer/envelopes.rs @@ -5,7 +5,8 @@ //! Contents (`AIDeformEditModeKey`), a warp's style, bend, distortions and orientation //! (`DeformStyle`, `DeformValue`, `DeformHoriz`, `DeformVert`, `Rotate`), with Distort Appearance //! the size of the box the contents map from (`AIDeformArtWidthKey`, `AIDeformArtHeightKey`), the -//! contents in an `X=` … `X+` block (while they are edited, the grid) as `AIDeformArtKey`, and the +//! contents in an `X=` … `X+` block (in a symbol's art, in the canvas's space with y down; while +//! they are edited, the grid) as `AIDeformArtKey`, and the //! kind (`AIDeformStyle`: 1 a warp, 2 a mesh, 3 a top object); then the distorted art on plain //! lines, and the plugin's `XP` after it. A top object's outline is the edge of the grid written //! for it, one grid edge to each segment of its sides, a side with fewer segments than the side @@ -401,7 +402,13 @@ impl Writer<'_> { if *editing { self.grid(record.grid.as_ref()); } else if self.open_group("u") { + // In a symbol's art, the contents in the dictionary are in the canvas's space, y down. + let to_art = self.to_art; + if self.in_symbol { + self.to_art = Affine::translate(self.canvas_origin) * to_art; + } self.contents(content, true); + self.to_art = to_art; self.end_group("U", Xy::PLAIN); } let block = std::mem::replace(&mut self.body, outer); @@ -448,15 +455,17 @@ impl Writer<'_> { /// An envelope's grid, when it has one, as a gray gradient mesh (`/Mesh X!` … `/End X!`): its /// size (`[cols rows] /Size`), then each patch's place (`[col row] /P`), its four corners /// (`/N`: gray, opacity, the point, the handle towards the next corner and a weight, the handle - /// towards the previous one and a weight, in art space), from its top left one down, across and - /// up, and `/E`. One object. + /// towards the previous one and a weight, in art space; in a symbol's art, in the space a + /// gradient mesh's corners are written in there), from its top left one down, across and up, + /// and `/E`. One object. fn grid(&mut self, grid: Option<&(usize, usize, Vec<GridPoint>)>) { let Some((rows, cols, pts)) = grid else { return }; if !self.take_objects(1) { return; } let (rows, cols, width) = (*rows, *cols, cols + 1); - let to_art = self.to_art; + // In a symbol's art, corners are written in the space a gradient mesh's are written in there. + let to_art = if self.in_symbol { self.instance_space } else { self.to_art }; let s = &mut self.body; let _ = writeln!(s, "/Mesh X!\n2 /Version X#\n/Cartesian /Type X#\n[{cols} {rows}] /Size X#\n/Data X#\n/DeviceGray /CS X#"); let num = |s: &mut String, v: f64| { diff --git a/crates/eps/src/ai_editing/writer/meshes.rs b/crates/eps/src/ai_editing/writer/meshes.rs new file mode 100644 index 0000000000..b0f3a8766c --- /dev/null +++ b/crates/eps/src/ai_editing/writer/meshes.rs @@ -0,0 +1,256 @@ +//! Gradient meshes: a mesh as the `.ai` reader reads one ([`crate::import`]'s `.ai` reader, +//! `mesh.rs` and `read/art.rs`' `end_mesh`). +//! +//! `/Mesh X!`, then on `%_` lines `value /key X#` entries: `2 /Version` (corners with an opacity), +//! `/Cartesian /Type`, `[rows cols] /Size`, `/Data` (the patches follow), and for each patch, row by +//! row, its place `[row col] /P`, the color space (`/DeviceGray`, +//! `/DeviceRGB` or `/DeviceCMYK`) with `/CS` where it changes, its four corners with `/N` and `/E`; +//! then `/End X!`. A corner is `[color… opacity x y nx ny 1 px py 1]` in art space (in a symbol's +//! art, in the canvas's space turned y up about art space's origin there, as an image's matrix in +//! it is): its color (gray as lightness), its opacity, the point, the +//! handle towards the next corner and the handle towards the one before it, each with a weight of 1. +//! The corners go from the patch's top left mesh point to the one below it, then to the right, then +//! up: the first index of `/P` runs along the first edge. The mesh's transparency is set before it +//! (`0 XR`, `Xy`), its name and opacity mask follow `/End X!` in an `/ArtDictionary`, then `0 0 Xd` +//! and `6 () XW`. +//! +//! Each record is read back with the reader's mesh reading ([`crate::import::mesh_reads`], the +//! patches and how they join; not the rest of the `.ai` reader) before it is written: a mesh it +//! would read otherwise is written as its drawn look, as are folded meshes (patches whose corners +//! turn different ways, along the handles there, or a corner with no angle), meshes in pattern +//! tiles and in art cut to a clipping object, and every mesh on a large canvas. A reflected mesh, +//! whose patches all turn the negative way, is written with its columns in reverse order: it draws +//! the same patches, and reads back with each row's points in reverse order. + +use std::fmt::Write; + +use vectorcraft_color::Color; +use vectorcraft_doc::live::{GradientMesh, H_DOWN, H_LEFT, H_RIGHT, H_UP, MeshPoint}; +use vectorcraft_geom::{Affine, Point, Vec2}; + +use super::{Writer, Xy}; +use crate::ai_ops::unit; +use crate::import::{MAX_MESH_SIDE, mesh_reads}; +use crate::ps; + +pub(in crate::ai_editing) const MESHES: &str = "gradient meshes with a point in a Lab color, with more than 128 rows or columns, folded meshes, meshes that would not open as they are drawn, meshes in pattern tiles and in art cut to a clipping object, and every gradient mesh on a large canvas are written as their drawn look in the editing data for other apps"; + +/// How far (in the document's units, at a scale of 1) a written point or handle's end may move: +/// coordinates are written to 4 decimals, which moves a point at most 0.00005 along each axis. +const SETTLE_POINT: f64 = 1e-4; +/// How far a written color channel or opacity may move: they are written to 4 decimals too. +const SETTLE_COLOR: f32 = 1e-4; + +/// The color space a corner's color is written in. +#[derive(Clone, Copy, PartialEq)] +enum Space { + Gray, + Rgb, + Cmyk, +} + +impl Space { + fn name(self) -> &'static str { + match self { + Space::Gray => "/DeviceGray", + Space::Rgb => "/DeviceRGB", + Space::Cmyk => "/DeviceCMYK", + } + } +} + +impl Writer<'_> { + /// Mesh `m`'s record as the reader reads it, or `None` when it would read it otherwise (the + /// mesh is then written as its drawn look). + pub(super) fn mesh_record(&self, m: &GradientMesh) -> Option<String> { + // Art cut to a clipping object is written cut, which a mesh can't be. Meshes in pattern + // tiles and on a large canvas are written as their drawn look too. (A mesh holds no objects, + // so it is written as a mesh however deep it is nested.) A grid the reader doesn't read as + // one mesh is left before its record is built. + if !self.meshes_live + || self.clip.is_some() + || !self.defining.is_empty() + || !m.is_valid() + || m.rows as usize > MAX_MESH_SIDE + || m.cols as usize > MAX_MESH_SIDE + { + return None; + } + // In a symbol's art, corners are written in the space an image's matrix is written in there. + let to_art = if self.in_symbol { self.instance_space } else { self.to_art }; + // Every patch turns the positive way where it is written: from its first corner, the second + // (below it) then the fourth (beside it) go anticlockwise, y up. A reflected mesh, whose + // patches all turn the other way, is written with its columns in reverse order, which turns + // each of them the positive way and draws the same mesh; any other mesh with a patch that + // doesn't turn the positive way is written as its drawn look. + let reversed; + let m = match turns(m, to_art)? { + true => m, + false => { + reversed = columns_reversed(m); + &reversed + } + }; + let (rows, cols) = (m.rows as usize, m.cols as usize); + let at = |r: usize, c: usize| m.points.get(r * (cols + 1) + c); + // Version 2: each corner has an opacity. + let mut s = String::from("/Mesh X!\n%_2 /Version X#\n%_/Cartesian /Type X#\n"); + let _ = writeln!(s, "%_[{rows} {cols}] /Size X#\n%_/Data X#"); + let mut space = None; + for r in 0..rows { + for c in 0..cols { + let _ = writeln!(s, "%_[{r} {c}] /P X#"); + // From the top left point down, right and up; each with its handles towards the + // next corner and the one before it. + for (p, next, prev) in + [(at(r, c)?, H_DOWN, H_RIGHT), (at(r + 1, c)?, H_RIGHT, H_UP), (at(r + 1, c + 1)?, H_UP, H_LEFT), (at(r, c + 1)?, H_LEFT, H_DOWN)] + { + corner(&mut s, &mut space, to_art, p, next, prev)?; + } + s.push_str("%_/E X#\n"); + } + } + s.push_str("/End X!\n"); + let read = mesh_reads(s.as_bytes(), to_art.inverse())?; + same_mesh(&read, m, SETTLE_POINT * to_art.inverse().determinant().abs().sqrt().max(1.0)).then_some(s) + } + + /// Mesh `n` written as `record`: its transparency before it (`xy`), the record, and the block + /// its name and opacity mask go before ([`Self::node`]). The mesh is one object + /// ([`Self::take_objects`]); nothing is written when there is no room for it. + pub(super) fn write_mesh(&mut self, record: &str, xy: Xy) { + if !self.take_objects(1) { + return; + } + self.set_object_xy(xy.object()); + self.body.push_str(record); + self.block_start = self.body.len(); + self.line("0 0 Xd\n6 () XW"); + self.block_end = self.body.len(); + } +} + +/// Which way every patch of `m` turns where `to_art` takes it, at each of its four corners, from +/// its top left point to the one below it, then right and up, y up: `Some(true)` when all turn +/// anticlockwise, `Some(false)` when all turn clockwise, and `None` when they differ (a patch +/// folded across itself, or patches folded over each other) or a corner has no angle. Each corner +/// is measured twice: along the straight lines to the next corners, and along its handles (towards +/// the next corners where a handle is zero), where the patch's edges leave it. +fn turns(m: &GradientMesh, to_art: Affine) -> Option<bool> { + let (rows, cols) = (m.rows as usize, m.cols as usize); + let at = |r: usize, c: usize| m.points.get(r * (cols + 1) + c); + let mut way = None; + for r in 0..rows { + for c in 0..cols { + // Each corner with the slots of its handles towards the next corner and the one before it. + let corners = + [(at(r, c)?, H_DOWN, H_RIGHT), (at(r + 1, c)?, H_RIGHT, H_UP), (at(r + 1, c + 1)?, H_UP, H_LEFT), (at(r, c + 1)?, H_LEFT, H_DOWN)]; + for i in 0..4 { + let (before, (here, next, prev), after) = (corners[(i + 3) % 4].0, corners[i], corners[(i + 1) % 4].0); + let line = |to: &MeshPoint| to_art * to.p - to_art * here.p; + let along = |h: usize, to: &MeshPoint| -> Option<Vec2> { + let h = *here.handles.get(h)?; + Some(if h == Vec2::ZERO { line(to) } else { to_art * (here.p + h) - to_art * here.p }) + }; + for cross in [line(after).cross(line(before)), along(next, after)?.cross(along(prev, before)?)] { + let positive = match cross { + x if x > 0.0 => true, + x if x < 0.0 => false, + _ => return None, + }; + if *way.get_or_insert(positive) != positive { + return None; + } + } + } + } + } + way +} + +/// `m` with its columns in reverse order: each row's points from the last to the first, each +/// point's handles to the right and left swapped. It draws the same mesh. +fn columns_reversed(m: &GradientMesh) -> GradientMesh { + let width = m.cols as usize + 1; + let points = m + .points + .chunks(width) + .flat_map(|row| { + row.iter().rev().map(|p| { + let mut p = p.clone(); + p.handles.swap(H_RIGHT, H_LEFT); + p + }) + }) + .collect(); + GradientMesh { rows: m.rows, cols: m.cols, points } +} + +/// A corner `p` of a patch: its color space when it changes (in `space`), then `[color… opacity x y +/// nx ny 1 px py 1] /N X#` with its handles `next` and `prev`, `to_art` taking the document to the +/// space the corners are written in. +fn corner(s: &mut String, space: &mut Option<Space>, to_art: Affine, p: &MeshPoint, next: usize, prev: usize) -> Option<()> { + let (sp, values): (Space, Vec<f32>) = match p.color { + // The format's gray is lightness. + Color::Gray { k } => (Space::Gray, vec![1.0 - unit(k)]), + Color::Rgb { r, g, b } => (Space::Rgb, vec![unit(r), unit(g), unit(b)]), + Color::Cmyk { c, m, y, k } => (Space::Cmyk, vec![unit(c), unit(m), unit(y), unit(k)]), + // The reader reads no Lab mesh colors. + Color::Lab { .. } => return None, + }; + if *space != Some(sp) { + let _ = writeln!(s, "%_{} /CS X#", sp.name()); + *space = Some(sp); + } + let art = |q: Point| to_art * q; + let (at, n, b) = (art(p.p), art(p.p + *p.handles.get(next)?), art(p.p + *p.handles.get(prev)?)); + s.push_str("%_["); + for v in values { + ps::push_num(s, f64::from(v)); + s.push(' '); + } + ps::push_num(s, f64::from(unit(p.opacity))); + for v in [at.x, at.y, n.x, n.y] { + s.push(' '); + ps::push_num(s, v); + } + s.push_str(" 1"); + for v in [b.x, b.y] { + s.push(' '); + ps::push_num(s, v); + } + s.push_str(" 1] /N X#\n"); + Some(()) +} + +/// Whether `read` is `m` as written: the same grid, each point within `tol` of its place, each +/// handle that points into the grid within `tol` (the reader gives the others none, and they draw +/// nothing), each color in the same model and within [`SETTLE_COLOR`] a channel, and each opacity +/// within it. +fn same_mesh(read: &GradientMesh, m: &GradientMesh, tol: f64) -> bool { + if (read.rows, read.cols) != (m.rows, m.cols) || read.points.len() != m.points.len() { + return false; + } + let (rows, cols) = (m.rows as usize, m.cols as usize); + let near = |a: Point, b: Point| (a - b).hypot() <= tol * (1.0 + 1e-9 * a.to_vec2().hypot()); + read.points.iter().zip(&m.points).enumerate().all(|(i, (a, b))| { + let (r, c) = (i / (cols + 1), i % (cols + 1)); + let inside = [c < cols, c > 0, r < rows, r > 0]; + let handles = [H_RIGHT, H_LEFT, H_DOWN, H_UP].iter().zip(inside).all(|(&h, inside)| { + !inside || near(a.p + a.handles.get(h).copied().unwrap_or(Vec2::ZERO), b.p + b.handles.get(h).copied().unwrap_or(Vec2::ZERO)) + }); + near(a.p, b.p) && handles && same_color(&a.color, &b.color) && (a.opacity - unit(b.opacity)).abs() <= SETTLE_COLOR + }) +} + +/// Whether `a` is `b` as written: the same model, each channel within [`SETTLE_COLOR`] of `b`'s +/// clamped to 0 to 1. +fn same_color(a: &Color, b: &Color) -> bool { + let close = |x: &[f32], y: &[f32]| x.iter().zip(y).all(|(x, y)| (x - unit(*y)).abs() <= SETTLE_COLOR); + match (a, b) { + (Color::Gray { k }, Color::Gray { k: k2 }) => close(&[*k], &[*k2]), + (Color::Rgb { r, g, b }, Color::Rgb { r: r2, g: g2, b: b2 }) => close(&[*r, *g, *b], &[*r2, *g2, *b2]), + (Color::Cmyk { c, m, y, k }, Color::Cmyk { c: c2, m: m2, y: y2, k: k2 }) => close(&[*c, *m, *y, *k], &[*c2, *m2, *y2, *k2]), + _ => false, + } +} diff --git a/crates/eps/src/ai_editing/writer/paints.rs b/crates/eps/src/ai_editing/writer/paints.rs index d9dc31a717..1d5651b596 100644 --- a/crates/eps/src/ai_editing/writer/paints.rs +++ b/crates/eps/src/ai_editing/writer/paints.rs @@ -417,8 +417,8 @@ impl Writer<'_> { /// A stop's color and its style: gray `lightness 0`, CMYK `c m y k 1`, RGB (and Lab, as RGB) /// `c m y k r g b 2` with its CMYK equivalent; a spot color its full color's CMYK equivalent, /// then its RGB values when it isn't CMYK, its name and how much lighter than the full color, - /// then `3` (CMYK), or `1 4` (RGB, and Lab as RGB). RGB values are an RGB color's own (in the - /// working RGB space) and a Lab color's display RGB ([`ai_ops::rgb_values`]). An RGB color's CMYK + /// then `3` (CMYK), or `1 4` (RGB, and Lab as RGB). RGB values are in the working RGB space: an + /// RGB color's own and a Lab color's converted ([`ai_ops::rgb_values`]). An RGB color's CMYK /// equivalent is converted from its values as written ([`ai_ops::as_written`]), a Lab color's /// from its Lab values, and a spot color's CMYK equivalent and RGB values both come from its full /// color as the palette writes it. diff --git a/crates/eps/src/ai_editing/writer/texts.rs b/crates/eps/src/ai_editing/writer/texts.rs index 506d13d9fc..e9d2dcf38c 100644 --- a/crates/eps/src/ai_editing/writer/texts.rs +++ b/crates/eps/src/ai_editing/writer/texts.rs @@ -28,7 +28,7 @@ use vectorcraft_doc::{ }; use vectorcraft_geom::{Affine, PathData, Point}; -use crate::ps; +use crate::{ai_ops, ps}; /// What the text document holds of type, and what it leaves out. pub(in crate::ai_editing) const TYPE_ATTRIBUTES: &str = "attributes of type other than its font, size, leading, tracking, baseline shift, horizontal and vertical scale, solid fill, solid stroke and its weight, cap, join and miter limit, capitals, small capitals at the document's size, Tate-chu-yoko, Standard Vertical Roman Alignment, Insert Aki, paragraph alignment, indents, space before and after, hyphenation on or off, right-to-left direction, Kinsoku set, Kinsoku Shori Type, Burasagari and Bunri-Kinshi (for example underline, kerning, OpenType features, swatch links of its colors, character and paragraph styles, tabs, lists, optical margin alignment, area type's inset spacing, vertical alignment and flow, a minimum first baseline with the Ascent first baseline, and type on a path's effect, alignment and spacing and an end bracket at the very end of an open path) are left out of the editing data for other apps"; @@ -176,11 +176,13 @@ fn set(resources: Vec<V>, display: bool) -> V { } /// A paint: kind 0 gray (`[alpha, lightness]`), 1 RGB, 2 CMYK, as the reader's `paint` reads them. +/// RGB values are an RGB color's own (in the working RGB space) and a Lab color's converted into +/// the working RGB space ([`ai_ops::rgb_values`]). fn paint(c: &Color) -> V { let (kind, values) = match *c { Color::Gray { k } => (0, vec![1.0 - f64::from(k.clamp(0.0, 1.0))]), Color::Cmyk { c, m, y, k } => (2, [c, m, y, k].iter().map(|v| f64::from(v.clamp(0.0, 1.0))).collect()), - Color::Rgb { .. } | Color::Lab { .. } => (1, c.to_rgb().iter().map(|v| f64::from(v.clamp(0.0, 1.0))).collect()), + Color::Rgb { .. } | Color::Lab { .. } => (1, ai_ops::rgb_values(*c).iter().map(|v| f64::from(*v)).collect()), }; let values: Vec<f64> = std::iter::once(1.0).chain(values).collect(); dict(vec![(99, V::Name("SimplePaint")), (0, dict(vec![(0, V::Int(kind)), (1, reals(&values))]))]) diff --git a/crates/eps/src/ai_ops.rs b/crates/eps/src/ai_ops.rs index aa819a77ad..d74932e74a 100644 --- a/crates/eps/src/ai_ops.rs +++ b/crates/eps/src/ai_ops.rs @@ -113,20 +113,23 @@ pub(crate) fn as_written(color: Color) -> Color { } } -/// The RGB values written for `color`, clamped to 0..1: an RGB color's own values (in the working -/// RGB space, as a reader reads them back), any other color's display RGB. +/// The RGB values written for `color`, clamped to 0..1, in the working RGB space, as a reader +/// reads them back: an RGB color's own values, any other color's display RGB converted into the +/// working RGB space. pub(crate) fn rgb_values(color: Color) -> [f32; 3] { match color { Color::Rgb { r, g, b } => [r, g, b].map(unit), - c => c.to_rgb().map(unit), + c => vectorcraft_color::cms::active().srgb_to_rgb(c.to_rgb()).map(unit), } } -/// The average colour of a gradient's stops (in RGB). +/// The average color of a gradient's stops: the average of their display RGB, as an RGB color in +/// the working RGB space. pub(crate) fn average(g: &Gradient) -> Color { let n = g.stops.len().max(1) as f32; let sum = g.stops.iter().map(|s| s.color.to_rgb()).fold([0.0f32; 3], |a, c| [a[0] + c[0], a[1] + c[1], a[2] + c[2]]); - Color::rgb(unit(sum[0] / n), unit(sum[1] / n), unit(sum[2] / n)) + let [r, green, b] = vectorcraft_color::cms::active().srgb_to_rgb(sum.map(|v| v / n)).map(unit); + Color::rgb(r, green, b) } /// The pixels an image's part keeps past the edge of the region that shows it, on each side: as diff --git a/crates/eps/src/import.rs b/crates/eps/src/import.rs index 259be45eac..0d451ec9da 100644 --- a/crates/eps/src/import.rs +++ b/crates/eps/src/import.rs @@ -90,9 +90,10 @@ pub use ai::NameEncoding; #[cfg(test)] pub(crate) use ai::objects_read; pub(crate) use ai::{ - BRUSH_MANAGER, BrushesRead, DEFORM_PLUGIN, EnvelopeGridPoint, MAX_CHECKED as ENVELOPE_CHECKS, MAX_EDITING_OBJECTS, MAX_GRADIENT_STOPS, - MAX_LISTED, MAX_LISTED_NAME, MAX_SYMBOLS, brush_plugin_name, brushes_kept, envelope_outline, envelope_upright, read_art_style, read_brush_object, - read_style_list, style_moves_with, symbol_art_member, warp_number, + BLEND_BUDGET, BLEND_PLUGIN, BRUSH_MANAGER, BrushesRead, DEFORM_PLUGIN, EnvelopeGridPoint, MAX_BLEND_KEYS, MAX_BLEND_OBJECTS, + MAX_CHECKED as ENVELOPE_CHECKS, MAX_EDITING_OBJECTS, MAX_GRADIENT_STOPS, MAX_LISTED, MAX_LISTED_NAME, MAX_MESH_SIDE, MAX_SYMBOLS, blend_reads, + brush_plugin_name, brushes_kept, envelope_outline, envelope_upright, mesh_reads, read_art_style, read_brush_object, read_style_list, + style_moves_with, symbol_art_member, turn_brush_art_over, warp_number, }; #[cfg(test)] pub(crate) use ai::{ENVELOPE_DRAWN, ENVELOPE_TYPE_DRAWN}; diff --git a/crates/eps/src/import/ai.rs b/crates/eps/src/import/ai.rs index 6676428408..78990f9db7 100644 --- a/crates/eps/src/import/ai.rs +++ b/crates/eps/src/import/ai.rs @@ -34,7 +34,10 @@ use std::io::Read as _; use super::lex::find; use crate::ps; -pub(crate) use brush::{BrushesRead, MANAGER_NAME as BRUSH_MANAGER, brushes_kept, plugin_name as brush_plugin_name, read_brush_object}; +pub(crate) use blend::{MAX_BLEND_OBJECTS, MAX_KEYS as MAX_BLEND_KEYS, PLUGIN as BLEND_PLUGIN, blend_reads}; +pub(crate) use brush::{ + BrushesRead, MANAGER_NAME as BRUSH_MANAGER, brushes_kept, plugin_name as brush_plugin_name, read_brush_object, turn_over as turn_brush_art_over, +}; pub(crate) use envelope::DRAWN as ENVELOPE_DRAWN; pub(crate) use envelope::MAX_CHECKED; pub(crate) use envelope::TYPE_DRAWN as ENVELOPE_TYPE_DRAWN; @@ -44,6 +47,7 @@ pub(crate) use envelope::{WARPED_TYPE_DRAWN, WarpedType}; #[cfg(test)] pub(crate) use frames::TEXT_FRAME_SCANS; pub(crate) use frames::text_frames; +pub(crate) use mesh::{MAX_SIDE as MAX_MESH_SIDE, mesh_reads}; pub use obj::{NameEncoding, Names}; pub(crate) use paint::MAX_STOPS as MAX_GRADIENT_STOPS; #[cfg(test)] @@ -52,14 +56,14 @@ pub(crate) use read::objects_read; pub use read::read; #[cfg(test)] pub(crate) use read::with_image_limits; +pub(crate) use read::{ + BLEND_BUDGET, MAX_NODES as MAX_EDITING_OBJECTS, MAX_SYMBOLS, join_and, read_art_style, read_over_page, read_program, read_style_list, slot_frame, + slot_of, style_moves_with, symbol_art_member, +}; pub use read::{ BindingRef, Brushes, PaletteSwatches, PlacedPage, Structure, Symbols, active_artboard, artboards, bindings_note, brushes, graphic_styles, palette, read_beside, read_in, symbols, variables, }; -pub(crate) use read::{ - MAX_NODES as MAX_EDITING_OBJECTS, MAX_SYMBOLS, join_and, read_art_style, read_over_page, read_program, read_style_list, slot_frame, slot_of, - style_moves_with, symbol_art_member, -}; pub(crate) use read::is_look_slot; pub(crate) use style::{MAX_LISTED, MAX_LISTED_NAME, warp_number}; diff --git a/crates/eps/src/import/ai/blend.rs b/crates/eps/src/import/ai/blend.rs index 530be2647d..d317164d3a 100644 --- a/crates/eps/src/import/ai/blend.rs +++ b/crates/eps/src/import/ai/blend.rs @@ -34,16 +34,16 @@ use vectorcraft_doc::{AppearanceItem, Node, NodeId, NodeKind}; use vectorcraft_geom::{ParamCurve, PathData, Point, SubPath}; /// The plugin that writes blends. -pub(super) const PLUGIN: &str = "Adobe Path Blends"; // brand-ok: the plugin name the files use +pub(crate) const PLUGIN: &str = "Adobe Path Blends"; // brand-ok: the plugin name the files use /// The most bytes of a blend's record read. pub(super) const MAX_RECORD: usize = 4096; /// The most keys read from one blend. -const MAX_KEYS: usize = 64; +pub(crate) const MAX_KEYS: usize = 64; /// The most steps between two keys (Blend Options' limit). const MAX_STEPS: usize = 1000; /// The most objects (keys and steps) one blend may lay out to be read live; more keep their /// drawn steps. -pub(super) const MAX_BLEND_OBJECTS: usize = 5_000; +pub(crate) const MAX_BLEND_OBJECTS: usize = 5_000; /// How far (pt) a step laid out here may be from where the file draws it. const PLACE_TOLERANCE: f64 = 0.5; /// How far a step's colour (each channel, 0 to 1) may be from the drawn one. @@ -227,6 +227,38 @@ pub(super) fn live_blend(edit: &Node, drawn: &Node, record: &Record, roles: &Rol .map(|(_, spec, _)| NodeKind::Blend { children: keys, spec: Box::new(spec.clone()) }) } +/// What the reader makes of a blend written as the key objects `keys`, named by `ids` in their +/// order, the spine `spine` (`None`: no spine part), the record `bytes` and the drawn steps `drawn`: +/// the live blend's settings, or `None` where it keeps the drawn steps. Takes from `budget` as +/// [`live_blend`] does. +pub(crate) fn blend_reads( + keys: &[Arc<Node>], + ids: &[String], + spine: Option<&PathData>, + bytes: &[u8], + drawn: &[Node], + budget: &mut usize, +) -> Option<BlendSpec> { + let record = record(bytes)?; + let mut roles = Roles::new(); + let mut parts: Vec<Arc<Node>> = Vec::with_capacity(keys.len() + 1); + for (k, id) in keys.iter().zip(ids) { + roles.insert(k.id, ("K".to_string(), Some(id.clone()))); + parts.push(k.clone()); + } + if let Some(s) = spine { + let id = NodeId(u64::MAX); + roles.insert(id, ("S".to_string(), None)); + parts.push(Arc::new(Node::path(id, s.clone(), Default::default()))); + } + let edit = Node::new(NodeId(u64::MAX - 1), NodeKind::Group { children: parts, clip: false }); + let drawn = Node::new(NodeId(u64::MAX - 2), NodeKind::Group { children: drawn.iter().cloned().map(Arc::new).collect(), clip: false }); + match live_blend(&edit, &drawn, &record, &roles, budget)? { + NodeKind::Blend { spec, .. } => Some(*spec), + _ => None, + } +} + /// The anchor of `spine`'s first subpath each key's centre sits on (within a point), each a /// different one. fn on_spine(keys: &[Arc<Node>], spine: &PathData) -> Option<Vec<u32>> { diff --git a/crates/eps/src/import/ai/brush.rs b/crates/eps/src/import/ai/brush.rs index fd28e42e47..ef45364de5 100644 --- a/crates/eps/src/import/ai/brush.rs +++ b/crates/eps/src/import/ai/brush.rs @@ -58,6 +58,7 @@ //! at None so the art keeps its own colors. use std::collections::{HashMap, HashSet}; +use std::sync::Arc; use kurbo::Affine; use vectorcraft_brush::{ArtBrush, ArtScale, Bristle, Brush, BrushKind, Calligraphic, Colorization, Scatter, Variation}; @@ -474,6 +475,30 @@ pub(super) fn parse_tool_object(kind: Tool, name: &str, params: &str) -> Result< Ok(BrushDraft { name: name.to_string(), kind }) } +/// Turn `art` over (y for -y) with the art of all its opacity masks, those that don't move with +/// their objects too: the art changes the space it is in, and no object moves over its mask. +pub(crate) fn turn_over(art: &mut Node) { + art.transform(Affine::scale_non_uniform(1.0, -1.0), false); + turn_unlinked_masks(art); +} + +/// Turn over the art of the opacity masks in `n` that a transform of `n` leaves in place (the masks +/// that don't move with their objects), in members and in other masks' art too. +fn turn_unlinked_masks(n: &mut Node) { + if let Some(m) = n.extras_if_any().and_then(|e| e.mask.as_mut()) { + let linked = m.linked; + let art = Arc::make_mut(&mut m.art); + if linked { + turn_unlinked_masks(art); + } else { + turn_over(art); + } + } + for c in n.children_mut().into_iter().flatten() { + turn_unlinked_masks(Arc::make_mut(c)); + } +} + /// The brushes of `drafts`, their art from the sections `art` (by name), in the brush manager's /// `order` (brushes it doesn't list after those it does, in the order of their objects), each /// kept within its ranges → the brushes and how many were left out: those whose art isn't read, @@ -553,7 +578,7 @@ pub(super) fn finish_brushes_within( DraftKind::Art { mut brush, art: name, settings } => copy(&name).map(|mut a| { // The side of the section with y up draws on the right of the path, and a brush // draws art's y (down here) on the left of the path. - a.transform(Affine::scale_non_uniform(1.0, -1.0), false); + turn_over(&mut a); if let ArtScale::BetweenGuides { start, end } = &mut brush.scale { // Guides that leave no art between them stretch the whole art. let length = a.geometric_bounds().map_or(0.0, |b| b.width()); diff --git a/crates/eps/src/import/ai/mesh.rs b/crates/eps/src/import/ai/mesh.rs index 91e8975e90..9e8a77e5dc 100644 --- a/crates/eps/src/import/ai/mesh.rs +++ b/crates/eps/src/import/ai/mesh.rs @@ -25,7 +25,7 @@ const MAX_PATCHES: usize = 16_384; const MAX_POINTS: usize = MAX_PATCHES * 16; /// The largest grid `/Size` read as one mesh, a side. -const MAX_SIDE: usize = 128; +pub(crate) const MAX_SIDE: usize = 128; /// The most inks of an `/NChannel` colour space read. const MAX_INKS: usize = 32; /// The most rows or columns a mesh stitched from its patches may have once the lines through the @@ -556,6 +556,14 @@ impl Path { /// `a` towards `b` by `t`, in their own colour model where they share one. fn mix(a: &Color, b: &Color, t: f32) -> Color { + // At either end, that end's own color in its own model: a mesh point of a patch whose corners + // differ in model keeps its color. + if t <= 0.0 { + return *a; + } + if t >= 1.0 { + return *b; + } let l = |x: f32, y: f32| x + (y - x) * t; match (a, b) { (Color::Rgb { r, g, b: bl }, Color::Rgb { r: r2, g: g2, b: b2 }) => Color::rgb(l(*r, *r2), l(*g, *g2), l(*bl, *b2)), @@ -565,6 +573,51 @@ fn mix(a: &Color, b: &Color, t: f32) -> Color { } } +/// The most values one entry of [`mesh_reads`]' record holds (a corner of [`MAX_INKS`] inks has +/// 41). +const MAX_ENTRY: usize = 64; + +/// The gradient mesh the reader reads from `record`, a mesh's lines (`/Mesh X!` … `/End X!`, +/// entries on `%_` lines or not), with `to_doc` taking art space to the document: one mesh, or +/// `None` where the reader would read none or a group of its patches. +pub(crate) fn mesh_reads(record: &[u8], to_doc: Affine) -> Option<GradientMesh> { + use super::lex::{Lexer, Tok}; + let mut lex = Lexer::new(record); + let mut m: Option<MeshReader> = None; + let mut stack: Vec<V> = vec![]; + let mut marks: Vec<usize> = vec![]; + while let Some(t) = lex.next_token() { + match t.tok { + Tok::Num(v) => stack.push(V::Num(v)), + Tok::Name(n) => stack.push(V::Name(super::obj::text(n))), + Tok::Str(s) | Tok::Hex(s) => stack.push(V::Str(s)), + Tok::Word(b"[") => marks.push(stack.len()), + Tok::Word(b"]") => { + let at = marks.pop()?; + let items = stack.split_off(at.min(stack.len())); + stack.push(V::Arr(items)); + } + Tok::Word(b"X!") => match (stack.last().and_then(V::text).as_deref(), m.take()) { + (Some("Mesh"), None) => m = Some(MeshReader::default()), + (Some("End"), Some(read)) => { + if read.unread || read.patches.is_empty() { + return None; + } + return read.one_mesh().ok(); + } + _ => return None, + }, + Tok::Word(b"X#") => m.as_mut()?.entry(&std::mem::take(&mut stack), to_doc), + Tok::Comment(_) => {} + _ => return None, + } + if stack.len() > MAX_ENTRY { + return None; + } + } + None +} + #[cfg(test)] mod tests { use super::*; @@ -885,6 +938,51 @@ mod tests { assert!(!reader.unread && reader.patches[0].points[0].color == Color::gray(1.0)); } + /// `/Version` and `/Data` entries, before or after the patches, are passed over: corners with + /// and without an opacity are read by their count of values either way. + #[test] + fn version_and_data_entries_are_passed_over() { + for (with_opacity, data_first) in [(true, true), (false, true), (true, false), (false, false)] { + let mut reader = MeshReader::default(); + for (value, key) in [(V::Name("Cartesian".into()), "Type"), (nums(&[1.0, 1.0]), "Size")] { + reader.entry(&[value, V::Name(key.into())], Affine::IDENTITY); + } + if data_first { + reader.entry(&[V::Num(2.0), V::Name("Version".into())], Affine::IDENTITY); + reader.entry(&[V::Name("Data".into())], Affine::IDENTITY); + } + reader.entry(&[nums(&[0.0, 0.0]), V::Name("P".into())], Affine::IDENTITY); + let colors: [&[f64]; 4] = + if with_opacity { [&[0.5, 0.25], &[0.5, 0.25], &[0.5, 0.25], &[0.5, 0.25]] } else { [&[0.5], &[0.5], &[0.5], &[0.5]] }; + square(&mut reader, colors, Default::default()); + if !data_first { + reader.entry(&[V::Name("Data".into())], Affine::IDENTITY); + reader.entry(&[V::Num(1.0), V::Name("Version".into())], Affine::IDENTITY); + } + assert!(!reader.unread, "{with_opacity} {data_first}"); + let mesh = reader.one_mesh().unwrap(); + let want = if with_opacity { 0.25 } else { 1.0 }; + assert!(mesh.points.iter().all(|p| p.opacity == want), "{with_opacity} {data_first}: {mesh:?}"); + } + } + + /// A patch whose corners differ in color space keeps each corner's color in its own model when + /// the patches are stitched into one mesh. + #[test] + fn stitched_corners_keep_their_own_color_models() { + let cs = |n: &str| (V::Name(n.into()), "CS"); + let mut reader = MeshReader::default(); + let first = vec![(nums(&[1.0, 1.0]), "Size"), (nums(&[0.0, 0.0]), "P"), cs("DeviceRGB")]; + square( + &mut reader, + [&[1.0, 0.0, 0.0], &[0.25], &[0.0, 1.0, 0.0, 0.0], &[0.0, 0.0, 1.0]], + [first, vec![cs("DeviceGray")], vec![cs("DeviceCMYK")], vec![cs("DeviceRGB")]], + ); + let mesh = reader.one_mesh().unwrap(); + let colors: Vec<Color> = mesh.points.iter().map(|p| p.color).collect(); + assert_eq!(colors, [Color::rgb(1.0, 0.0, 0.0), Color::rgb(0.0, 0.0, 1.0), Color::gray(0.75), Color::cmyk(0.0, 1.0, 0.0, 0.0)]); + } + /// A named colour (`[c m y k /DeviceCMYK (name) /Process]`) paints at each corner's tint, 1 its /// full colour; `/NChannel` inks overprint at their tints. Ones that don't add up stay unread. #[test] diff --git a/crates/eps/src/import/ai/read.rs b/crates/eps/src/import/ai/read.rs index 67928785ad..27a10033db 100644 --- a/crates/eps/src/import/ai/read.rs +++ b/crates/eps/src/import/ai/read.rs @@ -97,7 +97,9 @@ //! have is the object's own appearance, not a link. //! //! - Symbols: `%AI14_BeginSymbol` (or `%AI10_`), `(name)`, `0 A 0 Xw 0 Ae`, the art (in the -//! symbol's space, y down), a dictionary whose `AI13PatternRegistrationType` is the registration +//! symbol's space, y down; an image's matrix and a gradient mesh's corners in the canvas's space +//! turned y up about art space's origin there, an envelope's contents in its dictionary in the +//! canvas's space, y down), a dictionary whose `AI13PatternRegistrationType` is the registration //! point (1 to 9, from the top left, row by row), `%AI10_EndSymbol`; each is read by a reader of //! its own into the document's symbols. `%AI24_BeginSymbolList` (or `%AI10_`) lists their names //! in the Symbols panel's order. An instance: `/SymbolInstance : (name) /SymbolRef , a b c d tx @@ -156,9 +158,10 @@ use graph::Graph; pub(crate) use ops::{read_art_style, read_style_list, style_moves_with}; #[cfg(test)] pub(crate) use raster::with_image_limits; +pub(crate) use types::BLEND_BUDGET; pub(crate) use types::MAX_NODES; pub use types::PlacedPage; -use types::{BLEND_BUDGET, BrushArtColors, FLIP, Frame, GState, Kind, PatternHead, PendingEnvelope, Place, PlacedTail, Raster, SymbolHead}; +use types::{BrushArtColors, FLIP, Frame, GState, Kind, PatternHead, PendingEnvelope, Place, PlacedTail, Raster, SymbolHead}; #[cfg(test)] pub use types::{GRAPH_PLAIN, GRAPH_UNENDED, LINKED_PLACEHOLDERS, NON_NATIVE_ART, NON_NATIVE_ART_UNREAD, VERSIONED_UNENDED}; pub(super) use types::{blend_mode, blend_name}; diff --git a/crates/eps/src/import/ai/read/art.rs b/crates/eps/src/import/ai/read/art.rs index a5e222b12f..4e7b5adc92 100644 --- a/crates/eps/src/import/ai/read/art.rs +++ b/crates/eps/src/import/ai/read/art.rs @@ -277,6 +277,18 @@ impl<'a> Reader<'a> { Ok(()) } + /// A gradient mesh's `X#` entry `vals`. In a symbol's art, corners are in the space an image's + /// matrix is in there; a mesh there in a file that doesn't say where the canvas is is unread. + pub(super) fn mesh_entry(&mut self, vals: &[V]) { + let to_doc = self.image_space(); + if let Some((m, _)) = self.mesh.as_mut() { + match to_doc { + Some(to_doc) => m.entry(vals, to_doc), + None => m.unread = true, + } + } + } + /// `/End X!`: the gradient mesh read, as one object. pub(super) fn end_mesh(&mut self) -> Result<(), String> { let Some((m, hidden)) = self.mesh.take() else { return Ok(()) }; @@ -351,11 +363,15 @@ impl<'a> Reader<'a> { pub(super) fn set_instance(&mut self, i: &Instance) { let mut to_doc = self.space(); // In a pattern's definition a gradient's `Xm` and `Bm` are written y down about the canvas point of art space's - // origin, as the file's PDF part draws them; in a symbol's, as the instances in its art are. + // origin, as the file's PDF part draws them; in a symbol's, as the instances in its art are, an envelope's + // contents' included (which `space` moves alone). if (self.pattern.is_some() || self.symbol.is_some()) && i.has_matrix() && let Some(t) = self.template { + if self.pattern.is_none() && !self.envelope_blocks.is_empty() { + to_doc = Affine::IDENTITY; + } let (cx, cy) = ((t[0] + t[2]) / 2.0, (t[1] + t[3]) / 2.0); to_doc *= Affine::new([1.0, 0.0, 0.0, -1.0, CANVAS_CENTRE - cx, CANVAS_CENTRE + cy]); } diff --git a/crates/eps/src/import/ai/read/document.rs b/crates/eps/src/import/ai/read/document.rs index 258d7d584b..f3684f3882 100644 --- a/crates/eps/src/import/ai/read/document.rs +++ b/crates/eps/src/import/ai/read/document.rs @@ -923,12 +923,17 @@ impl<'a> Reader<'a> { } /// Art space → where the art being read goes: the document, or while a pattern's definition is - /// read, the pattern's space (y down). A symbol's definition is written in the symbol's space. + /// read, the pattern's space (y down). A symbol's definition is written in the symbol's space, + /// except an envelope's contents in its dictionary (its `AIDeformArtKey` block), which are in the + /// canvas's space, y down (in the symbol's space in a file without a template box). pub(crate) fn space(&mut self) -> Affine { if self.pattern.is_some() { FLIP } else if self.symbol.is_some() { - Affine::IDENTITY + match self.canvas_origin() { + Some(o) if !self.envelope_blocks.is_empty() => Affine::translate(-o.to_vec2()), + _ => Affine::IDENTITY, + } } else { self.ensure_space() } diff --git a/crates/eps/src/import/ai/read/ops.rs b/crates/eps/src/import/ai/read/ops.rs index 721a6988ba..39499b064d 100644 --- a/crates/eps/src/import/ai/read/ops.rs +++ b/crates/eps/src/import/ai/read/ops.rs @@ -226,10 +226,7 @@ impl<'a> Reader<'a> { } ("X!", Some("End")) if self.mesh.is_some() => return self.end_mesh(), ("X#", _) => { - let to_doc = self.space(); - if let Some((m, _)) = self.mesh.as_mut() { - m.entry(&vals, to_doc); - } + self.mesh_entry(&vals); return Ok(()); } _ if self.mesh.is_some() => return Ok(()), @@ -1129,13 +1126,47 @@ fn no_guides(n: &Node, depth: usize) -> bool { depth <= MAX_DEPTH && !n.is_guide() && n.children().into_iter().flatten().all(|c| no_guides(c, depth + 1)) } -/// Is `n` a compound path with a guide member whose bounds reach past the bounds of its members that -/// aren't guides, or with guide members only? Any other object counts as no. +/// Is `n` a compound path or group with a guide in it whose bounds reach past the bounds of the rest +/// of its art, or with guides only? Members are looked into to [`MAX_DEPTH`]; deeper counts as yes. +/// Any other object counts as no. fn guides_reach_past(n: &Node) -> bool { - let NodeKind::Compound { children, .. } = &n.kind else { return false }; - let bounds = - |guides: bool| children.iter().filter(|c| c.is_guide() == guides).fold(None, |acc, c| vectorcraft_geom::union_opt(acc, c.geometric_bounds())); - bounds(true).is_some_and(|g| bounds(false).is_none_or(|o| o.union(g) != o)) + /// Adds the bounds of the guides in `n`'s members to `guides` and of the rest to `art`; false when + /// it is deeper than [`MAX_DEPTH`]. + fn split(n: &Node, depth: usize, guides: &mut Option<Rect>, art: &mut Option<Rect>) -> bool { + depth <= MAX_DEPTH + && n.children().into_iter().flatten().all(|c| match c.children() { + _ if c.is_guide() => { + *guides = vectorcraft_geom::union_opt(*guides, c.geometric_bounds()); + true + } + Some(_) => split(c, depth + 1, guides, art), + None => { + *art = vectorcraft_geom::union_opt(*art, c.geometric_bounds()); + true + } + }) + } + if !matches!(n.kind, NodeKind::Compound { .. } | NodeKind::Group { .. }) { + return false; + } + let (mut guides, mut art) = (None, None); + !split(n, 0, &mut guides, &mut art) || guides.is_some_and(|g| art.is_none_or(|o| o.union(g) != o)) +} + +/// Do Transform params `p` scale, turn or reflect, so that where the object's bounds lie changes +/// what they draw? Moving alone doesn't. +fn transform_measures(p: &serde_json::Value) -> bool { + p["scaleH"].as_f64() != Some(100.0) + || p["scaleV"].as_f64() != Some(100.0) + || p["rotate"].as_f64() != Some(0.0) + || p["reflectX"].as_bool() != Some(false) + || p["reflectY"].as_bool() != Some(false) +} + +/// Do Free Distort params `p` move a corner of the box, so that where the object's bounds lie +/// changes what they draw? +fn free_distort_measures(p: &serde_json::Value) -> bool { + p["corners"] != serde_json::json!([[0.0, 0.0], [1.0, 0.0], [1.0, 1.0], [0.0, 1.0]]) } /// The largest Twist angle, in degrees either way, read as a live effect on an object that isn't a @@ -1154,7 +1185,11 @@ const MAX_STRAIGHT_TWIST: f64 = 180.0; /// compound path with straight segments (only at 0° when its guide members reach past its other /// members, see [`guides_reach_past`]), or up to [`MAX_TWIST`] degrees either way on another object /// with no guide in it. Transform that scales, turns or reflects is read only when nothing is stroked -/// (its reference point lies on the bounds without strokes). +/// (its reference point lies on the bounds without strokes) and, unless Transform Objects is off, +/// no guide reaches past the rest of the object's art ([`guides_reach_past`]). Free Distort that +/// moves a corner of a group is read only when no guide in the group reaches past the rest of its +/// art. The live effect is measured from bounds that take in the guides, so such an object keeps +/// its drawn look. fn moves_with(object: &Node, st: &crate::import::ai::style::ArtStyle) -> bool { use crate::import::ai::style::StyleItem; let stroked = st.items.iter().any(|i| matches!(i, StyleItem::Stroke { paint, .. } if !paint.is_none())) @@ -1174,12 +1209,14 @@ fn moves_with(object: &Node, st: &crate::import::ai::style::ArtStyle) -> bool { } "distort.transform" => { let p = &e.params; - !stroked - || (p["scaleH"].as_f64() == Some(100.0) - && p["scaleV"].as_f64() == Some(100.0) - && p["rotate"].as_f64() == Some(0.0) - && p["reflectX"].as_bool() == Some(false) - && p["reflectY"].as_bool() == Some(false)) + // With Transform Objects off, nothing is placed from the bounds: a style read here and + // the object's members paint with no pattern for Transform Patterns to move (`simple`, + // `moves_alike`). + let placed = p["objects"].as_bool() != Some(false); + !transform_measures(p) || (!stroked && (!placed || !guides_reach_past(object))) + } + "distort.freeDistort" => { + !matches!(object.kind, NodeKind::Group { .. }) || !free_distort_measures(&e.params) || !guides_reach_past(object) } _ => true, }) diff --git a/crates/eps/src/import/ai/read/types.rs b/crates/eps/src/import/ai/read/types.rs index b6e908c2e1..02d4a3354a 100644 --- a/crates/eps/src/import/ai/read/types.rs +++ b/crates/eps/src/import/ai/read/types.rs @@ -16,7 +16,7 @@ pub(crate) const MAX_NODES: usize = 4_000_000; /// The most objects all the blends of one import may lay out to be checked (each twice) and made /// live; past it, blends keep their drawn steps. -pub(super) const BLEND_BUDGET: usize = 50_000; +pub(crate) const BLEND_BUDGET: usize = 50_000; /// Most points in one path. pub(super) const MAX_POINTS: usize = 4_000_000; diff --git a/crates/eps/src/import/ai/tests.rs b/crates/eps/src/import/ai/tests.rs index 68ba060352..5b3f62f03e 100644 --- a/crates/eps/src/import/ai/tests.rs +++ b/crates/eps/src/import/ai/tests.rs @@ -5251,6 +5251,62 @@ fn an_image_in_a_symbols_art_is_placed_from_the_canvas() { assert_eq!(r.unread.len(), 1, "{:?}", r.warnings); } +#[test] +fn a_mesh_in_a_symbols_art_is_placed_from_the_canvas() { + // The template box's center is (100.5, 50.5): art space's origin is at canvas (8091, 8242). A + // mesh's corners in a symbol's art are in the canvas's space turned y up about that point, as an + // image's matrix there is: (-8096, 8244.5) is (-5, -2.5) in the symbol's art. + let corners: String = [(-8096.0, 8244.5), (-8096.0, 8239.5), (-8086.0, 8239.5), (-8086.0, 8244.5)] + .iter() + .map(|(x, y)| format!("%_[0.5 1 {x} {y} {x} {y} 1 {x} {y} 1] /N X#\n")) + .collect(); + let mesh = format!( + "/Mesh X!\n%_2 /Version X#\n%_/Cartesian /Type X#\n%_[1 1] /Size X#\n%_/Data X#\n%_[0 0] /P X#\n%_/DeviceGray /CS X#\n{corners}%_/E X#\n/End X!\n" + ); + let doc = read_ok(&format!("%AI3_TemplateBox: 100.5 50.5 100.5 50.5\n{}{}", symbols(&symbol("Patch", &mesh, 5)), layer(""))).doc; + assert_eq!(doc.symbols.len(), 1); + let mut found = vec![]; + let mut stack = vec![doc.symbols[0].art.clone()]; + while let Some(n) = stack.pop() { + match &n.kind { + NodeKind::Mesh(m) => found.push(m.points.iter().map(|p| p.p).collect::<Vec<_>>()), + _ => stack.extend(n.children().into_iter().flatten().cloned()), + } + } + assert_eq!(found.len(), 1, "{:?}", doc.symbols[0].art); + let want = [Point::new(-5.0, -2.5), Point::new(5.0, -2.5), Point::new(-5.0, 2.5), Point::new(5.0, 2.5)]; + assert!(want.iter().all(|w| found[0].iter().any(|p| (*p - *w).hypot() < 1e-9)), "{:?}", found[0]); + // Without a template box the mesh can't be placed, as an image there can't: the symbol isn't read + // whole and its instance comes in as the page draws it. + let group = format!("0 Ae\nu\n{}{RED}{}f\nU\n", instance("Patch", [1.0, 0.0, 0.0, -1.0, 20.0, 50.0]), rect_path(10.0, 0.0, 14.0, 4.0)); + let r = read_ok(&(symbols(&symbol("Patch", &mesh, 5)) + &layer(&group))); + assert!(r.doc.symbols.is_empty(), "{:?}", r.doc.symbols.iter().map(|s| &s.name).collect::<Vec<_>>()); + assert!(!r.unread.is_empty(), "{:?}", r.warnings); +} + +#[test] +fn an_envelope_in_a_symbols_art_is_read_from_the_canvas() { + // An envelope's grid in a symbol's art is read in the space a gradient mesh's corners are read + // in there. A grid and contents written in the symbol's own space, as earlier VectorCraft builds + // wrote them, don't meet there: the envelope opens as the art it draws. + let drawn = format!("{RED}{}f\n", rect_path(30.0, 10.0, 170.0, 90.0)); + let env = envelope_of(&straight_mesh(1, 1, (120.0, 60.0)), ENVELOPE_KEYS, &envelope_content(), 2, &drawn); + let doc = read_ok(&format!("%AI3_TemplateBox: 100.5 50.5 100.5 50.5\n{}{}", symbols(&symbol("Bent", &env, 5)), layer(""))).doc; + assert_eq!(doc.symbols.len(), 1); + let mut envelopes = 0; + doc.symbols[0].art.walk(&mut |n| envelopes += usize::from(matches!(n.kind, NodeKind::Envelope { .. }))); + assert_eq!(envelopes, 0, "{:?}", doc.symbols[0].art); + let mut paths = 0; + doc.symbols[0].art.walk(&mut |n| paths += usize::from(matches!(n.kind, NodeKind::Path { .. }))); + assert!(paths > 0, "{:?}", doc.symbols[0].art); + // Without a template box the grid can't be placed, as a gradient mesh there can't: the symbol + // isn't read whole and its instance comes in as the page draws it. + let group = format!("0 Ae\nu\n{}{RED}{}f\nU\n", instance("Bent", [1.0, 0.0, 0.0, -1.0, 20.0, 50.0]), rect_path(10.0, 0.0, 14.0, 4.0)); + let r = read_ok(&(symbols(&symbol("Bent", &env, 5)) + &layer(&group))); + assert!(r.doc.symbols.is_empty(), "{:?}", r.doc.symbols.iter().map(|s| &s.name).collect::<Vec<_>>()); + assert!(!r.unread.is_empty(), "{:?}", r.warnings); +} + #[test] fn an_instance_keeps_its_hide_lock_transparency_and_clip() { let m = [1.0, 0.0, 0.0, -1.0, 20.0, 50.0]; @@ -6462,6 +6518,30 @@ fn a_brushs_opacity_mask_art_takes_ids_of_the_document() { assert_eq!(unique.len(), all.len(), "{all:?}"); } +/// An Art brush's art is turned over with the art of its opacity mask, whether the mask moves with +/// its object or not: the mask's art stays over the part of the object it is over in the section. +#[test] +fn an_art_brushs_opacity_mask_art_turns_over_with_its_object() { + let mut read = vec![]; + for linked in [true, false] { + let mask_art: String = format!("1 g\n{}f\n", rect_path(0.0, 0.0, 40.0, 3.0)).lines().map(|l| format!("%_{l}\n")).collect(); + let options = format!("%_1 /Bool (Clipping) ,\n%_{} /Bool (Linked) ,\n", u8::from(linked)); + let mask = format!("%_/ArtDictionary :\n%_/Mask :\n%_X=\n{mask_art}%_X+\n%_(Art) ,\n{options}%_; (AI9_Mask) ,\n%_;\n"); + let section = format!("%AI8_BeginBrushPattern\n(Ribbon art)\n0 A\n0 g\n{}f\n{mask}%AI8_EndBrushPattern\n", rect_path(0.0, 0.0, 40.0, 8.0)); + let shape = format!("{RED}{}f\n", rect_path(0.0, 0.0, 10.0, 10.0)); + let r = read_ok(&format!("{section}{}{}", plugin_object(ART_BRUSH, "Ribbon", RIBBON), layer(&shape))); + let lib = vectorcraft_brush::library(&r.doc); + let vectorcraft_brush::BrushKind::Art(brush) = brush_named(&lib, "Ribbon") else { panic!("art: {:?}", r.warnings) }; + let m = brush.art.extras().mask.as_deref().unwrap_or_else(|| panic!("the mask is read: {:#?}", brush.art)); + assert_eq!(m.linked, linked); + let (object, over) = (brush.art.geometric_bounds().unwrap(), m.art.geometric_bounds().unwrap()); + assert!((object.height() - 8.0).abs() < 1e-6 && (over.height() - 3.0).abs() < 1e-6, "linked {linked}: {over:?} over {object:?}"); + assert!(over.y0 > object.y0 - 1e-6 && over.y1 < object.y1 + 1e-6, "linked {linked}: {over:?} over {object:?}"); + read.push((object, over)); + } + assert_eq!(read[0], read[1], "a mask is in the same place whether it moves with its object or not"); +} + /// An art styles section inside a symbol's, a pattern's or a brush's art is skipped: the file's own /// art styles still style the layers' objects read after the definition. #[test] @@ -7471,6 +7551,92 @@ fn twist_is_read_on_straight_paths_and_compound_paths_up_to_half_a_turn() { } } +#[test] +fn transform_and_free_distort_keep_the_drawn_look_where_a_guide_reaches_past_the_rest_of_the_art() { + // GUARDS: a compound path or group whose guides reach past the rest of its art was read with a + // live Transform that scales, turns or reflects (or, on a group, a live Free Distort) measured from + // bounds that take in those guides. Such an object keeps its drawn look. + let hide = |s: String| s.replace('\n', "\n%_"); + // A compound path of a square and `rest`, under its drawn look. + let compound = |rest: &str| { + format!( + "0 Ae\nu\n{RED}{}f\nU\n%_Bb\n%_{}0 BB\n1 (Bent) XW\n", + rect_path(16.0, 16.0, 64.0, 54.0), + hide(format!("*u\n{}f\n{rest}*U\n", rect_path(20.0, 20.0, 60.0, 50.0))) + ) + }; + // A group of a red square and `rest`, under its drawn look. + let group = |rest: &str| { + format!( + "0 Ae\nu\n{RED}{}f\nU\n%_0 Ae\n%_u\n%_{}U\n1 (Bent) XW\n", + rect_path(16.0, 16.0, 64.0, 54.0), + hide(format!("{RED}{}f\n{rest}", rect_path(20.0, 20.0, 60.0, 50.0))) + ) + }; + let guide = |from: (f64, f64), to: (f64, f64)| format!("{} {} m\n{} {} L\n(N) *\n", from.0, from.1, to.0, to.1); + let inside = guide((25.0, 25.0), (35.0, 35.0)); + let past = guide((30.0, 30.0), (70.0, 40.0)); + let nested = format!("0 Ae\nu\n{past}U\n"); + let transform = |keys: &str| format!("{keys}0 /Bool (transformPatterns) ,\n"); + let scale = transform("0.5 /Real (scaleH_Factor) ,\n0.5 /Real (scaleV_Factor) ,\n0 /Bool (scaleLines) ,\n"); + let turn = transform("0.5 /Real (rotate_Radians) ,\n"); + let reflect = transform("1 /Bool (reflectX) ,\n"); + let moved = transform("5 /Real (moveH_Pts) ,\n"); + let scale_in_place = transform("0.5 /Real (scaleH_Factor) ,\n0 /Bool (scaleLines) ,\n0 /Bool (transformObjects) ,\n"); + // Transform Objects off and Transform Patterns on: only a pattern moves, and a solid fill has none. + let scale_patterns = "0.5 /Real (scaleH_Factor) ,\n0 /Bool (scaleLines) ,\n0 /Bool (transformObjects) ,\n1 /Bool (transformPatterns) ,\n"; + let slanted = free_distort_keys([[25.0, 50.0], [65.0, 50.0], [20.0, 20.0], [60.0, 20.0]]); + let read = |name: &str, keys: &str, paint, art_: &str| read_ok(&format!("{}{}", distort_styles(name, keys, paint), layer(art_))); + let tr = "Adobe Transform"; + let fd = "Adobe Free Distort"; + for (what, r, id) in [ + ("a compound path scaled, its guide inside", read(tr, &scale, BLUE_FILL, &compound(&inside)), "distort.transform"), + ("a compound path moved, its guide past", read(tr, &moved, BLUE_FILL, &compound(&past)), "distort.transform"), + ("a compound path distorted, its guide past", read(fd, &slanted, BLUE_FILL, &compound(&past)), "distort.freeDistort"), + ("a group scaled, its guide inside", read(tr, &scale, None, &group(&inside)), "distort.transform"), + ("a group moved, its guide past", read(tr, &moved, None, &group(&past)), "distort.transform"), + ("a group scaled with Transform Objects off, its guide past", read(tr, &scale_in_place, None, &group(&past)), "distort.transform"), + ( + "a compound path scaled with Transform Objects off and Transform Patterns on, its guide past", + read(tr, scale_patterns, BLUE_FILL, &compound(&past)), + "distort.transform", + ), + ("a group distorted, its guide inside", read(fd, &slanted, None, &group(&inside)), "distort.freeDistort"), + ("a group distorted with no corner moved, its guide past", read(fd, "", None, &group(&past)), "distort.freeDistort"), + // A hidden member is measured too, and this one takes in the guide. + ( + "a group scaled, its guide past the square and inside a hidden member", + read(tr, &scale, None, &group(&format!("1 Xw\n{RED}{}f\n0 Xw\n{past}", rect_path(10.0, 10.0, 80.0, 60.0)))), + "distort.transform", + ), + ] { + assert!(!r.warnings.iter().any(|w| w.contains("drawn look")), "{what}: {:?}", r.warnings); + let a = art(&r.doc); + assert_eq!(a.len(), 1, "{what}: {a:#?}"); + assert!(a[0].children().map_or(0, |c| c.len()) >= 2, "{what}: the object, not its look: {a:#?}"); + let [e] = a[0].appearance.effects.as_slice() else { panic!("{what}: {:?}", a[0].appearance) }; + assert_eq!(e.id, id, "{what}"); + } + for (what, r) in [ + ("a compound path scaled, its guide past", read(tr, &scale, BLUE_FILL, &compound(&past))), + ("a compound path turned, its guide past", read(tr, &turn, BLUE_FILL, &compound(&past))), + ("a compound path reflected, its guide past", read(tr, &reflect, BLUE_FILL, &compound(&past))), + ("a group scaled, its guide past", read(tr, &scale, None, &group(&past))), + ("a group turned, its guide past", read(tr, &turn, None, &group(&past))), + ("a group distorted, its guide past", read(fd, &slanted, None, &group(&past))), + ("a group scaled, its guide past in a group in it", read(tr, &scale, None, &group(&nested))), + ( + "a group scaled, its guide past in a compound path in it", + read(tr, &scale, None, &group(&format!("*u\n{RED}{}f\n{past}*U\n", rect_path(25.0, 25.0, 35.0, 35.0)))), + ), + ] { + let a = art(&r.doc); + assert_eq!(a.len(), 1, "{what}: {a:#?}"); + assert!(a[0].appearance.effects.is_empty(), "{what}: the drawn look: {a:#?}"); + assert!(r.warnings.iter().any(|w| w.contains("drawn look")), "{what}: {:?}", r.warnings); + } +} + #[test] fn twist_on_a_straight_compound_path_keeps_the_drawn_look_where_a_guide_reaches_past_its_other_members() { // GUARDS: a straight compound path whose guide members reach past its other members was read diff --git a/crates/eps/src/legacy_ai.rs b/crates/eps/src/legacy_ai.rs index d304ed27df..ea569c94a5 100644 --- a/crates/eps/src/legacy_ai.rs +++ b/crates/eps/src/legacy_ai.rs @@ -122,6 +122,7 @@ const DIAMOND: &str = "diamond gradients are written as four linear gradients cl const SPREAD: &str = "gradients that repeat or reflect are written with their stops repeated across the shape (legacy .ai gradients only pad)"; const SPREAD_CAPPED: &str = "gradients that repeat or reflect are written with at most 256 stops; they pad past those"; const HUE_STOPS: &str = "gradients mixed around the hue wheel are written in process colors, with the colors between their stops as stops of their own (at most 256; legacy .ai gradients mix their stops' colors directly)"; +const PERCEPTUAL_STOPS: &str = "Perceptual gradients are written in process colors, with the colors between their stops as stops of their own (at most 256; legacy .ai gradients mix their stops' colors directly)"; /// Wedges a conic gradient is written as: one a degree. const CONIC_WEDGES: usize = 360; const STROKES: &str = diff --git a/crates/eps/src/legacy_ai/tests.rs b/crates/eps/src/legacy_ai/tests.rs index d8a81461cb..108c90c2fc 100644 --- a/crates/eps/src/legacy_ai/tests.rs +++ b/crates/eps/src/legacy_ai/tests.rs @@ -272,6 +272,81 @@ fn hue_wheel_gradients_are_written_with_the_stops_on_their_curve() { } } +/// The written definition of the gradient named `name` in `text`, and how many stops it holds. +fn definition<'a>(text: &'a str, name: &str) -> (&'a str, usize) { + let def = text.split(&format!("%AI5_BeginGradient: ({name})\n")).nth(1).and_then(|d| d.split("%AI5_EndGradient").next()).unwrap(); + (def, def.matches(" %_Bs\n").count()) +} + +/// The format's gradients mix their stops' colors directly: a Perceptual gradient is written in +/// process colors with the colors on its curve as stops, no more than the reader reads, in a +/// definition of its own rather than its swatch's, with a warning, and opens with the colors it +/// had. A Classic gradient keeps its own stops and gives no warning. +#[test] +fn perceptual_gradients_are_written_with_the_stops_on_their_curve() { + use vectorcraft_color::{GradientMethod, Swatch}; + let mut doc = Document::new(200.0, 100.0); + for (name, color) in [("Night", Color::cmyk(1.0, 1.0, 0.0, 0.0)), ("Sun", Color::cmyk(0.0, 0.0, 1.0, 0.0))] { + doc.swatches.push(Swatch { name: name.into(), paint: Paint::solid(color), global: true, spot: true }); + } + let stop = |offset: f32, color: Color, swatch: &str| GradientStop { swatch: Some(swatch.into()), ..GradientStop::new(offset, color) }; + let stops = vec![stop(0.0, Color::cmyk(1.0, 1.0, 0.0, 0.0), "Night"), stop(1.0, Color::cmyk(0.0, 0.0, 1.0, 0.0), "Sun")]; + let mut g = GradientPaint::new(Gradient { method: GradientMethod::Perceptual, ..Gradient::new(GradientKind::Linear, stops) }); + g.swatch = Some("Dusk".into()); + let want = g.gradient.clone(); + // The same stops mixed directly stray from the Perceptual curve, so a file holding only the + // two stops would not open with the colors it had. + let classic = Gradient { method: GradientMethod::Classic, ..want.clone() }; + assert!( + (0..=100).any(|k| { + let t = k as f32 / 100.0; + want.sample(t).0.to_rgb().iter().zip(classic.sample(t).0.to_rgb()).any(|(a, b)| (a - b).abs() > 0.05) + }), + "the methods mix alike" + ); + let n = shape(&mut doc, shapes::rectangle(Rect::new(20.0, 10.0, 180.0, 90.0)), Paint::Gradient(Box::new(g)), Paint::None); + let l = doc.layers[0].id; + doc.insert(Some(l), 0, n).unwrap(); + let out = write(&doc); + assert!(out.warnings.iter().any(|w| w == PERCEPTUAL_STOPS), "{:?}", out.warnings); + assert!(!out.warnings.iter().any(|w| w == HUE_STOPS), "{:?}", out.warnings); + let text = String::from_utf8_lossy(&out.bytes).into_owned(); + assert!(!text.contains("(Dusk)"), "the curve is not the swatch's gradient"); + assert!(!text.contains("(Night)") && !text.contains("(Sun)"), "the stops are process colors: {text}"); + let (_, written) = definition(&text, "Gradient"); + assert!((3..=crate::import::MAX_GRADIENT_STOPS).contains(&written), "{written} stops"); + let read = crate::import(&out.bytes).unwrap().document; + let mut back = None; + read.walk(|n| { + if let (None, Paint::Gradient(g)) = (&back, n.appearance.fill_paint()) { + back = Some(g.gradient.clone()); + } + }); + let back = back.unwrap(); + assert!(back.method.is_classic()); + assert_eq!(back.stops.len(), written, "every stop written is read"); + assert!(back.stops.iter().all(|s| s.swatch.is_none()), "{:?}", back.stops); + for k in 0..=100 { + let t = k as f32 / 100.0; + let (a, b) = (want.sample(t).0.to_rgb(), back.sample(t).0.to_rgb()); + assert!(a.iter().zip(b).all(|(x, y)| (x - y).abs() < 0.03), "at {t}: {a:?} vs {b:?}"); + } + + // Classic: its own two stops, its spot colors and its swatch's name, without the warning. + let mut doc = Document::new(200.0, 100.0); + doc.swatches.push(Swatch { name: "Night".into(), paint: Paint::solid(Color::cmyk(1.0, 1.0, 0.0, 0.0)), global: true, spot: true }); + let mut g = GradientPaint::new(classic); + g.swatch = Some("Dusk".into()); + let n = shape(&mut doc, shapes::rectangle(Rect::new(20.0, 10.0, 180.0, 90.0)), Paint::Gradient(Box::new(g)), Paint::None); + let l = doc.layers[0].id; + doc.insert(Some(l), 0, n).unwrap(); + let out = write(&doc); + assert!(!out.warnings.iter().any(|w| w == PERCEPTUAL_STOPS), "{:?}", out.warnings); + let text = String::from_utf8_lossy(&out.bytes).into_owned(); + assert_eq!(definition(&text, "Dusk").1, 2); + assert!(text.contains("%%DocumentCustomColors: (Night)"), "{text}"); +} + /// A radial gradient repeated out from a center far from the shape is written with its ramp points /// (percent) to five decimals, so its runs keep their places hundreds of runs out. #[test] @@ -728,6 +803,51 @@ fn images_are_written_in_the_form_the_specification_shows() { assert!(rgb.iter().zip([247.0, 148.0, 29.0]).all(|(c, want)| (c * 255.0 - want).abs() < 0.1), "{rgb:?}"); } +/// An image's samples are written as upper-case hex on `%` comment lines (§8.1, §8.4) of 60 +/// digits, the last line shorter, each line ending with a newline: no samples write no line, and +/// samples that fill their last line exactly write no empty `%` line after it. +#[test] +fn image_samples_are_written_as_hex_lines() { + let hex = |samples: &[u8]| { + let mut s = String::new(); + super::writer::Writer::push_hex(&mut s, samples); + s + }; + let mut samples = vec![0x00, 0x09, 0x0A, 0xAF, 0xFF]; + samples.extend(0x10..=0x29); + assert_eq!(hex(&samples), "%00090AAFFF101112131415161718191A1B1C1D1E1F202122232425262728\n%29\n"); + assert_eq!(hex(&samples[..30]), "%00090AAFFF101112131415161718191A1B1C1D1E1F202122232425262728\n"); + assert_eq!(hex(&samples[..29]), "%00090AAFFF101112131415161718191A1B1C1D1E1F2021222324252627\n"); + assert_eq!(hex(&[0xAB]), "%AB\n"); + assert_eq!(hex(&[]), ""); + // Appended after what is already written. + let mut s = String::from("0 0 1 1 1 1 8 3 0 0 0 0 XI\n"); + super::writer::Writer::push_hex(&mut s, &[0xC0, 0xFF, 0xEE]); + assert_eq!(s, "0 0 1 1 1 1 8 3 0 0 0 0 XI\n%C0FFEE\n"); +} + +/// The hex lines are the same as formatting each sample with `{:02X}` and breaking the digits +/// into lines of [`HEX_LINE`], for every length up to three lines and one more sample, and for +/// every byte value. +#[test] +fn image_hex_matches_formatted_samples() { + let formatted = |samples: &[u8]| { + let digits: String = samples.iter().map(|c| format!("{c:02X}")).collect(); + let lines: Vec<String> = digits.as_bytes().chunks(HEX_LINE).map(|l| format!("%{}\n", std::str::from_utf8(l).unwrap())).collect(); + lines.concat() + }; + let all: Vec<u8> = (0..=255u8).cycle().skip(7).take(3 * HEX_LINE / 2 + 1).collect(); + for n in 0..=all.len() { + let mut s = String::new(); + super::writer::Writer::push_hex(&mut s, &all[..n]); + assert_eq!(s, formatted(&all[..n]), "{n} samples"); + } + let every: Vec<u8> = (0..=255u8).collect(); + let mut s = String::new(); + super::writer::Writer::push_hex(&mut s, &every); + assert_eq!(s, formatted(&every)); +} + /// The pieces of an image cut into a raster mesh warp (as Object › Expand leaves a Warp on an /// image) are written as the image whole once, then each as the part of it that its triangle shows, /// and the file draws as the document does ([`write`] runs it). @@ -1030,6 +1150,63 @@ fn rgb_stops_are_written_again_unchanged() { assert_eq!(again, first); } +/// With a working RGB space other than sRGB, a Lab fill and a freeform gradient's average color +/// are written as RGB values in the working RGB space, so they read back as RGB colors that show as +/// the colors they were written for. +#[test] +fn a_lab_fill_reads_back_as_the_same_color_in_a_wide_gamut_working_space() { + const CHILD: &str = "VECTORCRAFT_TEST_LEGACY_AI_WIDE_GAMUT_LAB"; + if std::env::var_os(CHILD).is_none() { + // Color settings are process-wide: exercise this profile in a separate test process. + let output = std::process::Command::new(std::env::current_exe().unwrap()) + .args(["--exact", "legacy_ai::tests::a_lab_fill_reads_back_as_the_same_color_in_a_wide_gamut_working_space", "--nocapture"]) + .env(CHILD, "1") + .output() + .unwrap(); + let stdout = String::from_utf8_lossy(&output.stdout); + assert!( + output.status.success() && stdout.contains("test result: ok. 1 passed; 0 failed;"), + "isolated color profile test failed:\n{stdout}\n{}", + String::from_utf8_lossy(&output.stderr), + ); + return; + } + use vectorcraft_color::cms; + cms::set_active(&cms::ColorSettings { rgb: cms::WIDE_GAMUT_RGB.into(), ..Default::default() }).unwrap(); + assert!(!cms::active().rgb_is_srgb()); + let lab = Color::lab(60.0, 20.0, -30.0); + let mut doc = Document::new(100.0, 100.0); + let n = shape(&mut doc, shapes::rectangle(Rect::new(10.0, 10.0, 50.0, 50.0)), Paint::solid(lab), Paint::None); + let layer = doc.layers[0].id; + doc.insert(Some(layer), usize::MAX, n).unwrap(); + // A freeform gradient is written as the average of its stops' display colors. + let (a, b) = (Color::rgb(0.9, 0.2, 0.1), Color::lab(50.0, -40.0, -20.0)); + let stops = vec![GradientStop::new(0.0, a), GradientStop::new(1.0, b)]; + let free = Paint::Gradient(Box::new(GradientPaint::new(Gradient::new(GradientKind::Freeform, stops)))); + let n = shape(&mut doc, shapes::rectangle(Rect::new(60.0, 10.0, 90.0, 50.0)), free, Paint::None); + doc.insert(Some(layer), usize::MAX, n).unwrap(); + let average = { + let (a, b) = (a.to_rgb(), b.to_rgb()); + [0, 1, 2].map(|i| (a[i] + b[i]) / 2.0) + }; + // Written without [`write`]'s printed comparison, which paints a gradient in its first stop's + // color and not in the average color the writer writes for a freeform gradient. + let back = crate::import(&export_legacy_ai(&doc, &LegacyAiOptions::default()).unwrap().bytes).unwrap().document; + let mut read = vec![]; + back.walk(|n| { + if let NodeKind::Path { .. } = n.kind { + read.push(n.appearance.fill_paint()); + } + }); + let [Paint::Solid { color: got @ Color::Rgb { .. }, .. }, Paint::Solid { color: avg @ Color::Rgb { .. }, .. }] = read.as_slice() else { + panic!("two RGB fills: {read:?}") + }; + for (got, w, what) in [(got, lab.to_rgb(), "Lab fill"), (avg, average, "freeform gradient's average")] { + let g = got.to_rgb(); + assert!(g.iter().zip(w).all(|(a, b)| (a - b).abs() < 2e-3), "{what} {got:?} shows as {g:?}, not {w:?}"); + } +} + /// A gradient from white to #1b2a6b, the colors of #2687's circle, placed at `geom` (None: fitted /// to the object). fn white_to_navy(kind: GradientKind, geom: Option<vectorcraft_color::GradientGeom>) -> Paint { diff --git a/crates/eps/src/legacy_ai/writer.rs b/crates/eps/src/legacy_ai/writer.rs index 536940b9f6..2e5510d3d0 100644 --- a/crates/eps/src/legacy_ai/writer.rs +++ b/crates/eps/src/legacy_ai/writer.rs @@ -9,7 +9,7 @@ use super::{ ROTATED_TYPE, Rect, STROKES, SUBLAYERS, Shape, StrokeLayer, SubPath, TITLE_AND_COLOR_NAMES, TRANSPARENCY, TYPE, TYPE_ATTRIBUTES, TextKind, TextObject, UNDECODED, Vec2, Write, ai_ops, latin, ps, stroke, }; -use super::{CONIC, CONIC_WEDGES, DIAMOND, GRAPHS, HUE_STOPS, SPREAD, SPREAD_CAPPED}; +use super::{CONIC, CONIC_WEDGES, DIAMOND, GRAPHS, HUE_STOPS, PERCEPTUAL_STOPS, SPREAD, SPREAD_CAPPED}; #[cfg(test)] thread_local! { @@ -710,10 +710,7 @@ impl<'a> Writer<'a> { Color::Cmyk { c, m, y, k } => Ink::Cmyk([c, m, y, k].map(unit)), // The CMYK equivalent of the RGB values as written. Color::Rgb { r, g, b } => Ink::Rgb(self.cms.to_cmyk(&ai_ops::as_written(*color), intent).map(unit), [r, g, b].map(unit)), - Color::Lab { .. } => { - let rgb = color.to_rgb().map(unit); - Ink::Rgb(self.cms.to_cmyk(color, intent).map(unit), rgb) - } + Color::Lab { .. } => Ink::Rgb(self.cms.to_cmyk(color, intent).map(unit), ai_ops::rgb_values(*color)), } } @@ -755,11 +752,11 @@ impl<'a> Writer<'a> { /// (its distance a fraction of the radius, at most 1, §3.5.5; `0 0 0 0 Bh` at the center, /// §3.5.6), `1 (name) x y angle length 1 0 0 1 0 0 Bg`. fn gradient(&mut self, g: &GradientPaint, bounds: Rect) -> String { - // A gradient mixed around the hue wheel (the format's gradients mix their stops' colors - // directly): the stops on its curve, no more than the reader reads, in a definition of - // its own. - if g.gradient.method.is_hue() { - self.warn(HUE_STOPS); + // A gradient mixed by the Perceptual method or around the hue wheel (the format's + // gradients mix their stops' colors directly): the stops on its curve, in process colors, + // no more than the reader reads, in a definition of its own. + if !g.gradient.method.is_classic() { + self.warn(if g.gradient.method.is_hue() { HUE_STOPS } else { PERCEPTUAL_STOPS }); let curve = g.gradient.as_classic_curve(); let gradient = if curve.is_spread() { curve } else { curve.fitted(crate::import::MAX_GRADIENT_STOPS).into_owned() }; let p = GradientPaint { gradient, swatch: None, ..g.clone() }; @@ -1213,32 +1210,35 @@ impl<'a> Writer<'a> { coverage } + /// Appends `samples` to `s` as upper-case hex digits on comment lines: each line starts with `%`, + /// holds [`HEX_LINE`] digits (the last line may hold fewer) and ends with a newline. An empty + /// `samples` appends no line. + pub(super) fn push_hex(s: &mut String, samples: &[u8]) { + const DIGITS: &[u8; 16] = b"0123456789ABCDEF"; + const PER_LINE: usize = HEX_LINE / 2; + const _: () = assert!(HEX_LINE > 0 && HEX_LINE.is_multiple_of(2)); + let lines = samples.len().div_ceil(PER_LINE); + s.reserve(samples.len().saturating_mul(2).saturating_add(lines.saturating_mul(2))); + for line in samples.chunks(PER_LINE) { + s.push('%'); + for &c in line { + s.push(char::from(DIGITS[usize::from(c >> 4)])); + s.push(char::from(DIGITS[usize::from(c & 0x0F)])); + } + s.push('\n'); + } + } + /// An image's lines (§8.4): `%AI5_File:`, `%AI5_BeginRaster`, matrix `m` as `[ a b c d tx ty ]` /// and the numbers `operands` with `XI`, `samples` in hex on comment lines of [`HEX_LINE`] /// digits, `%AI5_EndRaster`, then `F`. fn raster(&mut self, m: Affine, operands: &str, samples: &[u8]) { - let mut hex = String::with_capacity(samples.len() * 2 + samples.len() / HEX_LINE * 2 + 2); - hex.push('%'); - let mut on_line = 0; - for c in samples { - let _ = write!(hex, "{c:02X}"); - on_line += 2; - if on_line >= HEX_LINE { - hex.push_str("\n%"); - on_line = 0; - } - } - if hex.ends_with('%') { - hex.pop(); - } else { - hex.push('\n'); - } let [a, b, c, d, e, f] = m.as_coeffs(); let s = &mut self.body; s.push_str("%AI5_File:\n%AI5_BeginRaster\n[ "); ps::push_nums(s, &[a, b, c, d, e, f]); let _ = writeln!(s, "] {operands} XI"); - s.push_str(&hex); + Self::push_hex(s, samples); s.push_str("%AI5_EndRaster\nF\n"); } } diff --git a/crates/mcp/src/tests.rs b/crates/mcp/src/tests.rs index 865adcc282..a6d1fe6c5d 100644 --- a/crates/mcp/src/tests.rs +++ b/crates/mcp/src/tests.rs @@ -1569,6 +1569,16 @@ fn headless_backend_methods() { assert_eq!(entry["label"], "Trim at Crossings Tool"); assert!(entry["shortcut"].is_null()); assert_eq!(h.call("ui.tool.select", json!({"tool": trim})).unwrap()["tool"], trim); + // The Enclosing Lasso Tool is listed once, in the Lasso tool's group after the Lasso. + let enclosing = vectorcraft_tools::addons::enclosing_lasso::ID; + let with_enclosing: Vec<_> = + groups.iter().map(|group| group.as_array().unwrap()).filter(|group| group.iter().any(|entry| entry["id"] == enclosing)).collect(); + assert_eq!(with_enclosing.len(), 1, "{enclosing} is in one group"); + let ids: Vec<_> = with_enclosing[0].iter().map(|entry| entry["id"].clone()).collect(); + assert_eq!(ids, [json!("lasso"), json!(enclosing)]); + assert_eq!(with_enclosing[0][1]["label"], "Enclosing Lasso Tool"); + assert!(with_enclosing[0][1]["shortcut"].is_null()); + assert_eq!(h.call("ui.tool.select", json!({"tool": enclosing})).unwrap()["tool"], enclosing); let polygonal = groups.iter().flat_map(|group| group.as_array().unwrap()).find(|entry| entry["id"] == "polygonalLasso"); assert_eq!(polygonal.map(|entry| entry["label"].clone()), Some(json!("Polygonal Lasso Tool"))); assert!(h.call("ui.resize", json!({})).is_err()); diff --git a/crates/mcp/src/ui_catalog.rs b/crates/mcp/src/ui_catalog.rs index 28cc0275f1..b6da21331e 100644 --- a/crates/mcp/src/ui_catalog.rs +++ b/crates/mcp/src/ui_catalog.rs @@ -1336,7 +1336,7 @@ pub const UI_COMMANDS: &[(&str, &str, &str, &str)] = &[ "ui.dialogReset", "Reset", "", - "{} the open dialog's Reset, which its Cancel button reads while Alt (Option on macOS) is held (Flare Tool Options, dialog `flareOptions`): its fields go back to their defaults and the dialog stays open, so OK applies them → the dialog; an error when no dialog is open or the open one has no Reset", + "{} the open dialog's Reset, which its Cancel button reads while Alt (Option on macOS) is held (Flare Tool Options, dialog `flareOptions`; Save PDF, dialog `savePdf`): its fields go back to their defaults (Save PDF: the chosen preset's settings, with the path and artboards kept) and the dialog stays open, so OK applies them → the dialog; an error when no dialog is open, the open one has no Reset, or Save PDF's chosen preset was deleted (the fields stay as they are)", ), ( "ui.justification", diff --git a/crates/metafile/src/import/picture.rs b/crates/metafile/src/import/picture.rs index e114151f9d..125126790c 100644 --- a/crates/metafile/src/import/picture.rs +++ b/crates/metafile/src/import/picture.rs @@ -46,12 +46,7 @@ use crate::{Imported, Kind}; const PATTERNS: &str = "hatched and pattern brushes are filled with their average color"; const ENDS_EARLY: &str = "the file ends early: what it held was imported"; const TOO_MANY: &str = "objects past the most one file may hold were left out"; -const AT_LIMIT: &str = "the file reached the most objects one file may hold: any after them were not read"; - -/// The most items `craft_metafile` keeps from one file (its `MAX_ITEMS`). It stops reading at the -/// limit and does not say whether more items followed, so a picture holding this many may have -/// been cut short. -const READER_ITEMS: usize = 200_000; +const AT_LIMIT: &str = "the file or a picture inside it reached a limit on what one file may hold: what came after the limit was not read"; /// Points a unit of a WMF without a placeable header (1440 units an inch). const WMF_UNIT: f64 = 72.0 / 1440.0; @@ -217,6 +212,18 @@ struct Pending { path: BezPath, } +/// What `craft_metafile` counted as not read or not played as the file asks. +struct Lost { + /// Records of kinds it doesn't read. + skipped: u32, + /// Images, and pattern brushes (a pen's included), whose bitmap it couldn't read. + images: u32, + /// Clip changes it didn't apply as the file sets them. + clips: u32, + /// Raster operations drawn as a plain copy or left out. + rops: u32, +} + /// Clip paths already made, by address (the `Arc` keeps the address from being reused); None for /// one that clips nothing in the picture. type MadeClips = HashMap<*const ClipPath, (Arc<ClipPath>, Option<Arc<Clip>>)>; @@ -561,10 +568,7 @@ impl Mapper { let shape = if k > 1e-12 && k.is_finite() && linear.determinant().abs() > 1e-24 { Affine::scale(1.0 / k) * linear } else { Affine::IDENTITY }; let f = &t.font; let h = f64::from(f.height); - // A negative height is the em; a positive one the cell (the em and the internal leading). - let em = if h < 0.0 { -h } else { h * 0.85 }; - let size = if em > 0.0 && (em * k).is_finite() { (em * k).clamp(0.5, 5000.0) } else { 12.0 }; - let mut style = CharStyle { size, fill: color(t.color), stroke: Paint::None, ..CharStyle::default() }; + let mut style = CharStyle { fill: color(t.color), stroke: Paint::None, ..CharStyle::default() }; if !f.family.trim().is_empty() { style.font_family = f.family.trim().to_string(); } @@ -575,6 +579,33 @@ impl Mapper { (false, false) => "Regular", } .into(); + // The face the font maps to (the fallback face for a font that isn't installed). Characters + // it has no glyph for are drawn from other faces at the same size and Horizontal Scale. + let face = vectorcraft_text::FontDb::global().style_face(&style); + // A negative height is the em. A positive height is the character cell, and the em is + // the cell times unitsPerEm divided by the face's OS/2 usWinAscent plus usWinDescent at + // its instance of a variable font (its own ascent plus descent when it has no OS/2 table). + let cell_em = face.as_ref().and_then(|face| { + let (a, d) = face.vertical_metrics(); + Some(face.units_per_em() / face.win_cell_height().unwrap_or(a + d)).filter(|r| r.is_finite() && *r > 0.0) + }); + let em = if h < 0.0 { -h } else { h * cell_em.unwrap_or(0.85) }; + let sized = em > 0.0 && (em * k).is_finite(); + let size = if sized { (em * k).clamp(0.5, 5000.0) } else { 12.0 }; + style.size = size; + // An average character width, negative or positive, becomes Horizontal Scale: the face's + // own average width (OS/2 xAvgCharWidth) at the type size is stretched or narrowed to it, + // also when the size was held to its range. A width is ignored when the height is 0. + let width = f64::from(f.width).abs(); + if width > 0.0 + && sized + && let Some(avg) = face.as_ref().and_then(|face| Some(face.average_char_width()? / face.units_per_em())) + { + let h_scale = width * k / (avg * size) * 100.0; + if h_scale.is_finite() { + style.h_scale = h_scale.clamp(1.0, 10000.0); + } + } style.underline = f.underline; style.strikethrough = f.strike; let db = vectorcraft_text::FontDb::global(); @@ -696,14 +727,38 @@ impl Mapper { } /// The document: what was drawn on one layer, clipped art in clipping groups. - fn finish(mut self, kind: Kind, skipped: u32) -> Imported { + fn finish(mut self, kind: Kind, lost: Lost) -> Imported { self.flush(); - if skipped > 0 { - let n = skipped; + let s = |n: u32| if n == 1 { "" } else { "s" }; + let was = |n: u32| if n == 1 { "was" } else { "were" }; + let n = lost.skipped; + if n > 0 { + self.warnings.push(format!("{n} record{} of kinds VectorCraft doesn't read {} skipped", s(n), was(n))); + } + let n = lost.images; + if n > 0 { self.warnings.push(format!( - "{n} record{} of kinds VectorCraft doesn't read {} skipped", - if n == 1 { "" } else { "s" }, - if n == 1 { "was" } else { "were" } + "{n} image{} or pattern brush{} that couldn't be read {} left out", + s(n), + if n == 1 { "" } else { "es" }, + was(n) + )); + } + let n = lost.clips; + if n > 0 { + self.warnings.push(format!( + "{n} clip{} couldn't be applied as the file sets {}: what is drawn after {} may show more or less than the file does", + s(n), + if n == 1 { "it" } else { "them" }, + if n == 1 { "it" } else { "them" } + )); + } + let n = lost.rops; + if n > 0 { + self.warnings.push(format!( + "{n} raster operation{} other than a plain copy (masks, inversions) {} drawn as a plain copy or left out", + s(n), + was(n) )); } let out = std::mem::take(&mut self.out); @@ -957,11 +1012,12 @@ pub(crate) fn import(bytes: &[u8]) -> Result<Imported, String> { if ends_early(bytes, kind) { m.warn(ENDS_EARLY); } - if pic.items.len() >= READER_ITEMS { + if pic.truncated { m.warn(AT_LIMIT); } + let lost = Lost { skipped: pic.skipped_records, images: pic.dropped_images, clips: pic.ignored_clips, rops: pic.unplayed_raster_ops }; for item in pic.items { m.item(item); } - Ok(m.finish(kind, pic.skipped_records)) + Ok(m.finish(kind, lost)) } diff --git a/crates/metafile/src/lib.rs b/crates/metafile/src/lib.rs index 61126ef228..1ba560d05e 100644 --- a/crates/metafile/src/lib.rs +++ b/crates/metafile/src/lib.rs @@ -16,6 +16,8 @@ //! [`import`] reads either format (an EMF with its EMF+ records too, through `craft_metafile`) //! into a document of one artboard (the picture's frame) and one layer: paths with fills and //! strokes, clipping, images and text. Records it doesn't read are skipped, with one warning. +//! A picture cut short by a reader limit, images and pattern brushes that can't be read, clips +//! that can't be applied and raster operations other than a plain copy each add a warning. //! [`import_pict`] reads QuickDraw pictures (PICT, versions 1 and 2) into the same kind of //! document. //! diff --git a/crates/metafile/src/tests/import.rs b/crates/metafile/src/tests/import.rs index 5f8ca735a0..01883c740b 100644 --- a/crates/metafile/src/tests/import.rs +++ b/crates/metafile/src/tests/import.rs @@ -527,11 +527,100 @@ fn a_file_with_more_objects_than_are_read_says_so() { let many = hand_emf(5000, 3000, &vec![rect.clone(); 200_010]); let back = import(&many).unwrap(); assert_eq!(paths(&back.document).len(), 200_000); - assert!(back.warnings.iter().any(|w| w.contains("reached the most objects")), "{:?}", back.warnings); + assert!(back.warnings.iter().any(|w| w.contains("reached a limit")), "{:?}", back.warnings); + // Exactly as many as the reader keeps: nothing was left unread. + let full = import(&hand_emf(5000, 3000, &vec![rect.clone(); 200_000])).unwrap(); + assert_eq!(paths(&full.document).len(), 200_000); + assert!(full.warnings.is_empty(), "{:?}", full.warnings); let few = import(&hand_emf(5000, 3000, &vec![rect; 3])).unwrap(); assert!(few.warnings.is_empty(), "{:?}", few.warnings); } +#[test] +fn a_file_cut_short_by_another_limit_says_so() { + // SAVEDC past the 1,024 levels the reader keeps stops the parse: the rectangle after them is + // not read. + let mut records = vec![(43, le(&[0, 0, 100, 100]))]; + records.extend(vec![(33, vec![]); 1100]); + records.push((43, le(&[200, 200, 300, 300]))); + let back = import(&hand_emf(5000, 3000, &records)).unwrap(); + assert_eq!(paths(&back.document).len(), 1); + assert_eq!( + back.warnings, + vec!["the file or a picture inside it reached a limit on what one file may hold: what came after the limit was not read".to_string()] + ); +} + +#[test] +fn images_the_reader_does_not_read_are_counted() { + let records = vec![(81, png_stretch_dibits(&png_claiming(1 << 13, 1 << 13))); 2]; + let back = import(&hand_emf(5000, 3000, &records)).unwrap(); + assert_eq!(back.warnings, vec!["2 images or pattern brushes that couldn't be read were left out".to_string()]); + let back = import(&hand_emf(5000, 3000, &records[..1])).unwrap(); + assert_eq!(back.warnings, vec!["1 image or pattern brush that couldn't be read was left out".to_string()]); +} + +#[test] +fn a_wmf_reports_unread_pattern_brushes_and_raster_operations() { + let records = vec![ + // DIBCREATEPATTERNBRUSH (style 5, usage 0) whose bitmap header can't be read. + (0x0142, [le16(&[5, 0]), vec![0xFF; 8]].concat()), + // A bitmap-less DIBBITBLT with DSTINVERT (0x00550009): rop, ySrc, xSrc, reserved, height, + // width, yDest, xDest. + (0x0940, le16(&[0x0009, 0x0055, 0, 0, 0, 100, 100, 0, 0])), + ]; + let back = import(&hand_wmf(1440, 1440, &records)).unwrap(); + assert_eq!( + back.warnings, + vec![ + "1 image or pattern brush that couldn't be read was left out".to_string(), + "1 raster operation other than a plain copy (masks, inversions) was drawn as a plain copy or left out".to_string(), + ] + ); +} + +#[test] +fn clips_that_are_not_applied_are_counted() { + // BEGINPATH, a rectangle, ENDPATH, SELECTCLIPPATH with RGN_XOR (3), then a rectangle drawn after it. + let records = vec![(59, vec![]), (43, le(&[100, 100, 2000, 2000])), (60, vec![]), (67, le(&[3])), (43, le(&[500, 500, 600, 600]))]; + let back = import(&hand_emf(5000, 3000, &records)).unwrap(); + assert_eq!(paths(&back.document).len(), 1); + assert_eq!( + back.warnings, + vec!["1 clip couldn't be applied as the file sets it: what is drawn after it may show more or less than the file does".to_string()] + ); + // RGN_AND (1) is applied. + let mut records = records; + records[3] = (67, le(&[1])); + let back = import(&hand_emf(5000, 3000, &records)).unwrap(); + assert!(back.warnings.is_empty(), "{:?}", back.warnings); +} + +/// An EMR_BITBLT of the 100 × 100 box at the origin with `rop` and no source bitmap. +fn bitblt(rop: u32) -> Vec<u8> { + // Bounds; destination; the operation; the source origin, transform (identity) and background + // color; usage, then no BITMAPINFO and no bits. + let mut body = vec![0; 16]; + body.extend(le(&[0, 0, 100, 100, rop as i32, 0, 0])); + body.extend(le_f32(&[1.0, 0.0, 0.0, 1.0, 0.0, 0.0])); + body.extend(le(&[0, 0, 0, 0, 0, 0])); + body +} + +#[test] +fn raster_operations_that_are_not_played_are_counted() { + // DSTINVERT and PATINVERT take no source bitmap and are left out. + let records = vec![(76, bitblt(0x0055_0009)), (76, bitblt(0x005A_0049))]; + let back = import(&hand_emf(5000, 3000, &records)).unwrap(); + assert_eq!( + back.warnings, + vec!["2 raster operations other than a plain copy (masks, inversions) were drawn as a plain copy or left out".to_string()] + ); + // WHITENESS is played. + let back = import(&hand_emf(5000, 3000, &[(76, bitblt(0x00FF_0062))])).unwrap(); + assert!(back.warnings.is_empty(), "{:?}", back.warnings); +} + /// An EMR_STRETCHDIBITS copying `png` (a BI_PNG bitmap) to a 10 × 10 box. fn png_stretch_dibits(png: &[u8]) -> Vec<u8> { // Bounds; destination, source and its size; the BITMAPINFO and the bits (from the record start); @@ -677,6 +766,124 @@ fn text_keeps_a_stretch_across() { assert!((a - 2.0).abs() < 1e-6 && b.abs() < 1e-6 && c.abs() < 1e-6 && (d - 1.0).abs() < 1e-6, "{:?}", t.xf); } +/// Source Sans 3 Regular's own values, read from its table directory: unitsPerEm (`head`), +/// xAvgCharWidth and usWinAscent + usWinDescent (`OS/2`), in font units. +fn source_sans_metrics() -> (f64, f64, f64) { + let font: &[u8] = include_bytes!("../../../../assets/fonts/SourceSans3-Regular.ttf"); + let u16_at = |at: usize| u16::from_be_bytes([font[at], font[at + 1]]); + let table = |tag: &[u8; 4]| { + let at = (0..usize::from(u16_at(4))).map(|i| 12 + 16 * i).find(|at| &font[*at..*at + 4] == tag).unwrap(); + u32::from_be_bytes([font[at + 8], font[at + 9], font[at + 10], font[at + 11]]) as usize + }; + let (head, os2) = (table(b"head"), table(b"OS/2")); + let avg = f64::from(i16::from_be_bytes([font[os2 + 2], font[os2 + 3]])); + (f64::from(u16_at(head + 18)), avg, f64::from(u16_at(os2 + 74)) + f64::from(u16_at(os2 + 76))) +} + +/// The style of "Hi" drawn in an EMF in Source Sans 3 with a LOGFONT of `height` and `width` +/// (hundredths of a millimeter). +fn emf_font_style(height: i32, width: i32) -> vectorcraft_doc::CharStyle { + emf_font_style_in("Source Sans 3", height, width) +} + +/// [`emf_font_style`] with the LOGFONT naming `family`. +fn emf_font_style_in(family: &str, height: i32, width: i32) -> vectorcraft_doc::CharStyle { + let mut text = vec![0; 16]; + text.extend(le(&[1, 0, 0])); + text.extend(le(&[1000, 1500, 2, 76, 0, 0, 0, 0, 0, 0])); + text.extend("Hi".encode_utf16().flat_map(u16::to_le_bytes)); + let mut font = le(&[2, height, width, 0, 0, 400]); + font.extend([0u8; 8]); + font.extend(family.encode_utf16().chain(std::iter::repeat_n(0, 32 - family.encode_utf16().count())).flat_map(u16::to_le_bytes)); + let records = vec![(82, font), (37, le(&[2])), (84, text)]; + let back = import(&hand_emf(5000, 3000, &records)).unwrap(); + let t = all(&back.document) + .into_iter() + .find_map(|n| match n.kind { + NodeKind::Text(t) => Some(t), + _ => None, + }) + .unwrap(); + t.runs[0].style.clone() +} + +#[test] +fn a_font_width_becomes_horizontal_scale() { + let (upem, avg, _) = source_sans_metrics(); + let mm = 72.0 / 25.4; + // A 10 mm em and an average character width of 6 mm: the face's average width, avg/upem of + // the em, is scaled to 6 mm. + let want = 6.0 / (avg / upem * 10.0) * 100.0; + for width in [600, -600] { + let st = emf_font_style(-1000, width); + assert_eq!(st.font_family, "Source Sans 3"); + assert!((st.size - 10.0 * mm).abs() < 1e-9, "{}", st.size); + assert!((st.h_scale - want).abs() < 1e-9, "width {width}: {} for {want}", st.h_scale); + } + assert_eq!(emf_font_style(-1000, 0).h_scale, 100.0); + // A 4 m em is set at the largest type size, 5000 pt, and a 2.4 m average width keeps its + // width at that size. + let st = emf_font_style(-400_000, 240_000); + assert_eq!(st.size, 5000.0); + let want = 2400.0 * mm / (avg / upem * 5000.0) * 100.0; + assert!((st.h_scale - want).abs() < 1e-9, "{} for {want}", st.h_scale); + // With a height of 0 the type is set at the default size and the width is ignored. + assert_eq!(emf_font_style(0, 600).h_scale, 100.0); +} + +#[test] +fn a_positive_font_height_is_the_character_cell() { + let (upem, avg, cell) = source_sans_metrics(); + let mm = 72.0 / 25.4; + // A 10 mm cell: the em is the cell times unitsPerEm divided by the face's usWinAscent plus + // usWinDescent, and a 6 mm average width is measured against that em. + let em = 10.0 * upem / cell; + let st = emf_font_style(1000, 600); + assert!((st.size - em * mm).abs() < 1e-9, "{} for {}", st.size, em * mm); + let want = 6.0 / (avg / upem * em) * 100.0; + assert!((st.h_scale - want).abs() < 1e-9, "{} for {want}", st.h_scale); +} + +#[test] +fn a_font_the_system_lacks_is_measured_in_the_face_that_draws_it() { + // A family no system has keeps its name, and layout draws it in Source Sans 3: the cell and + // the average width are measured in that face. + let (upem, avg, cell) = source_sans_metrics(); + let mm = 72.0 / 25.4; + let st = emf_font_style_in("Missing Family 7183", 1000, 600); + assert_eq!(st.font_family, "Missing Family 7183"); + let em = 10.0 * upem / cell; + assert!((st.size - em * mm).abs() < 1e-9, "{} for {}", st.size, em * mm); + let want = 6.0 / (avg / upem * em) * 100.0; + assert!((st.h_scale - want).abs() < 1e-9, "{} for {want}", st.h_scale); +} + +#[test] +fn wmf_font_width_becomes_horizontal_scale() { + let (upem, avg, _) = source_sans_metrics(); + // CREATEFONTINDIRECT: a 0.1 inch em (144 units) with an average width of 72 units, then + // SELECTOBJECT and TEXTOUT "Hi" at (720, 360). + let mut font = le16(&[-144, 72, 0, 0, 400]); + font.extend([0u8; 8]); + font.extend(b"Source Sans 3".iter().copied().chain(std::iter::repeat_n(0, 19))); + let mut text = le16(&[2]); + text.extend(b"Hi"); + text.extend(le16(&[360, 720])); + let records = vec![(0x02FB, font), (0x012D, le16(&[0])), (0x0521, text)]; + let back = import(&hand_wmf(1440, 1440, &records)).unwrap(); + let t = all(&back.document) + .into_iter() + .find_map(|n| match n.kind { + NodeKind::Text(t) => Some(t), + _ => None, + }) + .unwrap(); + let st = &t.runs[0].style; + assert!((st.size - 7.2).abs() < 1e-9, "{}", st.size); + let want = 72.0 / (avg / upem * 144.0) * 100.0; + assert!((st.h_scale - want).abs() < 1e-9, "{} for {want}", st.h_scale); +} + #[test] fn a_clip_whose_box_holds_the_picture_still_clips() { // A diamond around the middle of the picture, whose box holds the whole frame but which cuts diff --git a/crates/pathops/src/addons/pathtools/crossings.rs b/crates/pathops/src/addons/pathtools/crossings.rs index bcc254aa82..028a4715dc 100644 --- a/crates/pathops/src/addons/pathtools/crossings.rs +++ b/crates/pathops/src/addons/pathtools/crossings.rs @@ -34,9 +34,19 @@ fn flat(c: &CubicBez) -> bool { off(c.p1) <= FLAT && off(c.p2) <= FLAT } -/// Where the chords of `a` and `b` cross: (s, u) along each, or `None` when they don't (parallel -/// ones never do). -fn chords_cross(a: &CubicBez, b: &CubicBez) -> Option<(f64, f64)> { +/// Which ends of a segment are open ends of its path: (start, end). +type Open = (bool, bool); + +/// The open ends of segment `s` of `sp`. +fn open_ends(sp: &SubPath, s: usize) -> Open { + (!sp.closed && s == 0, !sp.closed && s + 1 == sp.segment_count()) +} + +/// Where the straight pieces `a` and `b` cross: (t on `a`, t on `b`), or `None` when their chords +/// don't cross (parallel ones never do, so paths lying along each other don't cross). An end in +/// `open_a` or `open_b` (start, end) that lies within [`SAME`] of the other piece meets it at the +/// point of that piece nearest it, at any angle. +fn pieces_cross(a: &CubicBez, b: &CubicBez, open_a: Open, open_b: Open) -> Option<(f64, f64)> { let (da, db) = (a.p3 - a.p0, b.p3 - b.p0); let den = da.cross(db); if den.abs() <= 1e-12 * da.hypot() * db.hypot() || den == 0.0 { @@ -45,12 +55,64 @@ fn chords_cross(a: &CubicBez, b: &CubicBez) -> Option<(f64, f64)> { let w = b.p0 - a.p0; let (s, u) = (w.cross(db) / den, w.cross(da) / den); let within = |v: f64| (-1e-9..=1.0 + 1e-9).contains(&v); - (within(s) && within(u)).then(|| (s.clamp(0.0, 1.0), u.clamp(0.0, 1.0))) + if within(s) && within(u) { + // The pieces are straight but their parameters needn't run evenly along them. + let (s, u) = (s.clamp(0.0, 1.0), u.clamp(0.0, 1.0)); + return Some((a.nearest(a.p0.lerp(a.p3, s), 1e-9).t, b.nearest(b.p0.lerp(b.p3, u), 1e-9).t)); + } + let ends_a = [(open_a.0, 0.0, a.p0), (open_a.1, 1.0, a.p3)].into_iter().filter(|e| e.0).map(|(_, ta, p)| { + let n = b.nearest(p, 1e-9); + ((ta, n.t), n.distance_sq) + }); + let ends_b = [(open_b.0, 0.0, b.p0), (open_b.1, 1.0, b.p3)].into_iter().filter(|e| e.0).map(|(_, tb, p)| { + let n = a.nearest(p, 1e-9); + ((n.t, tb), n.distance_sq) + }); + ends_a.chain(ends_b).filter(|e| e.1 < SAME * SAME).min_by(|x, y| x.1.total_cmp(&y.1)).map(|e| e.0) +} + +/// `(s, t)` moved to where `a` and `b` cross exactly, by Newton's method on a(s) = b(t), or as it +/// was when that doesn't settle within both segments, closer than it started, and within the +/// distance a piece bent by [`FLAT`] can shift a crossing at their angle there. +fn refined(a: &CubicBez, b: &CubicBez, (s0, t0): (f64, f64)) -> (f64, f64) { + let gap = |s: f64, t: f64| a.eval(s).distance(b.eval(t)); + let start = gap(s0, t0); + if start <= 1e-12 || !start.is_finite() { + return (s0, t0); + } + let (da, db) = (a.deriv(), b.deriv()); + let (mut s, mut t) = (s0, t0); + for _ in 0..8 { + let f = a.eval(s) - b.eval(t); + let (u, v) = (da.eval(s).to_vec2(), db.eval(t).to_vec2()); + // a(s + ds) - b(t + dt) ≈ f + u ds - v dt, which is zero for these steps. + let den = u.cross(v); + let (ds, dt) = (-f.cross(v) / den, u.cross(f) / den); + if !(ds.is_finite() && dt.is_finite()) { + return (s0, t0); + } + (s, t) = (s + ds, t + dt); + if !(-1e-12..=1.0 + 1e-12).contains(&s) || !(-1e-12..=1.0 + 1e-12).contains(&t) { + return (s0, t0); + } + if gap(s, t) <= 1e-12 { + break; + } + } + let (s, t) = (s.clamp(0.0, 1.0), t.clamp(0.0, 1.0)); + let (u, v) = (da.eval(s).to_vec2(), db.eval(t).to_vec2()); + let sin = u.cross(v).abs() / (u.hypot() * v.hypot()); + let reach = 4.0 * FLAT / sin + SAME; + let moved = a.eval(s).distance(a.eval(s0)).max(b.eval(t).distance(b.eval(t0))); + if gap(s, t) < start.min(1e-9) && moved <= reach { (s, t) } else { (s0, t0) } } /// Where segments `a` and `b` cross: (t on `a`, t on `b`) pairs, halving both while their control -/// boxes meet until each piece is straight. `None` once `budget` steps are spent. -fn segment_crossings(a: &CubicBez, b: &CubicBez, budget: &mut usize) -> Option<Vec<(f64, f64)>> { +/// boxes meet until each piece is straight. `None` once `budget` steps are spent. `open_a` and +/// `open_b` are the segments' ends that are open ends of their paths (start, end): such an end +/// within [`SAME`] of the other segment meets it there, as a path cut where another crosses it +/// ends a little off that path. +fn segment_crossings(a: &CubicBez, b: &CubicBez, open_a: Open, open_b: Open, budget: &mut usize) -> Option<Vec<(f64, f64)>> { let mut stack = vec![(0.0, 1.0, 0.0, 1.0, 0u32)]; let mut found: Vec<(f64, f64)> = vec![]; while let Some((a0, a1, b0, b1, depth)) = stack.pop() { @@ -60,10 +122,9 @@ fn segment_crossings(a: &CubicBez, b: &CubicBez, budget: &mut usize) -> Option<V continue; } if (flat(&ca) && flat(&cb)) || depth >= MAX_DEPTH { - if let Some((s, u)) = chords_cross(&ca, &cb) { - // The pieces are straight but their parameters needn't run evenly along them. - let x = ca.p0.lerp(ca.p3, s); - let (ta, tb) = (ca.nearest(x, 1e-9).t, cb.nearest(cb.p0.lerp(cb.p3, u), 1e-9).t); + // Only a piece's ends that are the segment's open ends reach past it. + let (oa, ob) = ((open_a.0 && a0 == 0.0, open_a.1 && a1 == 1.0), (open_b.0 && b0 == 0.0, open_b.1 && b1 == 1.0)); + if let Some((ta, tb)) = pieces_cross(&ca, &cb, oa, ob) { found.push((a0 + ta * (a1 - a0), b0 + tb * (b1 - b0))); } continue; @@ -80,6 +141,11 @@ fn segment_crossings(a: &CubicBez, b: &CubicBez, budget: &mut usize) -> Option<V stack.extend([(a0, a1, b0, bm, d), (a0, a1, bm, b1, d)]); } } + // A piece counts as straight while it bends by up to FLAT, so where the curves meet at a shallow + // angle the chords cross some way along from where the curves do. + for f in &mut found { + *f = refined(a, b, *f); + } found.sort_by(|x, y| x.0.total_cmp(&y.0)); // The same crossing found by neighbouring pieces counts once. found.dedup_by(|x, y| a.eval(x.0).distance(a.eval(y.0)) < SAME && b.eval(x.1).distance(b.eval(y.1)) < SAME); @@ -152,18 +218,21 @@ fn shared_anchors(sp: &SubPath, with_length: &[usize], i: usize, j: usize) -> Ve /// Where segments `a` and `b` cross, without the places at the anchors in `shared`: two segments that /// meet at an anchor don't cross there, but they can cross again elsewhere. -fn crossings_apart(a: &CubicBez, b: &CubicBez, shared: &[Point], budget: &mut usize) -> Option<Vec<(f64, f64)>> { - let mut found = segment_crossings(a, b, budget)?; +fn crossings_apart(a: (&CubicBez, Open), b: (&CubicBez, Open), shared: &[Point], budget: &mut usize) -> Option<Vec<(f64, f64)>> { + let ((a, open_a), (b, open_b)) = (a, b); + let mut found = segment_crossings(a, b, open_a, open_b, budget)?; found.retain(|(ta, _)| !shared.iter().any(|p| a.eval(*ta).distance(*p) < SAME)); Some(found) } /// Where `paths` cross one another (and, with `self_crossings`, where each crosses itself, a segment /// that loops over itself included): for each path, the places on it, in order. Segments that meet -/// at an anchor they share don't count as crossing there. `None` past [`MAX_CROSSING_SEGMENTS`] -/// segments or when the curves are too tangled to sort out, or when a coordinate isn't finite. +/// at an anchor they share don't count as crossing there, and an open end of a path that lies +/// within 0.001 pt of another path (or of itself) meets it there; paths that lie along each other +/// don't cross. `None` past [`MAX_CROSSING_SEGMENTS`] segments or when the curves are too tangled +/// to sort out, or when a coordinate isn't finite. pub fn crossings(paths: &[&PathData], self_crossings: bool) -> Option<Vec<Vec<Place>>> { - let mut segs: Vec<(usize, usize, usize, CubicBez, Rect)> = vec![]; + let mut segs: Vec<(usize, usize, usize, CubicBez, Rect, Open)> = vec![]; for (k, path) in paths.iter().enumerate() { for (si, sp) in path.subpaths.iter().enumerate() { for s in 0..sp.segment_count() { @@ -171,7 +240,7 @@ pub fn crossings(paths: &[&PathData], self_crossings: bool) -> Option<Vec<Vec<Pl if ![c.p0, c.p1, c.p2, c.p3].iter().all(|p| p.x.is_finite() && p.y.is_finite()) { return None; } - segs.push((k, si, s, c, control_box(&c))); + segs.push((k, si, s, c, control_box(&c), open_ends(sp, s))); if segs.len() > MAX_CROSSING_SEGMENTS { return None; } @@ -181,11 +250,11 @@ pub fn crossings(paths: &[&PathData], self_crossings: bool) -> Option<Vec<Vec<Pl let with_length: Vec<Vec<Vec<usize>>> = paths.iter().map(|p| p.subpaths.iter().map(with_length_from).collect()).collect(); let mut out: Vec<Vec<Place>> = vec![vec![]; paths.len()]; let mut budget = MAX_STEPS; - for (i, (ka, sa, ia, ca, ra)) in segs.iter().enumerate() { + for (i, (ka, sa, ia, ca, ra, oa)) in segs.iter().enumerate() { if self_crossings && let Some((s, t)) = self_crossing(ca) { out.get_mut(*ka)?.extend([(*sa, *ia, s), (*sa, *ia, t)]); } - for (kb, sb, ib, cb, rb) in segs.iter().skip(i + 1) { + for (kb, sb, ib, cb, rb, ob) in segs.iter().skip(i + 1) { if (ka == kb && !self_crossings) || !ra.inflate(SAME, SAME).overlaps(*rb) { continue; } @@ -193,7 +262,7 @@ pub fn crossings(paths: &[&PathData], self_crossings: bool) -> Option<Vec<Vec<Pl (Some(sp), Some(w)) if ka == kb && sa == sb => shared_anchors(sp, w, *ia, *ib), _ => vec![], }; - for (ta, tb) in crossings_apart(ca, cb, &shared, &mut budget)? { + for (ta, tb) in crossings_apart((ca, *oa), (cb, *ob), &shared, &mut budget)? { out.get_mut(*ka)?.push((*sa, *ia, ta)); out.get_mut(*kb)?.push((*sb, *ib, tb)); } @@ -248,41 +317,43 @@ impl Work { } /// Where `others` cross `path`, and where `path` crosses itself (a segment that loops over itself -/// included): the places on `path`, in order, within the work of [`Work::default`]. +/// included): the places on `path`, in order, within the work of [`Work::default`]. An open end of +/// a path that lies within 0.001 pt of another meets it there, as [`crossings_on_within`] says. pub fn crossings_on(path: &PathData, others: &[&PathData]) -> Option<Vec<Place>> { crossings_on_within(path, others, &mut Work::default()) } /// [`crossings_on`], drawing on `work`. Only the segments of `others` whose control boxes meet the /// box of `path` are compared with it, so the paths far from it cost one box test per segment. -/// Segments of `path` that meet at an anchor they share don't count as crossing there, and a -/// segment of `others` with a coordinate that isn't finite is left out. `None` when `path` has more -/// than [`MAX_CROSSING_SEGMENTS`] segments or a coordinate that isn't finite, when more than +/// Segments of `path` that meet at an anchor they share don't count as crossing there, an open end +/// of a path that lies within 0.001 pt of another meets it there, and a segment of `others` with a +/// coordinate that isn't finite is left out. `None` when `path` has more than +/// [`MAX_CROSSING_SEGMENTS`] segments or a coordinate that isn't finite, when more than /// [`MAX_CROSSED_BY_SEGMENTS`] segments of `others` lie in its box, when the pairs of segments to /// look at are more than `work` has left, or when the curves are too tangled to sort out in the /// steps it has left. pub fn crossings_on_within(path: &PathData, others: &[&PathData], work: &mut Work) -> Option<Vec<Place>> { - let mut own: Vec<(usize, usize, CubicBez, Rect)> = vec![]; + let mut own: Vec<(usize, usize, CubicBez, Rect, Open)> = vec![]; for (si, sp) in path.subpaths.iter().enumerate() { for s in 0..sp.segment_count() { let c = sp.segment(s); if ![c.p0, c.p1, c.p2, c.p3].iter().all(|p| p.x.is_finite() && p.y.is_finite()) { return None; } - own.push((si, s, c, control_box(&c))); + own.push((si, s, c, control_box(&c), open_ends(sp, s))); if own.len() > MAX_CROSSING_SEGMENTS { return None; } } } let Some(reach) = own.iter().map(|o| o.3).reduce(|a, b| a.union(b)).map(|r| r.inflate(SAME, SAME)) else { return Some(vec![]) }; - let mut near: Vec<(CubicBez, Rect)> = vec![]; + let mut near: Vec<(CubicBez, Rect, Open)> = vec![]; for sp in others.iter().flat_map(|p| &p.subpaths) { for s in 0..sp.segment_count() { let c = sp.segment(s); let r = control_box(&c); if [c.p0, c.p1, c.p2, c.p3].iter().all(|p| p.x.is_finite() && p.y.is_finite()) && reach.overlaps(r) { - near.push((c, r)); + near.push((c, r, open_ends(sp, s))); if near.len() > MAX_CROSSED_BY_SEGMENTS { return None; } @@ -293,17 +364,17 @@ pub fn crossings_on_within(path: &PathData, others: &[&PathData], work: &mut Wor let with_length: Vec<Vec<usize>> = path.subpaths.iter().map(with_length_from).collect(); let mut out: Vec<Place> = vec![]; let budget = &mut work.steps; - for (i, (sa, ia, ca, ra)) in own.iter().enumerate() { + for (i, (sa, ia, ca, ra, oa)) in own.iter().enumerate() { let ra = ra.inflate(SAME, SAME); if let Some((s, t)) = self_crossing(ca) { out.extend([(*sa, *ia, s), (*sa, *ia, t)]); } - for (cb, rb) in &near { + for (cb, rb, ob) in &near { if ra.overlaps(*rb) { - out.extend(segment_crossings(ca, cb, budget)?.into_iter().map(|(ta, _)| (*sa, *ia, ta))); + out.extend(segment_crossings(ca, cb, *oa, *ob, budget)?.into_iter().map(|(ta, _)| (*sa, *ia, ta))); } } - for (sb, ib, cb, rb) in own.iter().skip(i + 1) { + for (sb, ib, cb, rb, ob) in own.iter().skip(i + 1) { if !ra.overlaps(*rb) { continue; } @@ -311,7 +382,7 @@ pub fn crossings_on_within(path: &PathData, others: &[&PathData], work: &mut Wor (Some(sp), Some(w)) if sa == sb => shared_anchors(sp, w, *ia, *ib), _ => vec![], }; - for (ta, tb) in crossings_apart(ca, cb, &shared, budget)? { + for (ta, tb) in crossings_apart((ca, *oa), (cb, *ob), &shared, budget)? { out.push((*sa, *ia, ta)); out.push((*sb, *ib, tb)); } diff --git a/crates/pathops/src/addons/pathtools/tests.rs b/crates/pathops/src/addons/pathtools/tests.rs index 3c6c592d71..ba4a056568 100644 --- a/crates/pathops/src/addons/pathtools/tests.rs +++ b/crates/pathops/src/addons/pathtools/tests.rs @@ -244,6 +244,42 @@ fn crossings_are_found_on_both_paths() { assert!(near(hits[1][0].2, 0.0, 1e-6) && near(b.subpaths[0].segment(0).eval(hits[0][0].2).x, 50.0, 1e-6)); } +#[test] +fn a_shallow_crossing_is_placed_where_the_curves_meet() { + // Lines square to the middle of a quarter circle of radius 100, just inside it: each crosses the + // arc twice, at under a degree for the nearest one. + let arc = PathData::single(quarter()); + let k = std::f64::consts::FRAC_1_SQRT_2; + for gap in [0.5, 0.05, 0.005, 0.0005] { + let mid = pt((100.0 - gap) * k, (100.0 - gap) * k); + let (from, to) = (mid + Vec2::new(-k, k) * 60.0, mid + Vec2::new(k, -k) * 60.0); + let across = PathData::single(line(&[(from.x, from.y), (to.x, to.y)], false)); + let exact: Vec<Point> = kurbo::PathSeg::Cubic(arc.subpaths[0].segment(0)) + .intersect_line(kurbo::Line::new(from, to)) + .iter() + .map(|x| from.lerp(to, x.line_t)) + .collect(); + assert_eq!(exact.len(), 2, "{gap}"); + let on = |p: &PathData, other: &PathData| -> Vec<Point> { + crossings_on(p, &[other]).unwrap().iter().map(|q| p.subpaths[0].segment(q.1).eval(q.2)).collect() + }; + let both = crossings(&[&arc, &across], false).unwrap(); + let found = [ + on(&arc, &across), + on(&across, &arc), + both[0].iter().map(|q| arc.subpaths[0].segment(q.1).eval(q.2)).collect(), + both[1].iter().map(|q| across.subpaths[0].segment(q.1).eval(q.2)).collect(), + ]; + for places in found { + assert_eq!(places.len(), 2, "{gap}: {places:?}"); + for x in &exact { + let off = places.iter().map(|p| p.distance(*x)).fold(f64::INFINITY, f64::min); + assert!(off < 1e-6, "{gap}: {off} pt from {x:?}"); + } + } + } +} + #[test] fn insert_at_keeps_the_shape_and_names_the_new_anchors() { let sp = line(&[(0.0, 0.0), (100.0, 0.0), (100.0, 100.0)], false); @@ -689,3 +725,58 @@ fn a_slice_of_a_curve_keeps_its_shape_and_the_anchors_it_runs_through() { assert!(slice(&circle, (2.0, 1.0)).anchors.is_empty()); assert!(slice(&circle, (f64::NAN, 1.0)).anchors.is_empty()); } + +#[test] +fn an_open_end_a_hair_off_another_path_still_meets_it() { + // A bow from (0, 0) to (100, 100), and where a line across at y = 50 crosses it. + let bow = PathData::single(SubPath::new( + vec![Anchor { h_out: pt(0.0, 55.0), ..Anchor::corner(pt(0.0, 0.0)) }, Anchor { h_in: pt(45.0, 100.0), ..Anchor::corner(pt(100.0, 100.0)) }], + false, + )); + let across = PathData::single(line(&[(-50.0, 50.0), (150.0, 50.0)], false)); + let at = crossings_on(&across, &[&bow]).unwrap(); + assert_eq!(at.len(), 1); + let p = across.subpaths[0].segment(0).eval(at[0].2); + // A line ending 0.00005 pt short of the bow, or past it, as a line cut where the bow crosses it + // can: the bow is crossed there, on both searches. + let on_bow = |l: &PathData| crossings_on(&bow, &[l]).unwrap().iter().map(|q| bow.subpaths[0].segment(q.1).eval(q.2)).collect::<Vec<_>>(); + for off in [-5e-5, 5e-5] { + let stub = PathData::single(line(&[(-50.0, 50.0), (p.x + off, 50.0)], false)); + let found = on_bow(&stub); + assert!(found.len() == 1 && found[0].distance(p) < 1e-3, "{off}: {found:?}"); + let both = crossings(&[&stub, &bow], false).unwrap(); + assert_eq!((both[0].len(), both[1].len()), (1, 1), "{off}: {both:?}"); + } + // 0.01 pt short is not on it. + assert!(on_bow(&PathData::single(line(&[(-50.0, 50.0), (p.x - 0.01, 50.0)], false))).is_empty()); + // The bow's own open end 0.00005 pt short of an upright meets it there. + let upright = PathData::single(line(&[(100.00005, 50.0), (100.00005, 150.0)], false)); + let found = crossings_on(&upright, &[&bow]).unwrap(); + assert!(found.len() == 1 && near(upright.subpaths[0].segment(0).eval(found[0].2).y, 100.0, 1e-3), "{found:?}"); + // Two ends that each stop 0.0009 pt short of a corner lie 0.0013 pt apart: they don't meet. + let flat = PathData::single(line(&[(0.0, 0.0), (99.9991, 0.0)], false)); + let post = PathData::single(line(&[(100.0, 0.0009), (100.0, 50.0)], false)); + assert!(crossings_on(&flat, &[&post]).unwrap().is_empty() && crossings_on(&post, &[&flat]).unwrap().is_empty()); + // Two ends that each stop 0.0004 pt short of a corner lie 0.0006 pt apart: they meet. + let flat = PathData::single(line(&[(0.0, 0.0), (99.9996, 0.0)], false)); + let post = PathData::single(line(&[(100.0, 0.0004), (100.0, 50.0)], false)); + assert_eq!((crossings_on(&flat, &[&post]).unwrap().len(), crossings_on(&post, &[&flat]).unwrap().len()), (1, 1)); + // A level line that crosses a quarter circle near its top, where the two meet at under 3 + // degrees, cut 0.0015 pt short along its length: its end lies under 0.0001 pt from the arc and + // meets it there. + use kurbo::ParamCurveNearest; + let arc = PathData::single(quarter()); + let level = PathData::single(line(&[(50.0, 99.9), (-50.0, 99.9)], false)); + let at = crossings_on(&level, &[&arc]).unwrap(); + assert_eq!(at.len(), 1); + let end = level.subpaths[0].segment(0).eval(at[0].2) + Vec2::new(0.0015, 0.0); + assert!(arc.subpaths[0].segment(0).nearest(end, 1e-12).distance_sq.sqrt() < 1e-4); + let stub = PathData::single(line(&[(50.0, 99.9), (end.x, end.y)], false)); + let found = crossings_on(&arc, &[&stub]).unwrap(); + assert!(found.len() == 1 && arc.subpaths[0].segment(0).eval(found[0].2).distance(end) < 1e-3, "{found:?}"); + assert_eq!(crossings(&[&stub, &arc], false).unwrap().iter().map(Vec::len).collect::<Vec<_>>(), [1, 1]); + // A corner of a closed path as near a line is not an open end: it doesn't reach the line. + let wedge = PathData::single(line(&[(180.0, 0.0), (220.0, 0.0), (200.0, 49.99995)], true)); + let floor = PathData::single(line(&[(150.0, 50.0), (250.0, 50.0)], false)); + assert!(crossings_on(&floor, &[&wedge]).unwrap().is_empty() && crossings_on(&wedge, &[&floor]).unwrap().is_empty()); +} diff --git a/crates/pdf/Cargo.toml b/crates/pdf/Cargo.toml index 817d334fb8..69bcf84f7f 100644 --- a/crates/pdf/Cargo.toml +++ b/crates/pdf/Cargo.toml @@ -54,6 +54,8 @@ vectorcraft-text = { workspace = true, features = ["test-fonts"] } serde_json = { workspace = true } # `draw_text`, to write test files with live text as other writers do. krilla = { workspace = true, features = ["simple-text"] } +# How many times the symbol list is read to find symbols by name. +vectorcraft-doc = { workspace = true, features = ["symbol-read-count"] } # An independent raster oracle for gradient placement in PDF forms. These are test-only macOS # bindings; the exporter stays portable Rust and does not depend on an OS PDF renderer. diff --git a/crates/pdf/src/export/nodes.rs b/crates/pdf/src/export/nodes.rs index c6b165bbd5..2a2ab1a884 100644 --- a/crates/pdf/src/export/nodes.rs +++ b/crates/pdf/src/export/nodes.rs @@ -118,7 +118,7 @@ impl Exporter<'_> { if several && !elements.iter().skip(1).all(|(c, _)| shape_is_coverage(c)) { let doc = self.doc; let brushes = self.brushes.get_or_insert_with(|| vectorcraft_brush::library(doc)); - match knockout_masks(BrushSearch::new(doc, brushes), &elements) { + match knockout_masks(BrushSearch::new(&self.symbols, brushes), &elements) { Ok(above) => { // Every mask is made before anything is drawn: when the symbol objects the // masks may hold run out, one would leave out art its element covers, and @@ -452,7 +452,7 @@ impl Exporter<'_> { // A dynamic symbol's instance shows its own appearance changes, and the instance's // fill stains its art, as on the canvas. let doc = self.doc; - if let Some(sym) = doc.symbols.iter().find(|x| &x.name == symbol) { + if let Some(sym) = self.symbols.symbol(symbol) { let changed; let art: &Node = if n.extras().symbol_overrides.is_empty() && vectorcraft_doc::symbol_overrides::stain(n).is_none() { &sym.art @@ -968,8 +968,10 @@ enum SharedArt { /// A search for the brushed strokes drawing an object draws, whose brush art can hold many more /// objects than the stroked path. -struct BrushSearch<'a> { - doc: &'a Document, +struct BrushSearch<'a, 'd> { + doc: &'d Document, + /// `doc`'s symbols, found by name. + symbols: &'a vectorcraft_doc::SymbolBoxes<'d>, /// The brushes the export draws strokes with ([`Exporter::brush_art`]); a stroke whose brush /// is not among them is drawn as a plain stroke. brushes: &'a [vectorcraft_brush::Brush], @@ -983,9 +985,10 @@ struct BrushSearch<'a> { exhausted: bool, } -impl<'a> BrushSearch<'a> { - fn new(doc: &'a Document, brushes: &'a [vectorcraft_brush::Brush]) -> Self { - Self { doc, brushes, seen: HashMap::new(), left: MAX_KNOCKOUT_MASK_OBJECTS, exhausted: false } +impl<'a, 'd> BrushSearch<'a, 'd> { + /// A search through the document of `symbols`. + fn new(symbols: &'a vectorcraft_doc::SymbolBoxes<'d>, brushes: &'a [vectorcraft_brush::Brush]) -> Self { + Self { doc: symbols.document(), symbols, brushes, seen: HashMap::new(), left: MAX_KNOCKOUT_MASK_OBJECTS, exhausted: false } } /// Takes `n` objects from [`Self::left`]; false, and the search exhausted, when fewer are left. @@ -1046,8 +1049,7 @@ impl<'a> BrushSearch<'a> { NodeKind::SymbolInstance { symbol, .. } => { // A dynamic symbol's instance draws its art with its own appearance changes: the // art is copied once for each set of changes, counted before it is copied. - let doc = self.doc; - match doc.symbols.iter().find(|s| &s.name == symbol) { + match self.symbols.symbol(symbol) { Some(s) if !n.extras().symbol_overrides.is_empty() => { let key = format!("{symbol}\u{0}{:?}", n.extras().symbol_overrides); self.shared(SharedArt::Dynamic, &key, |search| { @@ -1080,8 +1082,7 @@ impl<'a> BrushSearch<'a> { /// Whether the art of the symbol named `name` draws a brushed stroke. fn symbol(&mut self, name: &str, depth: usize) -> bool { - let doc = self.doc; - let Some(s) = doc.symbols.iter().find(|s| s.name == name) else { return false }; + let Some(s) = self.symbols.symbol(name) else { return false }; self.shared(SharedArt::Symbol, name, |search| search.node(&s.art, true, depth)) } @@ -1177,7 +1178,8 @@ mod tests { let square = Node::path(NodeId(0), shapes::rectangle(Rect::new(0.0, 0.0, 10.0, 10.0)), Appearance::basic(Paint::None, Paint::None, 0.0)); let art = Node::group(NodeId(0), vec![Arc::new(square), Arc::new(instance())]); d.symbols.push(Symbol { dynamic: true, name: "Loop".into(), art: Arc::new(art) }); - let mut search = BrushSearch::new(&d, &[]); + let symbols = d.symbol_boxes(); + let mut search = BrushSearch::new(&symbols, &[]); assert!(!search.node(&instance(), true, 0)); assert!(!search.exhausted); assert!(MAX_KNOCKOUT_MASK_OBJECTS - search.left < 10, "{} objects", MAX_KNOCKOUT_MASK_OBJECTS - search.left); @@ -1205,11 +1207,12 @@ mod tests { .collect(); Node::group(NodeId(0), instances) }; - let mut search = BrushSearch::new(&d, &[]); + let symbols = d.symbol_boxes(); + let mut search = BrushSearch::new(&symbols, &[]); assert!(search.node(&group(true), true, 0)); assert!(search.exhausted); assert_eq!(search.left, 0); - let mut search = BrushSearch::new(&d, &[]); + let mut search = BrushSearch::new(&symbols, &[]); assert!(!search.node(&group(false), true, 0)); assert!(!search.exhausted); // The group, the 1,000 instances, and one copy of the art counted and looked through. @@ -1247,6 +1250,6 @@ mod tests { vectorcraft_doc::placed_document::prime(&placed, Arc::new(vec![]), brushed_art()); let n = Node::new(NodeId(0), NodeKind::PlacedDocument(Box::new(placed))); let brushes = vectorcraft_brush::library(&d); - assert!(BrushSearch::new(&d, &brushes).node(&n, true, 0)); + assert!(BrushSearch::new(&d.symbol_boxes(), &brushes).node(&n, true, 0)); } } diff --git a/crates/pdf/src/export/text.rs b/crates/pdf/src/export/text.rs index c3d30b7953..0ad1e2d4ff 100644 --- a/crates/pdf/src/export/text.rs +++ b/crates/pdf/src/export/text.rs @@ -134,7 +134,7 @@ impl Exporter<'_> { self.inline_depth += 1; for ig in &layout.inlines { let Some(art) = t.runs.get(ig.run).and_then(|r| r.inline.as_ref()) else { continue }; - let Some(sym) = doc.symbols.iter().find(|x| x.name == art.symbol) else { continue }; + let Some(sym) = self.symbols.symbol(&art.symbol) else { continue }; let mut node = (*sym.art).clone(); // Strokes scale with the art, as on the canvas. node.transform(t.xf * ig.xf * doc.symbol_natural_xf(&art.symbol), true); diff --git a/crates/pdf/src/import/builder.rs b/crates/pdf/src/import/builder.rs index e6e34ae429..a9cd9ada7c 100644 --- a/crates/pdf/src/import/builder.rs +++ b/crates/pdf/src/import/builder.rs @@ -991,7 +991,7 @@ impl<'p> Builder<'p> { self.flush_type3(); if let (Some(s), Some(line)) = (&look.stroke, &mut self.text) && look.fill.is_none() - && line.stroke_last(font_key, at, s.clone(), overprint) + && line.stroke_filled(font_key, at, opacity, &text, s.clone(), overprint) { return true; } @@ -1153,9 +1153,13 @@ impl<'p> Builder<'p> { // A stroke over the glyph just filled (fill and stroke rendering). if let (Some(s), Some(line)) = (&look.stroke, &mut self.text) && look.fill.is_none() - && line.stroke_last(key, at, s.clone(), overprint) + && line.stroke_filled(key, at, opacity, &text, s.clone(), overprint) { - self.keep_glyph(o, m, drawn, opacity, scale, overprint); + // Upright glyphs aren't kept as outlines (nor, below, are those filled only): a + // vertical line that came in as its outlines would lose the ones filled only. + if top.is_none() { + self.keep_glyph(o, m, drawn, opacity, scale, overprint); + } return true; } if !self.text.as_mut().is_some_and(place) { diff --git a/crates/pdf/src/import/device.rs b/crates/pdf/src/import/device.rs index 3fcefd7b8e..45ca7f7081 100644 --- a/crates/pdf/src/import/device.rs +++ b/crates/pdf/src/import/device.rs @@ -1,6 +1,6 @@ use super::entry::{INVISIBLE_TEXT_NOTE, MAX_NESTED, OUTLINED_TEXT_NOTE, UNSORTED, WHITE_KEY}; use super::state::{ - Builder, Decoded, Frame, FrameKind, GlyphRun, blend, fill_rule, gray_png, line_width, mean_scale, resize_alpha, rgba_png, same_outline, + Builder, Decoded, Frame, FrameKind, GlyphRun, blend, fill_rule, gray_png, line_width, mean_scale, resize_alpha, rgb_png, rgba_png, same_outline, stroke_layer, stroke_outline, }; use super::{ @@ -304,27 +304,39 @@ impl<'a> Device<'a> for Builder<'_> { self.add_image(key, || None, xf); return; } - let mut decoded: Option<Decoded> = None; + // RGB samples, or RGBA when the image has an alpha channel or is drawn white. + let mut decoded: Option<(Decoded, bool)> = None; r.with_rgba( |img, alpha| { let (w, h, sf) = (img.width(), img.height(), img.scale_factors()); - let a = alpha.map(|a| resize_alpha(&a, w, h)).unwrap_or_else(|| vec![255; (w * h) as usize]); - let rgba: Vec<u8> = match img { - _ if white => a.into_iter().flat_map(|a| [255, 255, 255, a]).collect(), - ImageData::Rgb(d) => d.data.as_chunks::<3>().0.iter().zip(a).flat_map(|(c, a)| [c[0], c[1], c[2], a]).collect(), - ImageData::Luma(d) => d.data.iter().zip(a).flat_map(|(g, a)| [*g, *g, *g, a]).collect(), + let px = match (img, alpha) { + // An opaque image's RGB samples are encoded as they are, with no copy. + (ImageData::Rgb(d), None) if !white => (d.data, false), + // Gray samples are stored as RGB: as a gray PNG, the image would become a + // grayscale image that a fill color colorizes. + (ImageData::Luma(d), None) if !white => (d.data.iter().flat_map(|g| [*g; 3]).collect(), false), + (img, alpha) => { + let a = alpha.map(|a| resize_alpha(&a, w, h)).unwrap_or_else(|| vec![255; (w * h) as usize]); + let rgba: Vec<u8> = match img { + _ if white => a.into_iter().flat_map(|a| [255, 255, 255, a]).collect(), + ImageData::Rgb(d) => d.data.as_chunks::<3>().0.iter().zip(a).flat_map(|(c, a)| [c[0], c[1], c[2], a]).collect(), + ImageData::Luma(d) => d.data.iter().zip(a).flat_map(|(g, a)| [*g, *g, *g, a]).collect(), + }; + (rgba, true) + } }; - decoded = Some((rgba, w, h, sf)); + decoded = Some(((px.0, w, h, sf), px.1)); }, None, ); - let Some((rgba, w, h, sf)) = decoded else { + let Some(((px, w, h, sf), alpha)) = decoded else { self.warn("an image could not be decoded and was skipped"); return; }; self.raster_scales.insert(key, sf); let xf = transform * Affine::scale_non_uniform(sf.0 as f64, sf.1 as f64); - self.add_image(key, || rgba_png(rgba, w, h).map(|png| (ImageBlob::new("image/png", png), w, h)), xf); + let png = move || if alpha { rgba_png(px, w, h) } else { rgb_png(px, w, h) }; + self.add_image(key, || png().map(|png| (ImageBlob::new("image/png", png), w, h)), xf); } Image::Stencil(s) => { let white = self.white_images; diff --git a/crates/pdf/src/import/state.rs b/crates/pdf/src/import/state.rs index 1eeb8a5539..ba0c23a808 100644 --- a/crates/pdf/src/import/state.rs +++ b/crates/pdf/src/import/state.rs @@ -340,6 +340,11 @@ pub(super) fn rgba_png(rgba: Vec<u8>, w: u32, h: u32) -> Option<Vec<u8>> { craft_image_codecs::encode(&img, craft_image_codecs::Format::Png, &craft_image_codecs::EncodeOptions::default()).ok() } +pub(super) fn rgb_png(rgb: Vec<u8>, w: u32, h: u32) -> Option<Vec<u8>> { + let img = craft_image_codecs::Image::from_raw(w, h, craft_image_codecs::ChannelLayout::Rgb, craft_image_codecs::SampleType::U8, rgb).ok()?; + craft_image_codecs::encode(&img, craft_image_codecs::Format::Png, &craft_image_codecs::EncodeOptions::default()).ok() +} + pub(super) fn gray_png(gray: Vec<u8>, w: u32, h: u32) -> Option<Vec<u8>> { let img = craft_image_codecs::Image::from_raw(w, h, craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, gray).ok()?; craft_image_codecs::encode(&img, craft_image_codecs::Format::Png, &craft_image_codecs::EncodeOptions::default()).ok() diff --git a/crates/pdf/src/import_text.rs b/crates/pdf/src/import_text.rs index ec4fff092a..a6b128e042 100644 --- a/crates/pdf/src/import_text.rs +++ b/crates/pdf/src/import_text.rs @@ -61,6 +61,17 @@ impl Placement { fn up(&self) -> Vec2 { Vec2::new(self.dir.y, -self.dir.x) } + + /// Is a glyph placed with `other` drawn where this one is, the same size, width, slant and + /// direction (a stroke the reader draws over a glyph it filled has the very same placement; + /// the tolerances only allow for rounding)? + fn same_as(&self, other: &Placement) -> bool { + (self.origin - other.origin).hypot() < self.size * 1e-3 + && (self.size - other.size).abs() <= self.size * 1e-3 + && (self.h_scale - other.h_scale).abs() < 0.05 + && (self.slant - other.slant).abs() < 1e-3 + && self.dir.dot(other.dir) > 1.0 - 1e-6 + } } /// A glyph set vertically (WMode 1: no horizontal advance) and the top centre of its em box: a @@ -100,16 +111,21 @@ pub(crate) struct Look { } impl Look { - /// Can a glyph drawn with `other` join a run drawn with this? A fill joins a run whose - /// glyphs were also stroked over (fill and stroke rendering draws each glyph twice); invisible - /// text (neither fill nor stroke) joins only invisible text. + /// Can a glyph drawn with `other` join a run drawn with this? Only a run drawn alike: fill, + /// stroke and overprints. A glyph filled only never joins a run whose glyphs were also stroked + /// over: it takes a stroke only when one is drawn over it later + /// ([`TextLine::stroke_filled`]), which then joins it to the run before if that is stroked + /// alike (fill and stroke rendering draws each glyph twice), and a glyph filled only after + /// one filled and stroked stays unstroked (#8300). Invisible text (neither fill nor stroke) + /// joins only invisible text. fn takes(&self, other: &Look) -> bool { self.font == other.font && (self.size - other.size).abs() <= self.size * 0.01 && (self.h_scale - other.h_scale).abs() < 0.5 && self.fill == other.fill && self.overprint_fill == other.overprint_fill - && ((other.stroke.is_none() && other.fill.is_some()) || (self.stroke == other.stroke && self.overprint_stroke == other.overprint_stroke)) + && self.stroke == other.stroke + && self.overprint_stroke == other.overprint_stroke } fn style(&self) -> CharStyle { @@ -219,6 +235,17 @@ pub(crate) struct TextLine { authored: Vec<bool>, /// Fill callbacks in an authored span, for the reader's later stroke pass. actual_fills: HashMap<(u128, u64, u64), Option<usize>>, + /// The glyphs filled without a stroke, in drawing order, for a stroke drawn over them later + /// ([`stroke_filled`](Self::stroke_filled)). + filled: Vec<Filled>, + /// The first of [`filled`](Self::filled) a stroke may still be drawn over: a stroke matches + /// glyphs in the order they were filled, and each at most once. + stroked: usize, + /// Glyphs stroked so far that are still to be restyled: a stroke pass over a word restyles it + /// once, as a whole ([`flush_stroke`](Self::flush_stroke)). + pending: Option<PendingStroke>, + /// The last glyph's placement. + last_at: Placement, /// The first glyph was set vertically ([`Upright`]). upright: Option<Upright>, /// The glyphs make a column (vertical type), each below the last. @@ -251,6 +278,28 @@ struct Slot { advance: Option<f64>, } +/// A glyph filled without a stroke: its font and placement, and where its text is in the line's +/// runs (the run's index, the text's byte offset in it and its length). +#[derive(Clone, Copy, Debug)] +struct Filled { + font: u128, + at: Placement, + run: usize, + start: usize, + len: usize, +} + +/// Glyphs next to each other in one run that a stroke is drawn over, not yet restyled +/// ([`TextLine::stroke_filled`]): the run's index, the text's byte range in it, and the stroke. +#[derive(Clone, Debug)] +struct PendingStroke { + run: usize, + start: usize, + end: usize, + stroke: TypeStroke, + overprint: bool, +} + /// What a finished line of type tells beyond its text object (see [`crate::import_lines`]). #[derive(Clone, Debug, Default)] pub(crate) struct LineFacts { @@ -283,6 +332,10 @@ impl TextLine { slots: vec![], authored: vec![], actual_fills: HashMap::new(), + filled: vec![], + stroked: 0, + pending: None, + last_at: at, upright: None, column: false, ink: vec![], @@ -313,12 +366,15 @@ impl TextLine { } pub fn push_upright_content(&mut self, look: &Look, at: Placement, opacity: f32, upright: Upright, content: TextContent<'_>) -> bool { + self.flush_stroke(); let text = content.text(); if !text.is_empty() && self.authored.is_empty() && self.upright.is_some() { // Suppressed vertical glyphs likewise provide no text anchor. self.at = at; self.opacity = opacity; self.runs.clear(); + self.filled.clear(); + self.stroked = 0; self.column = false; } let down = -self.at.up(); @@ -327,8 +383,9 @@ impl TextLine { self.runs.push((look.clone(), 0.0, text.to_string())); self.last_start = 0; self.record_actual_fill(look, at, content); + self.record_filled(look, at, content); self.authored.extend(text.chars().map(|_| content.authored())); - (self.upright, self.next, self.last) = (Some(upright), at.origin + down * at.size, at.origin); + (self.upright, self.next, self.last, self.last_at) = (Some(upright), at.origin + down * at.size, at.origin, at); return true; }; let across = (at.origin - self.at.origin).dot(self.at.dir); @@ -364,9 +421,11 @@ impl TextLine { self.last_start = 0; } self.record_actual_fill(look, at, content); + self.record_filled(look, at, content); self.authored.extend(text.chars().map(|_| content.authored())); self.next = at.origin + down * at.size; self.last = at.origin; + self.last_at = at; true } @@ -377,6 +436,7 @@ impl TextLine { } pub fn push_content(&mut self, look: &Look, at: Placement, opacity: f32, advance: f64, content: TextContent<'_>) -> bool { + self.flush_stroke(); let text = content.text(); let pen = matches!(content, TextContent::Pen); // A vertical line (even a single upright glyph) takes no horizontal glyphs. @@ -394,6 +454,8 @@ impl TextLine { self.last_size = at.size; self.baseline.clear(); self.runs.clear(); + self.filled.clear(); + self.stroked = 0; } let bytes = self.text_bytes; let glyph = self.baseline.len(); @@ -461,6 +523,7 @@ impl TextLine { self.last_start = 0; } self.record_actual_fill(look, at, content); + self.record_filled(look, at, content); self.text_bytes = self.text_bytes.saturating_add(text.len()); if !pen { let one = text.chars().count() == 1 && !content.authored(); @@ -475,6 +538,7 @@ impl TextLine { self.visible = self.next; } self.last = at.origin; + self.last_at = at; self.last_dir = at.dir; self.last_size = at.size; self.baseline.push(at.origin); @@ -488,10 +552,22 @@ impl TextLine { } } + /// Note glyph `content` just added to the last run, filled without a stroke, for a stroke + /// drawn over it later. + fn record_filled(&mut self, look: &Look, at: Placement, content: TextContent<'_>) { + let len = content.text().len(); + if content.authored() || len == 0 || look.fill.is_none() || look.stroke.is_some() { + return; + } + let run = self.runs.len().saturating_sub(1); + self.filled.push(Filled { font: look.font, at, run, start: self.last_start, len }); + } + /// The reader fills a whole Tj/TJ before replaying its glyphs as strokes. A replay /// must neither consume the replacement nor rewind the pen. Only the first glyph's /// style belongs to the replacement; suppressed glyphs have no text to restyle. pub fn stroke_actual(&mut self, font: u128, at: Placement, stroke: TypeStroke, overprint: bool) -> bool { + self.flush_stroke(); let key = (font, at.origin.x.to_bits(), at.origin.y.to_bits()); let Some(run) = self.actual_fills.remove(&key) else { return false }; if let Some((look, ..)) = run.and_then(|i| self.runs.get_mut(i)) { @@ -529,19 +605,152 @@ impl TextLine { Some(bp) } - /// A stroke (`stroke`: paint, width, cap, join and miter limit) over the glyph just drawn at - /// `at` in `font` (fill and stroke rendering), which `overprint`s or not: that glyph is - /// stroked. `false`: it isn't that glyph. + /// A stroke (`stroke`: paint, width, cap, join and miter limit) over glyph `text` drawn at + /// `at` in `font` at `opacity`, which `overprint`s or not, after the glyph was filled (fill + /// and stroke rendering): that glyph is stroked. `false`: no glyph on the line was filled so. /// - /// A filled glyph joins a run of the same fill whatever its stroke ([`Look::takes`]), so the - /// run can hold glyphs before it that are stroked otherwise or not at all: then the glyph's - /// text becomes a run of its own with this stroke, and the glyphs before it keep theirs - /// (#7741). The line's text is the same either way, so the characters' slots, gaps and - /// authored flags, kept along the whole line, still line up. - pub fn stroke_last(&mut self, font: u128, at: Placement, stroke: TypeStroke, overprint: bool) -> bool { + /// The reader fills all the glyphs a text-showing operator (`Tj`, `TJ`, `'`, `"`) draws + /// before it strokes them (#8015), or fills and strokes glyph by glyph: either way each + /// stroke is matched to the next glyph filled with the same placement (where, how large, how + /// wide, slanted and turned), in the same font with the same text, in order. Only that + /// glyph's text takes the stroke; strokes over glyphs next to each other in a run gather and + /// restyle their text as one run, so a word filled whole and stroked whole stays one run. The + /// glyphs around them keep their own stroke or none (#7741). + /// + /// Only opaque type takes its stroke: the file composites a translucent fill and stroke + /// apiece, darker where they overlap, while one object's opacity applies to its fill and + /// stroke together. Translucent fill and stroke stay type objects of their own, as do a fill + /// and stroke at different opacities. + pub fn stroke_filled(&mut self, font: u128, at: Placement, opacity: f32, text: &str, stroke: TypeStroke, overprint: bool) -> bool { + // A stroke at another opacity than the fill's (`CA` and `ca` differ), or over a + // translucent fill, is type of its own. + let opaque = opacity >= 0.999 && self.opacity >= 0.999; + let rest = if opaque { self.filled.get(self.stroked..) } else { None }; + let found = rest.and_then(|rest| { + rest.iter().position(|g| { + g.font == font + && g.at.same_as(&at) + && self.runs.get(g.run).and_then(|(.., t)| t.get(g.start..g.start.saturating_add(g.len))) == Some(text) + }) + }); + let Some(index) = found.map(|i| self.stroked.saturating_add(i)) else { + // Stroked text of its own (stroke rendering): no later stroke goes back over the + // glyphs filled before it, so no stroke looks through them again. + self.stroked = self.filled.len(); + // Nor does a translucent stroke join the glyph just filled. + return opaque && self.stroke_last(font, at, text, stroke, overprint); + }; + let continues = self + .pending + .as_ref() + .zip(self.filled.get(index)) + .is_some_and(|(p, g)| p.run == g.run && p.end == g.start && p.stroke == stroke && p.overprint == overprint); + if continues { + let end = self.filled.get(index).map(|g| g.start.saturating_add(g.len)); + if let (Some(p), Some(end)) = (&mut self.pending, end) { + p.end = end; + } + } else { + // Restyling what was gathered can move this glyph's text to another run: look it up after. + self.flush_stroke(); + if let Some(g) = self.filled.get(index) { + self.pending = Some(PendingStroke { run: g.run, start: g.start, end: g.start.saturating_add(g.len), stroke, overprint }); + } + } + self.stroked = index.saturating_add(1); + true + } + + /// Restyle the glyphs gathered for a stroke ([`stroke_filled`](Self::stroke_filled)): their + /// text becomes a run of its own with the stroke, unless the run is stroked so already, and the + /// text before and after it in the run keeps its stroke. Text that comes right after a run + /// drawn alike joins it, a run made up of it whole too: fill and stroke rendering glyph by + /// glyph fills each glyph as a run of its own ([`Look::takes`]) before its stroke (#8300). + fn flush_stroke(&mut self) { + let Some(PendingStroke { run, start, end, stroke, overprint }) = self.pending.take() else { return }; + let last = run.saturating_add(1) == self.runs.len(); + let previous = run.checked_sub(1).and_then(|i| self.runs.get(i)).map(|(l, sh, t)| (l.clone(), *sh, t.len())); + let Some((look, shift, text)) = self.runs.get_mut(run) else { return }; + if look.stroke.as_ref() == Some(&stroke) && look.overprint_stroke == overprint { + return; + } + if !(start < end && end <= text.len() && text.is_char_boundary(start) && text.is_char_boundary(end)) { + return; + } + let tail = text.split_off(end); + let glyphs = text.split_off(start); + let head = std::mem::take(text); + let mut own = look.clone(); + (own.stroke, own.overprint_stroke) = (Some(stroke), overprint); + let (old, shift) = (look.clone(), *shift); + // The stroked text joins the run before when nothing is left before it in its own run and + // that run is drawn alike. + let joins = match &previous { + Some((l, sh, _)) => head.is_empty() && *l == own && (sh - shift).abs() < 1e-3, + None => false, + }; + let joined_at = previous.as_ref().map_or(0, |(.., len)| *len); + let mut pieces = vec![]; + if !head.is_empty() { + pieces.push((old.clone(), shift, head.clone())); + } + // Where each part of the run's text goes: its run and how far its new run's text starts + // before it (bytes), for the head, the stroked glyphs and the tail. + let head_at = (run, 0usize); + let glyphs_at = if joins { + (run.saturating_sub(1), joined_at) + } else { + pieces.push((own, shift, glyphs.clone())); + (run.saturating_add(pieces.len()).saturating_sub(1), 0) + }; + if !tail.is_empty() { + pieces.push((old, shift, tail)); + } + let tail_at = run.saturating_add(pieces.len()).saturating_sub(1); + let count = pieces.len(); + if joins && let Some((.., t)) = run.checked_sub(1).and_then(|i| self.runs.get_mut(i)) { + t.push_str(&glyphs); + } + self.runs.splice(run..run.saturating_add(1), pieces); + let moved = |r: usize, at: usize| -> (usize, usize) { + if r > run { + (r.saturating_add(count).saturating_sub(1), at) + } else if r < run { + (r, at) + } else if at < start { + (head_at.0, at) + } else if at < end { + (glyphs_at.0, at.saturating_sub(start).saturating_add(glyphs_at.1)) + } else { + (tail_at, at.saturating_sub(end)) + } + }; + let from = self.stroked.min(self.filled.len()); + for g in self.filled.iter_mut().skip(from) { + (g.run, g.start) = moved(g.run, g.start); + } + for i in self.actual_fills.values_mut().flatten() { + *i = moved(*i, 0).0; + } + if last { + self.last_start = moved(run, self.last_start).1; + } + } + + /// A stroke over glyph `glyph` just drawn at `at` in `font`, which `overprint`s or not: that + /// glyph is stroked. `false`: it isn't that glyph (another place, font or text). + /// + /// The glyph's run can hold glyphs before it, filled alike and not stroked + /// ([`Look::takes`]): then the glyph's text becomes a run of its own with this stroke, and + /// the glyphs before it stay unstroked (#7741). The line's text is the same either way, so + /// the characters' slots, gaps and authored flags, kept along the whole line, still line up. + fn stroke_last(&mut self, font: u128, at: Placement, glyph: &str, stroke: TypeStroke, overprint: bool) -> bool { + self.flush_stroke(); let start = self.last_start; + let last_at = self.last_at; + // The glyph just filled, in the same font and placement, with the same text. let Some((look, shift, text)) = - self.runs.last_mut().filter(|(l, ..)| l.font == font && (at.origin - self.last).hypot() < self.at.size * 1e-3) + self.runs.last_mut().filter(|(l, _, t)| l.font == font && last_at.same_as(&at) && t.get(start..) == Some(glyph)) else { return false; }; @@ -563,6 +772,7 @@ impl TextLine { /// The point type object, its opacity and what else the line tells. pub fn finish(mut self) -> Option<(TextObject, f32, LineFacts)> { + self.flush_stroke(); let mut facts = LineFacts { ink: std::mem::take(&mut self.ink), ..LineFacts::default() }; // Turned along a curve: type on a path through the glyphs. let path = if self.curved() { self.baseline_path() } else { None }; diff --git a/crates/pdf/src/pages.rs b/crates/pdf/src/pages.rs index 64e6217148..470432aa8f 100644 --- a/crates/pdf/src/pages.rs +++ b/crates/pdf/src/pages.rs @@ -215,7 +215,7 @@ fn stream_kind(pdf: &Pdf, id: ObjectIdentifier, dict: &Dict<'_>) -> String { } /// `bytes` for a message, in whole megabytes, or gigabytes when it is a whole number of them. -fn decoded_size(bytes: usize) -> String { +pub(crate) fn decoded_size(bytes: usize) -> String { const GB: usize = 1 << 30; if bytes >= GB && bytes.is_multiple_of(GB) { format!("{} GB", bytes / GB) } else { format!("{} MB", bytes >> 20) } } @@ -323,10 +323,13 @@ pub struct TrimPages { pub bleed: [f64; 4], } -/// Preserve the application's existing accepted file sizes. Ordinary stream decoding still -/// uses the shared reader's immutable per-document limits, and its input copy is fallible. +/// The shared reader's options: files of any size are accepted. Ordinary stream decoding uses the shared reader's immutable per-document limits, and its input +/// copy is fallible. One image may decode to the bytes and pixels of +/// [`crate::streams::image_limits`] for this build, past the shared reader's defaults. pub(crate) fn open_options() -> craft_pdf::OpenOptions { - craft_pdf::OpenOptions { max_input_bytes: usize::MAX, ..Default::default() } + let (bytes, pixels) = crate::streams::image_limits(crate::streams::LARGE_IMAGES); + let decode_limits = craft_pdf::syntax::DecodeLimits::default().with_max_decoded_image(bytes).with_max_image_pixels(pixels); + craft_pdf::OpenOptions { max_input_bytes: usize::MAX, decode_limits } } pub(crate) fn open_with_options(bytes: &[u8], password: Option<&str>, options: &craft_pdf::OpenOptions) -> Result<Pdf, PdfError> { diff --git a/crates/pdf/src/pdfx.rs b/crates/pdf/src/pdfx.rs index e367221d59..2313d62129 100644 --- a/crates/pdf/src/pdfx.rs +++ b/crates/pdf/src/pdfx.rs @@ -6,7 +6,7 @@ //! transparency (the app flattens it before writing), no layers, PDF 1.3. //! - PDF/X-3:2002: colours are ICC-based (always tagged), no transparency, no layers, PDF 1.3. //! - PDF/X-4:2010: transparency and layers are kept, colours are tagged, PDF 1.6 at most, and the -//! XMP metadata names the standard too. +//! XMP metadata names the standard too and carries `xmp:MetadataDate`. //! - All of them: a `/GTS_PDFX` output intent (blank, the CMYK profile in effect, embedded), a //! TrimBox on every page (the artboard), `/Trapped` True or False, `/GTS_PDFXVersion` in the //! document information, a title and dates, embedded fonts (or text as outlines), no editing @@ -120,8 +120,9 @@ pub(crate) fn info_entries(standard: Standard) -> String { } /// Edit the XMP metadata of a PDF/X file (the catalog's `/Metadata` stream; `root` is the -/// catalog dictionary's contents) into `patch`: PDF/X-4 adds the standard, Trapped and a version -/// id (PDF 1.3 files say so in [`finish`]). Files without metadata are left as they are. +/// catalog dictionary's contents) into `patch`: PDF/X-4 adds the standard, Trapped, a version id +/// and the metadata date (PDF 1.3 files say so in [`finish`]). Files without metadata are left as +/// they are. pub(crate) fn xmp(pdf: &[u8], xref: &Xref, root: (usize, usize), patch: &mut Patch, standard: Standard, trapped: bool) -> Result<(), PdfError> { if !standard.is_pdfx() { return Ok(()); @@ -145,6 +146,22 @@ pub(crate) fn xmp(pdf: &[u8], xref: &Xref, root: (usize, usize), patch: &mut Pat "<pdfxid:GTS_PDFXVersion xmlns:pdfxid=\"http://www.npes.org/pdfx/ns/id/\">{version}</pdfxid:GTS_PDFXVersion><pdf:Trapped>{trapped}</pdf:Trapped><xmpMM:VersionID>1</xmpMM:VersionID>" ); edits.push((close, close, props.into_bytes())); + // When the packet has no `<xmp:MetadataDate>` element, this adds one after the writer's + // `<xmp:ModifyDate>` element with the same value. The search expects the writer's form: + // properties written as elements with the `xmp` prefix, and `<` in text written as `<`. + // The writer's description declares the `xmp` prefix there, and + // [`crate::post::modification_date`] keeps the two dates equal. + if find(xml, b"<xmp:MetadataDate>", 0).is_none() + && let Some(at) = find(xml, b"<xmp:ModifyDate>", 0).map(|i| i + b"<xmp:ModifyDate>".len()) + && let Some(to) = find(xml, b"</xmp:ModifyDate>", at) + { + let date = xml.get(at..to).ok_or_else(bad)?; + let mut prop = b"<xmp:MetadataDate>".to_vec(); + prop.extend_from_slice(date); + prop.extend_from_slice(b"</xmp:MetadataDate>"); + let after = to + b"</xmp:ModifyDate>".len(); + edits.push((after, after, prop)); + } } // Every edit grows the stream (or keeps its length). let grown: usize = edits.iter().map(|(s, e, new)| new.len().saturating_sub(e - s)).sum(); diff --git a/crates/pdf/src/post.rs b/crates/pdf/src/post.rs index 79e872e59b..81d0d5aa0a 100644 --- a/crates/pdf/src/post.rs +++ b/crates/pdf/src/post.rs @@ -84,8 +84,9 @@ pub(crate) fn user_units(pdf: Vec<u8>, units: &[f64]) -> Result<Vec<u8>, PdfErro /// `pdf` dated as modified at `modified` (Unix seconds, UTC), its creation dates kept: the /// document information's `/ModDate` (a PDF date, ISO 32000-1 §7.9.4) and every `xmp:ModifyDate`, /// `xmp:MetadataDate` and `stEvt:when` of the catalog's XMP metadata (ISO 8601 dates), in UTC as -/// the PDF writer writes the creation date. The writer gives `/ModDate`, `xmp:ModifyDate` and -/// `stEvt:when` the creation date. +/// the PDF writer writes the creation date. The writer gives `/ModDate`, `xmp:ModifyDate`, +/// `stEvt:when` and, in a PDF/X-4 file, `xmp:MetadataDate` ([`crate::pdfx::xmp`]) the creation +/// date. pub(crate) fn modification_date(pdf: Vec<u8>, modified: i64) -> Result<Vec<u8>, PdfError> { let failed = |why: &str| PdfError::Write(format!("can't write the file's modification date: {why}")); let Parsed { xref, objects, trailer, root, .. } = linearize::parse(&pdf).map_err(failed)?; diff --git a/crates/pdf/src/print.rs b/crates/pdf/src/print.rs index ba4fc5589f..6c619b3165 100644 --- a/crates/pdf/src/print.rs +++ b/crates/pdf/src/print.rs @@ -12,7 +12,8 @@ //! - Marks and bleed as PDF export draws them ([`crate::MarkSettings`], [`crate::BleedSettings`]), //! around the artboard on the paper, at the paper's scale. //! - Output: composite, or separations, one page per ink that prints ([`print_inks`]) in the -//! grey of its coverage (overprints honoured, spot colours as process if asked), emulsion down +//! gray of its coverage (overprints honored, every spot color or chosen ones as process if +//! asked), emulsion down //! (mirrored), negative (inverted). //! - Colour management: the printer profile composite colours are converted to (and //! separations separate with), the rendering intent, and whether CMYK colours keep their @@ -43,7 +44,7 @@ use vectorcraft_doc::overprint::{OverprintBlack, clear_overprints, darken_overpr use vectorcraft_doc::{ColorMode, Document, Node, NodeKind}; pub use layout::{MAX_COPIES_PER_SHEET, MAX_TILES, TileGrid}; -pub use plates::print_inks; +pub use plates::{document_inks, print_inks}; pub use settings::*; pub use tiling::{TilingPage, tiling}; @@ -132,6 +133,9 @@ pub struct PrintPreview { pub tiles: Vec<TileGrid>, /// The inks of a separation (empty for composite output). pub inks: Vec<PrintInk>, + /// Every ink of the document as a separation lists it, the spot inks printing as process + /// (which `inks` leaves out) included ([`document_inks`]); empty for composite output. + pub document_inks: Vec<PrintInk>, /// What the job leaves out of the document or prints differently. pub warnings: Vec<String>, /// Notes on the options: one the job doesn't apply or applies another way. They aren't @@ -148,6 +152,8 @@ struct Job<'a> { tiles: Vec<TileGrid>, /// The inks of a separation (every one, printed or not). inks: Vec<PrintInk>, + /// Every ink of the document, the spot inks printing as process included. + document_inks: Vec<PrintInk>, /// The inks that print (indices into `inks`): each a plate. plates: Vec<usize>, /// One copy's pages: (layout, plate). @@ -444,8 +450,9 @@ impl<'a> Job<'a> { let (mut warnings, mut setting_notes) = (vec![], vec![]); let (layouts, tiles) = layout::layout(&doc, set, &mut warnings, &mut setting_notes)?; let separations = set.output.mode == OutputMode::Separations; - let (inks, more) = if separations { print_inks(&doc, set) } else { Default::default() }; + let (document_inks, more) = if separations { document_inks(&doc, set) } else { Default::default() }; setting_notes.extend(more); + let inks: Vec<PrintInk> = document_inks.iter().filter(|i| !i.convert_to_process).cloned().collect(); let plates: Vec<usize> = (0..inks.len()).filter(|i| inks[*i].print).collect(); let printed: Vec<Option<usize>> = if separations { (0..plates.len()).map(Some).collect() } else { vec![None] }; if printed.is_empty() { @@ -474,7 +481,7 @@ impl<'a> Job<'a> { if !postscript && !set.graphics.auto_flatness { setting_notes.push("a fixed flatness is not written yet: the output device flattens curves".into()); } - Ok(Self { doc, layouts, tiles, inks, plates, sheets, warnings, setting_notes }) + Ok(Self { doc, layouts, tiles, inks, document_inks, plates, sheets, warnings, setting_notes }) } /// The ink of plate `plate` (`None`: composite). @@ -526,6 +533,7 @@ pub fn preview(doc: &Document, set: &PrintSettings) -> Result<PrintPreview, PdfE sheets, tiles: job.tiles, inks: job.inks, + document_inks: job.document_inks, warnings: job.warnings, setting_notes: job.setting_notes, }) diff --git a/crates/pdf/src/print/plates.rs b/crates/pdf/src/print/plates.rs index 6687d6af17..74102373e5 100644 --- a/crates/pdf/src/print/plates.rs +++ b/crates/pdf/src/print/plates.rs @@ -2,58 +2,80 @@ //! colour (and image pixel) replaced by the grey of that ink's coverage. An image placed from a //! DCS file prints its own plates ([`vectorcraft_doc::separated`]). -use std::collections::{BTreeMap, BTreeSet}; +use std::collections::{BTreeMap, BTreeSet, HashMap, HashSet}; use std::sync::Arc; use vectorcraft_color::cms::{self, Cms, Model, ProfileKind}; use vectorcraft_color::swatch::REGISTRATION; use vectorcraft_color::{BlendMode, Color, GradientKind, Paint}; use vectorcraft_doc::inks::{Link, StopPlates, inks, plates, spot_color, stop_inks, visit_node_colors}; -use vectorcraft_doc::overprint::{darken_overprints, is_white}; +use vectorcraft_doc::overprint::{darken_overprints, is_black_ink, is_white}; use vectorcraft_doc::{AppearanceItem, ColorMode, Document, ImageBlob, Node, NodeKind}; -use super::{DEFAULT_FREQUENCY, PrintInk, PrintSettings}; +use super::{DEFAULT_FREQUENCY, InkSettings, PrintInk, PrintSettings}; -/// The inks of a separation of `doc`: the process inks, then one per spot swatch (none when -/// spots print as process), with the options of [`super::PrintOutput::inks`]; and a warning -/// naming the options that name no ink. -pub fn print_inks(doc: &Document, set: &PrintSettings) -> (Vec<PrintInk>, Vec<String>) { - let out = &set.output; - // Options by ink name, the first for a name winning: looked up, not searched for each ink. - let mut options = std::collections::HashMap::new(); - for o in &out.inks { +/// The options of [`super::PrintOutput::inks`] by ink name, the first for a name winning: looked +/// up, not searched for each ink. +fn ink_options(set: &PrintSettings) -> HashMap<&str, &InkSettings> { + let mut options = HashMap::new(); + for o in &set.output.inks { options.entry(o.name.as_str()).or_insert(o); } + options +} + +/// The inks of a separation of `doc`: the process inks, then one per spot swatch (none for a spot +/// ink that prints as process, [`document_inks`]), with the options of +/// [`super::PrintOutput::inks`]; and the notes of [`document_inks`]. +pub fn print_inks(doc: &Document, set: &PrintSettings) -> (Vec<PrintInk>, Vec<String>) { + let (mut list, notes) = document_inks(doc, set); + list.retain(|p| !p.convert_to_process); + (list, notes) +} + +/// Every ink of `doc` as a separation lists it: the process inks, then one per spot swatch, with +/// the options of [`super::PrintOutput::inks`]. A spot ink prints as process inks +/// ([`PrintInk::convert_to_process`]) with Convert All Spot Colors to Process or its own +/// `convertToProcess`; its other options are kept for when it prints as a spot ink again. Notes: +/// one warning naming the options that name no ink, and one naming the process inks whose +/// options ask for a conversion they don't take. +pub fn document_inks(doc: &Document, set: &PrintSettings) -> (Vec<PrintInk>, Vec<String>) { + let out = &set.output; + let options = ink_options(set); let list: Vec<PrintInk> = plates(doc) .into_iter() - .filter(|p| !(p.spot && out.spots_to_process)) .map(|p| { let o = options.get(p.name.as_str()).copied(); PrintInk { print: o.is_none_or(|o| o.print), frequency: o.and_then(|o| o.frequency).unwrap_or(DEFAULT_FREQUENCY), angle: o.and_then(|o| o.angle).unwrap_or_else(|| PrintInk::default_angle(&p.name)), + convert_to_process: p.spot && (out.spots_to_process || o.is_some_and(|o| o.convert_to_process)), spot: p.spot, name: p.name, } }) .collect(); + let few = |all: Vec<&str>| { + let more = all.len().saturating_sub(MAX_NAMED); + let shown = all.into_iter().take(MAX_NAMED).map(|n| format!("`{n}`")).collect::<Vec<_>>().join(", "); + if more > 0 { format!("{shown} and {more} more") } else { shown } + }; // One warning for all the options naming no ink, each list cut short: the options and the - // inks both come from the file. + // inks both come from the file. A spot ink printing as process is still an ink of the job. let names: BTreeSet<&str> = list.iter().map(|p| p.name.as_str()).collect(); let unknown: Vec<&str> = out.inks.iter().map(|i| i.name.as_str()).filter(|n| !names.contains(n)).collect(); - let warnings = if unknown.is_empty() { - vec![] - } else { - let few = |all: Vec<&str>| { - let more = all.len().saturating_sub(MAX_NAMED); - let shown = all.into_iter().take(MAX_NAMED).map(|n| format!("`{n}`")).collect::<Vec<_>>().join(", "); - if more > 0 { format!("{shown} and {more} more") } else { shown } - }; + let mut notes = vec![]; + if !unknown.is_empty() { let inks = few(list.iter().map(|p| p.name.as_str()).collect()); - vec![format!("there is no ink named {} to print (inks: {inks})", few(unknown))] - }; - (list, warnings) + notes.push(format!("there is no ink named {} to print (inks: {inks})", few(unknown))); + } + let process: Vec<&str> = + list.iter().filter(|p| !p.spot && options.get(p.name.as_str()).is_some_and(|o| o.convert_to_process)).map(|p| p.name.as_str()).collect(); + if !process.is_empty() { + notes.push(format!("{} print as process inks already: only spot inks convert to process", few(process))); + } + (list, notes) } /// The most names a warning of [`print_inks`] lists. @@ -78,20 +100,30 @@ pub(crate) struct Separator<'a> { pub doc: &'a Document, cms: Arc<Cms>, set: &'a PrintSettings, + /// The inks whose own options convert them to process ([`InkSettings::convert_to_process`]). + converted: HashSet<&'a str>, /// The plates are written as PostScript, which has no blending modes. postscript: bool, } impl<'a> Separator<'a> { pub fn new(doc: &'a Document, set: &'a PrintSettings, postscript: bool) -> Self { - Self { doc, cms: separation_cms(doc, set), set, postscript } + let converted = ink_options(set).into_iter().filter(|(_, o)| o.convert_to_process).map(|(name, _)| name).collect(); + Self { doc, cms: separation_cms(doc, set), set, converted, postscript } + } + + /// Whether colors linked to swatch `name` print as process inks: every swatch but + /// Registration with Convert All Spot Colors to Process, else the inks converted one by one. + /// A link to a process swatch separates as its color either way. + fn converts(&self, name: &str) -> bool { + name != REGISTRATION && (self.set.output.spots_to_process || self.converted.contains(name)) } /// How much of ink `plate` colour `c` (with swatch link `link`) prints, 0..1. fn ink(&self, plate: &str, c: &Color, link: Link) -> f32 { let color = &self.set.color; - // Spot colours as process: only Registration keeps its link. - let link = link.filter(|(name, _)| !self.set.output.spots_to_process || *name == REGISTRATION); + // Spot colors as process lose their link; Registration always keeps its. + let link = link.filter(|(name, _)| !self.converts(name)); // Without Preserve Numbers, CMYK colours are separated again from their appearance. let lab; let c = if !color.preserve_numbers && matches!(c, Color::Cmyk { .. }) { @@ -104,15 +136,16 @@ impl<'a> Separator<'a> { } /// [`Self::ink`] of a colour that prints process plates `plates` with its spot tint - /// ([`stop_inks`]): the spot plate prints the tint and the process plates print `plates`. With - /// spots as process, each process plate prints `plates` layered with the spot tint's process - /// equivalent, as a separated image's plates layer ([`vectorcraft_doc::separated::Separated::coverage_as`]). + /// ([`stop_inks`]): the spot plate prints the tint and the process plates print `plates`. When + /// its spot ink prints as process, each process plate prints `plates` layered with the spot + /// tint's process equivalent, as a separated image's plates layer + /// ([`vectorcraft_doc::separated::Separated::coverage_as`]). fn stop_ink(&self, plate: &str, c: &Color, link: Link, plates: StopPlates) -> f32 { let own = stop_inks(self.doc, &self.cms, c, link, plates, self.set.color.intent); let (Some(_), Some((name, tint))) = (plates, own.spot.as_ref()) else { return self.ink(plate, c, link); }; - if !self.set.output.spots_to_process { + if !self.converts(name) { return own.on_plate(plate); } let Some(i) = cms::PROCESS_PLATES.iter().position(|p| *p == plate) else { @@ -135,17 +168,26 @@ impl<'a> Separator<'a> { /// Whether paint `p` puts none of ink `plate` down: a solid color, a gradient whose every stop /// does, or a freeform gradient with color points whose every point does (points carry no - /// swatch link). On PostScript plates, to within half a percent (the other inks a black may - /// carry and still count as black, [`vectorcraft_doc::overprint::is_black_ink`]). + /// swatch link). Any ink above zero puts ink down, except on PostScript plates for a color that + /// counts as 100% black ([`vectorcraft_doc::overprint::is_black_ink`], as + /// [`vectorcraft_doc::overprint::OverprintBlack::default`] judges it) and is not linked to a + /// spot swatch, to Registration or to a swatch the document lacks: up to the half a percent of + /// another ink such a black may carry counts as none. fn no_ink(&self, plate: &str, p: &Paint) -> bool { - let none = if self.postscript { 0.005 } else { 0.0 }; + let process = |swatch: Option<&str>| swatch.is_none_or(|n| n != REGISTRATION && self.doc.swatch(n).is_some_and(|w| !w.spot)); + let none = |c: &Color, process: bool, ink: f32| ink <= 0.0 || (self.postscript && process && ink <= 0.005 && is_black_ink(c, 1.0, false)); match p { - Paint::Solid { color, swatch, tint } => self.ink(plate, color, swatch.as_deref().map(|s| (s, *tint))) <= none, + Paint::Solid { color, swatch, tint } => { + none(color, process(swatch.as_deref()), self.ink(plate, color, swatch.as_deref().map(|s| (s, *tint)))) + } Paint::Gradient(g) => match g.freeform.as_ref().filter(|f| g.gradient.kind == GradientKind::Freeform && !f.points.is_empty()) { - Some(f) => f.points.iter().all(|pt| self.ink(plate, &pt.color, None) <= none), + Some(f) => f.points.iter().all(|pt| none(&pt.color, true, self.ink(plate, &pt.color, None))), None => { !g.gradient.stops.is_empty() - && g.gradient.stops.iter().all(|s| self.stop_ink(plate, &s.color, s.swatch.as_deref().map(|n| (n, s.tint)), s.plates) <= none) + && g.gradient.stops.iter().all(|s| { + let ink = self.stop_ink(plate, &s.color, s.swatch.as_deref().map(|n| (n, s.tint)), s.plates); + none(&s.color, s.plates.is_none() && process(s.swatch.as_deref()), ink) + }) } }, _ => false, @@ -156,7 +198,9 @@ impl<'a> Separator<'a> { /// overprinting character fills and strokes, that put none of ink `plate` down leave its plate /// as it is: they are drawn as nothing on it (white ones with `discard_white` aside, which /// knock out). A writer without blending modes (PostScript) then keeps the ink below them, - /// where it would draw their Darken as a knockout. + /// where it would draw their Darken as a knockout. One that puts any ink down is drawn, and on + /// a PostScript plate its ink replaces the ink below, as a nonzero component of an overprinting + /// color replaces the backdrop's with overprint mode 1 (ISO 32000-1, 11.7.4.2). fn clear_inkless_overprints(&self, plate: &str, a: &mut Arc<Node>, discard_white: bool) { let inkless = |overprint: bool, p: &Paint| overprint && !p.is_none() && !(discard_white && is_white(p)) && self.no_ink(plate, p); let n = Arc::make_mut(a); @@ -207,12 +251,8 @@ impl<'a> Separator<'a> { } } // A DCS file's image prints its own plates: a spot plate on its ink when the job prints - // that ink, else as its process equivalent. - let spots: BTreeSet<String> = if self.set.output.spots_to_process { - BTreeSet::new() - } else { - plates(self.doc).into_iter().filter(|p| p.spot).map(|p| p.name).collect() - }; + // that ink as a spot ink, else as its process equivalent. + let spots: BTreeSet<String> = plates(self.doc).into_iter().filter(|p| p.spot && !self.converts(&p.name)).map(|p| p.name).collect(); let own = |name: &str| spots.contains(name); // A spot plate printing as process prints as the document's swatch of its ink does, when // there is one; else as the process equivalent its file gives. diff --git a/crates/pdf/src/print/settings.rs b/crates/pdf/src/print/settings.rs index 15e029a13a..f6f3e5c563 100644 --- a/crates/pdf/src/print/settings.rs +++ b/crates/pdf/src/print/settings.rs @@ -462,15 +462,21 @@ pub struct InkSettings { /// Halftone screen angle (degrees); `None`: the ink's default. #[serde(skip_serializing_if = "Option::is_none")] pub angle: Option<f64>, + /// A spot ink prints as process inks: no plate of its own, its color on the process plates. + /// Off by default. [`PrintOutput::spots_to_process`] converts every spot ink whatever this + /// says; process inks and Registration ignore it. + #[serde(skip_serializing_if = "std::ops::Not::not")] + pub convert_to_process: bool, } impl Default for InkSettings { fn default() -> Self { - Self { name: String::new(), print: true, frequency: None, angle: None } + Self { name: String::new(), print: true, frequency: None, angle: None, convert_to_process: false } } } -/// An ink of a separation, with its options resolved ([`super::inks`]). +/// An ink of a separation, with its options resolved ([`super::print_inks`], +/// [`super::document_inks`]). #[derive(Clone, Debug, PartialEq, Serialize)] #[serde(rename_all = "camelCase")] pub struct PrintInk { @@ -479,6 +485,10 @@ pub struct PrintInk { pub print: bool, pub frequency: f64, pub angle: f64, + /// A spot ink printing as process inks (its own option or Convert All Spot Colors to + /// Process): it has no plate. + #[serde(skip_serializing_if = "std::ops::Not::not")] + pub convert_to_process: bool, } /// The default halftone screen ruling (lpi). diff --git a/crates/pdf/src/settings.rs b/crates/pdf/src/settings.rs index c2f5487cbb..e1dca94b3d 100644 --- a/crates/pdf/src/settings.rs +++ b/crates/pdf/src/settings.rs @@ -465,9 +465,14 @@ impl Default for SecuritySettings { } } -/// `v` lies in `lo..=hi` (and is a number). +/// `v` lies in `lo..=hi` (and is a number). The error names the range with its unit as one value +/// (`72–2400 ppi`), so a catalog can match the message and translate it. pub(crate) fn within(name: &str, v: f64, lo: f64, hi: f64, unit: &str) -> Result<(), PdfError> { - if (lo..=hi).contains(&v) { Ok(()) } else { Err(PdfError::BadSetting(format!("{name} must be {lo}–{hi}{unit} (got {v})"))) } + if (lo..=hi).contains(&v) { + return Ok(()); + } + let range = format!("{lo}–{hi}{unit}"); + Err(PdfError::BadSetting(format!("{name} must be {range} (got {v})"))) } impl PdfSettings { diff --git a/crates/pdf/src/streams.rs b/crates/pdf/src/streams.rs index 3f99b8b82a..1cb23b2768 100644 --- a/crates/pdf/src/streams.rs +++ b/crates/pdf/src/streams.rs @@ -15,9 +15,21 @@ use craft_pdf::syntax::object::{Array, Dict, FromBytes, MaybeRef, Name, Object, /// million, 4 bytes each). pub(crate) const MAX_DECODED: usize = 256 << 20; +/// Whether this build reads the larger images of [`image_limits`]: a 64-bit build that isn't for +/// the web. +pub(crate) const LARGE_IMAGES: bool = cfg!(all(target_pointer_width = "64", not(target_family = "wasm"))); + +/// The most bytes one image XObject may decode to and the most pixels it may have, for a build +/// that reads `large` images: 4 GiB and 2^30 pixels (31404 × 31403 pixels are 2.76 GiB in RGB and +/// 3.67 GiB in CMYK), otherwise 1 GiB and 2^28 pixels (an A0 sheet scanned at 300 ppi is 399 MiB +/// in RGB and 532 MiB in CMYK). The shared reader takes the same two figures ([`crate::pages::open_options`]). +pub(crate) const fn image_limits(large: bool) -> (u64, u64) { + if large { (1 << 32, 1 << 30) } else { (1 << 30, 1 << 28) } +} + /// The most an image XObject may decode to when its own size asks for more than -/// [`MAX_DECODED`]: 1 GB (an A0 sheet scanned at 300 ppi is 418 MB in RGB, 557 MB in CMYK). -const MAX_IMAGE_DECODED: usize = 1 << 30; +/// [`MAX_DECODED`]: the bytes of [`image_limits`] for this build. +const MAX_IMAGE_DECODED: usize = image_limits(LARGE_IMAGES).0 as usize; /// The longest row a predictor may have, in bytes. const MAX_ROW: usize = 1 << 24; @@ -779,31 +791,42 @@ mod tests { /// A one-page PDF drawing one flat 8-bit DeviceRGB image of `w` × `h` pixels, Flate-compressed. fn one_image_pdf(w: usize, h: usize) -> Vec<u8> { + image_pdf(&format!("/Width {w} /Height {h} /ColorSpace /DeviceRGB"), &flat(&[200, 180, 150].repeat(w), h), None) + } + + /// `row` repeated `h` times, Flate-compressed as it is written. + fn flat(row: &[u8], h: usize) -> Vec<u8> { let mut e = flate2::write::ZlibEncoder::new(Vec::new(), flate2::Compression::best()); - let row: Vec<u8> = [200, 180, 150].repeat(w); for _ in 0..h { - std::io::Write::write_all(&mut e, &row).unwrap(); + std::io::Write::write_all(&mut e, row).unwrap(); } - let image = e.finish().unwrap(); + e.finish().unwrap() + } + + /// A one-page PDF drawing one 8-bit image with the size and color space of `keys` and the + /// Flate-compressed samples `data`; with `smask`, a soft mask with those keys and data. + fn image_pdf(keys: &str, data: &[u8], smask: Option<(&str, &[u8])>) -> Vec<u8> { + let stream = |keys: &str, data: &[u8]| { + let dict = + format!("<< /Type /XObject /Subtype /Image {keys} /BitsPerComponent 8 /Filter /FlateDecode /Length {} >>\nstream\n", data.len()); + [dict.as_bytes(), data, b"\nendstream"].concat() + }; let content = b"q 595 0 0 842 0 0 cm /Im0 Do Q"; let mut out = b"%PDF-1.6\n".to_vec(); let mut offsets = vec![]; - let objects: Vec<Vec<u8>> = vec![ + let mut objects: Vec<Vec<u8>> = vec![ b"<< /Type /Catalog /Pages 2 0 R >>".to_vec(), b"<< /Type /Pages /Kids [3 0 R] /Count 1 >>".to_vec(), b"<< /Type /Page /Parent 2 0 R /MediaBox [0 0 595 842] /Contents 4 0 R /Resources << /XObject << /Im0 5 0 R >> >> >>".to_vec(), [format!("<< /Length {} >>\nstream\n", content.len()).as_bytes(), content, b"\nendstream"].concat(), - [ - format!( - "<< /Type /XObject /Subtype /Image /Width {w} /Height {h} /ColorSpace /DeviceRGB /BitsPerComponent 8 /Filter /FlateDecode /Length {} >>\nstream\n", - image.len() - ) - .as_bytes(), - &image, - b"\nendstream", - ] - .concat(), ]; + match smask { + Some((mask_keys, mask_data)) => { + objects.push(stream(&format!("{keys} /SMask 6 0 R"), data)); + objects.push(stream(mask_keys, mask_data)); + } + None => objects.push(stream(keys, data)), + } for (i, o) in objects.iter().enumerate() { offsets.push(out.len()); out.extend_from_slice(format!("{} 0 obj\n", i + 1).as_bytes()); @@ -828,6 +851,65 @@ mod tests { assert_eq!(info.map(|i| i.pages.len()).unwrap(), 1); } + #[test] + fn a_64_bit_desktop_build_reads_larger_images_and_others_keep_their_limits() { + assert_eq!(image_limits(false), (1 << 30, 1 << 28)); + assert_eq!(image_limits(true), (1 << 32, 1 << 30)); + let (bytes, pixels) = image_limits(LARGE_IMAGES); + assert_eq!(MAX_IMAGE_DECODED as u64, bytes); + let limits = crate::pages::open_options().decode_limits; + assert_eq!((limits.max_decoded_image(), limits.max_image_pixels()), (bytes, pixels)); + // An image declaring more is held to this build's limit, which a refusal of it names. + let d = dict("<< /Subtype /Image /Width 70000 /Height 70000 /ColorSpace /DeviceRGB /BitsPerComponent 8 /Filter /FlateDecode >>"); + assert_eq!(budget(&d), MAX_IMAGE_DECODED); + let most = if LARGE_IMAGES { "4 GB" } else { "1 GB" }; + assert_eq!(crate::pages::decoded_size(MAX_IMAGE_DECODED), most); + } + + /// The only image of `doc`, as stored: its width, height and channel layout. + fn stored_image(doc: &vectorcraft_doc::Document) -> (u32, u32, image::ExtendedColorType) { + use image::ImageDecoder as _; + let blobs: Vec<_> = doc.images.values().collect(); + let [blob] = blobs[..] else { panic!("one image expected, found {}", blobs.len()) }; + let decoder = image::ImageReader::new(std::io::Cursor::new(blob.bytes.as_slice())).with_guessed_format().unwrap().into_decoder().unwrap(); + let (w, h) = decoder.dimensions(); + (w, h, decoder.original_color_type()) + } + + #[test] + fn an_image_past_1_gb_and_2_to_the_28_pixels_opens_on_a_64_bit_desktop_build() { + if !LARGE_IMAGES { + return; + } + // 18919 × 18919 RGB pixels: 358 million pixels, 1.07 GB decoded (#4366). + let side = 18919; + let doc = crate::import(&one_image_pdf(side, side)).unwrap(); + // Opaque: stored as RGB, without an alpha channel. + assert_eq!(stored_image(&doc), (side as u32, side as u32, image::ExtendedColorType::Rgb8)); + } + + #[test] + fn opaque_images_are_stored_without_an_alpha_channel_and_masked_ones_with_one() { + let rgb = image_pdf("/Width 4 /Height 2 /ColorSpace /DeviceRGB", &flat(&[200, 180, 150].repeat(4), 2), None); + assert_eq!(stored_image(&crate::import(&rgb).unwrap()), (4, 2, image::ExtendedColorType::Rgb8)); + let gray = image_pdf("/Width 4 /Height 2 /ColorSpace /DeviceGray", &flat(&[120; 4], 2), None); + assert_eq!(stored_image(&crate::import(&gray).unwrap()), (4, 2, image::ExtendedColorType::Rgb8)); + let mask = ("/Width 4 /Height 2 /ColorSpace /DeviceGray", &flat(&[0, 85, 170, 255], 2)[..]); + let masked = image_pdf("/Width 4 /Height 2 /ColorSpace /DeviceRGB", &flat(&[200, 180, 150].repeat(4), 2), Some(mask)); + assert_eq!(stored_image(&crate::import(&masked).unwrap()), (4, 2, image::ExtendedColorType::Rgba8)); + } + + #[test] + fn an_image_of_more_pixels_than_the_limit_is_left_out_with_a_warning() { + let (_, pixels) = image_limits(LARGE_IMAGES); + // One more row than a square of the limit's pixels; its data isn't looked at. + let side = 1u64 << (pixels.ilog2() / 2); + let pdf = image_pdf(&format!("/Width {side} /Height {} /ColorSpace /DeviceGray", side + 1), &flat(&[0; 16], 1), None); + let report = crate::import_with_report(&pdf, &crate::ImportOptions::default()).unwrap(); + assert!(report.document.images.is_empty()); + assert!(report.warnings.iter().any(|w| w.contains("an image could not be decoded and was skipped")), "{:?}", report.warnings); + } + #[test] fn object_and_cross_reference_streams_are_looked_at_before_the_file_is_read() { let stream = |dict: &str, data: &[u8]| { diff --git a/crates/pdf/src/tests.rs b/crates/pdf/src/tests.rs index 2337cc8dee..91c037ad84 100644 --- a/crates/pdf/src/tests.rs +++ b/crates/pdf/src/tests.rs @@ -223,6 +223,60 @@ fn an_instance_whose_art_reaches_the_page_is_written() { assert!(fills.contains(&[255, 0, 0, 255]) && fills.contains(&[0, 0, 255, 255]), "{fills:?}"); } +/// 2,000 symbols, then two named "Mark" (a red square, then a blue one), with an instance of +/// "Mark" at (25, 25) and, in a knockout group above a green square, a half-opaque one at (70, 70). +/// With `second` the blue square's symbol is named that instead. +fn marks(second: &str) -> Document { + let mut d = doc(100.0, 100.0); + for i in 0..2000 { + let art = rect_node(Rect::new(0.0, 0.0, 1.0, 1.0), Color::BLACK); + d.symbols.push(vectorcraft_doc::Symbol { dynamic: false, name: format!("Filler {i}"), art: Arc::new(art) }); + } + for (name, color) in [("Mark", Color::rgb(1.0, 0.0, 0.0)), (second, Color::rgb(0.0, 0.0, 1.0))] { + let art = rect_node(Rect::new(-10.0, -10.0, 10.0, 10.0), color); + d.symbols.push(vectorcraft_doc::Symbol { dynamic: false, name: name.into(), art: Arc::new(art) }); + } + add(&mut d, Node::new(NodeId(0), NodeKind::SymbolInstance { symbol: "Mark".into(), xf: Affine::translate((25.0, 25.0)) })); + let green = rect_node(Rect::new(60.0, 60.0, 80.0, 80.0), Color::rgb(0.0, 1.0, 0.0)); + let mut above = Node::new(NodeId(0), NodeKind::SymbolInstance { symbol: "Mark".into(), xf: Affine::translate((70.0, 70.0)) }); + above.opacity = 0.5; + let mut group = Node::group(NodeId(0), vec![Arc::new(green), Arc::new(above)]); + group.knockout = vectorcraft_doc::Knockout::On; + add(&mut d, group); + d +} + +/// Instances among many symbols are written with the first symbol of their name, the same bytes +/// as when no other symbol has that name. +#[test] +fn instances_are_written_with_the_first_symbol_of_their_name() { + let d = marks("Mark"); + assert!(uncompressed(&d) == uncompressed(&marks("Other")), "the files differ"); + let fills: Vec<[u8; 4]> = leaves(&roundtrip(&d)).iter().filter_map(|n| Some(n.appearance.fill_paint().color()?.to_rgba8(1.0))).collect(); + assert!(fills.contains(&[255, 0, 0, 255]) && !fills.contains(&[0, 0, 255, 255]), "{fills:?}"); +} + +/// An export of 300 instances with drop shadows, among 2,000 symbols, reads the symbol list once +/// to find their symbols. +#[test] +fn an_export_reads_the_symbol_list_once() { + let mut d = marks("Other"); + for i in 0..300 { + let xf = Affine::translate((f64::from(i % 20) * 5.0, f64::from(i / 20) * 5.0)) * Affine::scale(0.2); + let mut n = Node::new(NodeId(0), NodeKind::SymbolInstance { symbol: "Mark".into(), xf }); + n.appearance.effects.push(vectorcraft_doc::Effect { + id: "stylize.dropShadow".into(), + params: serde_json::json!({"x": 1, "y": 1, "blur": 0}), + visible: true, + }); + add(&mut d, n); + } + let before = vectorcraft_doc::symbols_read(); + export(&d, &PdfOptions::default()).expect("export"); + let read = vectorcraft_doc::symbols_read() - before; + assert!(read <= d.symbols.len(), "{read} symbols read, {} in the document", d.symbols.len()); +} + #[test] fn an_instance_whose_brush_art_reaches_the_page_is_written() { // The symbol's art: a line from (0, 40) to (0, 60) with a 1 pt stroke painted by a 20 pt round diff --git a/crates/pdf/src/tests/cmykimages.rs b/crates/pdf/src/tests/cmykimages.rs index deb98b1fea..4d22a10ee6 100644 --- a/crates/pdf/src/tests/cmykimages.rs +++ b/crates/pdf/src/tests/cmykimages.rs @@ -423,6 +423,43 @@ fn a_dcs_spot_plate_printing_as_process_takes_the_documents_swatch() { assert_eq!(get(&own, "Yellow"), Some(vec![0, 0])); } +/// A DCS image's spot plate converted to process on its own prints as the document's swatch of +/// its ink, while its other spot plate keeps printing on its ink. +#[test] +fn a_dcs_image_converts_only_the_spot_ink_chosen() { + use vectorcraft_doc::separated::{InkPlate, Separated}; + let plate = |name: &str, cmyk: [f32; 4], data: [u8; 2]| InkPlate { name: name.into(), cmyk, data: data.to_vec() }; + let s = Separated::new( + 2, + 1, + vec![ + plate("Cyan", [0.0; 4], [0, 0]), + plate("Spot Orange", [0.0, 0.6, 1.0, 0.0], [128, 0]), + plate("Spot Green", [0.0, 0.0, 1.0, 0.0], [0, 128]), + ], + ) + .unwrap(); + let mut d = image_doc(ImageBlob::separated_tiff(&s, None, &[]).unwrap(), 2, 1); + d.swatches.push(Swatch { name: "Spot Orange".into(), paint: Paint::solid(Color::cmyk(0.0, 0.6, 1.0, 0.0)), global: true, spot: true }); + // The document's Spot Green is cyan, where its file says yellow. + d.swatches.push(Swatch { name: "Spot Green".into(), paint: Paint::solid(Color::cmyk(1.0, 0.0, 0.0, 0.0)), global: true, spot: true }); + let settings: PrintSettings = + serde_json::from_value(json!({"output": {"mode": "separations", "inks": [{"name": "Spot Green", "convertToProcess": true}]}})).unwrap(); + let names: Vec<String> = print_inks(&d, &settings).0.into_iter().map(|i| i.name).collect(); + assert_eq!(names, ["Cyan", "Magenta", "Yellow", "Black", "Spot Orange"]); + let job = plan(&d, &PrintOptions { settings, ..Default::default() }).unwrap(); + let coverage = job.plates.iter().map(|p| { + let NodeKind::Image(im) = &p.layers[0].children().unwrap()[0].kind else { panic!("an image") }; + p.image_blob(im).and_then(|b| b.coverage()).unwrap().2 + }); + let all: Vec<(String, Vec<u8>)> = names.into_iter().zip(coverage).collect(); + let get = |name: &str| all.iter().find(|(n, _)| n == name).map(|(_, c)| c.clone()); + assert_eq!(get("Cyan"), Some(vec![0, 128]), "the swatch's cyan"); + assert_eq!(get("Yellow"), Some(vec![0, 0]), "not the file's yellow"); + assert_eq!(get("Magenta"), Some(vec![0, 0]), "Spot Orange stays on its own plate"); + assert_eq!(get("Spot Orange"), Some(vec![128, 0])); +} + #[test] fn the_output_settings_convert_cmyk_images_and_compression_recompresses_them_in_cmyk() { let ink = [0u8, 102, 255, 0]; diff --git a/crates/pdf/src/tests/pdfx.rs b/crates/pdf/src/tests/pdfx.rs index 2003a6b7c6..1c12b9586f 100644 --- a/crates/pdf/src/tests/pdfx.rs +++ b/crates/pdf/src/tests/pdfx.rs @@ -42,6 +42,51 @@ fn text(pdf: &[u8]) -> String { String::from_utf8_lossy(pdf).into_owned() } +/// The XMP packet of `pdf`, read as its stream's `/Length` says: the packet's end must be inside +/// those bytes and nothing but the end of line may follow them before `endstream`. +fn xmp_packet(pdf: &[u8]) -> String { + use crate::lab_spot::{find, rfind}; + let begin = find(pdf, b"<?xpacket begin", 0).expect("an XMP packet"); + let head = &pdf[..begin]; + let obj = rfind(head, b" obj").expect("the packet's object"); + let dict = &head[obj..]; + let at = find(dict, b"/Length ", 0).expect("its length") + b"/Length ".len(); + let digits: Vec<u8> = dict[at..].iter().copied().take_while(u8::is_ascii_digit).collect(); + let length: usize = String::from_utf8(digits).unwrap().parse().unwrap(); + let mut data = obj + rfind(dict, b"stream").unwrap() + b"stream".len(); + data += pdf[data..].iter().take(2).take_while(|b| matches!(b, b'\r' | b'\n')).count(); + let stream = &pdf[data..data + length]; + let close = find(stream, b"<?xpacket end=", 0).expect("the packet ends inside the stream's length"); + assert!(find(stream, b"?>", close).is_some(), "the packet ends inside the stream's length"); + let rest = String::from_utf8_lossy(&pdf[data + length..]); + assert!(rest.trim_start_matches(['\r', '\n']).starts_with("endstream"), "the stream ends at its length"); + String::from_utf8(stream.to_vec()).unwrap() +} + +/// The value of the XMP element `tag` in `xmp`. +fn xmp_value<'a>(xmp: &'a str, tag: &str) -> Option<&'a str> { + let open = format!("<{tag}>"); + let rest = &xmp[xmp.find(&open)? + open.len()..]; + Some(&rest[..rest.find(&format!("</{tag}>"))?]) +} + +#[test] +fn pdfx4_metadata_has_a_metadata_date_equal_to_the_modification_date() { + let d = doc(&[Color::cmyk(0.0, 1.0, 1.0, 0.0)]); + // Dated by the writer (created), then dated again after writing (modified later). + for modified in [None, Some(1_800_000_000)] { + let mut o = opts(Standard::PdfX4, |_| {}); + o.modified = modified; + let xmp = xmp_packet(&export(&d, &o).unwrap()); + let modify = xmp_value(&xmp, "xmp:ModifyDate").expect("xmp:ModifyDate"); + assert_eq!(xmp_value(&xmp, "xmp:MetadataDate"), Some(modify), "{modified:?}: {xmp}"); + assert_eq!(xmp.matches("<xmp:MetadataDate>").count(), 1, "{modified:?}"); + if modified.is_some() { + assert!(modify.starts_with("2027-01-15T"), "the later date: {modify}"); + } + } +} + #[test] fn each_standard_writes_its_header_output_intent_boxes_and_identification() { let mut d = doc(&[Color::cmyk(0.0, 1.0, 1.0, 0.0), Color::rgb(0.2, 0.4, 0.9)]); diff --git a/crates/pdf/src/tests/print.rs b/crates/pdf/src/tests/print.rs index 2ae14a8d55..49a34ff428 100644 --- a/crates/pdf/src/tests/print.rs +++ b/crates/pdf/src/tests/print.rs @@ -637,6 +637,91 @@ fn cmyk_and_a_spot_separate_into_five_plates() { assert_eq!(inks(&p[2]), [0.0, 40.0], "the gold's yellow"); } +/// A CMYK document with spot swatches Gold and Pine, and three 50 pt squares left to right: Gold +/// at 50%, Pine at 100% and Registration. +fn gold_and_pine() -> Document { + let mut d = doc(200.0, 100.0, &[]); + d.color_mode = vectorcraft_doc::ColorMode::Cmyk; + d.swatches.push(Swatch { name: "Gold".into(), paint: Paint::solid(Color::cmyk(0.0, 0.2, 0.8, 0.1)), global: true, spot: true }); + d.swatches.push(Swatch { name: "Pine".into(), paint: Paint::solid(Color::cmyk(0.8, 0.0, 0.3, 0.0)), global: true, spot: true }); + let layer = d.default_layer().unwrap(); + let linked = |color: Color, swatch: &str, tint: f32| Paint::Solid { color, swatch: Some(swatch.into()), tint }; + let squares = [ + (0.0, linked(Color::cmyk(0.0, 0.1, 0.4, 0.05), "Gold", 0.5)), + (60.0, linked(Color::cmyk(0.8, 0.0, 0.3, 0.0), "Pine", 1.0)), + (120.0, linked(Color::cmyk(1.0, 1.0, 1.0, 1.0), vectorcraft_color::swatch::REGISTRATION, 1.0)), + ]; + for (x, p) in squares { + let id = d.alloc_id(); + d.insert(Some(layer), 0, Node::path(id, shapes::rectangle(Rect::new(x, 0.0, x + 50.0, 50.0)), Appearance::basic(p, Paint::None, 0.0))) + .unwrap(); + } + d +} + +/// The ink of each 50 pt square on a plate, left to right, in percent. +fn square_inks(page: &Page) -> Vec<f32> { + page.1 + .iter() + .filter(|(b, _)| (b.width() - 50.0).abs() < 1.0 && (b.height() - 50.0).abs() < 1.0) + .map(|(_, p)| match p.color() { + Some(Color::Gray { k }) => (k * 100.0).round(), + c => panic!("{c:?}"), + }) + .collect() +} + +#[test] +fn one_spot_ink_converts_to_process_and_the_others_keep_their_plates() { + let d = gold_and_pine(); + // Gold prints as process even with its plate turned off: converting is not leaving it out. + let set = json!({"output": {"mode": "separations", "inks": [{"name": "Gold", "convertToProcess": true, "print": false, "frequency": 100}]}}); + let pv = preview(&d, &settings(set.clone())).unwrap(); + assert_eq!(pv.inks.iter().map(|i| i.name.as_str()).collect::<Vec<_>>(), ["Cyan", "Magenta", "Yellow", "Black", "Pine"]); + let all: Vec<(&str, bool)> = pv.document_inks.iter().map(|i| (i.name.as_str(), i.convert_to_process)).collect(); + assert_eq!(all, [("Cyan", false), ("Magenta", false), ("Yellow", false), ("Black", false), ("Gold", true), ("Pine", false)]); + let gold = &pv.document_inks[4]; + assert_eq!((gold.print, gold.frequency), (false, 100.0), "its plate options are kept"); + assert!(pv.setting_notes.iter().all(|n| !n.contains("no ink named") && !n.contains("only spot inks")), "{:?}", pv.setting_notes); + let p = pages(&job(&d, set).bytes); + assert_eq!(p.len(), 5); + // (Gold, Pine, Registration) on Cyan, Magenta, Yellow, Black and Pine. + assert_eq!( + p.iter().map(square_inks).collect::<Vec<_>>(), + [[0.0, 0.0, 100.0], [10.0, 0.0, 100.0], [40.0, 0.0, 100.0], [5.0, 0.0, 100.0], [0.0, 100.0, 100.0]] + ); +} + +#[test] +fn converting_every_spot_ink_overrides_and_keeps_each_inks_own_choice() { + let d = gold_and_pine(); + let inks = json!([{"name": "Gold", "convertToProcess": false, "angle": 30}, {"name": "Pine", "convertToProcess": true}]); + let pv = preview(&d, &settings(json!({"output": {"mode": "separations", "spotsToProcess": true, "inks": inks}}))).unwrap(); + assert_eq!(pv.inks.iter().map(|i| i.name.as_str()).collect::<Vec<_>>(), ["Cyan", "Magenta", "Yellow", "Black"]); + let spots: Vec<(&str, bool, f64)> = pv.document_inks[4..].iter().map(|i| (i.name.as_str(), i.convert_to_process, i.angle)).collect(); + assert_eq!(spots, [("Gold", true, 30.0), ("Pine", true, 45.0)]); + // The options of the converted inks still name inks of the document. + assert!(pv.setting_notes.iter().all(|n| !n.contains("no ink named")), "{:?}", pv.setting_notes); + // Without the option, each ink's own choice applies again. + let pv = preview(&d, &settings(json!({"output": {"mode": "separations", "inks": inks}}))).unwrap(); + assert_eq!(pv.inks.iter().map(|i| i.name.as_str()).collect::<Vec<_>>(), ["Cyan", "Magenta", "Yellow", "Black", "Gold"]); + // A process ink doesn't convert: it keeps its plate, and a note says so. + let pv = preview(&d, &settings(json!({"output": {"mode": "separations", "inks": [{"name": "Cyan", "convertToProcess": true}]}}))).unwrap(); + assert_eq!(pv.inks.len(), 6); + assert!(pv.document_inks.iter().all(|i| !i.convert_to_process)); + assert_eq!(pv.setting_notes, ["`Cyan` print as process inks already: only spot inks convert to process"]); +} + +#[test] +fn an_ink_option_without_convert_to_process_keeps_its_spot_plate() { + let set = settings(json!({"output": {"inks": [{"name": "Gold", "angle": 30}]}})); + assert!(!set.output.inks[0].convert_to_process); + let back = serde_json::to_value(&set.output.inks[0]).unwrap(); + assert_eq!(back, json!({"name": "Gold", "print": true, "angle": 30.0}), "off is not written"); + let on = InkSettings { convert_to_process: true, ..set.output.inks[0].clone() }; + assert_eq!(serde_json::to_value(&on).unwrap()["convertToProcess"], json!(true)); +} + /// A 200 × 100 pt CMYK document filled with cyan, with spot swatch `Ink` (100% K) and the objects /// `art` over the cyan. fn over_cyan(art: Vec<Node>) -> Document { @@ -747,7 +832,7 @@ fn overprint_black_keeps_the_cyan_under_near_and_freeform_blacks_on_postscript_p #[test] fn an_overprinting_fill_keeps_its_faint_ink_on_pdf_plates() { // 0.4% cyan beside 100% K, set to overprint: a PDF plate draws it with Darken, a PostScript - // plate draws it as nothing (it has no blending modes). + // plate (it has no blending modes) draws it as nothing, since the color counts as black. let mut square = Node::path( vectorcraft_doc::NodeId(0), shapes::rectangle(Rect::new(10.0, 15.0, 30.0, 35.0)), @@ -767,6 +852,79 @@ fn an_overprinting_fill_keeps_its_faint_ink_on_pdf_plates() { assert_eq!((fills(false), fills(true)), (2, 1), "the cyan plate as PDF, as PostScript"); } +#[test] +fn overprinting_paints_keep_their_faint_ink_on_postscript_plates() { + // 0.4% cyan in a color that is not black, set to overprint, on a fill, a stroke, a character + // fill, a linear gradient's stop and a freeform gradient's point: the cyan plate draws it on + // PDF and PostScript plates alike. A magenta with no cyan at all draws as nothing. + let faint = Color::cmyk(0.004, 0.5, 0.0, 0.0); + let magenta = Color::cmyk(0.0, 0.5, 0.0, 0.0); + let square = |x: f64, fill: Paint, stroke: Paint| { + let mut n = + Node::path(vectorcraft_doc::NodeId(0), shapes::rectangle(Rect::new(x, 15.0, x + 20.0, 35.0)), Appearance::basic(fill, stroke, 2.0)); + if let Some(f) = n.appearance.fill_mut() { + f.overprint = true; + } + if let Some(s) = n.appearance.stroke_mut() { + s.overprint = true; + } + n + }; + let linear = GradientPaint::new(Gradient::new(GradientKind::Linear, vec![GradientStop::new(0.0, faint), GradientStop::new(1.0, magenta)])); + let mut freeform = + GradientPaint::new(Gradient::new(GradientKind::Freeform, vec![GradientStop::new(0.0, magenta), GradientStop::new(1.0, magenta)])); + let points = vec![FreeformPoint::new(kurbo::Point::new(105.0, 20.0), magenta), FreeformPoint::new(kurbo::Point::new(115.0, 30.0), faint)]; + freeform.freeform = Some(Freeform { points, ..Default::default() }); + let style = vectorcraft_doc::CharStyle { fill: Paint::solid(faint), overprint_fill: true, ..Default::default() }; + let text = vectorcraft_doc::TextObject::point(vectorcraft_geom::Point::new(20.0, 60.0), "Hi", style); + let d = over_cyan(vec![ + square(10.0, Paint::solid(faint), Paint::None), + square(40.0, Paint::None, Paint::solid(faint)), + square(70.0, Paint::Gradient(Box::new(linear)), Paint::None), + square(100.0, Paint::Gradient(Box::new(freeform)), Paint::None), + square(130.0, Paint::solid(magenta), Paint::None), + Node::new(vectorcraft_doc::NodeId(0), NodeKind::Text(Box::new(text))), + // A black linked to the spot swatch at a 0.4% tint: 0.4% on the spot plate, none on the cyan. + square(160.0, Paint::Solid { color: Color::cmyk(0.0, 0.0, 0.0, 1.0), swatch: Some("Ink".into()), tint: 0.004 }, Paint::None), + ]); + let opts = PrintOptions { settings: settings(json!({"output": {"mode": "separations"}})), postscript: true, ..Default::default() }; + let p = plan(&d, &opts).unwrap(); + let mut spot = vec![]; + p.plates[4].walk(|n| { + spot.extend(n.appearance.fill().and_then(|f| f.paint.color()).map(|c| match c { + Color::Gray { k } => (k * 1000.0).round(), + c => panic!("{c:?}"), + })) + }); + assert!(spot.contains(&4.0), "the PostScript spot plate draws the spot tint: {spot:?}"); + // The fills, strokes and character fills the cyan plate draws, and the gray of the solid fills. + let drawn = |postscript: bool| { + let opts = PrintOptions { settings: settings(json!({"output": {"mode": "separations"}})), postscript, ..Default::default() }; + let p = plan(&d, &opts).unwrap(); + let (mut fills, mut strokes, mut chars, mut grays) = (0, 0, 0, vec![]); + p.plates[0].walk(|n| { + if let Some(f) = n.appearance.fill().filter(|f| !f.paint.is_none()) { + fills += 1; + if let Some(Color::Gray { k }) = f.paint.color() { + grays.push((k * 1000.0).round()); + } + } + strokes += usize::from(n.appearance.stroke().is_some_and(|s| !s.paint.is_none())); + if let NodeKind::Text(t) = &n.kind { + chars += t.runs.iter().filter(|r| !r.style.fill.is_none()).count(); + } + }); + (fills, strokes, chars, grays) + }; + for postscript in [false, true] { + let (fills, strokes, chars, grays) = drawn(postscript); + let at = if postscript { "PostScript" } else { "PDF" }; + assert_eq!((strokes, chars), (1, 1), "{at}: the stroke and the character fill"); + assert_eq!(fills, 4, "{at}: the cyan, the faint fill and both gradients, not the magenta"); + assert_eq!(grays, [1000.0, 4.0], "{at}: the cyan and the faint fill's 0.4%"); + } +} + #[test] fn overprinting_type_leaves_the_inks_below_on_separations() { let style = vectorcraft_doc::CharStyle { fill: Paint::solid(Color::cmyk(0.0, 0.0, 0.0, 1.0)), ..Default::default() }; @@ -915,6 +1073,8 @@ fn a_spot_gradient_stop_prints_its_process_plates() { assert_eq!(first(json!({"output": {"mode": "separations"}})), [25.0, 0.0, 40.0, 0.0, 50.0], "Cyan, Magenta, Yellow, Black, Gold"); // Spots as process: the plates layered with the gold tint's process inks (0, 10, 40, 5). assert_eq!(first(json!({"output": {"mode": "separations", "spotsToProcess": true}})), [25.0, 10.0, 64.0, 5.0]); + // Gold converted on its own: the same. + assert_eq!(first(json!({"output": {"mode": "separations", "inks": [{"name": "Gold", "convertToProcess": true}]}})), [25.0, 10.0, 64.0, 5.0]); } #[test] diff --git a/crates/pdf/src/tests/reader_compat.rs b/crates/pdf/src/tests/reader_compat.rs index d292a03192..1c9ba71d7f 100644 --- a/crates/pdf/src/tests/reader_compat.rs +++ b/crates/pdf/src/tests/reader_compat.rs @@ -81,8 +81,13 @@ fn form_resource_scopes_keep_scanned_overprint_in_step_with_interpretation() { } pub(crate) fn text_pdf(content: &str) -> Vec<u8> { + text_pdf_with("/ca 0.25 /CA 0.75", content) +} + +/// [`text_pdf`] with graphics state `/G` set by `state` (its entries, such as `/ca 0.5 /CA 0.5`). +pub(crate) fn text_pdf_with(state: &str, content: &str) -> Vec<u8> { page( - "/Font << /F1 5 0 R >> /ExtGState << /G << /ca 0.25 /CA 0.75 >> >>", + &format!("/Font << /F1 5 0 R >> /ExtGState << /G << {state} >> >>"), content.as_bytes(), &[ b"<< /Type /Font /Subtype /TrueType /BaseFont /Inter-Regular /Encoding /WinAnsiEncoding /FirstChar 65 /LastChar 67 /Widths [600 600 600] /FontDescriptor 6 0 R >>".to_vec(), diff --git a/crates/pdf/src/tests/reshaped.rs b/crates/pdf/src/tests/reshaped.rs index af173fa55b..f73450b380 100644 --- a/crates/pdf/src/tests/reshaped.rs +++ b/crates/pdf/src/tests/reshaped.rs @@ -38,6 +38,11 @@ fn page(drawn: &[char], sign_width: Option<f64>) -> Vec<u8> { /// graphics state, to set between glyphs or before them, with `objects` it refers to (the first /// is object `first_extra(1) + 4`). fn page_with(ops: impl Fn(&dyn Fn(char) -> String) -> String, extra: &str, objects: &[String], sign_width: Option<f64>) -> Vec<u8> { + page_in("Identity-H", ops, extra, objects, sign_width) +} + +/// [`page_with`] with the Type 0 font's encoding `encoding` (`Identity-V`: vertical writing). +fn page_in(encoding: &str, ops: impl Fn(&dyn Fn(char) -> String) -> String, extra: &str, objects: &[String], sign_width: Option<f64>) -> Vec<u8> { FontDb::global().add_font(matra_font().expect("the test font builds")); let program = matra_font().unwrap(); let hex: String = program.iter().map(|b| format!("{b:02X}")).collect::<String>() + ">"; @@ -66,7 +71,7 @@ fn page_with(ops: impl Fn(&dyn Fn(char) -> String) -> String, extra: &str, objec ]; let refs: Vec<&str> = objs.iter().chain(objects).map(String::as_str).collect(); let resources = format!( - "/Font << /F1 << /Type /Font /Subtype /Type0 /BaseFont /MatratestSans-Regular /Encoding /Identity-H /DescendantFonts [{} 0 R] /ToUnicode {} 0 R >> >> {extra}", + "/Font << /F1 << /Type /Font /Subtype /Type0 /BaseFont /MatratestSans-Regular /Encoding /{encoding} /DescendantFonts [{} 0 R] /ToUnicode {} 0 R >> >> {extra}", n + 2, n + 3 ); @@ -218,3 +223,22 @@ fn outlined_glyphs_under_a_varying_soft_mask_are_masked_one_by_one() { assert_eq!(outlines(&report.document), 3, "a path each"); assert_eq!(masked_outlines(&report.document), 3, "each path has its own mask"); } + +/// A vertical line (upright glyphs) with one glyph filled and stroked: its glyphs aren't kept as +/// outlines, so it can't come in as the outlines of that glyph alone, losing the glyph filled +/// only. Every glyph comes in filled (#8015). +#[test] +fn a_vertical_line_with_one_glyph_filled_and_stroked_keeps_every_glyph_filled() { + let bytes = page_in("Identity-V", |id| format!("1 0 0 rg 0 0 1 RG 2 w {} Tj 2 Tr {} Tj 0 Tr", id(KA), id(SIGN_I)), "", &[], None); + let report = open(&bytes); + let mut runs = vec![]; + report.document.walk(|n| { + if let NodeKind::Text(t) = &n.kind { + runs.extend(t.runs.iter().map(|r| (r.text.clone(), !r.style.fill.is_none(), !r.style.stroke.is_none()))); + } + }); + let filled: String = runs.iter().filter(|r| r.1).map(|r| r.0.as_str()).collect(); + assert_eq!(filled, format!("{KA}{SIGN_I}"), "every glyph filled: {runs:?}"); + let stroked: String = runs.iter().filter(|r| r.2).map(|r| r.0.as_str()).collect(); + assert_eq!(stroked, SIGN_I.to_string(), "{runs:?}"); +} diff --git a/crates/pdf/src/tests/text_placement.rs b/crates/pdf/src/tests/text_placement.rs index 417a88e5b9..8bdde71eba 100644 --- a/crates/pdf/src/tests/text_placement.rs +++ b/crates/pdf/src/tests/text_placement.rs @@ -758,3 +758,19 @@ fn perf_text_heavy_open() { println!("4000 lines: {n} text objects in {took:?} (as outlines: {:?})", start.elapsed()); } } + +/// Vertical type filled, then stroked (fill and stroke rendering draws a whole operator's glyphs +/// filled before it strokes them): one column, each glyph filled and stroked (#8015). +#[test] +fn a_vertical_column_filled_then_stroked_is_one_filled_and_stroked_type() { + for mode in ["2", "6"] { + let content = format!("0 0 1 RG 1 0 0 rg 2 w BT {mode} Tr /F6 24 Tf 150 180 Td {} Tj 0 Tr ET", gids("§±×")); + let t = texts(&open_as(&page(&content, ""), TextAs::Text)); + assert_eq!(t.len(), 1, "{content}: {t:#?}"); + assert_eq!(t[0].plain_text(), "§±×"); + for r in &t[0].runs { + assert!(!r.style.fill.is_none() && !r.style.stroke.is_none(), "{content}: {:?}", t[0].runs); + assert!((r.style.stroke_width - 2.0).abs() < 1e-6, "{content}"); + } + } +} diff --git a/crates/pdf/src/tests/textstroke.rs b/crates/pdf/src/tests/textstroke.rs index f28e525f27..1cc1edf5ba 100644 --- a/crates/pdf/src/tests/textstroke.rs +++ b/crates/pdf/src/tests/textstroke.rs @@ -122,3 +122,227 @@ fn imported_stroked_type_keeps_the_files_cap_join_and_miter_limit() { assert_eq!(joins, [Some(LineJoin::Round), Some(LineJoin::Miter)], "{content}: {runs:?}"); } } + +/// Fill and stroke rendering (mode 2, or 6 with a clip) draws a text-showing operator's glyphs +/// filled, then the same glyphs stroked: the type comes in once, filled and stroked, whether the +/// operator shows one glyph or a word, or a TJ array of strings with kerning between them, in an +/// outline font, with or without replacement text (`ActualText`). Stroke rendering (modes 1 and 5) stays stroke only. A Type 3 glyph is filled in +/// every one of those modes, once (#8015). +#[test] +fn a_word_filled_then_stroked_imports_as_one_filled_and_stroked_type() { + use vectorcraft_testkit::pdf::{PdfPage, first_extra, pdf_with}; + // `/T3`: a Type 3 font whose glyphs take the text's paint (`d1`), `W A V E` mapped by ToUnicode. + let t3 = first_extra(1); + let glyph = crate::tests_import_fidelity::stream("", "600 0 0 0 600 700 d1 0 0 m 600 0 l 300 700 l h f"); + let to_unicode = crate::tests_import_fidelity::stream( + "", + "/CIDInit /ProcSet findresource begin 12 dict begin begincmap /CIDSystemInfo << /Registry (Adobe) /Ordering (UCS) /Supplement 0 >> def /CMapName /T3-UCS def /CMapType 2 def 1 begincodespacerange <00> <FF> endcodespacerange 4 beginbfchar\n<41> <0041>\n<45> <0045>\n<56> <0056>\n<57> <0057>\nendbfchar endcmap CMapName currentdict /CMap defineresource pop end end", + ); + let font = format!( + "<< /Type /Font /Subtype /Type3 /FontBBox [0 0 600 700] /FontMatrix [0.001 0 0 0.001 0 0] /CharProcs << /g {} 0 R >> /Encoding << /Type /Encoding /Differences [65 /g 69 /g 86 /g 87 /g] >> /FirstChar 65 /LastChar 87 /Widths [600 0 0 0 600 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 600 600] /ToUnicode {} 0 R /Resources << >> >>", + t3 + 1, + t3 + 2 + ); + let page = |content: &str| { + let resources = format!("/Font << /F1 << /Type /Font /Subtype /Type1 /BaseFont /Helvetica >> /T3 {t3} 0 R >>"); + pdf_with(&[PdfPage { resources, ..PdfPage::new(300.0, 200.0, content) }], &[&font, &glyph, &to_unicode], None) + }; + let objects = |content: &str| { + let d = import(&page(content)).unwrap(); + let mut types = vec![]; + d.walk(|n| { + if let NodeKind::Text(t) = &n.kind { + types.push((**t).clone()); + } + }); + types + }; + let cream = Paint::solid(Color::rgb8(0xff, 0xff, 0xcc)); + let black = Paint::solid(Color::BLACK); + let shows = + ["(WAVE) Tj", "[(WA) -50 (VE)] TJ", "(WA) Tj (VE) Tj", "(W) Tj (A) Tj (V) Tj (E) Tj", "/Span << /ActualText (WAVE) >> BDC (WAVE) Tj EMC"]; + for font in ["F1", "T3"] { + for show in shows { + for mode in ["0", "1", "2", "4", "5", "6"] { + let content = format!("0 0 0 RG 1 1 0.8 rg 3 w 1 J 1 j BT {mode} Tr /{font} 60 Tf 40 110 Td {show} 0 Tr ET"); + let types = objects(&content); + assert_eq!(types.len(), 1, "{content}: one type object: {types:#?}"); + let t = &types[0]; + assert_eq!(t.plain_text(), "WAVE", "{content}"); + // A Type 3 glyph paints itself: the reader fills it whatever the mode. + let (fill, stroke) = match mode { + _ if font == "T3" => (true, false), + "0" | "4" => (true, false), + "1" | "5" => (false, true), + _ => (true, true), + }; + for r in &t.runs { + let s = &r.style; + assert_eq!(s.fill, if fill { cream.clone() } else { Paint::None }, "{content}: fill: {:?}", t.runs); + if stroke { + assert_eq!(s.stroke, black, "{content}: stroke: {:?}", t.runs); + assert!((s.stroke_width - 3.0).abs() < 1e-6, "{content}: width {}", s.stroke_width); + assert_eq!((s.stroke_cap, s.stroke_join), (LineCap::Round, LineJoin::Round), "{content}"); + } else { + assert!(s.stroke.is_none(), "{content}: no stroke: {:?}", t.runs); + } + } + } + } + } + // A word filled, then stroked with another join part way through (one operator each): + // each part keeps its own join, all of it filled. + let content = "0 0 0 RG 1 1 0.8 rg 3 w BT 2 Tr /F1 60 Tf 40 110 Td 1 j (WA) Tj 0 j (VE) Tj 0 Tr ET"; + let types = objects(content); + assert_eq!(types.len(), 1, "{content}: {types:#?}"); + let joins: Vec<_> = types[0].runs.iter().map(|r| (r.text.as_str(), r.style.fill == cream, r.style.stroke_join)).collect(); + assert_eq!(joins, [("WA", true, LineJoin::Round), ("VE", true, LineJoin::Miter)], "{content}"); + // Filled type, then stroked type of its own elsewhere: a stroke over no filled glyph. + let content = "0 0 0 RG 1 1 0.8 rg 3 w BT 0 Tr /F1 60 Tf 40 110 Td (WAVE) Tj 1 Tr 0 -70 Td (WAVE) Tj 0 Tr ET"; + let types = objects(content); + assert_eq!(types.len(), 2, "{content}: {types:#?}"); + let looks: Vec<_> = types.iter().flat_map(|t| &t.runs).map(|r| (r.style.fill == cream, !r.style.stroke.is_none())).collect(); + assert_eq!(looks, [(true, false), (false, true)], "{content}"); +} + +/// Helvetica PDF page drawing `content`, imported: each run of type as its text, size, and +/// whether it is filled and stroked, in text order. +fn word_runs(content: &str) -> Vec<(String, f64, bool, bool)> { + use vectorcraft_testkit::pdf::{PdfPage, pdf}; + let resources = "/Font << /F1 << /Type /Font /Subtype /Type1 /BaseFont /Helvetica >> >>"; + let bytes = pdf(&[PdfPage { resources: resources.into(), ..PdfPage::new(300.0, 200.0, content) }], None); + let d = import(&bytes).unwrap(); + let mut runs = vec![]; + d.walk(|n| { + if let NodeKind::Text(t) = &n.kind { + runs.extend(t.runs.iter().map(|r| (r.text.clone(), r.style.size, !r.style.fill.is_none(), !r.style.stroke.is_none()))); + } + }); + runs.sort_by(|a, b| a.0.cmp(&b.0).then(a.1.total_cmp(&b.1))); + runs +} + +/// A stroke goes only over a glyph filled with the very same placement: a word filled, then its +/// first glyph stroked at another size from the same origin, is two pieces of type, the word +/// unstroked and the glyph at its own size (#8015). +#[test] +fn a_stroke_at_another_size_does_not_go_over_the_filled_glyph() { + for mode in ["1", "2"] { + let content = format!("0 0 0 RG 1 1 0.8 rg 3 w BT /F1 60 Tf 40 110 Td (WAVE) Tj ET BT {mode} Tr /F1 30 Tf 40 110 Td (W) Tj 0 Tr ET"); + let filled = mode == "2"; + assert_eq!(word_runs(&content), [("W".to_string(), 30.0, filled, true), ("WAVE".to_string(), 60.0, true, false)], "{content}"); + } +} + +/// A stroke over one glyph of a filled word strokes that glyph alone, not the rest of the word +/// (#8015). +#[test] +fn a_stroke_over_one_glyph_of_a_filled_word_strokes_only_that_glyph() { + // W alone stroked at the same size from the same origin: W is stroked, AVE not. + let content = "0 0 0 RG 1 1 0.8 rg 3 w BT /F1 60 Tf 40 110 Td (WAVE) Tj ET BT 1 Tr /F1 60 Tf 40 110 Td (W) Tj 0 Tr ET"; + assert_eq!(word_runs(content), [("AVE".to_string(), 60.0, true, false), ("W".to_string(), 60.0, true, true)], "{content}"); + // Filled and stroked there instead: that W is drawn again, over the word, as type of its own. + let content = "0 0 0 RG 1 1 0.8 rg 3 w BT /F1 60 Tf 40 110 Td (WAVE) Tj ET BT 2 Tr /F1 60 Tf 40 110 Td (W) Tj 0 Tr ET"; + assert_eq!(word_runs(content), [("W".to_string(), 60.0, true, true), ("WAVE".to_string(), 60.0, true, false)], "{content}"); +} + +/// A glyph filled at one opacity and stroked at another (`ca` and `CA` differ) stays two pieces +/// of type, each at its own opacity, also when it is shown on its own, so the stroke is drawn +/// right after its fill (#8015). Two such operators are four pieces in the order they are drawn, +/// the second glyph's fill over the first one's stroke. +#[test] +fn a_glyph_stroked_at_another_opacity_than_its_fill_stays_its_own_type() { + let (fill, stroke) = ((64.0 / 255.0, true, false), (191.0 / 255.0, false, true)); + for (show, want) in [("(A) Tj", vec![fill, stroke]), ("(A) Tj (B) Tj", vec![fill, stroke, fill, stroke])] { + let content = format!("/G gs 1 0 0 rg 0 0 1 RG 2 w BT /F1 20 Tf 2 Tr 1 0 0 1 10 20 Tm {show} 0 Tr ET"); + let d = import(&crate::tests::reader_compat::text_pdf(&content)).unwrap(); + let mut texts = vec![]; + d.walk(|n| { + if let NodeKind::Text(t) = &n.kind { + let st = t.first_style(); + texts.push((n.opacity, !st.fill.is_none(), !st.stroke.is_none())); + } + }); + assert_eq!(texts, want, "{content}"); + } +} + +/// Type filled and stroked at the same opacity below 1 stays a filled object and a stroked one: +/// the file composites the fill and the stroke apiece (darker where they overlap), while an +/// object's opacity applies to its fill and stroke together. Opaque, it is one object (#8015). +#[test] +fn translucent_fill_and_stroke_text_stays_two_objects() { + let half = |fill, stroke| (128.0 / 255.0, fill, stroke); + for show in ["(A) Tj", "(AB) Tj"] { + let content = format!("/G gs 1 0 0 rg 0 0 1 RG 2 w BT /F1 20 Tf 2 Tr 1 0 0 1 10 20 Tm {show} 0 Tr ET"); + for (state, want) in [("/ca 0.5 /CA 0.5", vec![half(true, false), half(false, true)]), ("/ca 1 /CA 1", vec![(1.0, true, true)])] { + let d = import(&crate::tests::reader_compat::text_pdf_with(state, &content)).unwrap(); + let mut texts = vec![]; + d.walk(|n| { + if let NodeKind::Text(t) = &n.kind { + let st = t.first_style(); + texts.push((n.opacity, !st.fill.is_none(), !st.stroke.is_none())); + } + }); + assert_eq!(texts, want, "{state}: {content}"); + } + } +} + +/// A stroke goes only over a glyph filled with the same text: "AB" filled, its "A" stroked, then +/// an "X" stroked where the "B" stands is type of its own, and the "B" stays unstroked (#8015). +#[test] +fn a_stroke_of_another_glyph_where_one_was_filled_stays_its_own_type() { + let content = "0 0 0 RG 1 1 0.8 rg 3 w BT /F1 60 Tf 1 0 0 1 40 110 Tm (AB) Tj 1 Tr 1 0 0 1 40 110 Tm (A) Tj (X) Tj 0 Tr ET"; + let want = [("A".to_string(), 60.0, true, true), ("B".to_string(), 60.0, true, false), ("X".to_string(), 60.0, false, true)]; + assert_eq!(word_runs(content), want, "{content}"); +} + +/// Helvetica PDF page drawing `content` (fill cream, stroke black, 3 points wide), imported: each +/// type object's runs in drawing order, as their text and whether they are filled and stroked. +fn type_runs(content: &str) -> Vec<Vec<(String, bool, bool)>> { + use vectorcraft_testkit::pdf::{PdfPage, pdf}; + let resources = "/Font << /F1 << /Type /Font /Subtype /Type1 /BaseFont /Helvetica >> >>"; + let content = format!("0 0 0 RG 1 1 0.8 rg 3 w {content}"); + let bytes = pdf(&[PdfPage { resources: resources.into(), ..PdfPage::new(300.0, 200.0, &content) }], None); + let d = import(&bytes).unwrap(); + let mut types = vec![]; + d.walk(|n| { + if let NodeKind::Text(t) = &n.kind { + types.push(t.runs.iter().map(|r| (r.text.clone(), !r.style.fill.is_none(), !r.style.stroke.is_none())).collect()); + } + }); + types +} + +/// A glyph filled only (mode 0) right after one filled and stroked (mode 2) is filled only: it +/// joins the same type object, but not the stroked run, whether the glyphs before were filled +/// only, filled and stroked, or both, and a glyph filled and stroked after it is stroked again +/// (#8300). +#[test] +fn a_glyph_filled_only_after_one_filled_and_stroked_is_not_stroked() { + let run = |text: &str, stroked: bool| (text.to_string(), true, stroked); + let cases = [ + ("2 Tr (B) Tj 0 Tr (C) Tj", vec![run("B", true), run("C", false)]), + ("0 Tr (A) Tj 2 Tr (B) Tj 0 Tr (C) Tj", vec![run("A", false), run("B", true), run("C", false)]), + ("2 Tr (B) Tj 0 Tr (C) Tj 2 Tr (D) Tj", vec![run("B", true), run("C", false), run("D", true)]), + ("2 Tr (AB) Tj 0 Tr (CD) Tj", vec![run("AB", true), run("CD", false)]), + ("0 Tr (A) Tj 2 Tr (BC) Tj", vec![run("A", false), run("BC", true)]), + ]; + for (show, want) in cases { + let content = format!("BT /F1 48 Tf 20 80 Td {show} 0 Tr ET"); + assert_eq!(type_runs(&content), [want], "{content}"); + } +} + +/// Fill and stroke rendering glyph by glyph, and a word filled whole then stroked whole at the +/// same place, still come in as one run filled and stroked (#8300). +#[test] +fn glyphs_filled_and_stroked_one_by_one_stay_one_run() { + for content in [ + "BT /F1 48 Tf 20 80 Td 2 Tr (A) Tj (B) Tj (C) Tj 0 Tr ET", + "BT /F1 48 Tf 1 0 0 1 20 80 Tm 0 Tr (ABC) Tj 1 Tr 1 0 0 1 20 80 Tm (ABC) Tj 0 Tr ET", + ] { + assert_eq!(type_runs(content), [vec![("ABC".to_string(), true, true)]], "{content}"); + } +} diff --git a/crates/render/Cargo.toml b/crates/render/Cargo.toml index 61569cc79e..9a4c095650 100644 --- a/crates/render/Cargo.toml +++ b/crates/render/Cargo.toml @@ -51,3 +51,5 @@ craft-tiff = { workspace = true } craft-psd = { workspace = true } proptest = { workspace = true } serde_json = { workspace = true } +# How many times the symbol list is read to find symbols by name. +vectorcraft-doc = { workspace = true, features = ["symbol-read-count"] } diff --git a/crates/render/src/addons/halftone.rs b/crates/render/src/addons/halftone.rs index 9b1cfe7091..a113e8fab8 100644 --- a/crates/render/src/addons/halftone.rs +++ b/crates/render/src/addons/halftone.rs @@ -57,7 +57,7 @@ pub fn sample(doc: &Document, nodes: Vec<Node>, region: Rect, scale: f64, mono: /// take too many cells: `n` then draws as it is. pub fn art(doc: &Document, n: &Node) -> Option<Node> { let ht = Halftone::of(n)?; - let found = Renderer::new().live_found(doc, &Arc::new(n.clone())); + let found = Renderer::new().live_found(&doc.symbol_boxes(), &Arc::new(n.clone())); let mut cache = CACHE.lock().unwrap_or_else(PoisonError::into_inner); if let Some(at) = cache.iter().position(|(node, was, _)| was.0 == found.0 && node == n) { let kept = cache.remove(at); diff --git a/crates/render/src/bounds.rs b/crates/render/src/bounds.rs index 569e0be64b..fafb1b188f 100644 --- a/crates/render/src/bounds.rs +++ b/crates/render/src/bounds.rs @@ -6,7 +6,13 @@ use super::{BezPath, Document, FillRule, Node, NodeKind, Rect, SymbolBoxes, brus /// geometry effects, and the shadows and glows of it and its members. Symbol instances are /// measured by their art in `doc` ([`Node::visual_bounds_with`]). pub fn painted_bounds(doc: &Document, n: &Node) -> Option<Rect> { - brush_fx::cull_bounds(&doc.symbol_boxes(), n) + painted_bounds_with(&doc.symbol_boxes(), n) +} + +/// [`painted_bounds`] with symbol instances measured by their art in `symbols` (made with +/// [`Document::symbol_boxes`]). +pub fn painted_bounds_with(symbols: &SymbolBoxes, n: &Node) -> Option<Rect> { + brush_fx::cull_bounds(symbols, n) } /// [`painted_bounds`] of `n` without the room it leaves for brush art past the brushed strokes of @@ -70,7 +76,7 @@ pub fn rasterize_stage(doc: &Document, n: &Node) -> Option<(Node, Vec<vectorcraf /// The outline, with `n`'s geometry effects applied, that the canvas clips `n`'s Rasterize with /// Create Clipping Mask to. Object › Rasterize's clipping mask follows it. pub fn drawn_outline(doc: &Document, n: &Node) -> Option<(BezPath, FillRule)> { - fx::drawn_outline(doc, n) + fx::drawn_outline(&doc.symbol_boxes(), n) } /// The outlines a drag draws for `nodes` with Real-time Drawing off: one for each object in them, diff --git a/crates/render/src/fx/bounds.rs b/crates/render/src/fx/bounds.rs index a9d86f79e7..dda132308f 100644 --- a/crates/render/src/fx/bounds.rs +++ b/crates/render/src/fx/bounds.rs @@ -397,9 +397,7 @@ fn shape_bounds(symbols: &SymbolBoxes, n: &Node) -> Option<Rect> { // effects in a symbol's art and a live object's content paint past it. _ if has_object_fx(n) => { let symbol = match &n.kind { - NodeKind::SymbolInstance { symbol, .. } => { - symbols.document().symbols.iter().find(|s| s.name == *symbol).map(|s| dynamic_art(&s.art, n)) - } + NodeKind::SymbolInstance { symbol, .. } => symbols.symbol(symbol).map(|s| dynamic_art(&s.art, n)), _ => None, }; let reshaped = effects::reshape(Some(symbols.document()), n, symbol.as_ref()); @@ -466,7 +464,7 @@ fn pieces_within(symbols: &SymbolBoxes, art: &Node, depth: usize, budget: &mut u NodeKind::Path { .. } | NodeKind::Compound { .. } if has_fx(art) => visual_bounds(symbols, art), NodeKind::SymbolInstance { symbol, .. } if depth < vectorcraft_doc::depth::MAX_DEPTH && has_instance_row_effects(art) => { let doc = symbols.document(); - let reshaped = doc.symbols.iter().find(|s| s.name == *symbol).and_then(|s| { + let reshaped = symbols.symbol(symbol).and_then(|s| { let count = s.art.count() as u64; if count > *budget { return None; @@ -501,13 +499,15 @@ pub(crate) fn painted_reach(symbols: &SymbolBoxes, n: &Node) -> Option<Rect> { /// The outline the renderer clips `n`'s Feather, Inner Glow and Rasterize with Create Clipping /// Mask to: a path's or compound path's geometry with its object-level geometry effects applied, /// the outline of the art [`Renderer::fx_art`] makes for an object with object effects, and with -/// Crop Marks the object's own. For other objects it is [`effects::clip_outline`]. -pub(crate) fn drawn_outline(doc: &Document, n: &Node) -> Option<(BezPath, FillRule)> { +/// Crop Marks the object's own. For other objects it is [`effects::clip_outline`]. The symbols of +/// instances are found in `symbols`. +pub(crate) fn drawn_outline(symbols: &SymbolBoxes, n: &Node) -> Option<(BezPath, FillRule)> { + let doc = symbols.document(); if let Some(art) = effects::crop_marks_art(n) { - return drawn_outline(doc, art.children()?.first()?); + return drawn_outline(symbols, art.children()?.first()?); } if has_object_fx(n) { - let art = Renderer::new().fx_art(doc, &Arc::new(n.clone()), false); + let art = Renderer::new().fx_art(symbols, &Arc::new(n.clone()), false); return effects::clip_outline(&art); } match &n.kind { @@ -545,7 +545,7 @@ pub(crate) fn drawn_outlines(doc: &Document, symbols: &SymbolBoxes, n: &Node, le if is_container(n) && !makes_art && !effects::has_item_geometry(n) { object.appearance.items.clear(); } - let art = Renderer::new().fx_art(doc, &Arc::new(object), false); + let art = Renderer::new().fx_art(symbols, &Arc::new(object), false); if art.children().is_some() && !has_object_fx(&art) { return evaluated_outlines(doc, symbols, &art, left, out); } @@ -570,7 +570,7 @@ pub(crate) fn drawn_outlines(doc: &Document, symbols: &SymbolBoxes, n: &Node, le NodeKind::SymbolInstance { .. } => { push_outline(n.geometric_bounds_with(symbols).map(|b| vectorcraft_geom::shapes::rectangle(b).to_bezpath()), left, out) } - _ => push_outline(drawn_outline(doc, n).map(|(path, _)| path), left, out), + _ => push_outline(drawn_outline(symbols, n).map(|(path, _)| path), left, out), } } @@ -690,9 +690,7 @@ fn cull_bounds_in(symbols: &SymbolBoxes, n: &Node, after_reshape: bool, brush: b // symbol instance's art paint past that art. _ if has_object_fx(n) => { let symbol = match &n.kind { - NodeKind::SymbolInstance { symbol, .. } => { - symbols.document().symbols.iter().find(|s| s.name == *symbol).map(|s| dynamic_art(&s.art, n)) - } + NodeKind::SymbolInstance { symbol, .. } => symbols.symbol(symbol).map(|s| dynamic_art(&s.art, n)), _ => None, }; let reshaped = effects::reshape(Some(symbols.document()), n, symbol.as_ref()); diff --git a/crates/render/src/fx/renderer.rs b/crates/render/src/fx/renderer.rs index 045aeceb39..555a121309 100644 --- a/crates/render/src/fx/renderer.rs +++ b/crates/render/src/fx/renderer.rs @@ -481,7 +481,7 @@ impl Renderer { /// What [`Self::draw_object_fx`] draws inside the object's transparency group. fn draw_object_fx_art(&mut self, ctx: &mut RenderContext, f: &Frame, a: &Arc<Node>, cache: bool) { - if !self.charge_fx_instance(f.doc, a) { + if !self.charge_fx_instance(f.symbols, a) { return; } // A path whose Transform effects after its Rasterize effect hold options that reach its @@ -493,7 +493,7 @@ impl Renderer { { return self.draw_staged(ctx, f, stage, &bp, *rule); } - let art = self.fx_art(f.doc, a, cache); + let art = self.fx_art(f.symbols, a, cache); // Art the cache did not keep is made again in the next frame. let kept = cache && self.fx_arts.get(&(Arc::as_ptr(a) as usize), self.stamp).is_some_and(|e| Arc::ptr_eq(&e.1, &art)); let outer = self.made_again; @@ -545,9 +545,9 @@ impl Renderer { /// frame's symbol budget as an instance without effects is (`draw_node`): an instance whose /// effects reshape its art draws through here, and nested instances would otherwise expand /// without a limit. True for any other object. - pub(crate) fn charge_fx_instance(&mut self, doc: &vectorcraft_doc::Document, a: &Node) -> bool { + pub(crate) fn charge_fx_instance(&mut self, symbols: &SymbolBoxes, a: &Node) -> bool { let NodeKind::SymbolInstance { symbol, .. } = &a.kind else { return true }; - let count = doc.symbols.iter().find(|s| &s.name == symbol).map_or(0, |s| s.art.count() as u64); + let count = symbols.symbol(symbol).map_or(0, |s| s.art.count() as u64); let mut used = self.symbol_nodes; let room = vectorcraft_doc::charge_symbol_art(&mut used, count, || ((), count)).is_some(); self.symbol_nodes = used; @@ -562,7 +562,7 @@ impl Renderer { /// is made from live objects it evaluated ([`evaluates_live`]), or from type, symbol art or /// colors shaded through the color settings ([`reads_outside`]), is kept only while what it /// reads from outside `a` stays the same ([`Self::live_found`]). - pub(super) fn fx_art(&mut self, doc: &vectorcraft_doc::Document, a: &Arc<Node>, cache: bool) -> Arc<Node> { + pub(super) fn fx_art(&mut self, symbols: &SymbolBoxes, a: &Arc<Node>, cache: bool) -> Arc<Node> { let key = Arc::as_ptr(a) as usize; let mut kept = None; if cache @@ -574,7 +574,7 @@ impl Renderer { Some(was) => kept = Some((art.clone(), was.0)), } } - let found = (kept.is_some() || (cache && (evaluates_live(a) || reads_outside(a)))).then(|| self.live_found(doc, a)); + let found = (kept.is_some() || (cache && (evaluates_live(a) || reads_outside(a)))).then(|| self.live_found(symbols, a)); if let Some((art, was)) = kept && found.as_ref().is_some_and(|f| f.0 == was) { @@ -590,11 +590,11 @@ impl Renderer { Some((art, was)) => { let now = match &found { Some(f) => Some(f.0), - None => self.outside_key(doc, a), + None => self.outside_key(symbols, a), }; - if was == now { art } else { self.make_fx_art(doc, a) } + if was == now { art } else { self.make_fx_art(symbols, a) } } - None => self.make_fx_art(doc, a), + None => self.make_fx_art(symbols, a), }; if cache { let bytes = crate::lru::node_bytes(&art); @@ -607,24 +607,24 @@ impl Renderer { /// held until the frame ends ([`Renderer::measured`]), for [`Self::fx_art`] to keep if `a` is /// drawn. What is measured but never drawn (culled, off the view) is let go, and isn't kept in /// place of what is drawn. - pub(crate) fn measured_fx_art(&mut self, doc: &vectorcraft_doc::Document, a: &Arc<Node>) -> Arc<Node> { + pub(crate) fn measured_fx_art(&mut self, symbols: &SymbolBoxes, a: &Arc<Node>) -> Arc<Node> { let key = Arc::as_ptr(a) as usize; if let Some((node, art, found)) = self.fx_arts.get(&key, self.stamp) && Arc::ptr_eq(node, a) { let (art, was) = (art.clone(), found.as_ref().map(|f| f.0)); - if was.is_none_or(|was| self.live_found(doc, a).0 == was) { + if was.is_none_or(|was| self.live_found(symbols, a).0 == was) { return art; } } - let now = self.outside_key(doc, a); + let now = self.outside_key(symbols, a); if let Some((node, art, was)) = self.measured.get(&key) && Arc::ptr_eq(node, a) && *was == now { return art.clone(); } - let art = self.make_fx_art(doc, a); + let art = self.make_fx_art(symbols, a); // Art held for an object before (made from what it read then) gives way. if let Some(old) = self.measured.remove(&key) { self.measured_bytes = self.measured_bytes.saturating_sub(crate::lru::node_bytes(&old.1)); @@ -657,18 +657,17 @@ impl Renderer { /// The key of what `a`'s art reads from outside it ([`Self::live_found`]), `None` when it reads /// nothing. - fn outside_key(&mut self, doc: &vectorcraft_doc::Document, a: &Arc<Node>) -> Option<u64> { - (evaluates_live(a) || reads_outside(a)).then(|| self.live_found(doc, a).0) + fn outside_key(&mut self, symbols: &SymbolBoxes, a: &Arc<Node>) -> Option<u64> { + (evaluates_live(a) || reads_outside(a)).then(|| self.live_found(symbols, a).0) } /// The art [`Self::fx_art`] draws for `a`, made now. - fn make_fx_art(&mut self, doc: &vectorcraft_doc::Document, a: &Arc<Node>) -> Arc<Node> { + fn make_fx_art(&mut self, symbols: &SymbolBoxes, a: &Arc<Node>) -> Arc<Node> { + let doc = symbols.document(); // Whether the art is a 3D effect's ([`Self::three_d_art_bounds`]). let mut three_d = false; let symbol = match &a.kind { - NodeKind::SymbolInstance { symbol, .. } => { - doc.symbols.iter().find(|s| s.name == *symbol).map(|s| crate::brush_fx::instance_art(&s.art, a)) - } + NodeKind::SymbolInstance { symbol, .. } => symbols.symbol(symbol).map(|s| crate::brush_fx::instance_art(&s.art, a)), _ => None, }; let container = is_container(a); diff --git a/crates/render/src/fx/tests.rs b/crates/render/src/fx/tests.rs index 3bbd803cc2..3c2e9ff65a 100644 --- a/crates/render/src/fx/tests.rs +++ b/crates/render/src/fx/tests.rs @@ -1066,7 +1066,7 @@ fn a_measuring_pass_sweeps_the_bounds_of_held_art_as_they_double() { } let mut r = Renderer::new(); // Held here, as the art kept to draw is. - let held: Vec<_> = d.layers[0].children().unwrap().iter().map(|n| r.measured_fx_art(&d, n)).collect(); + let held: Vec<_> = d.layers[0].children().unwrap().iter().map(|n| r.measured_fx_art(&d.symbol_boxes(), n)).collect(); assert_eq!((held.len(), r.three_d_bounds.len()), (3000, 3000)); assert!(r.three_d_sweeps <= 2, "{} sweeps", r.three_d_sweeps); } @@ -1193,7 +1193,7 @@ fn drawing_takes_measured_art_out_of_the_budget() { let mut r = Renderer::new(); r.bounds_of(&d.symbol_boxes(), &n); assert!(r.measured_bytes > 0); - r.fx_art(&d, &n, true); + r.fx_art(&d.symbol_boxes(), &n, true); assert_eq!((r.measured_bytes, r.measured.len()), (0, 0), "taken out when drawn"); let mut r = Renderer::new(); r.render(&d, 800, 100, Affine::IDENTITY, &RenderOptions::default()); @@ -1343,11 +1343,11 @@ fn art_measured_again_takes_the_place_of_the_held() { let n = d.layers[0].children().unwrap()[0].clone(); let key = Arc::as_ptr(&n) as usize; let mut r = Renderer::new(); - let art = r.measured_fx_art(&d, &n); + let art = r.measured_fx_art(&d.symbol_boxes(), &n); let bytes = r.measured_bytes; // As if it had read something else then. r.measured.insert(key, (n.clone(), art, Some(7))); - r.measured_fx_art(&d, &n); + r.measured_fx_art(&d.symbol_boxes(), &n); assert_eq!((r.measured_bytes, r.measured.len()), (bytes, 1)); } diff --git a/crates/render/src/lib.rs b/crates/render/src/lib.rs index 5aec78e679..af3a0d4da8 100644 --- a/crates/render/src/lib.rs +++ b/crates/render/src/lib.rs @@ -285,7 +285,7 @@ mod renderer; mod text_geom; mod threads; -pub use bounds::{drawn_bounds, drawn_outline, drawn_outlines, effect_bounds, painted_bounds, rasterize_stage}; +pub use bounds::{drawn_bounds, drawn_outline, drawn_outlines, effect_bounds, painted_bounds, painted_bounds_with, rasterize_stage}; pub use frame::FrameStats; use frame::{ ClipEntry, ClipPaintEntry, Frame, FxArtEntry, GeomEntry, PlacedEntry, PlacedKey, PtrHasher, PtrMap, SliceEntry, StrokeEntry, StrokeKey, diff --git a/crates/render/src/live.rs b/crates/render/src/live.rs index 3777c98948..dfa79a9ad5 100644 --- a/crates/render/src/live.rs +++ b/crates/render/src/live.rs @@ -21,7 +21,7 @@ use std::sync::{Arc, Weak}; use vectorcraft_doc::live::{GradientMesh, MeshQuad}; use vectorcraft_doc::placed_document::ReadDocument; -use vectorcraft_doc::{Document, Node, NodeKind}; +use vectorcraft_doc::{Document, Node, NodeKind, SymbolBoxes}; use vectorcraft_geom::{Affine, BezPath, Point, Vec2}; use vello_cpu::RenderContext; use vello_cpu::peniko; @@ -109,10 +109,11 @@ pub fn expand_live(n: &Node) -> Vec<Node> { /// their address). Art is hashed by the addresses of its `Arc`s, which copies of the document /// share: a copy of the document has the same key. It also returns weak references to the reads /// found, and what the walk found ([`Walked`]) when it found no placed file and no such image. -fn resources_key(doc: &Document, cms: usize, names: u64, n: &Node) -> (u64, Vec<Weak<ReadDocument>>, Option<Walked>) { +/// Symbols are found by name in `symbols`. +fn resources_key(symbols: &SymbolBoxes, cms: usize, names: u64, n: &Node) -> (u64, Vec<Weak<ReadDocument>>, Option<Walked>) { let mut h = DefaultHasher::new(); let mut shown = Shown::default(); - hash_resources(doc, n, &mut shown, &mut h); + hash_resources(symbols, n, &mut shown, &mut h); let walked = Walked { hash: h.finish(), text: shown.text, plugins: shown.plugins }; (walked.key(cms, names), shown.reads, (!shown.placed && !shown.pixels).then_some(walked)) } @@ -175,8 +176,9 @@ struct Shown { /// own fills or strokes follow them ([`crate::effects::follows_image_pixels`]). It walks `n` and /// then, one at a time from a list, the opacity-mask, pattern and symbol art it finds, each pattern /// and each symbol's art once ([`first_seen`]). `shown` records the type, placed files, reads, -/// such images and plug-in effects found. -fn hash_resources<'a>(doc: &'a Document, n: &'a Node, shown: &mut Shown, h: &mut DefaultHasher) { +/// such images and plug-in effects found. Symbols are found by name in `symbols`. +fn hash_resources<'a>(symbols: &SymbolBoxes<'a>, n: &'a Node, shown: &mut Shown, h: &mut DefaultHasher) { + let doc = symbols.document(); let mut todo = vec![]; let mut next = Some(n); while let Some(art) = next { @@ -198,7 +200,7 @@ fn hash_resources<'a>(doc: &'a Document, n: &'a Node, shown: &mut Shown, h: &mut } match &c.kind { NodeKind::SymbolInstance { symbol, .. } => { - if let Some(s) = doc.symbols.iter().find(|s| s.name == *symbol) { + if let Some(s) = symbols.symbol(symbol) { (Arc::as_ptr(&s.art) as usize).hash(h); if first_seen(&mut shown.seen, Arc::as_ptr(&s.art) as usize) { todo.push(&s.art); @@ -249,6 +251,10 @@ fn mesh_level(m: &GradientMesh, bounds_px: f64) -> usize { /// of pixels per mesh and frame. const MESH_RASTER_MAX_PIXELS: usize = 4 << 20; +/// The widest and tallest a gradient mesh's outline is in device pixels for [`draw_mesh_raster`] +/// to flatten it (about 16.7 million pixels, far past any buffer it fills). +const MESH_OUTLINE_MAX_EXTENT: f64 = (1u32 << 24) as f64; + /// Draw a tessellated gradient mesh as one image: its quads are filled into a pixel buffer of the /// mesh's on-screen box by scanline (each pixel takes the quad its centre is in, so neighbouring /// quads meet without seams or overlap, and is shaded between the quad's corner colours, so the @@ -262,7 +268,12 @@ const MESH_RASTER_MAX_PIXELS: usize = 4 << 20; fn draw_mesh_raster(ctx: &mut RenderContext, f: &Frame, m: &GradientMesh, quads: &[MeshQuad], alpha: f32) -> bool { let outline = m.outline().to_bezpath(); let dev = f.view.transform_rect_bbox(vectorcraft_geom::Shape::bounding_box(&outline)); - if ![dev.x0, dev.y0, dev.x1, dev.y1].iter().all(|v| v.is_finite()) { + // The outline is flattened whole in device pixels ([`grown_outline`]): one far past any + // buffer would make more segments than memory holds, so the caller draws the quads. + if ![dev.x0, dev.y0, dev.x1, dev.y1].iter().all(|v| v.is_finite()) + || dev.width() > MESH_OUTLINE_MAX_EXTENT + || dev.height() > MESH_OUTLINE_MAX_EXTENT + { return false; } let (cw, ch) = (f64::from(ctx.width()), f64::from(ctx.height())); @@ -453,14 +464,14 @@ fn spread_to_edges(px: &mut [vello_cpu::color::PremulRgba8], filled: Vec<bool>, } impl Renderer { - /// The [`resources_key`] of `n` in `doc`, with the frame's [`DocInputs`] ([`Found`]): `n` is a - /// live node, or an object with effects whose art ([`Renderer::fx_art`]) can be made from - /// evaluated live objects, type, symbol art or colors shaded through the color settings. The - /// key is made from the [`Walk`] kept for `n` while `doc`'s symbols and patterns are those it - /// read; `n` is walked again when they changed, and in every frame when the walk found a - /// placed file or an image whose own fills or strokes follow its pixels. - pub(crate) fn live_found(&mut self, doc: &Document, n: &Arc<Node>) -> Found { - let inputs = self.doc_inputs(doc); + /// The [`resources_key`] of `n` in the document of `symbols`, with the frame's [`DocInputs`] + /// ([`Found`]): `n` is a live node, or an object with effects whose art ([`Renderer::fx_art`]) + /// can be made from evaluated live objects, type, symbol art or colors shaded through the color + /// settings. The key is made from the [`Walk`] kept for `n` while the document's symbols and + /// patterns are those it read; `n` is walked again when they changed, and in every frame when + /// the walk found a placed file or an image whose own fills or strokes follow its pixels. + pub(crate) fn live_found(&mut self, symbols: &SymbolBoxes, n: &Arc<Node>) -> Found { + let inputs = self.doc_inputs(symbols.document()); let at = Arc::as_ptr(n) as usize; if let Some((node, walked, read)) = self.live.walks.get(&at, self.stamp) && std::ptr::eq(node.as_ptr(), Arc::as_ptr(n)) @@ -472,7 +483,7 @@ impl Renderer { { self.live.walked += 1; } - let (key, reads, walked) = resources_key(doc, inputs.cms, inputs.names, n); + let (key, reads, walked) = resources_key(symbols, inputs.cms, inputs.names, n); if let Some(walked) = walked { // The bytes count the key and the entry, and the node's allocation that the weak // reference keeps. @@ -482,11 +493,12 @@ impl Renderer { (key, inputs, reads) } - fn live_expanded(&mut self, doc: &Document, a: &Arc<Node>, cache: bool) -> Expanded { + fn live_expanded(&mut self, symbols: &SymbolBoxes, a: &Arc<Node>, cache: bool) -> Expanded { + let doc = symbols.document(); let key = Arc::as_ptr(a) as usize; // An evaluation the cache does not keep is made without the key, so the copy that // `draw_live_node` makes is not walked. - let resources = cache.then(|| self.live_found(doc, a)); + let resources = cache.then(|| self.live_found(symbols, a)); if let Some(resources) = &resources && let Some(e) = self.live.expanded.get(&key, self.stamp) && Arc::ptr_eq(&e.0, a) @@ -541,7 +553,7 @@ impl Renderer { let knockout = !f.opts.outline && matches!(a.kind, NodeKind::Blend { .. }) && a.knockout.resolve(self.knockout) - && vectorcraft_doc::live::steps_knockout_shows(&self.live_expanded(f.doc, a, true)); + && vectorcraft_doc::live::steps_knockout_shows(&self.live_expanded(f.symbols, a, true)); let enclosing = std::mem::replace(&mut self.knockout, knockout); if !f.opts.outline && (opacity < 1.0 || a.blend != vectorcraft_color::BlendMode::Normal || a.isolate || knockout) { let blends = self.blends_through(a); @@ -566,7 +578,7 @@ impl Renderer { | NodeKind::Intertwine { .. } | NodeKind::Group { .. } | NodeKind::Layer { .. } => { - let items = self.live_expanded(f.doc, a, cache); + let items = self.live_expanded(f.symbols, a, cache); // An evaluation the cache did not keep is made again in the next frame. let kept = cache && self.live.expanded.get(&(Arc::as_ptr(a) as usize), self.stamp).is_some_and(|e| Arc::ptr_eq(&e.1, &items)); let outer = self.made_again; @@ -809,7 +821,12 @@ mod tests { let envelope = Node::new(d.alloc_id(), envelope); let key = |d: &Document| { std::thread::scope(|s| { - std::thread::Builder::new().stack_size(256 << 10).spawn_scoped(s, || resources_key(d, 0, 0, &envelope).0).unwrap().join().unwrap() + std::thread::Builder::new() + .stack_size(256 << 10) + .spawn_scoped(s, || resources_key(&d.symbol_boxes(), 0, 0, &envelope).0) + .unwrap() + .join() + .unwrap() }) }; let before = key(&d); @@ -841,8 +858,8 @@ mod tests { frame: Box::new(Affine::IDENTITY), }; let envelope = Node::new(d.alloc_id(), envelope); - let before = resources_key(&d, 0, 0, &envelope).0; + let before = resources_key(&d.symbol_boxes(), 0, 0, &envelope).0; d.symbols[2].art = y.clone(); - assert_ne!(resources_key(&d, 0, 0, &envelope).0, before, "the art of every instance is hashed"); + assert_ne!(resources_key(&d.symbol_boxes(), 0, 0, &envelope).0, before, "the art of every instance is hashed"); } } diff --git a/crates/render/src/renderer/nodes.rs b/crates/render/src/renderer/nodes.rs index 8e18b3a045..bd26c851cd 100644 --- a/crates/render/src/renderer/nodes.rs +++ b/crates/render/src/renderer/nodes.rs @@ -36,7 +36,7 @@ impl Renderer { // drawn otherwise, measured as below. _ if measures_three_d(a) && let Some(b) = { - let art = self.measured_fx_art(symbols.document(), a); + let art = self.measured_fx_art(symbols, a); self.three_d_art_bounds(symbols, &art) } => { @@ -578,7 +578,7 @@ impl Renderer { self.draw_image_in(ctx, f, &f.doc.shown_image(n, im), None, images::image_tint(f.doc, n, f.ink), n.extras().pixelated) } NodeKind::SymbolInstance { symbol, xf } => { - if let Some(sym) = f.doc.symbols.iter().find(|s| &s.name == symbol) { + if let Some(sym) = f.symbols.symbol(symbol) { // The instance draws when the frame has room for its art's objects; a symbol // with 9-slice guides is placed cell by cell (`Self::sliced_art`). let mut used = self.symbol_nodes; diff --git a/crates/render/src/renderer/text.rs b/crates/render/src/renderer/text.rs index 945ce5303b..01c73918e7 100644 --- a/crates/render/src/renderer/text.rs +++ b/crates/render/src/renderer/text.rs @@ -32,14 +32,14 @@ impl Renderer { return; } for r in t.runs.iter().filter_map(|r| r.inline.as_ref()) { - if !f.doc.symbols.iter().any(|s| s.name == r.symbol) && !MISSING_INLINE_LOGGED.swap(true, std::sync::atomic::Ordering::Relaxed) { + if f.symbols.symbol(&r.symbol).is_none() && !MISSING_INLINE_LOGGED.swap(true, std::sync::atomic::Ordering::Relaxed) { log::warn!("inline graphic shows symbol {:?}, which the document doesn't have: it draws nothing", r.symbol); } } self.inline_depth += 1; for ig in &g.inlines { let Some(art) = t.runs.get(ig.run).and_then(|r| r.inline.as_ref()) else { continue }; - let Some(sym) = f.doc.symbols.iter().find(|s| s.name == art.symbol) else { continue }; + let Some(sym) = f.symbols.symbol(&art.symbol) else { continue }; // Strokes scale with the art (it is sized to the type, as in the SVG `<use>`). let (node, kept) = self.placed_art(&sym.art, t.xf * ig.xf * f.doc.symbol_natural_xf(&art.symbol), true, None); self.draw_placed_art(ctx, f, &node, kept); diff --git a/crates/render/src/tests.rs b/crates/render/src/tests.rs index 89e90c31aa..2a0e6c9a93 100644 --- a/crates/render/src/tests.rs +++ b/crates/render/src/tests.rs @@ -314,6 +314,76 @@ fn past_the_measured_placements_an_instance_is_culled_by_an_estimate_of_its_art_ assert!(img.pixel(3, 20)[3] > 0, "{:?}", img.pixel(3, 20)); } +/// 2,000 symbols, then two named "Mark" (a red square, then a blue one), and an instance of +/// "Mark" at (25, 25) and one with a drop shadow at (70, 70). With `second` the blue square's +/// symbol is named that instead. +fn marks(second: &str) -> Document { + let mut d = Document::new(100.0, 100.0); + for i in 0..2000 { + let art = rect_node(&mut d, Rect::new(0.0, 0.0, 1.0, 1.0), Paint::solid(Color::BLACK), Paint::None, 0.0); + d.symbols.push(vectorcraft_doc::Symbol { dynamic: false, name: format!("Filler {i}"), art: Arc::new(art) }); + } + for (name, color) in [("Mark", Color::rgb(1.0, 0.0, 0.0)), (second, Color::rgb(0.0, 0.0, 1.0))] { + let art = rect_node(&mut d, Rect::new(-10.0, -10.0, 10.0, 10.0), Paint::solid(color), Paint::None, 0.0); + d.symbols.push(vectorcraft_doc::Symbol { dynamic: false, name: name.into(), art: Arc::new(art) }); + } + let l = d.layers[0].id; + let plain = Node::new(d.alloc_id(), NodeKind::SymbolInstance { symbol: "Mark".into(), xf: Affine::translate((25.0, 25.0)) }); + let mut shadowed = Node::new(d.alloc_id(), NodeKind::SymbolInstance { symbol: "Mark".into(), xf: Affine::translate((70.0, 70.0)) }); + shadowed.appearance.effects.push(vectorcraft_doc::Effect { + id: "stylize.dropShadow".into(), + params: serde_json::json!({"x": 4, "y": 4, "blur": 0}), + visible: true, + }); + d.insert(Some(l), 0, plain).unwrap(); + d.insert(Some(l), 1, shadowed).unwrap(); + d +} + +/// Instances among many symbols draw the first symbol of their name, the same pixels as when no +/// other symbol has that name. +#[test] +fn instances_draw_the_first_symbol_of_their_name() { + let img = render(&marks("Mark")); + assert_eq!(img.pixel(25, 25), [255, 0, 0, 255]); + assert_eq!(img.pixel(70, 70), [255, 0, 0, 255]); + assert!(img.pixels == render(&marks("Other")).pixels, "the pixels differ"); +} + +/// A frame that draws 300 instances with drop shadows, among 2,000 symbols, and an envelope around +/// instances reads the symbol list once to find their symbols. +#[test] +fn a_frame_reads_the_symbol_list_once() { + let mut d = marks("Other"); + let l = d.layers[0].id; + for i in 0..300 { + let xf = Affine::translate((f64::from(i % 20) * 5.0, f64::from(i / 20) * 5.0)) * Affine::scale(0.2); + let mut n = Node::new(d.alloc_id(), NodeKind::SymbolInstance { symbol: "Mark".into(), xf }); + n.appearance.effects.push(vectorcraft_doc::Effect { + id: "stylize.dropShadow".into(), + params: serde_json::json!({"x": 1, "y": 1, "blur": 0}), + visible: true, + }); + d.insert(Some(l), usize::MAX, n).unwrap(); + } + let content = Arc::new(Node::new(d.alloc_id(), NodeKind::SymbolInstance { symbol: "Mark".into(), xf: Affine::translate((50.0, 50.0)) })); + let kind = vectorcraft_doc::live::EnvelopeKind::Warp { style: "arc".into(), bend: 30.0, h: 0.0, v: 0.0, horizontal: true, version: 0 }; + let envelope = NodeKind::Envelope { + content: vec![content], + kind: Box::new(kind), + fidelity: 50.0, + editing: false, + options: Default::default(), + frame: Box::new(Affine::IDENTITY), + }; + let envelope = Node::new(d.alloc_id(), envelope); + d.insert(Some(l), usize::MAX, envelope).unwrap(); + let before = vectorcraft_doc::symbols_read(); + render(&d); + let read = vectorcraft_doc::symbols_read() - before; + assert!(read <= d.symbols.len(), "{read} symbols read, {} in the document", d.symbols.len()); +} + /// Symbols 0 to 29 each hold two instances of the next, sheared two ways, so that the 2^30 /// instances drawn from the first are all placed differently. Symbol 30 holds a square with a drop /// shadow. An instance of symbol 0 lies far left of the view. With `effect`, every instance has diff --git a/crates/render/src/tests/objectfx.rs b/crates/render/src/tests/objectfx.rs index 6eb13767d8..5a4fb97b44 100644 --- a/crates/render/src/tests/objectfx.rs +++ b/crates/render/src/tests/objectfx.rs @@ -1241,9 +1241,10 @@ fn symbol_instances_with_effects_are_charged_to_the_symbol_budget() { let inst = d.layers[0].children().unwrap()[0].clone(); let mut r = Renderer::new(); r.symbol_nodes = vectorcraft_doc::MAX_SYMBOL_NODES - 1; - assert!(r.charge_fx_instance(&d, &inst), "one object fits"); + let symbols = d.symbol_boxes(); + assert!(r.charge_fx_instance(&symbols, &inst), "one object fits"); assert_eq!(r.symbol_nodes, vectorcraft_doc::MAX_SYMBOL_NODES); - assert!(!r.charge_fx_instance(&d, &inst), "the next does not"); + assert!(!r.charge_fx_instance(&symbols, &inst), "the next does not"); assert_eq!(r.symbol_nodes, vectorcraft_doc::MAX_SYMBOL_NODES); } diff --git a/crates/render/src/tests/viewraster.rs b/crates/render/src/tests/viewraster.rs index 7d7399e608..7474772eae 100644 --- a/crates/render/src/tests/viewraster.rs +++ b/crates/render/src/tests/viewraster.rs @@ -463,3 +463,19 @@ fn backdrop_drag_perf() { ); } } + +/// A gradient mesh far larger than any buffer (a damaged file can give one) is drawn without +/// flattening its whole outline in device pixels, which would make more segments than memory holds. +#[test] +fn a_mesh_past_any_buffer_draws_without_flattening_its_outline() { + let side = 1e30; + let mut d = Document::new(595.0, 842.0); + let m = vectorcraft_doc::GradientMesh::from_surface(2, 2, &|u, v| vectorcraft_geom::Point::new(u * side, v * side + u * u * side), &|u, v| { + Color::rgb(u as f32, v as f32, 0.5) + }); + let layer = d.layers[0].id; + let node = Node::new(d.alloc_id(), NodeKind::Mesh(m)); + d.insert(Some(layer), 0, node).unwrap(); + let image = Renderer::new().render(&d, 640, 900, view(1.0, (640, 900)), &RenderOptions::default()); + assert_eq!(image.pixels.len(), 640 * 900 * 4); +} diff --git a/crates/svg/Cargo.toml b/crates/svg/Cargo.toml index 660ef967ad..c1a59d7022 100644 --- a/crates/svg/Cargo.toml +++ b/crates/svg/Cargo.toml @@ -47,3 +47,5 @@ vectorcraft-text = { workspace = true, features = ["test-fonts"] } craft-svg = { workspace = true, features = ["tree-render", "tree-text"] } vectorcraft-testkit = { workspace = true } proptest = { workspace = true } +# How many times the symbol list is read to find symbols by name. +vectorcraft-doc = { workspace = true, features = ["symbol-read-count"] } diff --git a/crates/svg/src/export.rs b/crates/svg/src/export.rs index e3acc9f032..ded9a037fe 100644 --- a/crates/svg/src/export.rs +++ b/crates/svg/src/export.rs @@ -117,6 +117,7 @@ fn write(doc: &Document, opts: &ExportOptions, native: Option<&[u8]>, id_prefix: linked: Vec::new(), instance_xf: Affine::IDENTITY, symbols: HashMap::new(), + symbol_lookup: doc.symbol_boxes(), symbol_nest: 0, symbol_nodes: 0, inline_graphic: false, @@ -301,6 +302,9 @@ struct Writer<'a> { instance_xf: Affine, /// What each symbol's instances can share, by symbol name (see [`Writer::symbol_use`]). symbols: HashMap<String, SymbolDef>, + /// The document's symbols, found by name ([`vectorcraft_doc::SymbolBoxes::symbol`]) in time + /// independent of how many symbols the document holds. + symbol_lookup: vectorcraft_doc::SymbolBoxes<'a>, /// Symbols being written inside one another (instances nested deeper are left out: a symbol /// can't contain itself). symbol_nest: u32, diff --git a/crates/svg/src/export/nodes.rs b/crates/svg/src/export/nodes.rs index b9af2a6c06..6427d048bd 100644 --- a/crates/svg/src/export/nodes.rs +++ b/crates/svg/src/export/nodes.rs @@ -51,15 +51,16 @@ fn export_shape_bounds(n: &Node) -> Option<Rect> { impl Reuse { const NONE: Self = Self { moves: false, turns: false, scales: false }; - /// What a def of symbol art `art` stands for. - pub(crate) fn of(doc: &Document, art: &Node) -> Self { + /// What a def of symbol art `art` stands for, in `doc`. `find` finds the symbol of each + /// instance in it by name. + pub(crate) fn of<'d>(doc: &'d Document, find: &dyn Fn(&str) -> Option<&'d vectorcraft_doc::Symbol>, art: &Node) -> Self { let mut r = Self { moves: true, turns: true, scales: true }; - r.scan(doc, art, 0); + r.scan(doc, find, art, 0); r } /// Narrow down to what `n` (inside symbols nested `depth` deep) allows. - fn scan(&mut self, doc: &Document, n: &Node, depth: u32) { + fn scan<'d>(&mut self, doc: &'d Document, find: &dyn Fn(&str) -> Option<&'d vectorcraft_doc::Symbol>, n: &Node, depth: u32) { let pattern = |p: &Paint| matches!(p, Paint::Pattern { .. }); let text_patterns = matches!(&n.kind, NodeKind::Text(t) if t.runs.iter().any(|r| pattern(&r.style.fill) || pattern(&r.style.stroke))); let unlinked_mask = n.extras().mask.as_ref().is_some_and(|m| !m.linked); @@ -95,17 +96,17 @@ impl Reuse { if doc.symbol_nine_slice(symbol).is_some() { self.scales = false; } - if let Some(s) = doc.symbols.iter().find(|s| s.name == *symbol) { - self.scan(doc, &s.art, depth + 1); + if let Some(s) = find(symbol) { + self.scan(doc, find, &s.art, depth + 1); } } _ => {} } if let Some(m) = &n.extras().mask { - self.scan(doc, &m.art, depth); + self.scan(doc, find, &m.art, depth); } for c in n.children().into_iter().flatten() { - self.scan(doc, c, depth); + self.scan(doc, find, c, depth); } } @@ -481,7 +482,7 @@ impl Writer<'_> { if let NodeKind::SymbolInstance { symbol, .. } = &n.kind { let custom = !n.extras().symbol_overrides.is_empty(); if symbols.insert((symbol.clone(), custom.then_some(n.id))) - && let Some(s) = self.doc.symbols.iter().find(|s| s.name == *symbol) + && let Some(s) = self.symbol_lookup.symbol(symbol) { stack.push(if custom { std::sync::Arc::new(vectorcraft_brush::instance_art(&s.art, n)) } else { s.art.clone() }); } @@ -518,7 +519,7 @@ impl Writer<'_> { /// its geometry, so the region also covers the geometry's box, placed, grown by the strokes' /// and effects' reach unscaled. fn region_attrs(&mut self, nodes: &[&Node]) -> String { - let symbols = self.region_boxes.take().unwrap_or_else(|| self.doc.symbol_boxes()); + let symbols = self.region_boxes.take().unwrap_or_else(|| self.symbol_lookup.unmeasured()); let mut art_reach = std::mem::take(&mut self.art_reach); let region = self.region_of(&symbols, &mut art_reach, nodes); self.region_boxes = Some(symbols); @@ -528,7 +529,7 @@ impl Writer<'_> { /// The box of what each of `nodes` paints, as [`Self::paint_box`] measures it. fn paint_boxes(&mut self, nodes: &[&Node]) -> Vec<Option<Option<Rect>>> { - let symbols = self.region_boxes.take().unwrap_or_else(|| self.doc.symbol_boxes()); + let symbols = self.region_boxes.take().unwrap_or_else(|| self.symbol_lookup.unmeasured()); let mut art_reach = std::mem::take(&mut self.art_reach); let boxes = nodes.iter().map(|n| self.paint_box(&symbols, &mut art_reach, n)).collect(); self.region_boxes = Some(symbols); @@ -615,7 +616,7 @@ impl Writer<'_> { return Some(own + past + self.paint_reach(symbols, art_reach, &g, gb, depth + 1)?); } let symbol = match &n.kind { - NodeKind::SymbolInstance { symbol, xf } => self.doc.symbols.iter().find(|s| s.name == *symbol).map(|s| (s, xf)), + NodeKind::SymbolInstance { symbol, xf } => self.symbol_lookup.symbol(symbol).map(|s| (s, xf)), _ => None, }; if n.children().is_none_or(|c| c.is_empty()) && symbol.is_none() { @@ -1026,7 +1027,7 @@ impl Writer<'_> { let doc = self.doc; // The instances nested in an inline graphic's art are ordinary instances again. let inline = std::mem::take(&mut self.inline_graphic); - let Some(sym) = doc.symbols.iter().find(|s| s.name == *symbol) else { return }; + let Some(sym) = self.symbol_lookup.symbol(symbol) else { return }; if self.symbol_nest > MAX_SYMBOL_NEST { return; } @@ -1113,7 +1114,8 @@ impl Writer<'_> { return None; } if !self.symbols.contains_key(&sym.name) { - let reuse = Reuse::of(self.doc, &sym.art); + let lookup = &self.symbol_lookup; + let reuse = Reuse::of(self.doc, &|name| lookup.symbol(name), &sym.art); self.symbols.insert(sym.name.clone(), SymbolDef { id: None, reuse, nodes: 0 }); } let def = self.symbols.get(&sym.name)?; diff --git a/crates/svg/src/export/paint.rs b/crates/svg/src/export/paint.rs index 234783d029..57e0a6caf4 100644 --- a/crates/svg/src/export/paint.rs +++ b/crates/svg/src/export/paint.rs @@ -680,7 +680,7 @@ impl Writer<'_> { } return 0; } - let bounds = n.visual_bounds_with(&self.doc.symbol_boxes()); + let bounds = n.visual_bounds_with(&self.symbol_lookup.unmeasured()); // An Outer Glow's silhouette grows by a quarter of a pixel of the document's raster grid first. let grow = 18.0 / self.doc.raster_ppi(); let reach: f64 = @@ -705,7 +705,7 @@ impl Writer<'_> { // 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 symbols = self.symbol_lookup.unmeasured(); let visual = input.visual_bounds_with(&symbols).unwrap_or_default(); let user_box = if sf.moves_only() { visual - sf.origin() diff --git a/crates/svg/src/import.rs b/crates/svg/src/import.rs index 6348b6e141..aaeac31a11 100644 --- a/crates/svg/src/import.rs +++ b/crates/svg/src/import.rs @@ -202,7 +202,7 @@ pub(crate) fn import_finding( hidden: found.hidden, uses: found.uses, symbols: HashMap::new(), - symbol_names: HashSet::new(), + symbol_names: HashMap::new(), symbol_suffixes: HashMap::new(), pattern_suffixes: HashMap::new(), blends: fx::blends(&xml, &scan.markers), @@ -360,8 +360,8 @@ struct Importer { uses: HashMap<String, String>, /// The symbols made so far, by `<symbol>` id. symbols: HashMap<String, SymbolMade>, - /// The names of the symbols made so far. - symbol_names: HashSet<String>, + /// The names of the symbols made so far, each with its index in the document's symbols. + symbol_names: HashMap<String, usize>, /// Where the suffixes of each symbol and pattern name base go on from (`unique_name`). symbol_suffixes: HashMap<String, usize>, pattern_suffixes: HashMap<String, usize>, diff --git a/crates/svg/src/import/importer.rs b/crates/svg/src/import/importer.rs index 9badabc601..c1dd856559 100644 --- a/crates/svg/src/import/importer.rs +++ b/crates/svg/src/import/importer.rs @@ -207,9 +207,11 @@ impl Importer { None => { let base = self.name_of(&sym).to_string(); let names = &self.symbol_names; - let name = unique_name(&base, &mut self.symbol_suffixes, |n| names.contains(n)); - self.symbol_names.insert(name.clone()); - let reuse = Reuse::of(&self.doc, &art); + let name = unique_name(&base, &mut self.symbol_suffixes, |n| names.contains_key(n)); + let doc = &self.doc; + let find = |n: &str| names.get(n).and_then(|&i| doc.symbols.get(i)).filter(|s| s.name == n); + let reuse = Reuse::of(doc, &find, &art); + self.symbol_names.insert(name.clone(), self.doc.symbols.len()); let made = SymbolMade { name: name.clone(), art: without_ids(&art), reuse }; self.doc.symbols.push(vectorcraft_doc::Symbol { dynamic: false, name: name.clone(), art: Arc::new(art) }); self.symbols.insert(sym, made); @@ -862,7 +864,7 @@ mod tests { hidden: HashSet::new(), uses: HashMap::new(), symbols: HashMap::new(), - symbol_names: HashSet::new(), + symbol_names: HashMap::new(), symbol_suffixes: HashMap::new(), pattern_suffixes: HashMap::new(), blends: HashMap::new(), diff --git a/crates/svg/tests/it/symbols_layers.rs b/crates/svg/tests/it/symbols_layers.rs index b30d367858..1d1b4cc712 100644 --- a/crates/svg/tests/it/symbols_layers.rs +++ b/crates/svg/tests/it/symbols_layers.rs @@ -69,6 +69,64 @@ fn three_instances_give_one_symbol_and_three_uses() { assert!(boxes.iter().any(|b| (b.x0 - 90.0).abs() < 1e-3 && (b.y0 - 30.0).abs() < 1e-3), "{boxes:?}"); } +/// 2,000 symbols, then two named "Mark" (a red square with a black stroke, then a blue one) and +/// "Holder", holding an instance of "Mark". Instances: "Mark" moved, "Mark" stretched (written as +/// its own art) and "Holder". With `second` the blue square's symbol is named that instead. +fn marks(second: &str) -> Document { + let mut d = Document::new(200.0, 120.0); + for i in 0..2000 { + let art = Node::path( + d.alloc_id(), + shapes::rectangle(Rect::new(0.0, 0.0, 1.0, 1.0)), + Appearance::basic(Paint::solid(Color::BLACK), Paint::None, 0.0), + ); + d.symbols.push(Symbol { dynamic: false, name: format!("Filler {i}"), art: Arc::new(art) }); + } + for (name, color) in [("Mark", Color::rgb8(255, 0, 0)), (second, Color::rgb8(0, 0, 255))] { + let ap = Appearance::basic(Paint::solid(color), Paint::solid(Color::BLACK), 2.0); + let art = Node::path(d.alloc_id(), shapes::rectangle(Rect::new(-10.0, -10.0, 10.0, 10.0)), ap); + d.symbols.push(Symbol { dynamic: false, name: name.into(), art: Arc::new(art) }); + } + let held = Node::new(d.alloc_id(), NodeKind::SymbolInstance { symbol: "Mark".into(), xf: Affine::translate((5.0, 5.0)) }); + let holder = Node::group(d.alloc_id(), vec![Arc::new(held)]); + d.symbols.push(Symbol { dynamic: false, name: "Holder".into(), art: Arc::new(holder) }); + instance(&mut d, "Mark", Affine::translate((25.0, 25.0))); + instance(&mut d, "Mark", Affine::translate((80.0, 60.0)) * Affine::scale_non_uniform(2.0, 1.0)); + instance(&mut d, "Holder", Affine::translate((150.0, 60.0))); + d +} + +/// Instances among many symbols are written with the first symbol of their name, the same SVG as +/// when no other symbol has that name. +#[test] +fn instances_are_written_with_the_first_symbol_of_their_name() { + let svg = export(&marks("Mark"), &ExportOptions::default()); + assert_eq!(svg, export(&marks("Other"), &ExportOptions::default())); + assert!(svg.contains("#ff0000") && !svg.contains("#0000ff"), "{svg}"); +} + +/// An export of 300 instances with drop shadows, among 2,000 symbols, reads the symbol list once +/// to find their symbols. +#[test] +fn an_export_reads_the_symbol_list_once() { + let mut d = marks("Other"); + for i in 0..300 { + let xf = Affine::translate((f64::from(i % 20) * 10.0, f64::from(i / 20) * 8.0)) * Affine::scale(0.2); + let mut n = Node::new(d.alloc_id(), NodeKind::SymbolInstance { symbol: "Mark".into(), xf }); + n.appearance.effects.push(vectorcraft_doc::Effect { + id: "stylize.dropShadow".into(), + params: serde_json::json!({"x": 1, "y": 1, "blur": 0}), + visible: true, + }); + let l = d.layers[0].id; + d.insert(Some(l), usize::MAX, n).unwrap(); + } + let before = vectorcraft_doc::symbols_read(); + export(&d, &ExportOptions::default()); + let read = vectorcraft_doc::symbols_read() - before; + assert!(read <= d.symbols.len(), "{read} symbols read, {} in the document", d.symbols.len()); +} + /// A scaled instance of a symbol with 9-slice guides is written as the canvas draws it, with no /// `<use>`: at 200 × 150 its 10 × 10 corner square stays 10 × 10 and its center square becomes /// 30 × 20. An instance at the natural size still uses the def. diff --git a/crates/text/Cargo.toml b/crates/text/Cargo.toml index 1f8ddc3755..fa88e3f9ef 100644 --- a/crates/text/Cargo.toml +++ b/crates/text/Cargo.toml @@ -28,6 +28,12 @@ icu_segmenter = "2.3" # Grapheme clusters (a Thai consonant with its vowel and tone marks, an accented letter, an emoji # sequence) for caret movement; MIT OR Apache-2.0, already in the build. unicode-segmentation = "1.13" +# Hyphenation patterns and rules for German, Polish, Portuguese, Italian, Bulgarian, Turkish and +# Russian; MIT OR Apache-2.0, already in the build through the engine's spell checking. +craft-proof = { workspace = true } +# Composes a decomposed Cyrillic word (`и` + U+0306 is `й`) before its script check; MIT OR +# Apache-2.0, already in the build through craft-proof. +unicode-normalization = "0.1.26" # Draws COLR colour glyphs whose paints documents have no form for (sweep gradients, compositing # modes) into images: the canvas's renderer, already in the build. vello_cpu = { workspace = true } diff --git a/crates/text/src/fontdb/face.rs b/crates/text/src/fontdb/face.rs index c856525dfc..f02ebea3fc 100644 --- a/crates/text/src/fontdb/face.rs +++ b/crates/text/src/fontdb/face.rs @@ -368,6 +368,28 @@ impl FontFace { pub fn line_gap(&self) -> f64 { self.skrifa().map_or(0.0, |f| f64::from(f.metrics(Size::unscaled(), self.location()).leading)).max(0.0) } + /// The height of the face's character cell on Windows (the OS/2 table's `usWinAscent` plus + /// `usWinDescent`, at the face's location in a variable font), in font units; `None` when the + /// font has no OS/2 table or the sum isn't positive. + pub fn win_cell_height(&self) -> Option<f64> { + use skrifa::raw::TableProvider; + let f = self.skrifa()?; + let o = f.os2().ok()?; + // A variable font's MVAR table moves usWinAscent (`hcla`) and usWinDescent (`hcld`): + // https://learn.microsoft.com/en-us/typography/opentype/spec/mvar + let varied = |tag: &[u8; 4]| { + f.mvar().ok().and_then(|m| m.metric_delta(skrifa::Tag::new(tag), self.location().coords()).ok()).map_or(0.0, |d| d.to_f64()) + }; + let h = f64::from(o.us_win_ascent()) + varied(b"hcla") + f64::from(o.us_win_descent()) + varied(b"hcld"); + (h > 0.0 && h.is_finite()).then_some(h) + } + /// The average width of the face's characters (the OS/2 table's `xAvgCharWidth`), in font + /// units; `None` when the font has no OS/2 table or gives no positive width. + pub fn average_char_width(&self) -> Option<f64> { + use skrifa::raw::TableProvider; + let w = f64::from(self.skrifa()?.os2().ok()?.x_avg_char_width()); + (w > 0.0).then_some(w) + } /// Every mapped character and its glyph id, sorted by code point (the Glyphs panel). pub fn chars(&self) -> Vec<(char, u32)> { self.mapped_chars().to_vec() diff --git a/crates/text/src/hyphen.rs b/crates/text/src/hyphen.rs index c940ed85a4..435aae7ea9 100644 --- a/crates/text/src/hyphen.rs +++ b/crates/text/src/hyphen.rs @@ -9,8 +9,11 @@ //! [`set_hyphenation_exceptions`]. //! //! Each run hyphenates in its own language ([`vectorcraft_doc::CharStyle::language`]). English -//! uses the rules above; eleven Indian languages use bundled hyph-utf8 patterns. Other languages -//! only break at user exceptions. Indic breaks always preserve Unicode grapheme boundaries. +//! uses the rules above; eleven Indian languages use bundled hyph-utf8 patterns; German, Polish, +//! Portuguese, Italian, Bulgarian, Turkish and Russian use craft-proof's patterns and rules (German, +//! Polish, Portuguese and Italian only in builds that embed their patterns). Other languages only +//! break at user exceptions. Indic and craft-proof breaks always preserve Unicode grapheme +//! boundaries. use std::collections::HashMap; use std::sync::{Mutex, MutexGuard, OnceLock}; @@ -18,22 +21,28 @@ use std::sync::{Mutex, MutexGuard, OnceLock}; use vectorcraft_doc::HyphenationOptions; mod indic; +mod proof; #[derive(Clone, Copy, Debug)] pub(crate) enum Language { None, English, Indic(u8), + /// One of [`proof::TAGS`]. + Proof(u8), } impl Language { /// Select rules by the primary BCP 47 subtag; absent tags retain the English default. pub(crate) fn from_tag(tag: Option<&str>) -> Self { let primary = tag.unwrap_or("en").split('-').next().unwrap_or_default(); + let index = |tags: &[&str]| tags.iter().position(|t| primary.eq_ignore_ascii_case(t)).and_then(|i| u8::try_from(i).ok()); if primary.eq_ignore_ascii_case("en") { Self::English + } else if let Some(i) = index(&indic::TAGS) { + Self::Indic(i) } else { - indic::TAGS.iter().position(|t| primary.eq_ignore_ascii_case(t)).and_then(|i| u8::try_from(i).ok()).map_or(Self::None, Self::Indic) + index(&proof::TAGS).map_or(Self::None, Self::Proof) } } } @@ -189,11 +198,16 @@ fn onset_pair(a: char, b: char) -> bool { /// Whether text in `language` (a [`vectorcraft_doc::CharStyle::language`]: a BCP 47 tag, `None` for /// the default, English: USA) has break points of its own. pub fn language_has_patterns(language: Option<&str>) -> bool { - !matches!(Language::from_tag(language), Language::None) + match Language::from_tag(language) { + Language::None => false, + Language::Proof(index) => proof::available(usize::from(index)), + Language::English | Language::Indic(_) => true, + } } -/// Language-specific break points as character indices. Indic patterns and exceptions are -/// filtered to whole graphemes; the paragraph's length options count Unicode characters. +/// Language-specific break points as character indices. Indic and craft-proof points and +/// exceptions are filtered to whole graphemes; the paragraph's length options count Unicode +/// characters. pub fn hyphen_points_for_language(word: &str, opts: &HyphenationOptions, language: Option<&str>) -> Vec<usize> { points_for(word, opts, Language::from_tag(language)) } @@ -220,14 +234,15 @@ pub fn hyphen_points_in(word: &str, opts: &HyphenationOptions, patterns: bool) - points_for(word, opts, if patterns { Language::English } else { Language::None }) } -/// Apply exceptions first, then language rules and paragraph limits, protecting Indic clusters. +/// Apply exceptions first, then language rules and paragraph limits, protecting Indic and +/// craft-proof clusters. pub(crate) fn points_for(word: &str, opts: &HyphenationOptions, language: Language) -> Vec<usize> { if let Some(ex) = exception_for(word) { let mut points = match ex { Exception::Never => vec![], Exception::Only(pts) => lowercase_points_to_word(word, &pts), }; - if matches!(language, Language::Indic(_)) { + if matches!(language, Language::Indic(_) | Language::Proof(_)) { indic::retain_boundaries(word, &mut points); } return points; @@ -241,8 +256,9 @@ pub(crate) fn points_for(word: &str, opts: &HyphenationOptions, language: Langua if n <= longer_than || !c.iter().all(|&ch| is_word_char(ch)) { return vec![]; } - // A capitalised run like "NASA" or a proper name stays whole only when all caps. - if c.iter().all(|c| c.is_uppercase()) { + // A capitalised run like "NASA" or a proper name stays whole only when all caps. Combining + // marks have no case, so a decomposed capital ("O" + U+0308) counts by its letter. + if c.iter().filter(|&&ch| !unicode_normalization::char::is_combining_mark(ch)).all(|c| c.is_uppercase()) { return vec![]; } if !opts.capitalized && c.first().is_some_and(|c| c.is_uppercase()) { @@ -250,8 +266,9 @@ pub(crate) fn points_for(word: &str, opts: &HyphenationOptions, language: Langua } let before = usize::try_from(opts.after_first).unwrap_or(usize::MAX).max(1); let after = usize::try_from(opts.before_last).unwrap_or(usize::MAX).max(1); - if let Language::Indic(index) = language { - let mut points = indic::points(word, usize::from(index)); + if let Language::Indic(index) | Language::Proof(index) = language { + let mut points = + if matches!(language, Language::Indic(_)) { indic::points(word, usize::from(index)) } else { proof::points(word, usize::from(index)) }; points.retain(|p| *p >= before && n.saturating_sub(*p) >= after); indic::retain_boundaries(word, &mut points); return points; @@ -308,6 +325,112 @@ pub(crate) fn with_hyphenation_exceptions_for_test(source: &str, f: impl FnOnce( #[cfg(test)] mod tests { use super::*; + use craft_proof::hyphen::Patterns; + + /// Paragraph options that let every point through: words of any length, one letter each side. + fn open() -> HyphenationOptions { + HyphenationOptions { words_longer_than: 0, after_first: 1, before_last: 1, ..Default::default() } + } + + /// Bulgarian, Turkish and Russian break by their own syllable rules in every build, with + /// regional tags too. + #[test] + fn rule_languages_break_by_their_own_rules() { + for (tags, word, points) in [ + (["bg", "bg-BG"], "планина", vec![3, 5]), + (["tr", "TR-cy"], "öğrenci", vec![2, 5]), + (["tr", "tr-TR"], "kardeş", vec![3]), + (["ru", "ru-RU"], "родина", vec![2, 4]), + (["ru", "RU"], "сестра", vec![3]), + ] { + for tag in tags { + assert_eq!(hyphen_points_for_language(word, &open(), Some(tag)), points, "{tag}: {word}"); + } + } + // Capitals keep their points. + assert_eq!(hyphen_points_for_language("Родина", &open(), Some("ru")), vec![2, 4]); + } + + /// German, Polish, Portuguese and Italian break at their own TeX patterns when craft-proof + /// embeds them, and not at all otherwise (two letters on each side, as TeX's defaults keep). + #[test] + fn pattern_languages_break_at_their_own_patterns() { + let open = || HyphenationOptions { after_first: 2, before_last: 2, ..open() }; + for (tags, patterns, word, points) in [ + (["de", "de-CH"], Patterns::de(), "Silbentrennung", vec![3, 6, 10]), + (["pl", "pl-PL"], Patterns::pl(), "kobieta", vec![2, 5]), + (["pt", "pt-BR"], Patterns::pt(), "computador", vec![3, 5, 7]), + (["it", "it-CH"], Patterns::it(), "montagna", vec![3, 5]), + ] { + for tag in tags { + let got = hyphen_points_for_language(word, &open(), Some(tag)); + if patterns.is_empty() { + assert!(got.is_empty(), "{tag}: {word}: no patterns embedded, no English fallback: {got:?}"); + } else { + assert_eq!(got, points, "{tag}: {word}"); + } + } + } + // A letter outside the language's patterns sends craft-proof to a general syllable + // heuristic, which isn't the language's own: the word stays whole. + for (tag, word) in [("de", "Søndergaard"), ("pl", "Müllerowa"), ("pt", "Łódzkaliano"), ("it", "Łódzkaliano")] { + assert!(hyphen_points_for_language(word, &open(), Some(tag)).is_empty(), "{tag}: {word}"); + } + } + + /// A word outside its language's script stays whole: craft-proof would hyphenate it as English. + #[test] + fn other_scripts_in_a_language_get_no_english_points() { + for (tag, word) in [("ru", "typography"), ("bg", "typography"), ("ru", "Москваcity"), ("bg", "ёжикова"), ("tr", "родина")] + { + assert!(hyphen_points_for_language(word, &open(), Some(tag)).is_empty(), "{tag}: {word}"); + } + // A combining stress mark in a Russian word, and a joiner in a German one. + assert!(hyphen_points_for_language("моло\u{301}ко", &open(), Some("ru")).is_empty()); + assert!(hyphen_points_for_language("Silben\u{200d}trennung", &open(), Some("de")).is_empty()); + for tag in ["fr", "es", "hr", "cs", "sr", "nl", "sa", "ur", "x-none", "zz"] { + assert!(hyphen_points_for_language("typography", &open(), Some(tag)).is_empty(), "{tag}"); + assert!(hyphen_points_for_language("родина", &open(), Some(tag)).is_empty(), "{tag}"); + } + } + + /// A decomposed word breaks as its composed spelling does, at the matching characters, and a + /// decomposed all-capitals word stays whole as the composed one does. + #[test] + fn decomposed_words_break_as_composed_ones() { + for tag in ["ru", "bg"] { + let composed = hyphen_points_for_language("чайник", &open(), Some(tag)); + assert!(!composed.is_empty(), "{tag}"); + // `и` + U+0306 is `й`: points after it move one character on. + let shifted: Vec<usize> = composed.iter().map(|&p| if p >= 3 { p + 1 } else { p }).collect(); + assert_eq!(hyphen_points_for_language("чаи\u{306}ник", &open(), Some(tag)), shifted, "{tag}"); + } + assert!(hyphen_points_for_language("ÖĞRENCİ", &open(), Some("tr")).is_empty()); + assert!(hyphen_points_for_language("O\u{308}ĞRENCİ", &open(), Some("tr")).is_empty(), "decomposed capitals"); + assert_eq!(hyphen_points_for_language("o\u{308}ğrenci", &open(), Some("tr")), vec![3, 6]); + } + + /// The paragraph's limits and the Preferences exceptions apply to the new languages as they + /// do to English. + #[test] + fn limits_and_exceptions_apply_in_the_rule_languages() { + let d = HyphenationOptions::default(); + // 3 letters each side by default: "ро-ди-на" keeps neither point, "сес-тра" keeps its one. + assert!(hyphen_points_for_language("родина", &d, Some("ru")).is_empty()); + assert_eq!(hyphen_points_for_language("сестра", &d, Some("ru")), vec![3]); + assert!(hyphen_points_for_language("сестра", &HyphenationOptions { words_longer_than: 6, ..d.clone() }, Some("ru")).is_empty()); + assert!(hyphen_points_for_language("Сестра", &HyphenationOptions { capitalized: false, ..d.clone() }, Some("ru")).is_empty()); + assert!(hyphen_points_for_language("СЕСТРА", &d, Some("ru")).is_empty(), "all capitals"); + assert!(hyphen_points_for_language("", &open(), Some("ru")).is_empty()); + assert!(hyphen_points_for_language("я", &open(), Some("ru")).is_empty()); + with_exceptions("родина, kar-deş", || { + assert!(hyphen_points_for_language("родина", &open(), Some("ru")).is_empty()); + assert_eq!(hyphen_points_for_language("kardeş", &d, Some("tr")), vec![3], "marked points ignore the limits"); + }); + with_exceptions("ро-дина", || { + assert_eq!(hyphen_points_for_language("родина", &open(), Some("ru")), vec![2]); + }); + } fn with_exceptions(source: &str, f: impl FnOnce()) { with_hyphenation_exceptions_for_test(source, f); @@ -319,9 +442,15 @@ mod tests { for l in [None, Some("en-US"), Some("en-GB"), Some("EN-gb"), Some("en")] { assert!(language_has_patterns(l), "{l:?}"); } - for l in [Some("de"), Some("fr"), Some("pt"), Some("eng"), Some("x-unknown"), Some(""), Some("é")] { + for l in [Some("fr"), Some("es"), Some("hr"), Some("cs"), Some("nl"), Some("eng"), Some("x-unknown"), Some(""), Some("é")] { assert!(!language_has_patterns(l), "{l:?}"); } + for l in ["bg", "tr", "ru", "BG-bg", "tr-CY", "ru-RU"] { + assert!(language_has_patterns(Some(l)), "{l}"); + } + for (l, embedded) in [("de", Patterns::de()), ("pl", Patterns::pl()), ("pt", Patterns::pt()), ("it", Patterns::it())] { + assert_eq!(language_has_patterns(Some(l)), !embedded.is_empty(), "{l}"); + } for tag in indic::TAGS { assert!(language_has_patterns(Some(tag))); assert!(language_has_patterns(Some(&format!("{}-IN", tag.to_uppercase())))); diff --git a/crates/text/src/hyphen/proof.rs b/crates/text/src/hyphen/proof.rs new file mode 100644 index 0000000000..05d5f4634b --- /dev/null +++ b/crates/text/src/hyphen/proof.rs @@ -0,0 +1,76 @@ +//! Break points from craft-proof for the languages it has rules or patterns of its own for: +//! German, Polish, Portuguese and Italian (hyph-utf8's TeX patterns, embedded only when craft-proof +//! is built with `CRAFT_I18N_DIR`), Bulgarian and Turkish (syllable rules) and Russian (word-division +//! rules). craft-proof hyphenates any other word as English; those points are dropped here, so a +//! word outside its language's script, or one these rules don't cover, stays whole. + +use craft_proof::hyphen::{Patterns, ProofLang, Source, word_breaks_in}; +use unicode_normalization::UnicodeNormalization; +use unicode_script::{Script, UnicodeScript}; + +pub(super) const TAGS: [&str; 7] = ["de", "pl", "pt", "it", "bg", "tr", "ru"]; + +fn lang(index: usize) -> Option<ProofLang> { + Some(match *TAGS.get(index)? { + "de" => ProofLang::De, + "pl" => ProofLang::Pl, + "pt" => ProofLang::Pt, + "it" => ProofLang::It, + "bg" => ProofLang::Bg, + "tr" => ProofLang::Tr, + "ru" => ProofLang::Ru, + _ => return None, + }) +} + +/// The pattern file of a pattern language, `None` for the languages with rules. +fn patterns(lang: ProofLang) -> Option<&'static Patterns> { + match lang { + ProofLang::De => Some(Patterns::de()), + ProofLang::Pl => Some(Patterns::pl()), + ProofLang::Pt => Some(Patterns::pt()), + ProofLang::It => Some(Patterns::it()), + _ => None, + } +} + +/// Whether the language has break points in this build: the rule languages always, the pattern +/// languages when their patterns are embedded. +pub(super) fn available(index: usize) -> bool { + lang(index).is_some_and(|l| patterns(l).is_none_or(|p| !p.is_empty())) +} + +/// A Latin letter or a combining mark. +fn latin(c: char) -> bool { + matches!(c.script(), Script::Latin | Script::Inherited) && c != '\u{200c}' && c != '\u{200d}' +} + +/// A Cyrillic letter, as craft-proof's Russian rules read them. +fn cyrillic(c: char) -> bool { + matches!(c, '\u{0400}'..='\u{052F}') && c.is_alphabetic() +} + +/// Whether `word` is written in the language's script, and the sources of points that come from +/// the language's own rules or patterns. A Cyrillic word is checked composed, as craft-proof +/// hyphenates it: `и` + U+0306 is `й`, while a stress mark, which composes with nothing, is not a +/// letter. +fn fits(lang: ProofLang, word: &str) -> Option<&'static [Source]> { + let all = |f: fn(char) -> bool| word.chars().all(f); + let composed_cyrillic = || word.nfc().all(cyrillic); + match lang { + ProofLang::De | ProofLang::Pl | ProofLang::Pt | ProofLang::It => all(latin).then_some(&[Source::Patterns, Source::Dictionary]), + ProofLang::Tr => word.chars().all(|c| latin(c) || matches!(c, '\'' | '’')).then_some(&[Source::Rules]), + ProofLang::Bg => composed_cyrillic().then_some(&[Source::Rules]), + ProofLang::Ru => composed_cyrillic().then_some(&[Source::Heuristic]), + _ => None, + } +} + +/// Character-index candidates for one language, before the paragraph's limits; empty when the +/// word isn't in the language's script or the language's own rules give it none. +pub(super) fn points(word: &str, index: usize) -> Vec<usize> { + let Some(lang) = lang(index) else { return vec![] }; + let Some(sources) = fits(lang, word) else { return vec![] }; + let (points, source) = word_breaks_in(word, lang); + if sources.contains(&source) { points } else { vec![] } +} diff --git a/crates/text/src/test_fonts.rs b/crates/text/src/test_fonts.rs index b2deb5044f..1e1a195db0 100644 --- a/crates/text/src/test_fonts.rs +++ b/crates/text/src/test_fonts.rs @@ -1598,7 +1598,8 @@ pub const PATH_ALIGN_TYPO_FAMILY: &str = "Pathalign Typo Sans"; pub const PATH_ALIGN_HHEA_FAMILY: &str = "Pathalign Hhea Sans"; /// A family of [`path_align_font`]: as [`PATH_ALIGN_TYPO_FAMILY`], as a variable font with one /// weight axis (400–700, named instances Regular and Bold) whose `MVAR` table raises the -/// typographic ascender and descender by 100 at 700: a box from 0 to 1,000 in Bold. +/// typographic ascender and descender by 100 at 700: a box from 0 to 1,000 in Bold. It also raises +/// `usWinAscent` by 120 and `usWinDescent` by 80 at 700. pub const PATH_ALIGN_VARIABLE_FAMILY: &str = "Pathalign Variable Sans"; /// A family of [`path_align_font`]: Japanese code page, with no reference ideograph and no ┼. pub const PATH_ALIGN_NONE_FAMILY: &str = "Pathalign None Sans"; @@ -1693,10 +1694,16 @@ pub fn path_align_font(family: &str) -> Option<Vec<u8>> { } if family == PATH_ALIGN_VARIABLE_FAMILY { let region = VariationRegion::new(vec![RegionAxisCoordinates::new(F2Dot14::from_f32(0.0), F2Dot14::from_f32(1.0), F2Dot14::from_f32(1.0))]); - // Two delta sets (hasc, hdsc) of one 16-bit delta each for the one region. - let data = ItemVariationData::new(2, 1, vec![0], [100_i16.to_be_bytes(), 100_i16.to_be_bytes()].concat()); + // Four delta sets (hasc, hdsc, hcla, hcld) of one 16-bit delta each for the one region. + let deltas = [100_i16, 100, 120, 80].map(i16::to_be_bytes).concat(); + let data = ItemVariationData::new(4, 1, vec![0], deltas); let store = ItemVariationStore::new(VariationRegionList::new(1, vec![region]), vec![Some(data)]); - let records = vec![ValueRecord::new(Tag::new(b"hasc"), 0, 0), ValueRecord::new(Tag::new(b"hdsc"), 0, 1)]; + let records = vec![ + ValueRecord::new(Tag::new(b"hasc"), 0, 0), + ValueRecord::new(Tag::new(b"hcla"), 0, 2), + ValueRecord::new(Tag::new(b"hcld"), 0, 3), + ValueRecord::new(Tag::new(b"hdsc"), 0, 1), + ]; let axis = VariationAxisRecord { axis_tag: Tag::new(b"wght"), min_value: Fixed::from_i32(400), diff --git a/crates/text/src/tests.rs b/crates/text/src/tests.rs index c2acbe9897..38a8d97f69 100644 --- a/crates/text/src/tests.rs +++ b/crates/text/src/tests.rs @@ -874,6 +874,19 @@ fn on_path_align_takes_a_variable_font_instances_em_box() { assert!(ascender.len() == 2 && (ascender[0] - 9.0).abs() < 1e-6 && (ascender[1] - 10.0).abs() < 1e-6, "{ascender:?}"); } +/// A variable font's instance takes its Windows character cell from the `usWinAscent` and +/// `usWinDescent` its `MVAR` table varies: 200 units taller in Bold. +#[test] +fn win_cell_height_takes_a_variable_font_instances_mvar() { + use crate::test_fonts::{PATH_ALIGN_VARIABLE_FAMILY, path_align_font}; + let db = FontDb::with_font_dirs(vec![]); + db.add_font(path_align_font(PATH_ALIGN_VARIABLE_FAMILY).unwrap()); + let st = |font_style: &str| CharStyle { font_family: PATH_ALIGN_VARIABLE_FAMILY.into(), font_style: font_style.into(), ..style(10.0) }; + let cell = |font_style: &str| db.style_face(&st(font_style)).and_then(|f| f.win_cell_height()).unwrap(); + let (regular, bold) = (cell("Regular"), cell("Bold")); + assert!((bold - regular - 200.0).abs() < 1e-6, "Regular {regular}, Bold {bold}"); +} + /// In vertical type, Align to Path moves the glyphs half an em, with their horizontal scale and not /// their vertical scale, for Ascender and Descender, and leaves them on the path for Center: their /// baselines and their drawn outlines both. diff --git a/crates/text/src/tests/harakat.rs b/crates/text/src/tests/harakat.rs index 4e11921a6f..4281cf9a5d 100644 --- a/crates/text/src/tests/harakat.rs +++ b/crates/text/src/tests/harakat.rs @@ -454,18 +454,23 @@ fn check_spaced_harakat(db: &FontDb, family: &str) { } /// Right to left, with harakat coloured apart, Optical kerning keeps the Tsume of each letter's -/// cluster as it does in "HOH": the glyphs move as far with Optical kerning as without it. +/// cluster as it does in "HOH": the glyphs move as far with Optical kerning as without it. The test +/// font leaves blank space beside both letters' ink, so its Tsume must move something; an installed +/// face may not (#7821: Arial's initial beh and its fatha fill its cell), and there the Tsume takes +/// nothing, with or without Optical kerning. #[test] fn optical_kerning_keeps_the_tsume_of_a_letter_with_coloured_harakat() { let db = FontDb::with_font_dirs(vec![]); assert_eq!(db.add_font(crate::test_fonts::lam_alef_font(b"rlig").unwrap()), 1); - check_optical_tsume(&db, crate::test_fonts::lam_alef_family(b"rlig")); + check_optical_tsume(&db, crate::test_fonts::lam_alef_family(b"rlig"), true); if let Some(face) = arabic_face("optical_kerning_keeps_the_tsume_of_a_letter_with_coloured_harakat") { - check_optical_tsume(FontDb::global(), &face.family); + check_optical_tsume(FontDb::global(), &face.family, false); } } -fn check_optical_tsume(db: &FontDb, family: &str) { +/// `strict`: every letter's cluster must leave blank space beside its ink, so its Tsume must move +/// or narrow something. +fn check_optical_tsume(db: &FontDb, family: &str, strict: bool) { const WORD: &str = "بَبَ"; // ب 0, fatha 2, ب 4, fatha 6 let set = |optical: bool, letter: Option<usize>| { let mut t = text_with_harakat(WORD, family, Some(red())); @@ -479,11 +484,27 @@ fn check_optical_tsume(db: &FontDb, family: &str) { // Tsume of the line's first cluster only narrows its advance and moves no glyph. let xs = |t: &TextObject| layout(db, t).glyphs.iter().flat_map(|g| [g.xf.as_coeffs()[4], g.advance]).collect::<Vec<_>>(); assert!(xs(&set(true, None)).iter().zip(xs(&set(false, None))).any(|(a, b)| (a - b).abs() > 1e-6), "{family}: Optical moves the pair"); + // The blank space Tsume shares out: between the letter's cluster's cell (from its glyphs' + // shared origin, as long as their advances) and its glyphs' ink, on each side, without Tsume. + let plain = layout(db, &set(false, None)); + let blank = |letter: usize| { + let cluster: Vec<_> = plain.glyphs.iter().filter(|g| g.byte == letter).collect(); + let start = cluster.iter().map(|g| g.origin.x).fold(f64::INFINITY, f64::min); + let end = start + cluster.iter().map(|g| g.advance).sum::<f64>(); + let ink = cluster.iter().filter(|g| !g.outline.elements().is_empty()).map(|g| g.outline.bounding_box()); + let (lo, hi) = ink.fold((f64::INFINITY, f64::NEG_INFINITY), |(lo, hi), b| (lo.min(b.x0), hi.max(b.x1))); + (lo - start).clamp(0.0, end - start) + (end - hi).clamp(0.0, end - start) + }; // Each letter in turn: the first one's cluster ends the pair, the second one's starts it. for letter in [0, 4] { let moved = |optical: bool| xs(&set(optical, Some(letter))).iter().zip(xs(&set(optical, None))).map(|(a, b)| a - b).collect::<Vec<_>>(); let (without, with_optical) = (moved(false), moved(true)); - assert!(without.iter().any(|m| m.abs() > 1e-3), "{family} {letter}: Tsume moves or narrows the glyphs: {without:?}"); + let blank = blank(letter); + if strict || blank > 1e-6 { + assert!(without.iter().any(|m| m.abs() > 1e-6), "{family} {letter}: Tsume moves or narrows the glyphs ({blank} blank): {without:?}"); + } else { + assert!(without.iter().all(|m| m.abs() < 1e-6), "{family} {letter}: no blank space ({blank}), Tsume takes nothing: {without:?}"); + } assert!( without.len() == with_optical.len() && without.iter().zip(&with_optical).all(|(a, b)| (a - b).abs() < 1e-6), "{family} {letter}: {without:?} {with_optical:?}" diff --git a/crates/text/src/tests/typo.rs b/crates/text/src/tests/typo.rs index 351c698451..80bd7c783a 100644 --- a/crates/text/src/tests/typo.rs +++ b/crates/text/src/tests/typo.rs @@ -1108,18 +1108,49 @@ fn each_run_hyphenates_in_its_own_language() { let saved_without_one = hyphens(None); assert!(saved_without_one > 0, "some words hyphenated"); assert_eq!(hyphens(Some("en-GB")), saved_without_one); - assert_eq!(hyphens(Some("de")), 0, "German has no break points yet"); + assert_eq!(hyphens(Some("fr")), 0, "French has no break points yet"); + assert_eq!(hyphens(Some("ru")), 0, "English words in a Russian run are not hyphenated as English"); assert_eq!(hyphens(Some("x-from-a-file")), 0, "a tag that isn't known has no hyphenation"); - // both in one paragraph: the English run breaks and the German one doesn't + // both in one paragraph: the English run breaks and the French one doesn't let mut t = area(&format!("{text} {text}"), style(14.0), frame, Justify::Left); t.para.hyphenate = true; - edit::style_range(&mut t.runs, text.len(), 2 * text.len() + 1, |s| s.language = Some("de".into())); + edit::style_range(&mut t.runs, text.len(), 2 * text.len() + 1, |s| s.language = Some("fr".into())); let l = layout(db(), &t); let at: Vec<usize> = l.glyphs.iter().filter(|g| g.len == 0).map(|g| g.byte).collect(); assert!(!at.is_empty() && at.iter().all(|b| *b < text.len()), "hyphens only in the English run: {at:?}"); } +/// A justified Russian paragraph in a narrow frame breaks its long words at the Russian rules' +/// points with either composer, and not at all with Hyphenate off. +#[test] +fn a_russian_run_hyphenates_at_russian_break_points() { + let text = "Государственное законодательство регулирует достопримечательности."; + let frame = Rect::new(0.0, 0.0, 120.0, 600.0); + let st = CharStyle { language: Some("ru-RU".into()), ..style(14.0) }; + for composer in [Composer::EveryLine, Composer::SingleLine] { + let mut t = area(text, st.clone(), frame, Justify::JustifyLeft); + t.para.composer = composer; + t.para.hyphenate = true; + let l = layout(db(), &t); + let at: Vec<usize> = l.glyphs.iter().filter(|g| g.len == 0).map(|g| g.byte).collect(); + assert!(!at.is_empty(), "{composer:?}: some words hyphenated"); + for b in at { + // The word the hyphen splits, and where in it the line ends. + let start = text[..b].rfind(' ').map_or(0, |i| i + 1); + let end = text[b..].find([' ', '.']).map_or(text.len(), |i| b + i); + let word = &text[start..end]; + let point = text[start..b].chars().count(); + assert!( + hyphen::hyphen_points_for_language(word, &t.para.hyphenation, Some("ru")).contains(&point), + "{composer:?}: {word} broken after {point} letters" + ); + } + t.para.hyphenate = false; + assert_eq!(layout(db(), &t).glyphs.iter().filter(|g| g.len == 0).count(), 0, "{composer:?}: Hyphenate off"); + } +} + #[test] fn hyphenated_layout_adds_hyphens() { let text = "Extraordinarily comprehensive typographical considerations notwithstanding everything."; diff --git a/crates/three-d/src/lib.rs b/crates/three-d/src/lib.rs index f232d265e9..18d371b420 100644 --- a/crates/three-d/src/lib.rs +++ b/crates/three-d/src/lib.rs @@ -12,8 +12,8 @@ pub mod fold; mod solid; mod visibility; pub use solid::{ - Bevel, BevelShape, DepthPlane, Extrude, FaceMap, Facet, Inflate, PlanarFace, TOO_COMPLEX_SOLID, View, extrude, extrude_face_map, inflate, - inflate_each, inflate_together, plane, plane_face_map, + Bevel, BevelShape, DepthPlane, Extrude, FaceMap, Facet, Inflate, MeshFace, PlanarFace, TOO_COMPLEX_SOLID, View, extrude, extrude_face_map, + extrude_mesh_face, inflate, inflate_each, inflate_together, plane, plane_face_map, plane_mesh_face, }; pub use visibility::{VisibleFace, visible_faces}; mod shading; diff --git a/crates/three-d/src/solid.rs b/crates/three-d/src/solid.rs index 18ef7d6d1b..cc8881d2d9 100644 --- a/crates/three-d/src/solid.rs +++ b/crates/three-d/src/solid.rs @@ -28,7 +28,7 @@ pub(crate) use build::PLANES; use build::{Camera, cuts, edge_distance, newell, section}; pub(crate) use build::{Face3, Keep, extrude_faces, plane_faces}; pub use build::{extrude, plane}; -pub use face_map::{FaceMap, extrude_face_map, plane_face_map}; +pub use face_map::{FaceMap, MeshFace, extrude_face_map, extrude_mesh_face, plane_face_map, plane_mesh_face}; #[cfg(test)] use inflate::GRID_WORK; pub(crate) use inflate::inflate_faces; diff --git a/crates/three-d/src/solid/face_map.rs b/crates/three-d/src/solid/face_map.rs index d84dcc5ee6..ac99348ba3 100644 --- a/crates/three-d/src/solid/face_map.rs +++ b/crates/three-d/src/solid/face_map.rs @@ -174,6 +174,95 @@ pub fn plane_face_map(bounds: Rect, view: View) -> Option<FaceMap> { Some(FaceMap::new(&camera, &placing, true)) } +/// A planar face in its solid's mesh ([`crate::Mesh`]): where the points of the art's plane lie +/// before projection, in the mesh's coordinates (y up), and the face's outward normal there. +#[derive(Clone, Copy, Debug, PartialEq)] +pub struct MeshFace { + /// An art point `p` lies at `x · (p.x - centre.x) + y · (p.y - centre.y) + at`, with the art's + /// center at `at`. + x: V3, + y: V3, + centre: Point, + at: V3, + normal: V3, + /// A plane's mesh turns its normal toward the viewer, so its triangles face either way. + either_side: bool, +} + +/// From the effects' view space (y down) to the mesh's (y up). +fn mesh_space(v: V3) -> V3 { + V3(v.0, -v.1, v.2) +} + +impl MeshFace { + fn new(camera: &Camera, placing: &Placing, centre: Point, side: f64, either_side: bool) -> Self { + let (x, y, _) = placing.frame(); + let at = mesh_space(placing.place(centre)); + let normal = mesh_space(camera.rotate(V3(0.0, 0.0, side))).unit(); + Self { x: mesh_space(x), y: mesh_space(y), centre, at, normal, either_side } + } + + /// The art point that mesh point `m` shows, when `m` lies on the face's plane and a triangle + /// with unit normal `n` there belongs to the face. `None` otherwise, and when the face has no + /// area (a taper of 0 at the back). + pub fn art_point(&self, m: [f64; 3], n: [f64; 3]) -> Option<Point> { + let facing = self.normal.dot(V3(n[0], n[1], n[2])); + let facing = if self.either_side { facing.abs() } else { facing }; + // A NaN normal faces no way. + let faces = facing > 1.0 - 1e-6; + if !faces { + return None; + } + // Measured from the art's center, so the tolerance follows the solid's size and not where + // the art lies on the page. + let d = V3(m[0], m[1], m[2]).sub(self.at); + let (xx, xy, yy) = (self.x.dot(self.x), self.x.dot(self.y), self.y.dot(self.y)); + let det = xx * yy - xy * xy; + let spans = xx > 1e-24 && yy > 1e-24 && det >= 1e-12 * xx * yy; + if !spans { + return None; + } + let (bx, by) = (self.x.dot(d), self.y.dot(d)); + let (px, py) = ((bx * yy - by * xy) / det, (xx * by - xy * bx) / det); + let on = V3(self.x.0 * px + self.y.0 * py, self.x.1 * px + self.y.1 * py, self.x.2 * px + self.y.2 * py); + let off = d.sub(on); + let size = 1.0 + d.dot(d).sqrt(); + let p = Point::new(self.centre.x + px, self.centre.y + py); + (p.x.is_finite() && p.y.is_finite() && off.dot(off).sqrt() <= 1e-6 * size).then_some(p) + } +} + +/// Extrude & Bevel's cap `face` in the solid's mesh ([`MeshFace`]), for a solid built with +/// `bounds`, `options` and `view`, as [`extrude_face_map`] maps it on the page. With a depth of 0 +/// the art is a plane ([`plane_mesh_face`]). `None` for a hollow solid, for the back of a plane, +/// and for invalid bounds. +pub fn extrude_mesh_face(bounds: Rect, options: Extrude, view: View, face: PlanarFace) -> Option<MeshFace> { + check_bounds(bounds).ok()?; + let o = options.sanitized(); + if o.depth <= 0.0 { + return (face == PlanarFace::Front).then(|| plane_mesh_face(bounds, view)).flatten(); + } + if !o.cap { + return None; + } + let camera = Camera::new(view, bounds, o.depth); + let (t, side) = match face { + PlanarFace::Front => (0.0, 1.0), + PlanarFace::Back => (1.0, -1.0), + }; + let placing = Placing::new(&camera, bounds.center(), Turn::new(bounds, o.twist, o.taper, t), o.depth / 2.0 - o.depth * t); + Some(MeshFace::new(&camera, &placing, bounds.center(), side, false)) +} + +/// The plane [`super::plane`] turns art with `bounds` into, with `view`, in its mesh +/// ([`MeshFace`]). +pub fn plane_mesh_face(bounds: Rect, view: View) -> Option<MeshFace> { + check_bounds(bounds).ok()?; + let camera = Camera::new(view, bounds, 0.0); + let placing = Placing::new(&camera, bounds.center(), Turn::new(bounds, 0.0, 1.0, 0.0), 0.0); + Some(MeshFace::new(&camera, &placing, bounds.center(), 1.0, true)) +} + #[cfg(test)] #[path = "tests_face_map.rs"] mod tests; diff --git a/crates/three-d/src/solid/tests_face_map.rs b/crates/three-d/src/solid/tests_face_map.rs index 31644beda5..ebbe95448a 100644 --- a/crates/three-d/src/solid/tests_face_map.rs +++ b/crates/three-d/src/solid/tests_face_map.rs @@ -1,7 +1,7 @@ use vectorcraft_geom::{BezPath, FillRule, PathData, Point, Rect}; use super::super::{Extrude, Facet, PlanarFace, View, extrude, plane}; -use super::{FaceMap, NEAREST, extrude_face_map, plane_face_map}; +use super::{FaceMap, MeshFace, NEAREST, extrude_face_map, extrude_mesh_face, plane_face_map, plane_mesh_face}; fn square() -> (PathData, Rect) { let mut b = BezPath::new(); @@ -143,6 +143,70 @@ fn a_page_point_nearer_the_eye_than_the_page_map_allows_has_no_art_point() { assert_eq!(map.to_art(q), None, "the inverse map takes {q:?} back to an art point the page map has no point for"); } +/// The art point of every corner of each triangle of `mesh` that `face` takes, and how many +/// triangles it takes. +fn mesh_art(mesh: &crate::Mesh, face: &MeshFace) -> (Vec<Point>, usize) { + let (mut points, mut taken) = (vec![], 0); + for t in &mesh.triangles { + let corners: Option<Vec<Point>> = t.iter().map(|&i| face.art_point(mesh.positions[i as usize], mesh.normals[i as usize])).collect(); + if let Some(c) = corners { + points.extend(c); + taken += 1; + } + } + (points, taken) +} + +#[test] +fn a_caps_mesh_corners_go_back_to_the_art_they_were_made_from() { + let (path, bounds) = square(); + let bevel = crate::Bevel { width: 4.0, height: 4.0, ..Default::default() }; + let options = Extrude { twist: 30.0, taper: 0.5, bevel: Some(bevel), ..Extrude::default() }; + let view = turned(40.0); + let mesh = crate::extrude_mesh(&path, FillRule::NonZero, bounds, options, view).unwrap(); + // The bevel's width sets the walls, and the back cap, out from the front's outline. + let outset = bounds.inflate(4.0, 4.0); + for (face, cap) in [(PlanarFace::Front, bounds), (PlanarFace::Back, outset)] { + let mesh_face = extrude_mesh_face(bounds, options, view, face).unwrap(); + let (points, taken) = mesh_art(&mesh, &mesh_face); + // A square cap is two triangles, and none of the bevel's or the walls' triangles are + // taken. The art points undo the back's twist and taper. + assert_eq!(taken, 2, "{face:?}"); + for p in points { + let near = corners(cap).iter().map(|c| c.distance(p)).fold(f64::INFINITY, f64::min); + assert!(near < 1e-6, "{face:?}: {p:?} is {near} from the cap's corners"); + } + } + // A hollow solid has no caps, and a plane's mesh has only the front, facing either way. + assert_eq!(extrude_mesh_face(bounds, Extrude { cap: false, ..options }, view, PlanarFace::Front), None); + let plane = crate::plane_mesh(&path, FillRule::NonZero, bounds, view).unwrap(); + let (points, taken) = mesh_art(&plane, &plane_mesh_face(bounds, view).unwrap()); + assert_eq!(taken, plane.triangles.len()); + assert!(points.iter().all(|p| corners(bounds).iter().any(|c| c.distance(*p) < 1e-6)), "{points:?}"); + assert_eq!(extrude_mesh_face(bounds, Extrude { depth: 0.0, ..options }, view, PlanarFace::Back), None); +} + +#[test] +fn a_cap_far_from_the_page_origin_takes_none_of_a_step_bevels_treads() { + let (path, bounds) = square(); + let far = vectorcraft_geom::kurbo::Affine::translate((1e7, 1e7)); + let path = PathData::from_bezpath(&(far * path.to_bezpath())); + let bounds = far.transform_rect_bbox(bounds); + let bevel = crate::Bevel { width: 4.0, height: 4.0, shape: crate::BevelShape::Step, ..Default::default() }; + let options = Extrude { bevel: Some(bevel), ..Extrude::default() }; + let view = turned(0.0); + let mesh = crate::extrude_mesh(&path, FillRule::NonZero, bounds, options, view).unwrap(); + let mesh_face = extrude_mesh_face(bounds, options, view, PlanarFace::Front).unwrap(); + let (points, taken) = mesh_art(&mesh, &mesh_face); + // The treads face the same way as the cap, a few points behind it: only the cap's two + // triangles are taken, wherever the art lies on the page. + assert_eq!(taken, 2); + for p in points { + let near = corners(bounds).iter().map(|c| c.distance(p)).fold(f64::INFINITY, f64::min); + assert!(near < 1e-6, "{p:?} is {near} from the cap's corners"); + } +} + #[test] fn the_mapped_part_of_a_rectangle_stops_before_the_eye() { let (_, bounds) = square(); diff --git a/crates/tools/src/addons.rs b/crates/tools/src/addons.rs index c75a73882a..ca8645ffc8 100644 --- a/crates/tools/src/addons.rs +++ b/crates/tools/src/addons.rs @@ -1,8 +1,9 @@ //! The tools of VectorCraft's built-in add-ons. They aren't in the toolbars as they ship: the All //! Tools drawer lists them (under their add-on's heading) so they can be added, and each add-on's -//! submenu selects them. Tool gestures emit engine commands. The Trim at Crossings Tool is the -//! exception: it is in the Scissors tool's group ([`crate::TOOL_GROUPS`]), where the toolbars and -//! the All Tools drawer show it, as well as in Path Precision Tools' submenu. +//! submenu selects them. Tool gestures emit engine commands. Two tools are the exceptions: the Trim +//! at Crossings Tool is in the Scissors tool's group and the Enclosing Lasso Tool is in the Lasso +//! tool's group ([`crate::TOOL_GROUPS`]), where the toolbars and the All Tools drawer show them, as +//! well as in their add-ons' submenus. pub mod anchor_eraser; pub mod box3d; @@ -37,25 +38,17 @@ pub const SMART_PEN: &[ToolInfo] = &[ToolInfo { id: smart_pen::ID, label: "Smart pub const CONTOUR: &[ToolInfo] = &[ToolInfo { id: contour::ID, label: "Contour Tool", shortcut: None, icon: "tool-contour" }]; -pub const ENCLOSING_LASSO: &[ToolInfo] = &[ToolInfo { id: enclosing_lasso::ID, label: "Enclosing Lasso Tool", shortcut: None, icon: "tool-lasso" }]; - pub const BOX_3D: &[ToolInfo] = &[ToolInfo { id: box3d::ID, label: "3D Box Tool", shortcut: None, icon: "box" }]; pub const POLYGONAL_LASSO: &[ToolInfo] = &[ToolInfo { id: polygonal_lasso::ID, label: "Polygonal Lasso Tool", shortcut: None, icon: "tool-lasso" }]; /// The add-ons' tool groups, after the toolbar's own ([`crate::TOOL_GROUPS`]), each with the /// heading the All Tools drawer lists it under (its add-on's name). -const HEADED: &[(&[ToolInfo], &str)] = &[ - (PATH_TOOLS, "Path Precision Tools"), - (SMART_PEN, "Smart Pen"), - (ENCLOSING_LASSO, "Enclosing Lasso"), - (CONTOUR, "Contour"), - (BOX_3D, "3D Box"), - (POLYGONAL_LASSO, "Polygonal Lasso"), -]; +const HEADED: &[(&[ToolInfo], &str)] = + &[(PATH_TOOLS, "Path Precision Tools"), (SMART_PEN, "Smart Pen"), (CONTOUR, "Contour"), (BOX_3D, "3D Box"), (POLYGONAL_LASSO, "Polygonal Lasso")]; /// The add-ons' tool groups, after the toolbar's own ([`crate::TOOL_GROUPS`]). -pub const GROUPS: &[&[ToolInfo]] = &[PATH_TOOLS, SMART_PEN, ENCLOSING_LASSO, CONTOUR, BOX_3D, POLYGONAL_LASSO]; +pub const GROUPS: &[&[ToolInfo]] = &[PATH_TOOLS, SMART_PEN, CONTOUR, BOX_3D, POLYGONAL_LASSO]; /// The heading the All Tools drawer lists tool `id` under: its add-on's name. pub fn heading(id: &str) -> Option<&'static str> { @@ -97,7 +90,6 @@ mod tests { } assert!(PATH_TOOLS.iter().all(|t| heading(t.id) == Some("Path Precision Tools"))); assert_eq!(heading(smart_pen::ID), Some("Smart Pen")); - assert_eq!(heading(enclosing_lasso::ID), Some("Enclosing Lasso")); assert_eq!(heading(contour::ID), Some("Contour")); assert_eq!(heading(box3d::ID), Some("3D Box")); assert_eq!(heading(polygonal_lasso::ID), Some("Polygonal Lasso")); @@ -122,4 +114,21 @@ mod tests { assert!(!GROUPS.iter().any(|g| g.iter().any(|t| t.id == trim::ID)), "not listed again under the add-on"); assert_eq!(crate::catalog::all_tools().filter(|t| t.id == trim::ID).count(), 1); } + + /// The Enclosing Lasso Tool is in the Lasso tool's group, right after the Lasso, with no + /// default shortcut, listed once, and still made by its add-on. + #[test] + fn enclosing_lasso_is_in_the_lasso_group_once() { + let id = enclosing_lasso::ID; + let groups: Vec<_> = crate::TOOL_GROUPS.iter().filter(|g| g.iter().any(|t| t.id == id)).collect(); + assert_eq!(groups.len(), 1); + let ids: Vec<_> = groups[0].iter().map(|t| t.id).collect(); + assert_eq!(ids, ["lasso", id]); + let info = crate::tool_info(id).expect("catalogued"); + assert_eq!((info.label, info.shortcut, info.icon), ("Enclosing Lasso Tool", None, "tool-lasso")); + assert_eq!(crate::tool_info("lasso").and_then(|t| t.shortcut), Some("Q"), "the Lasso keeps its shortcut"); + assert_eq!(create(id).map(|tool| tool.id()), Some(id)); + assert!(heading(id).is_none(), "not listed again under the add-on"); + assert_eq!(crate::catalog::all_tools().filter(|t| t.id == id).count(), 1); + } } diff --git a/crates/tools/src/addons/polygonal_lasso.rs b/crates/tools/src/addons/polygonal_lasso.rs index 1838293b66..b212943117 100644 --- a/crates/tools/src/addons/polygonal_lasso.rs +++ b/crates/tools/src/addons/polygonal_lasso.rs @@ -167,6 +167,13 @@ impl Tool for PolygonalLassoTool { self.mesh.options() } + /// Pick the gradient mesh points the Eyedropper held (`meshPoints`). + fn set_option(&mut self, key: &str, value: &serde_json::Value) { + if key == "meshPoints" { + self.mesh.set_options(value); + } + } + fn overlays(&self, cx: &ToolContext) -> Vec<Overlay> { let mut out = self.mesh.overlays(cx, &|id| cx.selection.contains(id)); let mut line = self.vertices.clone(); diff --git a/crates/tools/src/builder/lookup.rs b/crates/tools/src/builder/lookup.rs index 0d7acd7e67..7dfa249586 100644 --- a/crates/tools/src/builder/lookup.rs +++ b/crates/tools/src/builder/lookup.rs @@ -38,14 +38,20 @@ fn named(n: &Node, name: &str) -> bool { n.name.as_deref() == Some(name) } +/// Is `n` a Live Paint group's part named `name` ([`FACE_NAME`] or [`EDGE_NAME`]): a path with that +/// name? Type, groups and other objects drawn in the group under such a name are not parts. +fn part(n: &Node, name: &str) -> bool { + named(n, name) && n.path_data().is_some() +} + /// Face children of a Live Paint group (paint order). pub fn faces(group: &Node) -> Vec<&Arc<Node>> { - group.children().map(|c| c.iter().filter(|n| named(n, FACE_NAME)).collect()).unwrap_or_default() + group.children().map(|c| c.iter().filter(|n| part(n, FACE_NAME)).collect()).unwrap_or_default() } /// Edge children of a Live Paint group. pub fn edges(group: &Node) -> Vec<&Arc<Node>> { - group.children().map(|c| c.iter().filter(|n| named(n, EDGE_NAME)).collect()).unwrap_or_default() + group.children().map(|c| c.iter().filter(|n| part(n, EDGE_NAME)).collect()).unwrap_or_default() } /// The hidden sources group of a Live Paint group. diff --git a/crates/tools/src/catalog.rs b/crates/tools/src/catalog.rs index 386dfeb4a5..529aa80d18 100644 --- a/crates/tools/src/catalog.rs +++ b/crates/tools/src/catalog.rs @@ -24,7 +24,11 @@ pub const TOOL_GROUPS: &[&[ToolInfo]] = &[ t("groupSelection", "Group Selection Tool", None, "tool-group-select"), ], &[t("magicWand", "Magic Wand Tool", Some("Y"), "tool-magic-wand")], - &[t("lasso", "Lasso Tool", Some("Q"), "tool-lasso")], + &[ + t("lasso", "Lasso Tool", Some("Q"), "tool-lasso"), + // Enclosing Lasso's tool, kept out of `addons::GROUPS` so that `all_tools` lists it once. + t(crate::addons::enclosing_lasso::ID, "Enclosing Lasso Tool", None, "tool-lasso"), + ], &[ t("pen", "Pen Tool", Some("P"), "tool-pen"), t("addAnchor", "Add Anchor Point Tool", Some("+"), "tool-pen-add"), diff --git a/crates/tools/src/cursor.rs b/crates/tools/src/cursor.rs index 6c883a97e8..0f654340fe 100644 --- a/crates/tools/src/cursor.rs +++ b/crates/tools/src/cursor.rs @@ -94,6 +94,9 @@ pub enum Cursor { /// The Selection tool loaded with the text of area type or type on a path by a click on its out /// or in port (a click threads it into a path or a new frame, a drag draws the new frame). LoadedText, + /// The same loaded Selection tool over a closed path, area type or type on a path that a click + /// threads the text into: the loaded text with a link badge. + LoadedTextLink, /// The Shape Builder: a crosshair with a plus (merge mode)... ShapeBuilder, /// ...or, with Alt held, a minus (erase mode). diff --git a/crates/tools/src/cursors.toml b/crates/tools/src/cursors.toml index 07023d390d..5d97694a28 100644 --- a/crates/tools/src/cursors.toml +++ b/crates/tools/src/cursors.toml @@ -75,6 +75,7 @@ group = "Selection" shown_when = [ "The Group Selection tool: each click selects the next enclosing group.", "Direct Selection with Alt held (Alt makes it Group Selection for the next click).", + "Over a panel where a click or a drop adds something, such as the strip under the Gradient panel's ramp, where a click adds a stop, or the Layers panel's list while rows are Alt-dragged, where the drop adds copies (where the system has no copy cursor the app can show).", ] hotspot = "The arrow's tip." look = "ArrowHollow with a plus badge." @@ -170,6 +171,15 @@ shown_when = [ hotspot = "Where the new frame's top-left corner goes (the click), or the path clicked." look = "A small block of text lines: the overflow text the pointer carries." +[[cursor]] +id = "LoadedTextLink" +group = "Selection" +shown_when = [ + "The Selection tool loaded with text from a port, over a closed path, area type or type on a path that a click threads the text into: not the frame the text came from, not a frame already in a thread and not a path inside a compound path. Over empty canvas or other art the pointer stays the loaded text, and a click there makes a new frame.", +] +hotspot = "The point of the object's path the click threads the text into." +look = "The loaded text's block of lines with two linked chain rings below right." + # ── Pen family ──────────────────────────────────────────────────────────────────────────────────── [[cursor]] diff --git a/crates/tools/src/direct.rs b/crates/tools/src/direct.rs index 4c93660ace..6586cb8586 100644 --- a/crates/tools/src/direct.rs +++ b/crates/tools/src/direct.rs @@ -14,8 +14,8 @@ //! (the selected ones when anchors are selected; Alt-click cycles their kind, double-click opens //! the Corners dialog). //! Group Selection: click selects the leaf; each further click on it adds the next enclosing group; -//! its marquee works as Direct Selection's, and E pressed during the drag makes it select only the -//! objects entirely inside it (members of groups too), whole. +//! its marquee selects every object it touches (members of groups too), whole, and E pressed during +//! the drag makes it select only the objects entirely inside it, whole. //! In isolation mode both pick only the isolated object and what is inside it: anchors, segments, //! paths and groups outside it stay put. //! Both move objects selected as a whole as the Selection tool does, snapping alike. When the @@ -762,6 +762,13 @@ impl Tool for DirectSelectionTool { fn options(&self) -> Value { self.mesh.options() } + /// Direct Selection picks the gradient mesh points the Eyedropper held (`meshPoints`); Group + /// Selection, which selects whole objects, does not. + fn set_option(&mut self, key: &str, value: &Value) { + if key == "meshPoints" && !self.group { + self.mesh.set_options(value); + } + } /// Escape during a drag (anchors, handles, segments, objects, type areas, blend spines, mesh /// points, corner widgets, the brackets of type on a path, a marquee) cancels it: what it moved /// goes back and the tool waits for the next press (#1743). @@ -1651,9 +1658,9 @@ impl DirectSelectionTool { return vec![Action::Exec("select.none".into(), json!({}))]; } // With Group Selection's enclosed marquee, the tool selects the objects inside it - // (members of groups too), each whole, as a click selects one; with an Alt-marquee, every - // object it touches, each whole. - if enclosed || whole { + // (members of groups too), each whole, as a click selects one; with Group Selection's + // marquee or an Alt-marquee, every object it touches, each whole (#8047). + if enclosed || whole || self.group { (self.spine, self.spine_more) = (None, vec![]); let mut touched = vectorcraft_doc::hit::marquee_in_view(cx.doc, r, cx.isolation, true, cx.outline); let editable = cx.doc.editable(); diff --git a/crates/tools/src/direct/tests.rs b/crates/tools/src/direct/tests.rs index 0c2aabb768..a0fabb9cb8 100644 --- a/crates/tools/src/direct/tests.rs +++ b/crates/tools/src/direct/tests.rs @@ -596,10 +596,7 @@ fn a_marquee_selects_frame_anchors_of_area_type() { let mut g = DirectSelectionTool::new(true); g.pointer(&cx1, &ev(PointerKind::Down, 400.0, 280.0)); g.pointer(&cx1, &ev(PointerKind::Drag, 440.0, 360.0)); - assert_eq!( - g.pointer(&cx1, &ev(PointerKind::Up, 440.0, 360.0)), - vec![Action::Exec("select.anchorsMany".into(), json!({"items": [{"id": text.0, "anchors": []}], "mode": "set"}))] - ); + assert_eq!(g.pointer(&cx1, &ev(PointerKind::Up, 440.0, 360.0)), vec![Action::Exec("select.set".into(), json!({"ids": [text.0]}))]); } /// A click without a drag on one of several selected frame anchors selects it alone, as a click on @@ -1364,8 +1361,9 @@ fn marquee_selects_type_it_touches() { assert_eq!(a, vec![Action::Exec("select.anchorsMany".into(), json!({"items": [{"id": rect.0, "anchors": [[0, 1]]}], "mode": "set"}))]); } -/// A marquee across a member of an Intertwine group selects the member's anchors, as in a -/// plain group, and not the Intertwine group whole. +/// A Direct Selection marquee across a member of an Intertwine group selects the member's anchors, +/// as in a plain group, and not the Intertwine group whole; a Group Selection marquee selects the +/// member whole. #[test] fn marquee_selects_the_anchors_of_intertwine_members() { let mut d = vectorcraft_doc::Document::new(500.0, 500.0); @@ -1389,11 +1387,17 @@ fn marquee_selects_the_anchors_of_intertwine_members() { t.pointer(&cx, &PointerEvent::new(PointerKind::Down, 150.0, 50.0)); let actions = t.pointer(&cx, &PointerEvent::new(PointerKind::Up, 250.0, 150.0)); let items = json!([{"id": a.0, "anchors": [[0, 1]]}]); - assert_eq!(actions, vec![Action::Exec("select.anchorsMany".into(), json!({"items": items, "mode": "set"}))], "group: {group}"); + let want = if group { + Action::Exec("select.set".into(), json!({"ids": [a.0]})) + } else { + Action::Exec("select.anchorsMany".into(), json!({"items": items, "mode": "set"})) + }; + assert_eq!(actions, vec![want], "group: {group}"); } } -/// Shift-drag a marquee: the anchors inside toggle (#483), with Group Selection too. +/// Shift-drag a marquee: the anchors inside toggle (#483); with Group Selection, the objects it +/// touches toggle whole. #[test] fn shift_marquee_toggles_anchors() { let (d, id) = doc_with_rect(); @@ -1406,10 +1410,46 @@ fn shift_marquee_toggles_anchors() { t.pointer(&cx, &PointerEvent::new(PointerKind::Down, 150.0, 50.0).with_mods(shift)); t.pointer(&cx, &PointerEvent::new(PointerKind::Drag, 250.0, 150.0).with_mods(shift)); let a = t.pointer(&cx, &PointerEvent::new(PointerKind::Up, 250.0, 150.0).with_mods(shift)); - assert_eq!(a, vec![Action::Exec("select.anchorsMany".into(), json!({"items": [{"id": id.0, "anchors": [[0, 1]]}], "mode": "toggle"}))]); + let want = if group { + Action::Exec("select.toggle".into(), json!({"ids": [id.0]})) + } else { + Action::Exec("select.anchorsMany".into(), json!({"items": [{"id": id.0, "anchors": [[0, 1]]}], "mode": "toggle"})) + }; + assert_eq!(a, vec![want], "group: {group}"); } } +/// #8047: a Group Selection marquee across part of two members of a group selects both members +/// whole, not the anchors inside it and not the group, and leaves the member it misses. +#[test] +fn a_group_selection_marquee_selects_the_members_it_touches_whole() { + let mut d = vectorcraft_doc::Document::new(600.0, 400.0); + let l = d.layers[0].id; + let (g, a, b, c) = (d.alloc_id(), d.alloc_id(), d.alloc_id(), d.alloc_id()); + let path = |id, x: f64| { + vectorcraft_doc::Node::path( + id, + vectorcraft_geom::shapes::rectangle(Rect::new(x, 120.0, x + 100.0, 240.0)), + vectorcraft_doc::Appearance::default_art(), + ) + }; + d.insert(Some(l), 0, vectorcraft_doc::Node::group(g, vec![])).unwrap(); + for (i, (id, x)) in [(a, 100.0), (b, 250.0), (c, 400.0)].into_iter().enumerate() { + d.insert(Some(g), i, path(id, x)).unwrap(); + } + let (s, p) = (Selection::default(), paint()); + let cx = cx(&d, &s, &p); + let mut t = DirectSelectionTool::new(true); + // From (150, 95) to (300, 265): the right side of A and the left side of B. + t.pointer(&cx, &PointerEvent::new(PointerKind::Down, 150.0, 95.0)); + t.pointer(&cx, &PointerEvent::new(PointerKind::Drag, 300.0, 265.0)); + let up = t.pointer(&cx, &PointerEvent::new(PointerKind::Up, 300.0, 265.0)); + let Some(Action::Exec(cmd, params)) = up.first() else { panic!("{up:?}") }; + assert_eq!(cmd, "select.set"); + let ids: BTreeSet<String> = params["ids"].as_array().unwrap().iter().map(|v| v.to_string()).collect(); + assert_eq!(ids, [json!(a.0), json!(b.0)].iter().map(|v| v.to_string()).collect()); +} + /// #4890: Alt held at the press makes a Direct Selection marquee Group Selection's for the drag: /// it selects each path it touches whole (with Shift, toggles it), not the anchors inside it, and /// leaves the paths it misses; the Group Selection cursor stays until the release. diff --git a/crates/tools/src/draw2/family.rs b/crates/tools/src/draw2/family.rs index 8d7fc38df5..8bdbb4db0f 100644 --- a/crates/tools/src/draw2/family.rs +++ b/crates/tools/src/draw2/family.rs @@ -5,7 +5,8 @@ //! start point and the dragged corner snap to Smart Guides ([`DrawSnap`]), hovering too. //! While dragging, ↑/↓ change the arc's slope, the spiral's segments, the grid rows or the //! concentric dividers; ←/→ change grid columns / radial dividers. C switches the arc between open -//! and closed, and F switches its base between the X and Y axes. While a spiral is dragged out, Alt +//! and closed, and F switches its base between the X and Y axes. A spiral's outer end follows the +//! pointer, so dragging around the center turns the spiral. While a spiral is dragged out, Alt //! and Ctrl/Cmd keep its inner end at the distance from the center on the first modified drag as //! the outer end follows the pointer: Alt adds or removes whole winds of four segments, and //! Ctrl/Cmd changes the decay. @@ -48,6 +49,9 @@ pub struct FamilyTool { spiral_end: Option<f64>, /// The segment count when Alt alone starts adjusting winds. spiral_alt_base: Option<u32>, + /// The direction (degrees clockwise on the page from the x axis) of the drag's last pointer at + /// least 0.01 pt from the center, 0 before there is one: the spiral's outer end turns to it. + spiral_bearing: f64, /// Rows / concentric dividers. pub rows: u32, /// Columns / radial dividers. @@ -108,6 +112,7 @@ impl FamilyTool { clockwise: true, spiral_end: None, spiral_alt_base: None, + spiral_bearing: 0.0, rows: 5, columns: 5, skew: [0.0; 2], @@ -202,6 +207,13 @@ impl FamilyTool { } } + /// The direction (degrees clockwise on the page from the x axis) from a spiral's center `start` + /// to the pointer `p`, or the last one when `p` is less than 0.01 pt from the center. + fn spiral_bearing_to(&self, start: Point, p: Point) -> f64 { + let d = p - start; + if d.hypot() >= 0.01 { d.y.atan2(d.x).to_degrees() } else { self.spiral_bearing } + } + /// The skew a letter changes while a grid is dragged out, as an index into `skew`, and the /// direction: F lowers and V raises the skew of the horizontal dividers (a rectangular grid's /// rows) or the radial dividers (a polar grid's), X lowers and C raises that of the vertical @@ -244,12 +256,16 @@ impl FamilyTool { /// arc and the grids are drawn along the x and y axes turned by it, as the rectangle is. pub fn command_at(&self, start: Point, p: Point, m: Mods, base: f64) -> (String, Value) { match self.id { + // The spiral: its outer end at the pointer, turned about the center. "spiral" => { let r = p.distance(start).max(0.01); - ( - "shape.spiral".into(), - json!({"cx": start.x, "cy": start.y, "radius": r, "decay": self.decay, "segments": self.segments, "clockwise": self.clockwise}), - ) + let mut params = + json!({"cx": start.x, "cy": start.y, "radius": r, "decay": self.decay, "segments": self.segments, "clockwise": self.clockwise}); + let rotation = self.spiral_bearing_to(start, p); + if rotation != 0.0 { + params["rotation"] = json!(rotation); + } + ("shape.spiral".into(), params) } // The grids: the dragged box (along the Constrain Angle's axes) with the tool's options. "rectangularGrid" | "polarGrid" => { @@ -308,6 +324,7 @@ impl Tool for FamilyTool { self.began = false; self.spiral_end = None; self.spiral_alt_base = None; + self.spiral_bearing = 0.0; self.before_drag = None; vec![] } @@ -329,6 +346,7 @@ impl Tool for FamilyTool { } if self.id == "spiral" { self.hold_spiral_end(s, ev.pos, ev.mods); + self.spiral_bearing = self.spiral_bearing_to(s, ev.pos); } let (c, v) = self.command_at(s, ev.pos, ev.mods, cx.constrain_angle); out.push(Action::Preview(c, v)); @@ -982,6 +1000,43 @@ mod tests { assert_eq!(t.spiral_alt_base, None, "Up after Down clears the Alt base"); } + /// A spiral dragged out turns to the pointer (`rotation` clockwise from the x axis), none to + /// the right as before; a pointer back on the center keeps the last direction, ↑ keeps it, + /// Shift and Constrain Angle leave it to the pointer, and the next drag starts from none. + #[test] + fn spiral_drag_turns_the_spiral_to_the_pointer() { + let (d, _) = doc_with_rect(); + let s = Selection::default(); + let p = paint(); + let mut cx = cx(&d, &s, &p); + cx.smart_guides = false; + cx.constrain_angle = 30.0; + let preview = |a: Vec<Action>| match &a[..] { + [.., Action::Preview(c, v)] if c == "shape.spiral" => v.clone(), + _ => panic!("{a:?}"), + }; + let shift = Mods { shift: true, ..Mods::default() }; + let mut t = FamilyTool::new("spiral"); + t.pointer(&cx, &PointerEvent::new(PointerKind::Down, 100.0, 100.0)); + let v = preview(t.pointer(&cx, &PointerEvent::new(PointerKind::Drag, 150.0, 100.0))); + assert!(v.get("rotation").is_none(), "to the right: {v}"); + assert_eq!(v["radius"], json!(50.0)); + for ((x, y), rotation) in [((100.0, 150.0), 90.0), ((50.0, 100.0), 180.0), ((100.0, 50.0), -90.0), ((130.0, 130.0), 45.0)] { + let v = preview(t.pointer(&cx, &PointerEvent::new(PointerKind::Drag, x, y).with_mods(shift))); + assert!((v["rotation"].as_f64().unwrap() - rotation).abs() < 1e-9, "to ({x}, {y}): {v}"); + } + let v = preview(t.pointer(&cx, &PointerEvent::new(PointerKind::Drag, 100.0, 100.0))); + assert!((v["rotation"].as_f64().unwrap() - 45.0).abs() < 1e-9, "on the center: {v}"); + assert_eq!(v["radius"], json!(0.01)); + t.pointer(&cx, &PointerEvent::new(PointerKind::Drag, 100.0, 140.0)); + let v = preview(t.key(&cx, ToolKey::Up, Mods::default())); + assert!((v["rotation"].as_f64().unwrap() - 90.0).abs() < 1e-9, "after ↑: {v}"); + assert_eq!(v["segments"], json!(11)); + assert_eq!(t.pointer(&cx, &PointerEvent::new(PointerKind::Up, 100.0, 140.0)), vec![Action::Commit]); + t.pointer(&cx, &PointerEvent::new(PointerKind::Down, 100.0, 100.0)); + assert_eq!(t.spiral_bearing, 0.0, "a new drag starts from none"); + } + #[test] fn arc_drag_uses_stored_segment_options() { let mut t = FamilyTool::new("arc"); diff --git a/crates/tools/src/guides/snap.rs b/crates/tools/src/guides/snap.rs index f985ab1d63..496ad00bfb 100644 --- a/crates/tools/src/guides/snap.rs +++ b/crates/tools/src/guides/snap.rs @@ -29,7 +29,9 @@ pub(super) fn seg_direction(seg: &PathSeg, t: f64) -> Vec2 { } /// The parameters in (0, 1) where the line from `at` to `seg` is square to it (`perpendicular`) -/// or grazes it, found by sampling the curve for a change of sign and bisecting. +/// or grazes it, found by sampling the curve for a change of sign and bisecting. A sample where +/// the line is exactly square or grazing, and its neighbors are not, is one of them too: no sign +/// changes on either side of it. pub(super) fn touch_params(seg: &PathSeg, at: Point, perpendicular: bool) -> Vec<f64> { const STEPS: usize = 24; let f = |t: f64| { @@ -41,7 +43,17 @@ pub(super) fn touch_params(seg: &PathSeg, at: Point, perpendicular: bool) -> Vec for i in 1..=STEPS { let t = i as f64 / STEPS as f64; let cur = (t, f(t)); - if prev.1.is_finite() && cur.1.is_finite() && prev.1 * cur.1 < 0.0 { + if cur.1 == 0.0 { + // Not at the end (t = 1), not where `at` lies on the curve or the direction is zero + // (a cusp), and not along a stretch that is zero throughout, such as a straight + // curve seen from its own line. The sign need not change: the tangent at an + // inflection touches zero without crossing it. + let isolated = |n: f64| n.is_finite() && n != 0.0; + let (v, d) = (seg.eval(t) - at, seg_direction(seg, t)); + if i < STEPS && isolated(prev.1) && isolated(f((i + 1) as f64 / STEPS as f64)) && v.hypot() * d.hypot() > 1e-12 { + out.push(t); + } + } else if prev.1.is_finite() && cur.1.is_finite() && prev.1 * cur.1 < 0.0 { let (mut lo, mut hi) = (prev, cur); for _ in 0..40 { let mid = 0.5 * (lo.0 + hi.0); diff --git a/crates/tools/src/guides/tests.rs b/crates/tools/src/guides/tests.rs index ecfd3a2edc..0406ea5f77 100644 --- a/crates/tools/src/guides/tests.rs +++ b/crates/tools/src/guides/tests.rs @@ -535,6 +535,60 @@ fn drawn_lines_land_perpendicular_to_segments_and_tangent_to_curves() { } } +/// A touch point that falls exactly on one of the samples `touch_params` takes (t = k / 24) is +/// found, once: the foot of the perpendicular from above a segment's middle, and the tangent +/// point of a line drawn from a free point to a circle (#7846). A line to an oval lands tangent +/// between samples, as before. +#[test] +fn touch_points_exactly_on_a_sample_are_found() { + use super::snap::touch_params; + use vectorcraft_doc::{Appearance, Node}; + use vectorcraft_geom::kurbo::{CubicBez, Line, ParamCurve}; + use vectorcraft_geom::shapes; + // (50, 40) above the segment (0, 0) to (100, 0): the foot is (50, 0), at t = 0.5 = 12 / 24. + let flat = PathSeg::Line(Line::new((0.0, 0.0), (100.0, 0.0))); + assert_eq!(touch_params(&flat, Point::new(50.0, 40.0), true), [0.5]); + assert_eq!(touch_params(&flat, Point::new(30.0, 40.0), true).len(), 1, "between samples, as before"); + assert!(touch_params(&flat, Point::new(0.0, 40.0), true).is_empty(), "the ends stay out"); + assert!(touch_params(&flat, Point::new(100.0, 40.0), true).is_empty(), "the ends stay out"); + // From a point on the segment itself there is no line to be square. + assert!(touch_params(&flat, Point::new(50.0, 0.0), true).is_empty()); + // A straight cubic seen from its own line runs along that line everywhere: no touch point. + let straight = PathSeg::Cubic(CubicBez::new((0.0, 0.0), (30.0, 0.0), (70.0, 0.0), (100.0, 0.0))); + assert!(touch_params(&straight, Point::new(-50.0, 0.0), false).is_empty()); + // y = 400 (t - 0.5)^3 has its inflection at t = 0.5, and the tangent there (the x axis) + // touches zero without a change of sign; seen from (-100, 0) it is still found. + let wave = PathSeg::Cubic(CubicBez::new((0.0, -50.0), (100.0 / 3.0, 50.0), (200.0 / 3.0, -50.0), (100.0, 50.0))); + assert_eq!(touch_params(&wave, Point::new(-100.0, 0.0), false), [0.5]); + let (mut d, _) = doc_with_rect(); + let l = d.layers[0].id; + let id = d.alloc_id(); + let circle = shapes::ellipse(Rect::new(450.0, 450.0, 550.0, 550.0)); + // The middle of the lower right quarter, and a point on the circle's tangent there. + let quarter = PathSeg::Cubic(circle.subpaths[0].segment(2)); + let mid = quarter.eval(0.5); + let from = mid + Vec2::new(-64.0, 64.0); + assert!(((mid - Point::new(500.0, 500.0)).hypot() - 50.0).abs() < 0.1, "{mid:?}"); + assert_eq!(touch_params(&quarter, from, false), [0.5]); + d.insert(Some(l), 1, Node::path(id, circle, Appearance::default_art())).unwrap(); + // An oval (centre (500, 300), 100 by 50) seen from (300, 300): the tangent points are at + // x = 450, y = 300 -/+ 25 * sqrt(3), between samples. + let oval = d.alloc_id(); + d.insert(Some(l), 2, Node::path(oval, shapes::ellipse(Rect::new(400.0, 250.0, 600.0, 350.0)), Appearance::default_art())).unwrap(); + let (s, p) = (Selection::default(), paint()); + let c = cx(&d, &s, &p); + let leave = Leave::segment(&c, from, false); + let (q, ov) = PointSnap::new(&c, || Targets::for_drawing(&d, &[], None, None)).snap_from(&c, mid + Vec2::new(1.5, 1.0), Some(&leave)); + assert_eq!(labels(&ov), ["tangent"]); + assert!((q - mid).hypot() < 1e-9, "{q:?} {mid:?}"); + assert_eq!(lines(&ov), vec![(from, q)]); + let start = Point::new(300.0, 300.0); + let leave = Leave::segment(&c, start, false); + let (q, ov) = PointSnap::new(&c, || Targets::for_drawing(&d, &[], None, None)).snap_from(&c, Point::new(452.0, 259.0), Some(&leave)); + assert_eq!(labels(&ov), ["tangent"]); + assert!((q - Point::new(450.0, 300.0 - 25.0 * 3f64.sqrt())).hypot() < 0.2, "{q:?}"); +} + /// A box dragged from a corner (Rectangle, Ellipse, ...) never snaps square to a segment, and /// a busy spot does not hide the contact: every segment in reach is tried. #[test] diff --git a/crates/tools/src/meshblend.rs b/crates/tools/src/meshblend.rs index 21ee30eed6..c9ab307028 100644 --- a/crates/tools/src/meshblend.rs +++ b/crates/tools/src/meshblend.rs @@ -360,6 +360,12 @@ impl Tool for MeshTool { fn options(&self) -> serde_json::Value { self.edit.options() } + /// Pick the gradient mesh points the Eyedropper held (`meshPoints`). + fn set_option(&mut self, key: &str, value: &serde_json::Value) { + if key == "meshPoints" { + self.edit.set_options(value); + } + } fn busy(&self) -> bool { self.edit.dragging() } diff --git a/crates/tools/src/meshedit.rs b/crates/tools/src/meshedit.rs index 1069c90eb5..71ae329c4c 100644 --- a/crates/tools/src/meshedit.rs +++ b/crates/tools/src/meshedit.rs @@ -34,6 +34,13 @@ pub fn grid_of(n: &Node) -> Option<Cow<'_, GradientMesh>> { } } +/// The `{id, index}` entries of a `meshPoints` option ([`MeshEdit::options`]); malformed entries +/// are left out. +pub fn points_of(value: &Value) -> Vec<(NodeId, usize)> { + let Some(v) = value.as_array() else { return vec![] }; + v.iter().filter_map(|p| Some((NodeId(p.get("id")?.as_u64()?), usize::try_from(p.get("index")?.as_u64()?).ok()?))).collect() +} + /// Can `n` have an editable grid ([`grid_of`])? Its kind alone answers, without building the grid. pub fn may_have_grid(n: &Node) -> bool { match &n.kind { @@ -66,6 +73,16 @@ pub fn part_points(m: &GradientMesh, p: Point, point_tol: f64, line_tol: f64) -> Some(vec![m.idx(r, c), m.idx(r, c + 1), m.idx(r + 1, c), m.idx(r + 1, c + 1)]) } +/// The points of gradient mesh `m` that a color dropped at `p`, or an Eyedropper click there, +/// recolors: the point within `point_tol`, else the four points around the patch under `p`. +pub fn color_points(m: &GradientMesh, p: Point, point_tol: f64) -> Option<Vec<usize>> { + if let Some(i) = m.point_near(p, point_tol) { + return Some(vec![i]); + } + let (r, c, ..) = m.locate(p)?; + Some(vec![m.idx(r, c), m.idx(r, c + 1), m.idx(r + 1, c), m.idx(r + 1, c + 1)]) +} + /// What a press on a mesh grabs: the mesh, the point and (on the focused point) a handle. #[derive(Clone, Copy, Debug, PartialEq, Eq)] pub struct MeshGrab { @@ -307,6 +324,16 @@ impl MeshEdit { json!({"meshPoints": self.picked.iter().map(|(id, index)| json!({"id": id.0, "index": index})).collect::<Vec<_>>()}) } + /// Pick the points a `meshPoints` option lists (see [`points_of`]), with none focused: the + /// points the Eyedropper held when the tool switched back. + pub fn set_options(&mut self, value: &Value) { + if self.drag.is_some() { + return; + } + self.picked = points_of(value).into_iter().collect(); + (self.focus, self.click) = (None, None); + } + /// The picked points of the meshes `shown` accepts, filled, and the focused point's handles /// (lines and ends). pub fn overlays(&self, cx: &ToolContext, shown: &dyn Fn(NodeId) -> bool) -> Vec<Overlay> { @@ -637,4 +664,21 @@ mod tests { assert_eq!(out, vec![Action::Exec("select.set".into(), json!({"ids": [m.0]})), Action::Begin("Move Mesh Points".into())]); assert_eq!(picked(&t), set(&[(100.0, 100.0), (150.0, 100.0), (100.0, 150.0), (150.0, 150.0)])); } + + /// The tools that pick mesh points pick again the points a `meshPoints` option lists (those the + /// Eyedropper held), leaving malformed entries out; Group Selection picks none. + #[test] + fn mesh_point_tools_take_back_the_eyedroppers_picks() { + let points = json!([{"id": 7, "index": 2}, {"id": 7}, {"id": 7, "index": 0}]); + for id in ["mesh", "directSelection", "lasso", crate::addons::polygonal_lasso::ID] { + let mut t = crate::create(id); + t.set_option("meshPoints", &points); + assert_eq!(picked(&*t), [0, 2], "{id}"); + t.set_option("meshPoints", &json!([])); + assert!(picked(&*t).is_empty(), "{id}"); + } + let mut t = crate::create("groupSelection"); + t.set_option("meshPoints", &points); + assert!(picked(&*t).is_empty(), "Group Selection"); + } } diff --git a/crates/tools/src/select.rs b/crates/tools/src/select.rs index 1ac8f78ea6..700c045d3f 100644 --- a/crates/tools/src/select.rs +++ b/crates/tools/src/select.rs @@ -22,7 +22,8 @@ //! bracket drag) cancels it: the art returns to its state at the press. //! Selected area type and type on a path show an in port and an out port. A click on the out port //! loads the pointer with the text ([`Cursor::LoadedText`]): the next click threads it into the -//! closed path, area type or type on a path under the pointer, or into a new frame of the same +//! closed path, area type or type on a path under the pointer, where the pointer shows the link +//! cursor ([`Cursor::LoadedTextLink`]), or into a new frame of the same //! kind, shape and size at the click on empty canvas, and a drag draws a rectangle for the new //! frame (`text.thread.add`), which comes after the clicked one in its thread. A click on the in //! port does the same with the new frame put before it: the story then starts there and flows on @@ -770,21 +771,41 @@ impl SelectionTool { } } -/// Where the text of `from` goes for a press at `start` released at `end`: a dragged rectangle, -/// else the closed path, area type or type on a path pressed on, else a new frame with its -/// top-left at `start`. -fn thread_params(cx: &ToolContext, from: NodeId, start: Point, end: Point) -> Value { +/// The rectangle a press at `start` dragged to `end` draws for a new frame, None when the drag +/// is too small to be one (a click). +fn new_frame_rect(cx: &ToolContext, start: Point, end: Point) -> Option<Rect> { let r = Rect::from_points(start, end); - if r.width() > cx.tol(6.0) && r.height() > cx.tol(6.0) { - return json!({ "from": from.0, "rect": [r.x0, r.y0, r.width(), r.height()] }); - } + (r.width() > cx.tol(6.0) && r.height() > cx.tol(6.0)).then_some(r) +} + +/// The object a click at `p` threads the text of `from` into: the closed path, area type or type +/// on a path drawn there, other than `from`, not inside a compound path and in no thread yet, as +/// `text.thread.add` takes for `to`. None elsewhere, where the click makes a new frame, and when +/// `from` can no longer thread. +fn thread_target(cx: &ToolContext, from: NodeId, p: Point) -> Option<NodeId> { + use vectorcraft_doc::NodeKind; + let d = cx.doc; let frame = |n: &vectorcraft_doc::Node| { - is_threadable(n) || matches!(&n.kind, vectorcraft_doc::NodeKind::Path { path, .. } if path.subpaths.first().is_some_and(|s| s.closed)) + is_threadable(n) || matches!(&n.kind, NodeKind::Path { path, .. } if path.subpaths.first().is_some_and(|s| s.closed)) }; // The art the text flows into: what is drawn, not a clipping path's outline. - let to = - hit_test(cx.doc, start, cx.hit_options()).map(|h| h.top_object(cx.isolation)).filter(|id| *id != from && cx.doc.node(*id).is_some_and(frame)); - match to { + let id = hit_test(d, p, cx.hit_options()).map(|h| h.top_object(cx.isolation))?; + let ok = id != from + && d.node(from).is_some_and(is_threadable) + && d.node(id).is_some_and(frame) + && !d.parent_of(id).and_then(|i| d.node(i)).is_some_and(|n| matches!(n.kind, NodeKind::Compound { .. })) + && !d.text_threads.iter().any(|t| t.contains(&id)); + ok.then_some(id) +} + +/// Where the text of `from` goes for a press at `start` released at `end`: a dragged rectangle, +/// else the object pressed on that can take it ([`thread_target`]), else a new frame with its +/// top-left at `start`. +fn thread_params(cx: &ToolContext, from: NodeId, start: Point, end: Point) -> Value { + if let Some(r) = new_frame_rect(cx, start, end) { + return json!({ "from": from.0, "rect": [r.x0, r.y0, r.width(), r.height()] }); + } + match thread_target(cx, from, start) { Some(to) => json!({ "from": from.0, "to": to.0 }), None => json!({ "from": from.0, "at": [start.x, start.y] }), } @@ -1271,7 +1292,15 @@ impl Tool for SelectionTool { State::Space(_) => return Cursor::ArrowHollow, State::MoveAll(_) | State::Member(_) => return Cursor::Move, State::Bracket(_) => return Cursor::PathBracket, - State::Loaded { .. } => return Cursor::LoadedText, + // Loaded text: the link cursor where a click threads it into the object there (for a + // press held down, the object pressed on until the drag draws a new frame). + State::Loaded { from, press, .. } => { + let at = match press { + Some((start, cur)) => new_frame_rect(cx, start, cur).is_none().then_some(start), + None => Some(p), + }; + return if at.and_then(|q| thread_target(cx, from, q)).is_some() { Cursor::LoadedTextLink } else { Cursor::LoadedText }; + } _ => {} } if self.guide.busy() { diff --git a/crates/tools/src/select/tests.rs b/crates/tools/src/select/tests.rs index 0c72e6d056..a8e1f8acee 100644 --- a/crates/tools/src/select/tests.rs +++ b/crates/tools/src/select/tests.rs @@ -2197,6 +2197,110 @@ fn a_click_on_the_out_port_loads_the_text_and_the_next_click_or_drag_threads_it( assert_eq!(t.pointer(&cx, &ev(PointerKind::Down, corner.x, corner.y)), vec![Action::Begin("Resize Type Area".into())]); } +/// Loaded text shows the link cursor over an object a click threads it into (a closed path, +/// area type in no thread), and the loaded text elsewhere: empty canvas, an open path, point type, +/// the frame it came from and a frame already in a thread, where a click makes a new frame +/// instead. Held down on a target, the press keeps the link cursor until its drag draws a frame; +/// placing the text or Escape ends both. +#[test] +fn loaded_text_shows_the_link_cursor_where_a_click_threads_it_into_the_object() { + use vectorcraft_doc::{Node, NodeKind, TextKind, TextObject}; + use vectorcraft_geom::shapes; + let (mut d, id, rect, port) = overflowing_area_type(); + let l = d.layers[0].id; + let add = |d: &mut vectorcraft_doc::Document, n: NodeKind| { + let nid = d.alloc_id(); + d.insert(Some(l), 0, Node::new(nid, n)).unwrap(); + nid + }; + let area = |x: f64, y: f64| { + let mut t = TextObject::point(Point::new(x, y), "", Default::default()); + t.kind = TextKind::Area { frame: shapes::rectangle(Rect::new(0.0, 0.0, 120.0, 40.0)) }; + NodeKind::Text(Box::new(t)) + }; + let free = add(&mut d, area(300.0, 100.0)); + let threaded = add(&mut d, area(100.0, 380.0)); + let next = add(&mut d, area(250.0, 440.0)); + d.text_threads.push(vec![threaded, next]); + let line = vectorcraft_geom::kurbo::Line::new((50.0, 250.0), (250.0, 250.0)); + let open = Node::path( + d.alloc_id(), + vectorcraft_geom::PathData::from_bezpath(&vectorcraft_geom::kurbo::Shape::to_path(&line, 0.1)), + vectorcraft_doc::Appearance::default_art(), + ); + d.insert(Some(l), 0, open).unwrap(); + let point = TextObject::point(Point::new(40.0, 480.0), "Point", Default::default()); + let point_at = point.bounds().expect("point type has bounds").center(); + add(&mut d, NodeKind::Text(Box::new(point))); + let mut s = Selection::default(); + s.set([id]); + let p = paint(); + let cx = cx(&d, &s, &p); + let mut t = SelectionTool::default(); + let load = |t: &mut SelectionTool| { + t.pointer(&cx, &ev(PointerKind::Down, port.x, port.y)); + t.pointer(&cx, &ev(PointerKind::Up, port.x, port.y)); + }; + let at = |t: &SelectionTool, x: f64, y: f64| t.cursor(&cx, Point::new(x, y), Mods::default()); + let thread = |params: Value| vec![Action::Exec("text.thread.add".into(), params)]; + load(&mut t); + assert_eq!(at(&t, 150.0, 150.0), Cursor::LoadedTextLink, "a closed path"); + assert_eq!(at(&t, 360.0, 120.0), Cursor::LoadedTextLink, "area type in no thread"); + assert_eq!(at(&t, 30.0, 420.0), Cursor::LoadedText, "empty canvas"); + assert_eq!(at(&t, 150.0, 250.0), Cursor::LoadedText, "an open path"); + assert_eq!(at(&t, point_at.x, point_at.y), Cursor::LoadedText, "point type"); + assert_eq!(at(&t, 360.0, 320.0), Cursor::LoadedText, "the frame the text came from"); + assert_eq!(at(&t, 160.0, 400.0), Cursor::LoadedText, "a frame already in a thread"); + // A click where the pointer shows the loaded text makes a new frame there. + t.pointer(&cx, &ev(PointerKind::Down, 160.0, 400.0)); + assert_eq!(t.pointer(&cx, &ev(PointerKind::Up, 160.0, 400.0)), thread(json!({"from": id.0, "at": [160.0, 400.0]}))); + load(&mut t); + t.pointer(&cx, &ev(PointerKind::Down, 150.0, 150.0)); + assert_eq!(at(&t, 150.0, 150.0), Cursor::LoadedTextLink, "held down on the path"); + t.pointer(&cx, &ev(PointerKind::Drag, 151.0, 151.0)); + assert_eq!(at(&t, 151.0, 151.0), Cursor::LoadedTextLink, "a drag too small to draw a frame"); + assert_eq!(t.pointer(&cx, &ev(PointerKind::Up, 151.0, 151.0)), thread(json!({"from": id.0, "to": rect.0}))); + assert!(!matches!(at(&t, 150.0, 150.0), Cursor::LoadedText | Cursor::LoadedTextLink), "the text is placed"); + load(&mut t); + t.pointer(&cx, &ev(PointerKind::Down, 150.0, 150.0)); + t.pointer(&cx, &ev(PointerKind::Drag, 230.0, 240.0)); + assert_eq!(at(&t, 230.0, 240.0), Cursor::LoadedText, "the drag draws a new frame"); + t.pointer(&cx, &ev(PointerKind::Up, 230.0, 240.0)); + load(&mut t); + t.pointer(&cx, &ev(PointerKind::Down, 360.0, 120.0)); + assert_eq!(t.pointer(&cx, &ev(PointerKind::Up, 360.0, 120.0)), thread(json!({"from": id.0, "to": free.0}))); + load(&mut t); + assert!(t.key(&cx, ToolKey::Escape, Mods::default()).is_empty()); + assert!(!matches!(at(&t, 150.0, 150.0), Cursor::LoadedText | Cursor::LoadedTextLink), "Escape drops the text"); +} + +/// In an isolated compound path, loaded text shows no link cursor over a member path, which +/// `text.thread.add` does not take for `to`: a click there makes a new frame. +#[test] +fn loaded_text_shows_no_link_cursor_over_a_compound_paths_member() { + use vectorcraft_doc::{Appearance, Node, NodeKind}; + let (mut d, id, _, port) = overflowing_area_type(); + let l = d.layers[0].id; + let (c, member) = (d.alloc_id(), d.alloc_id()); + let path = Node::path(member, vectorcraft_geom::shapes::rectangle(Rect::new(300.0, 100.0, 400.0, 200.0)), Appearance::default_art()); + let mut compound = Node::new(c, NodeKind::Compound { children: vec![std::sync::Arc::new(path)], rule: Default::default() }); + compound.appearance = Appearance::default_art().into(); + d.insert(Some(l), 0, compound).unwrap(); + let mut s = Selection::default(); + s.set([id]); + let p = paint(); + let cx = ToolContext { isolation: Some(c), ..cx(&d, &s, &p) }; + let mut t = SelectionTool::default(); + t.pointer(&cx, &ev(PointerKind::Down, port.x, port.y)); + t.pointer(&cx, &ev(PointerKind::Up, port.x, port.y)); + assert_eq!(t.cursor(&cx, Point::new(350.0, 150.0), Mods::default()), Cursor::LoadedText); + t.pointer(&cx, &ev(PointerKind::Down, 350.0, 150.0)); + assert_eq!( + t.pointer(&cx, &ev(PointerKind::Up, 350.0, 150.0)), + vec![Action::Exec("text.thread.add".into(), json!({"from": id.0, "at": [350.0, 150.0]}))] + ); +} + /// Loaded text clicked just inside a layer's clipping mask, where art is drawn over the mask's /// edge, threads into that art, not into the unpainted mask: placing text acts on what is drawn, /// so it takes the ordinary hit, not the selection tools' clipping-path outline. diff --git a/crates/tools/src/xform/eyedropper.rs b/crates/tools/src/xform/eyedropper.rs index a83bf1bae6..eb1b8b3895 100644 --- a/crates/tools/src/xform/eyedropper.rs +++ b/crates/tools/src/xform/eyedropper.rs @@ -10,10 +10,20 @@ //! blend's steps, an envelope's distorted contents). Clicking an image samples its pixels //! (averaged over the options' raster sample size; a CMYK image gives its ink amounts). //! +//! With a gradient mesh selected, a click on one of its points gives that point the current solid +//! fill color, and a click inside one of its patches gives it to the patch's four points +//! (`object.mesh.setPointColor`). +//! //! The Gradient panel's eyedropper sets the `stop` option (the tool to return to): the next click //! samples the colour under the cursor into the selected gradient stop (`paint.sampleColor //! {stop}`) and switches back to that tool. //! +//! Gradient mesh points picked with the Mesh tool, Direct Selection or the Lasso before switching +//! to the Eyedropper stay picked (its `meshPoints` option), and go back to one of those tools +//! switched to next. While a selected, editable mesh has picked points, a click or Shift-click on an image or +//! other art samples the color under the cursor into those points alone (`paint.sampleColor +//! {stroke: false, ids}` with those meshes, which recolors the points through `paint.setFill`). +//! //! Brush Options' Key Color eyedropper sets `brushKeyColor` and `stop`: the next click samples into //! the open dialog (`brushKeyColor` UI request) and switches back. //! @@ -41,6 +51,28 @@ pub struct EyedropperTool { text_selection: crate::text::TypeTool, /// Brush Options › Key Color (Hue Shift): sample into the dialog, then [`Self::stop`]. brush_key_color: bool, + /// The gradient mesh points the tool switched from had picked, each a mesh and a point index. + mesh_points: Vec<(NodeId, usize)>, +} + +/// The point of each of `points` that a selected, editable gradient mesh in `cx` has. +fn live_points<'a>(cx: &'a ToolContext, points: &'a [(NodeId, usize)]) -> impl Iterator<Item = (NodeId, Point)> + 'a { + let editable = cx.doc.editable(); + points.iter().filter(move |(id, _)| cx.selection.contains(*id) && editable(*id)).filter_map(|(id, index)| { + let Some(NodeKind::Mesh(m)) = cx.doc.node(*id).map(|n| &n.kind) else { return None }; + Some((*id, m.points.get(*index)?.p)) + }) +} + +/// The selected, editable gradient meshes in `cx` with one of `points` picked, in range, each once. +fn picked_meshes(cx: &ToolContext, points: &[(NodeId, usize)]) -> Vec<NodeId> { + let mut ids: Vec<NodeId> = vec![]; + for (id, _) in live_points(cx, points) { + if !ids.contains(&id) { + ids.push(id); + } + } + ids } /// The colour of `paint` at `p` (gradients are sampled along their vector, radial ones honouring @@ -456,6 +488,21 @@ fn image_color_at(s: &Sampler, n: &Node, p: Point) -> Option<Color> { Some(Color::rgb(r, g, b)) } +/// The selected, editable gradient mesh and its points that an Eyedropper click at `p` recolors +/// ([`crate::meshedit::color_points`]): the topmost visible object within reach of `p` (locked art +/// included, clipping applied) must be that mesh, and the points are its point within reach of +/// `p`, else the four points around its patch under `p`. +fn selected_mesh_points(cx: &ToolContext, p: Point) -> Option<(NodeId, Vec<usize>)> { + let tol = cx.tol(5.0); + let opt = sample_options(cx); + let leaf = hit_test_visible(cx.doc, p, HitOptions { tol: opt.tol.max(tol), ..opt })?.leaf; + if !cx.selection.contains(leaf) || !cx.doc.editable()(leaf) { + return None; + } + let Some(NodeKind::Mesh(m)) = cx.doc.node(leaf).map(|n| &n.kind) else { return None }; + Some((leaf, crate::meshedit::color_points(m, p, tol)?)) +} + impl Tool for EyedropperTool { fn id(&self) -> &'static str { "eyedropper" @@ -474,6 +521,17 @@ impl Tool for EyedropperTool { return vec![Action::Dialog("brushKeyColor".into(), json!({ "color": color_json(&c) })), Action::SwitchTool(back)]; } let stop = self.stop.as_ref().zip(cx.gradient_stop); + // A plain click on a selected gradient mesh gives the fill color to the point there, else + // to the four points of the patch there. + if stop.is_none() + && !ev.mods.alt + && !ev.mods.shift + && let Paint::Solid { color, .. } = &cx.paint.fill + && let Some((id, points)) = selected_mesh_points(cx, ev.pos) + { + let params = json!({ "id": id.0, "points": points, "color": color_json(color), "keepModel": true }); + return vec![Action::Exec("object.mesh.setPointColor".into(), params)]; + } // Reading a source is independent of its editability. Only Alt's reverse operation // writes to the clicked object; Shift+Alt appends its appearance to the selection. let source = if ev.mods.alt && !ev.mods.shift && stop.is_none() { @@ -488,11 +546,20 @@ impl Tool for EyedropperTool { return vec![Action::Exec("appearance.copyFrom".into(), json!({ "source": src.0, how: true }))]; } let image = matches!(n.kind, NodeKind::Image(_)); - if !(ev.mods.shift || stop.is_some() || image) { + // Picked mesh points take only a color sampled from other art or an image: the sample goes + // to them as a fill, and to nothing else that is selected. A click on a mesh with picked + // points is handled as before. + let meshes = if stop.is_none() { picked_meshes(cx, &self.mesh_points) } else { vec![] }; + let meshes = if meshes.contains(&src) { vec![] } else { meshes }; + if !(ev.mods.shift || stop.is_some() || image || !meshes.is_empty()) { return vec![Action::Exec("appearance.copyFrom".into(), json!({ "source": src.0 }))]; } let Some(c) = sample_color_at(cx, ev.pos) else { return vec![] }; let color = color_json(&c); + if !meshes.is_empty() { + let ids: Vec<u64> = meshes.iter().map(|id| id.0).collect(); + return vec![Action::Exec("paint.sampleColor".into(), json!({ "color": color, "stroke": false, "ids": ids }))]; + } let Some((back, i)) = stop else { return vec![Action::Exec("paint.sampleColor".into(), json!({ "color": color }))] }; let out = vec![Action::Exec("paint.sampleColor".into(), json!({ "color": color, "stop": i })), Action::SwitchTool(back.clone())]; self.stop = None; @@ -506,15 +573,21 @@ impl Tool for EyedropperTool { if let Some(o) = options.as_object_mut() { o.insert("stop".into(), json!(self.stop)); o.insert("brushKeyColor".into(), json!(self.brush_key_color)); + if !self.mesh_points.is_empty() { + let points: Vec<Value> = self.mesh_points.iter().map(|(id, index)| json!({"id": id.0, "index": index})).collect(); + o.insert("meshPoints".into(), Value::Array(points)); + } } options } - /// Accept a stop target or the selection transferred from the Type tool. + /// Accept a stop target, or the selection or the mesh points picked, transferred from the + /// Type tool or a tool that picks mesh points. fn set_option(&mut self, key: &str, value: &Value) { match key { "stop" => self.stop = value.as_str().map(str::to_string), "brushKeyColor" => self.brush_key_color = value.as_bool().unwrap_or(false), + "meshPoints" => self.mesh_points = crate::meshedit::points_of(value), "textSelection" => self.text_selection.set_option(key, value), _ => {} } @@ -525,9 +598,13 @@ impl Tool for EyedropperTool { self.text_selection.after_command(cx) } - /// Keep the sampled character range highlighted without activating text input. + /// Keep the sampled character range highlighted without activating text input, and the picked + /// points of selected gradient meshes filled, as the tools that picked them show them. fn overlays(&self, cx: &ToolContext) -> Vec<Overlay> { - if self.text_selection.options().get("editing").is_some_and(|v| !v.is_null()) { self.text_selection.overlays(cx) } else { vec![] } + let mut out = + if self.text_selection.options().get("editing").is_some_and(|v| !v.is_null()) { self.text_selection.overlays(cx) } else { vec![] }; + out.extend(live_points(cx, &self.mesh_points).map(|(_, p)| Overlay::Anchor { p, color: crate::draw2::FEEDBACK, filled: true, size: 5.0 })); + out } fn cursor(&self, _cx: &ToolContext, _p: Point, _m: Mods) -> Cursor { @@ -607,6 +684,82 @@ mod tests { assert!(t.pointer(&cx, &PointerEvent::new(PointerKind::Down, 400.0, 400.0)).is_empty()); } + /// With points of a selected gradient mesh picked, a click on other art samples the color under + /// the cursor into those points as a fill, as a Shift-click does. Unselected, or with the picks + /// out of range, on a locked mesh, or on the mesh itself, the click copies the appearance as + /// before; Alt still applies in reverse. + #[test] + fn picked_mesh_points_take_the_color_a_click_samples() { + use vectorcraft_doc::{Document, GradientMesh}; + let mut d = Document::new(500.0, 500.0); + let l = d.layers[0].id; + let mesh = d.alloc_id(); + let grid = GradientMesh::from_surface(1, 1, &|u, v| Point::new(100.0 + 100.0 * u, 100.0 + 100.0 * v), &|_, _| Color::WHITE); + d.insert(Some(l), 0, Node::new(mesh, NodeKind::Mesh(grid))).unwrap(); + let red = d.alloc_id(); + let mut art = (*filled_rect(Rect::new(300.0, 100.0, 350.0, 150.0), Paint::solid(Color::rgb(1.0, 0.0, 0.0)))).clone(); + art.id = red; + d.insert(Some(l), usize::MAX, art).unwrap(); + let p = paint(); + let mut s = Selection::default(); + s.set([mesh]); + let mut t = EyedropperTool::default(); + t.set_option("meshPoints", &json!([{"id": mesh.0, "index": 1}, {"id": "x"}, {"id": mesh.0, "index": 3}])); + assert_eq!(t.options()["meshPoints"], json!([{"id": mesh.0, "index": 1}, {"id": mesh.0, "index": 3}]), "malformed entries are left out"); + // The picked points show filled while the mesh is selected. + let anchors: Vec<Point> = t + .overlays(&cx(&d, &s, &p)) + .into_iter() + .filter_map(|o| match o { + Overlay::Anchor { p, filled: true, .. } => Some(p), + _ => None, + }) + .collect(); + assert_eq!(anchors, [Point::new(200.0, 100.0), Point::new(200.0, 200.0)]); + assert!(t.overlays(&cx(&d, &Selection::default(), &p)).is_empty()); + let click = |t: &mut EyedropperTool, s: &Selection, m: Mods| { + t.pointer(&cx(&d, s, &p), &PointerEvent::new(PointerKind::Down, 325.0, 125.0).with_mods(m)) + }; + let sample = vec![Action::Exec( + "paint.sampleColor".into(), + json!({"color": color_json(&Color::rgb(1.0, 0.0, 0.0)), "stroke": false, "ids": [mesh.0]}), + )]; + assert_eq!(click(&mut t, &s, Mods::default()), sample); + assert_eq!(click(&mut t, &s, Mods { shift: true, ..Default::default() }), sample); + // Other selected art does not take the sample. + let mut both = Selection::default(); + both.set([mesh, red]); + assert_eq!(click(&mut t, &both, Mods::default()), sample, "only the picked mesh"); + let alt = click(&mut t, &s, Mods { alt: true, ..Default::default() }); + assert_eq!(alt, vec![Action::Exec("appearance.copyFrom".into(), json!({"source": red.0, "reverse": true}))]); + // The mesh deselected, the picks stand for nothing. + let copy = vec![Action::Exec("appearance.copyFrom".into(), json!({"source": red.0}))]; + assert_eq!(click(&mut t, &Selection::default(), Mods::default()), copy); + // Selected again, as Direct Selection keeps them, the picks take the sample again. + assert_eq!(click(&mut t, &s, Mods::default()), sample, "the mesh selected again"); + // A click on the picked mesh itself (with no solid fill) copies its appearance as before, and + // a Shift-click samples into the active fill as before. + let mut unfilled = paint(); + unfilled.fill = Paint::None; + let on_mesh = + |t: &mut EyedropperTool, m: Mods| t.pointer(&cx(&d, &s, &unfilled), &PointerEvent::new(PointerKind::Down, 150.0, 150.0).with_mods(m)); + let own = vec![Action::Exec("appearance.copyFrom".into(), json!({"source": mesh.0}))]; + assert_eq!(on_mesh(&mut t, Mods::default()), own, "a click on the mesh"); + let shift = on_mesh(&mut t, Mods { shift: true, ..Default::default() }); + assert_eq!(shift, vec![Action::Exec("paint.sampleColor".into(), json!({"color": color_json(&Color::WHITE)}))], "a Shift-click on the mesh"); + // A locked mesh's picks stand for nothing. + let mut locked = d.clone(); + locked.node_mut(mesh).unwrap().locked = true; + let a = t.pointer(&cx(&locked, &s, &p), &PointerEvent::new(PointerKind::Down, 325.0, 125.0)); + assert_eq!(a, copy, "a locked mesh"); + assert!(t.overlays(&cx(&locked, &s, &p)).is_empty()); + t.set_option("meshPoints", &json!([{"id": mesh.0, "index": 4}])); + assert_eq!(click(&mut t, &s, Mods::default()), copy, "a point the mesh does not have"); + t.set_option("meshPoints", &json!([])); + assert!(t.options().get("meshPoints").is_none()); + assert_eq!(click(&mut t, &s, Mods::default()), copy); + } + /// On a clip group's mask edge, where the art it clips lies over it, the eyedropper copies the /// art's appearance, not the unpainted clipping path's (the selection tools take the path there). #[test] @@ -1429,6 +1582,70 @@ mod tests { assert_eq!(sampled_hex(&a), "#404040"); } + /// With a gradient mesh selected, a click on one of its points gives that point the fill color, + /// and a click inside a patch gives it to the patch's four points. Unselected, a click copies + /// the mesh's appearance as before, and Shift still samples. + #[test] + fn a_click_on_a_selected_mesh_gives_its_point_or_patch_the_fill_color() { + use vectorcraft_doc::{Document, GradientMesh}; + let mut d = Document::new(500.0, 500.0); + let l = d.layers[0].id; + let id = d.alloc_id(); + let mesh = GradientMesh::from_surface(2, 2, &|u, v| Point::new(100.0 + 100.0 * u, 100.0 + 100.0 * v), &|_, _| Color::WHITE); + d.insert(Some(l), 0, Node::new(id, NodeKind::Mesh(mesh))).unwrap(); + let mut p = paint(); + p.fill = Paint::solid(Color::rgb(1.0, 0.0, 0.0)); + let red = color_json(&Color::rgb(1.0, 0.0, 0.0)); + let set = |points: Value| { + vec![Action::Exec("object.mesh.setPointColor".into(), json!({"id": id.0, "points": points, "color": red, "keepModel": true}))] + }; + let mut s = Selection::default(); + let click = |s: &Selection, p: &crate::PaintDefaults, x: f64, y: f64, m: Mods| { + EyedropperTool::default().pointer(&cx(&d, s, p), &PointerEvent::new(PointerKind::Down, x, y).with_mods(m)) + }; + let plain = Mods::default(); + let a = click(&s, &p, 125.0, 125.0, plain); + assert_eq!(a, vec![Action::Exec("appearance.copyFrom".into(), json!({"source": id.0}))], "an unselected mesh"); + s.set([id]); + assert_eq!(click(&s, &p, 151.0, 149.0, plain), set(json!([4])), "the point near the click"); + assert_eq!(click(&s, &p, 125.0, 125.0, plain), set(json!([0, 1, 3, 4])), "the patch's four points"); + assert_eq!(click(&s, &p, 175.0, 175.0, plain), set(json!([4, 5, 7, 8]))); + let shift = Mods { shift: true, ..Default::default() }; + assert!(matches!(&click(&s, &p, 125.0, 125.0, shift)[0], Action::Exec(c, _) if c == "paint.sampleColor")); + let alt = Mods { alt: true, ..Default::default() }; + assert!(matches!(&click(&s, &p, 125.0, 125.0, alt)[0], Action::Exec(c, v) if c == "appearance.copyFrom" && v["reverse"] == true)); + // Off the mesh, or with a fill that is not a solid color, nothing goes to its points. + assert!(click(&s, &p, 400.0, 400.0, plain).is_empty()); + p.fill = Paint::None; + assert!(matches!(&click(&s, &p, 125.0, 125.0, plain)[0], Action::Exec(c, _) if c == "appearance.copyFrom")); + } + + /// An unselected object on top of a selected mesh's point keeps the click: it copies that + /// object's appearance, and the mesh's points keep their colors. + #[test] + fn a_click_on_an_object_over_a_selected_mesh_copies_that_object() { + use vectorcraft_doc::{Document, GradientMesh}; + let mut d = Document::new(500.0, 500.0); + let l = d.layers[0].id; + let id = d.alloc_id(); + let mesh = GradientMesh::from_surface(2, 2, &|u, v| Point::new(100.0 + 100.0 * u, 100.0 + 100.0 * v), &|_, _| Color::WHITE); + d.insert(Some(l), 0, Node::new(id, NodeKind::Mesh(mesh))).unwrap(); + let top = d.alloc_id(); + let mut cover = (*filled_rect(vectorcraft_geom::Rect::new(140.0, 140.0, 160.0, 160.0), Paint::solid(Color::BLACK))).clone(); + cover.id = top; + d.insert(Some(l), usize::MAX, cover).unwrap(); + let mut p = paint(); + p.fill = Paint::solid(Color::rgb(1.0, 0.0, 0.0)); + let mut s = Selection::default(); + s.set([id]); + let a = EyedropperTool::default().pointer(&cx(&d, &s, &p), &PointerEvent::new(PointerKind::Down, 150.0, 150.0)); + assert_eq!(a, vec![Action::Exec("appearance.copyFrom".into(), json!({"source": top.0}))]); + // Locked, it is still what the click samples. + d.node_mut(top).unwrap().locked = true; + let a = EyedropperTool::default().pointer(&cx(&d, &s, &p), &PointerEvent::new(PointerKind::Down, 150.0, 150.0)); + assert_eq!(a, vec![Action::Exec("appearance.copyFrom".into(), json!({"source": top.0}))], "a locked object on top"); + } + /// Finding the point in a mesh counts the points it looks at in every patch: a 20 × 20 mesh /// takes more than a thousand units of work. #[test] diff --git a/crates/tools/src/xform/wand.rs b/crates/tools/src/xform/wand.rs index e34630020f..d2074e386e 100644 --- a/crates/tools/src/xform/wand.rs +++ b/crates/tools/src/xform/wand.rs @@ -165,6 +165,13 @@ impl Tool for LassoTool { self.mesh.options() } + /// Pick the gradient mesh points the Eyedropper held (`meshPoints`). + fn set_option(&mut self, key: &str, value: &Value) { + if key == "meshPoints" { + self.mesh.set_options(value); + } + } + fn overlays(&self, cx: &ToolContext) -> Vec<Overlay> { let mut out = self.mesh.overlays(cx, &|id| cx.selection.contains(id)); if self.active && self.points.len() >= 2 { diff --git a/crates/trace/src/params.rs b/crates/trace/src/params.rs index 7b850fc344..1fa8aaa2c3 100644 --- a/crates/trace/src/params.rs +++ b/crates/trace/src/params.rs @@ -38,11 +38,12 @@ pub enum Palette { #[serde(alias = "Limited")] Limited, /// As many colours as the image's tones need, up to [`FULL_TONE_MAX`] (photos, gradients): - /// `color_detail` sets how close two colours may be and stay apart. + /// `color_detail` sets how close two colours may be and stay apart. Before merging colors that + /// look alike, it splits to at least one color per step of `color_detail` where the image has that many. #[serde(alias = "Full Tone")] FullTone, /// Flat art (a few colours cover nearly all of it) traces with exactly those colours, anything - /// else as Full Tone. + /// else with as many as its tones need, without Full Tone's least count and merging close RGB colors. #[serde(alias = "Automatic")] Automatic, /// The most used colours of a swatch library ([`TraceParams::swatches`]), at most `colors` of @@ -243,7 +244,10 @@ pub fn preset(name: &str) -> Option<TraceParams> { // many as its tones need where it is not. // (Color detail 85: a colour on a hundredth of the picture is still one of its colours.) "auto color" => TraceParams { palette: Palette::Automatic, color_detail: 85.0, ..color(6, 65.0, 60.0, 16, Method::Abutting) }, - "high fidelity photo" => color(64, 50.0, 50.0, 5, Method::Overlapping), + // A photo's tones: as many colors as they need (Full Tone), split until no color spans more + // than about 21 levels of a channel and into at least 85 (Color detail 85) before colors that + // look alike merge, as abutting shapes. VectorCraft's own values. + "high fidelity photo" => TraceParams { palette: Palette::FullTone, color_detail: 85.0, ..color(64, 50.0, 50.0, 5, Method::Abutting) }, "low fidelity photo" => color(20, 50.0, 50.0, 10, Method::Overlapping), "3 colors" => color(3, 50.0, 50.0, 15, Method::Abutting), "6 colors" => color(6, 50.0, 50.0, 8, Method::Abutting), diff --git a/crates/trace/src/quantize.rs b/crates/trace/src/quantize.rs index ea8fa00ac8..a115cd3ce3 100644 --- a/crates/trace/src/quantize.rs +++ b/crates/trace/src/quantize.rs @@ -93,7 +93,7 @@ pub(crate) fn quantize_keeping(img: &Raster, params: &TraceParams) -> (Quantized let g = l.round().clamp(0.0, 255.0) as u8; [g, g, g] }); - let q = merge_mixed(compact(labels, palette.collect()), img.width as usize, img.height as usize, &[]); + let q = merge_mixed(compact(labels, palette.collect()), img.width as usize, img.height as usize, &[], Alike::Rgb); (if settles_wide(params) { settled_wide(q, img, &own, true) } else { settled(q, img, &own) }, vec![]) } // Logo mode traces without quantising; asked directly, it quantises like Color. @@ -175,12 +175,14 @@ pub(crate) fn quantize_keeping(img: &Raster, params: &TraceParams) -> (Quantized img.rgba.as_chunks::<4>().0.iter().map(|p| if p[3] < 128 { TRANSPARENT } else { lut[hk.key(p[0], p[1], p[2])] }).collect(); let palette = centers.iter().map(|c| [c[0].round() as u8, c[1].round() as u8, c[2].round() as u8]).collect(); let q = compact(labels, palette); - // A swatch library's colours are used as they are. + // A swatch library's colours are used as they are. Full Tone's colors merge only when + // they look alike (see `Alike`). if library { return (q, false); } + let alike = if params.palette == Palette::FullTone { Alike::Seen } else { Alike::Rgb }; let before = q.palette.len(); - let q = merge_mixed(q, img.width as usize, img.height as usize, &rare); + let q = merge_mixed(q, img.width as usize, img.height as usize, &rare, alike); let merged = q.palette.len() < before; (q, merged) }; @@ -309,16 +311,38 @@ pub(crate) fn tests_oklab(c: [u8; 3]) -> [f64; 3] { oklab(c.map(f64::from)) } +/// Which colors [`merge_mixed`] takes for one color that noise split. +#[derive(Clone, Copy, PartialEq, Eq, Debug)] +enum Alike { + /// Close in RGB: under 30 levels apart and thoroughly mixed, or under 12 and mixed in patches. + /// Used for Grayscale and for every Color palette but Full Tone (Automatic included). + Rgb, + /// Close to the eye: under [`FULL_TONE_ALIKE`] apart in Oklab and thoroughly mixed, or under + /// [`FULL_TONE_PATCHES`] and mixed in patches (compression blocks). Full Tone's neighboring tones + /// of a smooth photo are about as close in RGB as noise makes one color, and mixed along their + /// soft border, so the RGB test would take most of them for one color. + Seen, +} + +/// How far apart (Oklab × 100) two thoroughly mixed Full Tone colors may lie and still be merged +/// as one color that noise split: a little more than the least difference one sees (see [`oklab`]). +const FULL_TONE_ALIKE: f64 = 5.0; + +/// How far apart (Oklab × 100) two Full Tone colors mixed in patches may lie and still be merged: +/// the blocks of one flat color that compression shifted by a few levels each. +const FULL_TONE_PATCHES: f64 = 1.5; + /// `q` with the colours that noise made of one colour merged, largest mix first. /// /// Asked for more colours than a picture has, k-means splits a flat colour along its noise, and -/// the two halves would trace as specks of one all over the other. Such halves are close (under 30 -/// levels apart: noise is about as strong in a dark colour as in a light one, so the distance is -/// taken in RGB) and thoroughly mixed: the pixels of the lesser one have, on average, more than -/// half a neighbour of the other each; or they are closer still (under 12 levels) and mixed in -/// patches (compression blocks). The bands of a gradient are close too, but each keeps to itself -/// and they stay apart. The colours in `keep` merge with none. -fn merge_mixed(q: Quantized, w: usize, h: usize, keep: &[[u8; 3]]) -> Quantized { +/// the two halves would trace as specks of one all over the other. Such halves are close and +/// thoroughly mixed: the pixels of the lesser one have, on average, more than half a neighbour of +/// the other each; or they are closer still and mixed in patches (compression blocks). The bands +/// of a gradient are close too, but each keeps to itself and they stay apart. The colours in +/// `keep` merge with none. Close is under 30 RGB levels apart for thoroughly mixed colours and +/// under 12 for patches with [`Alike::Rgb`], and in Oklab under [`FULL_TONE_ALIKE`] and +/// [`FULL_TONE_PATCHES`] with [`Alike::Seen`]. +fn merge_mixed(q: Quantized, w: usize, h: usize, keep: &[[u8; 3]], alike: Alike) -> Quantized { let k = q.palette.len(); // A rare colour kept on purpose (see `rare_colours`) is distinct by choice: it merges with none. let kept: Vec<bool> = q.palette.iter().map(|c| keep.contains(c)).collect(); @@ -340,6 +364,13 @@ fn merge_mixed(q: Quantized, w: usize, h: usize, keep: &[[u8; 3]]) -> Quantized } } let mut color: Vec<[f64; 3]> = q.palette.iter().map(|c| c.map(f64::from)).collect(); + // Each colour in Oklab, for `Alike::Seen`, worked out once and again only for a colour that + // takes in another. + let mut lab: Vec<[f64; 3]> = if alike == Alike::Seen { color.iter().map(|&c| oklab(c)).collect() } else { vec![] }; + let seen_apart = |lab: &[[f64; 3]], a: usize, b: usize| match (lab.get(a), lab.get(b)) { + (Some(la), Some(lb)) => (0..3).map(|c| (la[c] - lb[c]).powi(2)).sum::<f64>().sqrt(), + _ => f64::INFINITY, + }; // Which colour each has merged into (itself when none). let mut into: Vec<usize> = (0..k).collect(); loop { @@ -350,14 +381,30 @@ fn merge_mixed(q: Quantized, w: usize, h: usize, keep: &[[u8; 3]]) -> Quantized continue; } let mixed = touch[a * k + b] / count[a].min(count[b]); - let apart = (0..3).map(|c| (color[a][c] - color[b][c]).powi(2)).sum::<f64>().sqrt(); - if (mixed > 0.5 && apart < 30.0 || mixed > 0.15 && apart < 12.0) && best.is_none_or(|x| mixed > x.0) { + // Two colours this little mixed merge under neither test. + if mixed <= 0.15 { + continue; + } + let merges = match alike { + Alike::Rgb => { + let apart = (0..3).map(|c| (color[a][c] - color[b][c]).powi(2)).sum::<f64>().sqrt(); + mixed > 0.5 && apart < 30.0 || apart < 12.0 + } + Alike::Seen => { + let apart = seen_apart(&lab, a, b); + mixed > 0.5 && apart < FULL_TONE_ALIKE || apart < FULL_TONE_PATCHES + } + }; + if merges && best.is_none_or(|x| mixed > x.0) { best = Some((mixed, a, b)); } } } let Some((_, a, b)) = best else { break }; color[a] = [0, 1, 2].map(|c| (color[a][c] * count[a] + color[b][c] * count[b]) / (count[a] + count[b])); + if let Some(l) = lab.get_mut(a) { + *l = oklab(color[a]); + } count[a] += count[b]; count[b] = 0.0; into[b] = a; @@ -410,6 +457,33 @@ mod tests { assert!(own.iter().all(|o| *o == own[0])); } + #[test] + fn full_tone_merges_only_mixed_colors_that_look_alike() { + // Two colors in a checkerboard: every pixel has four neighbors of the other color. + let mixed = + |a: [u8; 3], b: [u8; 3]| Quantized { labels: (0..16 * 16).map(|i| ((i % 16 + i / 16) % 2) as u16).collect(), palette: vec![a, b] }; + let colors = |q: Quantized, alike: Alike| merge_mixed(q, 16, 16, &[], alike).palette.len(); + // Gray and a greener gray, 22 levels apart (about 6.4 in Oklab): one color in RGB, two that look different. + let (gray, green) = ([128, 128, 128], [128, 150, 128]); + assert_eq!(colors(mixed(gray, green), Alike::Rgb), 1); + assert_eq!(colors(mixed(gray, green), Alike::Seen), 2); + // Two grays 3 levels apart (about 1 in Oklab): one color either way. + assert_eq!(colors(mixed(gray, [131; 3]), Alike::Rgb), 1); + assert_eq!(colors(mixed(gray, [131; 3]), Alike::Seen), 1); + // Side by side, not mixed: two colors either way. + let halves = Quantized { labels: (0..16 * 16).map(|i| u16::from(i % 16 >= 8)).collect(), palette: vec![[128; 3], [131; 3]] }; + assert_eq!(colors(halves.clone(), Alike::Rgb), 2); + assert_eq!(colors(halves, Alike::Seen), 2); + // In 8 × 8 blocks, mixed in patches: grays 3 levels apart merge either way; grays 6 levels + // apart (about 10 in RGB, more than 1.5 in Oklab) merge only in RGB. + let blocks = + |b: [u8; 3]| Quantized { labels: (0..16 * 16).map(|i| ((i % 16 / 8 + i / 16 / 8) % 2) as u16).collect(), palette: vec![gray, b] }; + assert_eq!(colors(blocks([131; 3]), Alike::Rgb), 1); + assert_eq!(colors(blocks([131; 3]), Alike::Seen), 1); + assert_eq!(colors(blocks([134; 3]), Alike::Rgb), 1); + assert_eq!(colors(blocks([134; 3]), Alike::Seen), 2); + } + #[test] fn a_picture_with_no_pixels_is_not_shared_out() { // No band for each of the rows of a picture with no columns, however many rows it has. diff --git a/crates/trace/src/quantize/cut_edge.rs b/crates/trace/src/quantize/cut_edge.rs index 61a9db4c8e..4e32856ef1 100644 --- a/crates/trace/src/quantize/cut_edge.rs +++ b/crates/trace/src/quantize/cut_edge.rs @@ -607,7 +607,7 @@ pub(crate) fn settle_cut_edges(q: &mut Quantized, img: &Raster, gray: bool) -> V let edge = cut_edge(img); let mut changed = false; let mut stack: Vec<(usize, usize)> = Vec::new(); - for i in 0..w * h { + for (i, blend) in blended.iter_mut().enumerate() { let mine = q.labels[i]; if mine == TRANSPARENT || !edge.get(i).copied().unwrap_or(false) { continue; @@ -630,7 +630,7 @@ pub(crate) fn settle_cut_edges(q: &mut Quantized, img: &Raster, gray: bool) -> V } } }); - blended[i] = !near.is_empty(); + *blend = !near.is_empty(); if keep || near.is_empty() { continue; } diff --git a/crates/trace/src/quantize/palette.rs b/crates/trace/src/quantize/palette.rs index 43a1954cd7..63c8fe9a06 100644 --- a/crates/trace/src/quantize/palette.rs +++ b/crates/trace/src/quantize/palette.rs @@ -138,6 +138,12 @@ pub(super) fn labs(colors: &[[f64; 3]]) -> Vec<[f64; 3]> { /// The most colours Full Tone (and Automatic on continuous-tone images) makes. pub const FULL_TONE_MAX: usize = 256; +/// The fewest colors Palette › Full Tone splits into, before merging, at Color detail `detail` +/// (0–1): one per step of Color detail, 85 at 85. Automatic does not use it. +pub(super) fn full_tone_least(detail: f64) -> usize { + (detail.clamp(0.0, 1.0) * 100.0).round() as usize +} + /// A histogram bin in use: its index, mean colour and pixel count. pub(super) type Used = (usize, [f64; 3], f64); @@ -152,11 +158,14 @@ pub(super) fn color_palette(used: &[Used], params: &TraceParams) -> Vec<[f64; 3] // Full Tone: split until no colour box is wider than 96 (few colours) … 8 (many) levels per // channel, which is one histogram bin. let full_tone = || refine(used, centers(&median_cut(used, FULL_TONE_MAX, 96.0 - 88.0 * detail))); + // Palette › Full Tone also splits into at least one color per step of Color detail, where the + // picture has that many (see [`full_tone_least`]). + let full_tone_palette = || refine(used, centers(&median_cut_least(used, FULL_TONE_MAX, 96.0 - 88.0 * detail, full_tone_least(detail)))); // A Limited palette of 9 to 16 colors keeps a nearly flat dark ground in one color (see [`kmeans_rgb`]). let limited = || kmeans_rgb(used, k, if FEW_COLORS.contains(&k) { LEAST_APART } else { 0.0 }); match params.palette { Palette::Limited => limited(), - Palette::FullTone => full_tone(), + Palette::FullTone => full_tone_palette(), Palette::Automatic => match flat_colors(used, detail) { Some(n) => flat_palette(used, n), None => full_tone(), @@ -285,7 +294,7 @@ const GRAY: f64 = 3.0; /// (see [`median_cut_apart`]). A large, nearly flat dark ground then keeps one color, and the /// color it would have taken goes to another cut. fn kmeans_rgb(used: &[Used], k: usize, apart: f64) -> Vec<[f64; 3]> { - refine(used, centers(&median_cut_apart(used, k, 0.0, apart))) + refine(used, centers(&median_cut_apart(used, k, 0.0, apart, 0))) } /// Divisive clustering in the manner of median cut, but each box is cut where that leaves its two @@ -295,21 +304,34 @@ fn kmeans_rgb(used: &[Used], k: usize, apart: f64) -> Vec<[f64; 3]> { /// and leaves two smaller colours in one box. Boxes are cut while there are fewer than `k` and /// some box spans more than `spread` levels of a channel. pub(super) fn median_cut(used: &[Used], k: usize, spread: f64) -> Vec<ColorBox> { - median_cut_apart(used, k, spread, 0.0) + median_cut_apart(used, k, spread, 0.0, 0) } -/// [`median_cut`], except when both sides of a cut have a dark gray mean color (see [`DARK`] and -/// [`GRAY`]) and the two means lie `d` (Oklab × 100) apart with `d` < `apart`: then the cut's gain -/// is scaled by (`d` / `apart`)². With `apart` 0 it is [`median_cut`]. -fn median_cut_apart(used: &[Used], k: usize, spread: f64, apart: f64) -> Vec<ColorBox> { +/// [`median_cut`], then, while there are fewer than `least` boxes, cutting the boxes no wider than +/// `spread` too, the one whose cut gains most first. +fn median_cut_least(used: &[Used], k: usize, spread: f64, least: usize) -> Vec<ColorBox> { + median_cut_apart(used, k, spread, 0.0, least) +} + +/// [`median_cut`] with at least `least` boxes where the bins allow (see [`median_cut_least`]), +/// except when both sides of a cut have a dark gray mean color (see [`DARK`] and [`GRAY`]) and the +/// two means lie `d` (Oklab × 100) apart with `d` < `apart`: then the cut's gain is scaled by +/// (`d` / `apart`)². With `apart` 0 and `least` 0 it is [`median_cut`]. +fn median_cut_apart(used: &[Used], k: usize, spread: f64, apart: f64, least: usize) -> Vec<ColorBox> { if used.is_empty() { return vec![ColorBox { mean: [255.0; 3], weight: 0.0, peak: 0.0 }]; } - /// A box's bins and its best cut: (gain, bins sorted along the cut's channel, bins on the first side). + /// A box's bins, its widest span over the channels, and its best cut: (gain, bins sorted along + /// the cut's channel, bins on the first side). struct Cut { bins: Vec<usize>, + widest: f64, best: Option<(f64, Vec<usize>, usize)>, } + // Boxes no wider than `spread` are cut only while there are fewer than `least` boxes. A box made + // when there are already `least` boxes or more is never cut unless it is wider, so its cut is + // not planned. + let narrowest = |boxes_after: usize| if boxes_after < least { 0.0 } else { spread.max(0.0) }; // How much of a cut's gain counts when its sides' mean colors are `a` and `b`: all of it when // they look different or either is not a dark gray, less as two dark grays look more alike. let dark_gray = |c: [f64; 3]| c[0] < DARK && c[1].hypot(c[2]) < GRAY; @@ -320,7 +342,8 @@ fn median_cut_apart(used: &[Used], k: usize, spread: f64, apart: f64) -> Vec<Col } ((0..3).map(|q| (a[q] - b[q]).powi(2)).sum::<f64>() / (apart * apart)).min(1.0) }; - let plan = |bins: Vec<usize>| { + let plan = |bins: Vec<usize>, boxes_after: usize| { + let narrowest = narrowest(boxes_after); let mut best: Option<(f64, Vec<usize>, usize)> = None; let widest = (0..3) .map(|ch| { @@ -328,7 +351,7 @@ fn median_cut_apart(used: &[Used], k: usize, spread: f64, apart: f64) -> Vec<Col v.clone().fold(f64::NEG_INFINITY, f64::max) - v.fold(f64::INFINITY, f64::min) }) .fold(0.0, f64::max); - if bins.len() >= 2 && widest > spread.max(0.0) { + if bins.len() >= 2 && widest > narrowest { for ch in 0..3 { let mut sorted = bins.clone(); sorted.sort_by(|x, y| used[*x].1[ch].total_cmp(&used[*y].1[ch])); @@ -366,18 +389,26 @@ fn median_cut_apart(used: &[Used], k: usize, spread: f64, apart: f64) -> Vec<Col } } } - Cut { bins, best } + Cut { bins, widest, best } }; - let mut boxes = vec![plan((0..used.len()).collect())]; + let mut boxes = vec![plan((0..used.len()).collect(), 1)]; while boxes.len() < k { let gain = |c: &Cut| c.best.as_ref().map_or(f64::NEG_INFINITY, |b| b.0); - let Some(bi) = (0..boxes.len()).filter(|&i| boxes[i].best.is_some()).max_by(|&a, &b| gain(&boxes[a]).total_cmp(&gain(&boxes[b]))) else { + // The boxes wider than `spread` first; when none is left and there are fewer than `least`, + // any box with a cut. + let most = |wide: bool| { + (0..boxes.len()) + .filter(|&i| boxes[i].best.is_some() && (!wide || boxes[i].widest > spread.max(0.0))) + .max_by(|&a, &b| gain(&boxes[a]).total_cmp(&gain(&boxes[b]))) + }; + let Some(bi) = most(true).or_else(|| if boxes.len() < least { most(false) } else { None }) else { break; }; let Some((_, mut sorted, at)) = boxes.swap_remove(bi).best else { break }; let tail = sorted.split_off(at); - boxes.push(plan(sorted)); - boxes.push(plan(tail)); + let after = boxes.len() + 2; + boxes.push(plan(sorted, after)); + boxes.push(plan(tail, after)); } boxes .iter() @@ -467,7 +498,9 @@ mod tests { assert_eq!(palette(Palette::DocumentLibrary, colors), plain(colors as usize), "{colors} colors"); } let detail = (TraceParams::default().color_detail / 100.0).clamp(0.0, 1.0); - assert_eq!(palette(Palette::FullTone, 16), refine(&used, centers(&median_cut(&used, FULL_TONE_MAX, 96.0 - 88.0 * detail)))); + // Full Tone's median cut makes at least one color per step of Color detail. + let full_tone = refine(&used, centers(&median_cut_least(&used, FULL_TONE_MAX, 96.0 - 88.0 * detail, full_tone_least(detail)))); + assert_eq!(palette(Palette::FullTone, 16), full_tone); let automatic = match flat_colors(&used, detail) { Some(n) => plain(n), None => refine(&used, centers(&median_cut(&used, FULL_TONE_MAX, 96.0 - 88.0 * detail))), @@ -475,6 +508,32 @@ mod tests { assert_eq!(palette(Palette::Automatic, 16), automatic); } + #[test] + fn full_tone_makes_one_color_per_step_of_color_detail() { + // 256 grays, 1,200 pixels each: the width limit alone gives fewer colors than Color detail. + let ramp = bins((0..256).map(|g| ([f64::from(g); 3], 1200.0))); + let colors = |used: &[Used], color_detail: f64| { + color_palette(used, &TraceParams { palette: Palette::FullTone, color_detail, ..TraceParams::default() }).len() + }; + assert!(median_cut(&ramp, FULL_TONE_MAX, 96.0 - 88.0 * 0.85).len() < 85); + assert_eq!(colors(&ramp, 85.0), 85); + assert_eq!(colors(&ramp, 40.0), 40); + // A picture of three colors keeps three. + let three = bins([([0.0; 3], 100.0), ([128.0; 3], 100.0), ([255.0; 3], 100.0)]); + assert_eq!(colors(&three, 85.0), 3); + // A large, finely shaded area does not take the count from a small pair of reds 40 levels + // apart, wider than one color may be at Color detail 85: the pair keeps two colors. + let shaded = bins((0..128).map(|g| ([f64::from(g); 3], 10_000.0)).chain([([200.0, 0.0, 0.0], 1.0), ([240.0, 0.0, 0.0], 1.0)])); + let reds = color_palette(&shaded, &TraceParams { palette: Palette::FullTone, color_detail: 85.0, ..TraceParams::default() }); + assert!(reds.len() >= 85, "{} colors", reds.len()); + for red in [200.0, 240.0] { + assert!(reds.iter().any(|c| (c[0] - red).abs() < 1.0 && c[1] < 1.0), "no color for red {red}: {reds:?}"); + } + // Automatic's continuous-tone colors are not raised to the count. + let automatic = color_palette(&ramp, &TraceParams { palette: Palette::Automatic, color_detail: 85.0, ..TraceParams::default() }); + assert!(automatic.len() < 85, "{} colors with Automatic", automatic.len()); + } + /// `colors`, each with `n` pixels, as histogram bins. fn bins(colors: impl IntoIterator<Item = ([f64; 3], f64)>) -> Vec<Used> { colors.into_iter().enumerate().map(|(i, (c, n))| (i, c, n)).collect() diff --git a/crates/trace/src/tests.rs b/crates/trace/src/tests.rs index 7e037c8b70..694892a8a6 100644 --- a/crates/trace/src/tests.rs +++ b/crates/trace/src/tests.rs @@ -944,6 +944,16 @@ fn presets_have_their_paths_corners_and_noise() { assert_eq!(colors, [64, 20, 3, 6, 16, 8]); } +#[test] +fn high_fidelity_photo_traces_in_full_tone() { + // As many colors as the tones need, split until no color spans more than about 21 levels, as + // abutting shapes. + let p = preset("High Fidelity Photo").unwrap(); + assert_eq!((p.palette, p.color_detail, p.method), (Palette::FullTone, 85.0, Method::Abutting)); + // Low Fidelity Photo keeps its 20 colors. + assert_eq!(preset("Low Fidelity Photo").unwrap().palette, Palette::Limited); +} + #[test] fn params_json_roundtrip_and_partial() { let p = preset("6 Colors").unwrap(); @@ -1213,12 +1223,14 @@ fn full_tone_follows_the_tones_the_image_has() { } #[test] -fn automatic_traces_flat_art_with_its_colours_and_photos_in_full_tone() { +fn automatic_traces_flat_art_with_its_colours_and_photos_in_continuous_tone() { let flat = palette(&flat_quads(), Palette::Automatic, 2, 50.0); assert_eq!(flat.len(), 4, "the four flat colours, whatever `colors` says: {flat:?}"); assert!(flat.iter().any(|c| c[0] > 200 && c[1] < 60 && c[2] < 60), "red is one of them: {flat:?}"); let tone = palette(&gradient(), Palette::Automatic, 2, 50.0); - assert_eq!(tone.len(), palette(&gradient(), Palette::FullTone, 2, 50.0).len(), "continuous tone: as Full Tone"); + // Continuous tone: as many colors as the tones need, without Full Tone's least count. + let full = palette(&gradient(), Palette::FullTone, 2, 50.0); + assert!(tone.len() > 4 && tone.len() <= full.len(), "{} colors, {} in Full Tone", tone.len(), full.len()); } #[test] @@ -1713,6 +1725,56 @@ fn jitter(x: u32, y: u32, salt: u32) -> f64 { f64::from(v & 0xFFFF) / 32768.0 - 1.0 } +#[test] +fn full_tone_keeps_more_of_a_noisy_ramps_tones() { + // Gray to green with grain: Full Tone's neighboring tones are close in RGB and mixed along + // their borders, and still look different. + let img = Raster::from_fn(256, 96, |x, y| { + let v = |k: u32, base: f64, slope: f64| (base + slope * f64::from(x) + 8.0 * jitter(x, y, k)).round().clamp(0.0, 255.0) as u8; + [v(0, 100.0, 0.0), v(1, 40.0, 0.7), v(2, 100.0, 0.0), 255] + }); + let params = TraceParams { mode: Mode::Color, palette: Palette::FullTone, color_detail: 85.0, ..TraceParams::default() }; + // Median cut gives at least 85 (one per step of Color detail). Merging the ones that look alike + // leaves 6 (one per 30 or so levels of the ramp); merging close RGB colors would leave 4. + let n = quantize(&img, ¶ms).palette.len(); + assert!(n >= 6, "{n} tones"); + // Automatic traces continuous tone without Full Tone's least count and keeps merging close RGB colors. + let automatic = quantize(&img, &TraceParams { palette: Palette::Automatic, ..params }).palette.len(); + assert!(automatic < n, "{automatic} tones with Automatic, {n} with Full Tone"); +} + +#[test] +fn full_tone_traces_a_noisy_dark_ground_like_a_light_one() { + // A gray ground with up to 8 levels of grain a channel. The same grain lies farther apart in + // Oklab in a dark gray than in a light one; the dark ground still takes about as many colors + // and shapes as the light one (32 and 53 against 31 and 52 when measured). + let ground = |gray: f64| { + let img = Raster::from_fn(192, 128, |x, y| { + let c = |k: u32| (gray + 8.0 * jitter(x, y, k)).round().clamp(0.0, 255.0) as u8; + [c(0), c(1), c(2), 255] + }); + trace(&img, &preset("High Fidelity Photo").unwrap()) + }; + let (dark, light) = (ground(28.0), ground(200.0)); + assert!(dark.palette.len() <= light.palette.len() + 2, "{} colors dark, {} light", dark.palette.len(), light.palette.len()); + assert!(dark.paths.len() <= light.paths.len() + 6, "{} shapes dark, {} light", dark.paths.len(), light.paths.len()); +} + +#[test] +fn full_tone_merges_a_flat_colors_compression_blocks() { + // Three flat colors stored in 8 × 8 blocks, each block off by up to 8 levels a channel, with a + // little grain: the blocks of one color look alike and are mixed in patches, so each flat + // color traces as one shape in Full Tone too, not as squares of near colors. + let bases = [[200.0, 150.0, 120.0], [70.0, 120.0, 190.0], [40.0, 90.0, 40.0]]; + let img = Raster::from_fn(192, 128, |x, y| { + let base: [f64; 3] = bases[(x / 64) as usize]; + let c = |k: u32| (base[k as usize] + 8.0 * jitter(x / 8, y / 8, k) + 1.5 * jitter(x, y, k + 7)).round().clamp(0.0, 255.0) as u8; + [c(0), c(1), c(2), 255] + }); + let res = trace(&img, &preset("High Fidelity Photo").unwrap()); + assert_eq!((res.palette.len(), res.paths.len()), (3, 3), "{:?}", res.palette); +} + /// Three flat colours (a navy field, a yellow disc, a green bar) drawn anti-aliased, with `noise` /// levels of noise per channel. fn three_colour_art(noise: f64) -> Raster { @@ -2013,7 +2075,7 @@ fn a_nearly_flat_dark_ground_keeps_one_color() { #[test] fn a_noisy_gradient_keeps_its_tones_without_specks() { - // Tones 0–255 across with noise larger than High Fidelity Photo's 64 steps are apart. + // Tones 0–255 across with up to 5 levels of noise a channel. let img = Raster::from_fn(256, 96, |x, y| { let c = |k: u32| (f64::from(x) + 5.0 * jitter(x, y, k)).round().clamp(0.0, 255.0) as u8; [c(0), c(1), c(2), 255] diff --git a/crates/ui-egui/src/app/commands.rs b/crates/ui-egui/src/app/commands.rs index 8cf742e499..6c31668533 100644 --- a/crates/ui-egui/src/app/commands.rs +++ b/crates/ui-egui/src/app/commands.rs @@ -236,6 +236,7 @@ impl VectorcraftApp { let ime_target = crate::ime::target(&mut self.session, ime_view); let ime_before = crate::ime::stamp(&mut self.session, ime_view); let cursor_settings = (self.session.caps_lock, self.session.prefs.use_precise_cursors); + let spot_base = panels::color_guide::before_command(self); let r = self.session.execute(id, ¶ms).map_err(|e| e.to_string()); let r = panels::actions::after_recorded_command(self, r); if r.is_ok() && cursor_settings != (self.session.caps_lock, self.session.prefs.use_precise_cursors) { @@ -267,6 +268,8 @@ impl VectorcraftApp { { self.ui.status = w.to_string(); } + // A renamed spot color swatch stays the Color Guide's base; a deleted one ends the link. + panels::color_guide::after_command(self, id, ¶ms, v, spot_base); if id == "file.new" { self.ui.status.clear(); // New Document's Pixel preview mode (Overprint Preview is the engine's). diff --git a/crates/ui-egui/src/canvas.rs b/crates/ui-egui/src/canvas.rs index ed2e1aa7ba..70c8834c2d 100644 --- a/crates/ui-egui/src/canvas.rs +++ b/crates/ui-egui/src/canvas.rs @@ -66,8 +66,8 @@ use overlays::selected_anchor; use overlays::{HandleLook, blend_widgets_overlay, draw_inside_overlay, draw_overlays, hover_highlight, ime_geometry, selection_overlay}; pub use panes::Panes; pub(crate) use panes::{consolidate, note_drop, noted_cursor, pane, release_on_noted, tile, tiled_area}; +pub(crate) use raster::{KeptFrame, color_image, color_image_owned, render_job}; use raster::{changed_pixels, frame_ppp, pixel_region, upload}; -pub(crate) use raster::{color_image, color_image_owned, render_job}; pub use selection_marks::SelectionMarks; #[cfg(test)] pub(crate) use task_bar::chip_paints; diff --git a/crates/ui-egui/src/canvas/context.rs b/crates/ui-egui/src/canvas/context.rs index cd98a214b7..d8cd85d13a 100644 --- a/crates/ui-egui/src/canvas/context.rs +++ b/crates/ui-egui/src/canvas/context.rs @@ -50,7 +50,9 @@ pub(super) fn context_menu(app: &mut VectorcraftApp, resp: &egui::Response, xf: /// A panel drag ([`widgets::PanelDrag`]) dropped on art acts on the object under the pointer, /// selected or not: a paint (swatches, a Fill/Stroke proxy, the Gradient panel's thumbnail) goes -/// to its active proxy (`paint.setFill`/`paint.setStroke` with its `ids`; a gradient fits it), the +/// to its active proxy (`paint.setFill`/`paint.setStroke` with its `ids`; a gradient fits it; a +/// solid fill color on a selected gradient mesh recolors the mesh point under the pointer, else the +/// four points of the patch there, with `object.mesh.setPointColor`), the /// Appearance panel's thumbnail gives the object (the topmost one hit) the appearance it carries /// (`appearance.copyFrom`), a graphic style is applied to it (`graphicStyle.apply`; with Alt, on /// top of its appearance), and a brush is applied to it (`brush.apply`, `brush.addFromLibrary` @@ -89,6 +91,21 @@ pub(super) fn panel_drop(app: &mut VectorcraftApp, ui: &Ui, resp: &egui::Respons } return; } + // A solid fill color on a selected gradient mesh: the point under the pointer, else the four + // points around the patch there, take it. The selected meshes are looked at directly, so + // Object Selection by Path Only and the selection tolerance do not stop it. + if let widgets::PanelDrag::Paint { params, paint, .. } = &*d + && !params.is_null() + && let Some(color) = paint.color() + && crate::panels::proxy_cmd(app, false) == "paint.setFill" + && let Some((id, points)) = selected_mesh_drop(app, xf.to_doc(pos), xf.zoom) + { + let params = json!({"id": id.0, "points": points, "color": crate::panels::color_json(&color), "keepModel": true}); + if let Err(e) = app.run("object.mesh.setPointColor", params) { + app.status(e); + } + return; + } let hit = hit_at(app, xf.to_doc(pos), xf.zoom); // A scatter, art or pattern brush from the Brushes panel dropped where there is no art: a copy // of its art, centered where it is dropped, to edit and Alt-drag back onto the brush. @@ -148,3 +165,21 @@ pub(super) fn panel_drop(app: &mut VectorcraftApp, ui: &Ui, resp: &egui::Respons app.status(e); } } + +/// The selected, editable gradient mesh and its points that a solid color dropped at document +/// point `p` at `zoom` recolors: the topmost object within 5 screen pixels of `p` must be that mesh +/// (fills count even with Object Selection by Path Only, and clipping applies), and the points are +/// its point within 5 screen pixels, else the four points around its patch under `p`. +fn selected_mesh_drop(app: &VectorcraftApp, p: vectorcraft_geom::Point, zoom: f64) -> Option<(vectorcraft_doc::NodeId, Vec<usize>)> { + let tol = 5.0 / zoom.max(1e-9); + let leaf = hit_with(app, p, zoom, |doc, p, opt| { + vectorcraft_doc::hit::hit_test(doc, p, vectorcraft_doc::hit::HitOptions { path_only: false, tol: opt.tol.max(tol), ..opt }) + })? + .leaf; + let st = app.session.active()?; + if !st.selection.contains(leaf) || !st.doc.editable()(leaf) { + return None; + } + let Some(vectorcraft_doc::NodeKind::Mesh(m)) = st.doc.node(leaf).map(|n| &n.kind) else { return None }; + Some((leaf, vectorcraft_tools::meshedit::color_points(m, p, tol)?)) +} diff --git a/crates/ui-egui/src/canvas/cursor.rs b/crates/ui-egui/src/canvas/cursor.rs index 631809ed8a..864a708e34 100644 --- a/crates/ui-egui/src/canvas/cursor.rs +++ b/crates/ui-egui/src/canvas/cursor.rs @@ -84,6 +84,7 @@ pub(super) fn cursor_icon(c: Cursor) -> egui::CursorIcon { | Cursor::PathBracket | Cursor::TypeWidget | Cursor::LoadedText + | Cursor::LoadedTextLink | Cursor::LivePaintSelectFace | Cursor::LivePaintSelectEdge | Cursor::LivePaintSelectOutside => C::Default, diff --git a/crates/ui-egui/src/canvas/tests.rs b/crates/ui-egui/src/canvas/tests.rs index cc65044dfb..34d0777c51 100644 --- a/crates/ui-egui/src/canvas/tests.rs +++ b/crates/ui-egui/src/canvas/tests.rs @@ -2821,10 +2821,20 @@ fn the_art_renders_within_the_largest_texture_side() { assert_eq!(pixel_region(&xf, 1024), None, "more than the display's largest texture"); } +/// Run a test that compares two renders with the color settings that are active when it starts. +/// A test on another thread can change the process's active settings; this thread keeps its own. +fn keeping_color_settings(test: fn()) { + vectorcraft_color::cms::with_active(vectorcraft_color::cms::active(), test); +} + /// A placed document's bitmap made in the background renders the canvas again only where the /// objects showing its file are: both copies of the file are in the part rendered again. #[test] fn a_ready_placed_document_bitmap_renders_only_its_part_of_the_canvas() { + keeping_color_settings(a_ready_placed_bitmap); +} + +fn a_ready_placed_bitmap() { let mut app = VectorcraftApp::new(Session::new(), Default::default()); app.run("file.new", json!({"width":400,"height":300})).unwrap(); app.ui.task_bar = false; @@ -2859,9 +2869,8 @@ fn a_ready_placed_document_bitmap_renders_only_its_part_of_the_canvas() { }; let (_, delta) = frame_output(&mut app, &ctx); assert!(canvas(&app, delta).is_some_and(|(pos, _)| pos.is_none()), "the first frame renders all of it"); - let t = std::time::Instant::now(); - while vectorcraft_render::placed_document::busy() && t.elapsed().as_secs() < 20 { - std::thread::sleep(std::time::Duration::from_millis(5)); + while vectorcraft_render::placed_document::busy() { + std::thread::yield_now(); } let (_, delta) = frame_output(&mut app, &ctx); let (pos, size) = canvas(&app, delta).expect("the bitmap shows"); @@ -3137,6 +3146,10 @@ fn the_canvas_is_drawn_through_the_display_profile_while_the_preference_is_on() /// transparency grid renders the art again, and Outline converts the art alone. #[test] fn translucent_art_over_the_paper_is_blended_before_the_display_profile() { + keeping_color_settings(translucent_art_over_the_paper); +} + +fn translucent_art_over_the_paper() { use crate::display_profile::{Found, Reading}; let mut app = VectorcraftApp::new(Session::new(), Default::default()); app.run("file.new", json!({"width": 400, "height": 300})).unwrap(); @@ -3490,12 +3503,42 @@ fn the_first_view_reports_the_plug_in_effects_it_deferred() { } } +/// The render worker's side of a controlled worker: the test thread renders the jobs the canvas +/// queues, with [`crate::render_worker::render`] and the worker's own renderer and last frame. +struct WorkerSide { + jobs: std::sync::mpsc::Receiver<crate::render_worker::Job>, + done: std::sync::mpsc::Sender<crate::render_worker::Done>, + renderer: vectorcraft_render::Renderer, + kept: Option<crate::canvas::KeptFrame>, +} + +impl WorkerSide { + /// A controlled worker for the canvas, and its side. + fn start() -> (crate::render_worker::Worker, Self) { + let (worker, jobs, done) = crate::render_worker::Worker::test_channel(); + (worker, Self { jobs, done, renderer: vectorcraft_render::Renderer::new(), kept: None }) + } + + /// Render the newest job queued, as the worker thread does, and send its frame with a time of + /// 50 ms: the canvas then keeps sending the document's frames to the worker. False when no job + /// is queued. + fn render(&mut self) -> bool { + let Some(job) = self.jobs.try_iter().last() else { return false }; + let done = crate::render_worker::render(&mut self.renderer, &mut self.kept, job); + self.done.send(crate::render_worker::Done { ms: 50.0, ..done }).is_ok() + } +} + /// A drag of an object with raster effects (#1257): the drag's frames render while /// interacting and draw the object's drop shadow and filtered content from the rasters of the /// frame before; the frame after the drag renders without `interacting`, on the render worker, -/// and draws what a fresh renderer draws. +/// and draws what a fresh renderer draws. The worker is a controlled one ([`WorkerSide`]). #[test] fn dragging_an_object_with_raster_effects_draws_its_rasters_moved() { + keeping_color_settings(dragging_with_raster_effects); +} + +fn dragging_with_raster_effects() { let mut app = VectorcraftApp::new(Session::new(), Default::default()); app.session.execute("file.new", &json!({"width": 400, "height": 300})).unwrap(); app.canvas.worker_started = true; // render on this thread @@ -3528,17 +3571,13 @@ fn dragging_an_object_with_raster_effects_draws_its_rasters_moved() { } // The frame after the drag runs the effects again: on the worker, while the canvas shows // the drag's last frame. - app.canvas.worker = crate::render_worker::Worker::spawn(ctx.clone()); + let (worker, mut side) = WorkerSide::start(); + app.canvas.worker = Some(worker); app.session.pointer(&PointerEvent::new(PointerKind::Up, 181.9, 131.3), view).unwrap(); assert!(upload(&mut app).is_none(), "not rendered on this thread"); assert!(app.canvas.worker.as_ref().and_then(|w| w.pending.as_ref()).is_some_and(|k| !k.interacting), "sent to the worker"); - let until = std::time::Instant::now() + std::time::Duration::from_secs(60); - let mut after = None; - while after.is_none() && std::time::Instant::now() < until { - std::thread::sleep(std::time::Duration::from_millis(5)); - after = upload(&mut app); - } - let after = after.expect("the worker's frame arrives"); + assert!(side.render(), "the worker renders the frame"); + let after = upload(&mut app).expect("the worker's frame arrives"); assert!(app.canvas.key.as_ref().is_some_and(|k| !k.interacting)); assert!(!app.canvas.moved); app.canvas.worker = None; @@ -3554,6 +3593,10 @@ fn dragging_an_object_with_raster_effects_draws_its_rasters_moved() { /// without a drag, renders without `dragging` and draws the same. #[test] fn a_drag_on_the_canvas_draws_raster_effects_at_a_lower_resolution() { + keeping_color_settings(a_drag_at_a_lower_resolution); +} + +fn a_drag_at_a_lower_resolution() { let mut app = VectorcraftApp::new(Session::new(), Default::default()); app.session.execute("file.new", &json!({"width": 400, "height": 300})).unwrap(); app.canvas.worker_started = true; // render on this thread @@ -3609,9 +3652,13 @@ fn a_drag_on_the_canvas_draws_raster_effects_at_a_lower_resolution() { /// the blur reaches far past the raster budget, so the still frame keeps the backdrop's raster /// cropped to the view, and each frame of a Selection tool drag draws it from there instead of /// previewing it at the drag's lower resolution: on this thread, and on the worker, where the -/// frames of a heavy document render. +/// frames of a heavy document render. The worker is a controlled one ([`WorkerSide`]). #[test] fn a_drag_over_a_wide_blur_draws_the_blur_from_the_still_frame() { + keeping_color_settings(a_drag_over_a_wide_blur); +} + +fn a_drag_over_a_wide_blur() { for on_worker in [false, true] { let mut app = VectorcraftApp::new(Session::new(), Default::default()); app.session.execute("file.new", &json!({"width": 595, "height": 842})).unwrap(); @@ -3623,9 +3670,9 @@ fn a_drag_over_a_wide_blur_draws_the_blur_from_the_still_frame() { app.run("select.set", json!({"ids": [square]})).unwrap(); app.select_tool("selection"); let ctx = egui::Context::default(); - // One headless frame with `events`, then, on the worker, frames until the frame it renders - // for them is shown. - let run = |app: &mut VectorcraftApp, events: Vec<egui::Event>| { + // One headless frame with `events`, then, with a worker, its frames rendered and shown + // until none is pending. + let run = |app: &mut VectorcraftApp, side: &mut Option<WorkerSide>, events: Vec<egui::Event>| { let frame = |app: &mut VectorcraftApp, events| { let raw = egui::RawInput { screen_rect: Some(egui::Rect::from_min_size(Pos2::ZERO, vec2(1440.0, 870.0))), events, ..Default::default() }; @@ -3633,39 +3680,40 @@ fn a_drag_over_a_wide_blur_draws_the_blur_from_the_still_frame() { out.textures_delta.clear(); }; frame(app, events); - let until = std::time::Instant::now() + std::time::Duration::from_secs(60); - while app.canvas.worker.as_ref().is_some_and(|w| w.pending.is_some()) && std::time::Instant::now() < until { - std::thread::sleep(std::time::Duration::from_millis(5)); + for _ in 0..8 { + if !side.as_mut().is_some_and(WorkerSide::render) { + break; + } frame(app, vec![]); } + assert!(app.canvas.worker.as_ref().is_none_or(|w| w.pending.is_none()), "the worker's frame is shown"); }; let moved = |app: &VectorcraftApp| if on_worker { app.canvas.moved } else { app.canvas.renderer.stats.moved > 0 }; - run(&mut app, vec![]); + let mut side = None; + run(&mut app, &mut side, vec![]); if let Some(vm) = app.view_mut() { (vm.zoom, vm.center) = (2.0, Point::new(290.0, 410.0)); } if on_worker { - app.canvas.worker = crate::render_worker::Worker::spawn(ctx.clone()); + let (worker, worker_side) = WorkerSide::start(); + app.canvas.worker = Some(worker); app.canvas.last_ms = 50.0; + side = Some(worker_side); } - run(&mut app, vec![]); + run(&mut app, &mut side, vec![]); assert_eq!(app.canvas.from_worker, on_worker); assert!(!moved(&app), "a still frame, on the worker: {on_worker}"); let at = app.canvas_rect.unwrap().center(); let button = |pos, pressed| egui::Event::PointerButton { pos, button: egui::PointerButton::Primary, pressed, modifiers: Default::default() }; - run(&mut app, vec![egui::Event::PointerMoved(at)]); - run(&mut app, vec![button(at, true)]); + run(&mut app, &mut side, vec![egui::Event::PointerMoved(at)]); + run(&mut app, &mut side, vec![button(at, true)]); for step in [1.0, 2.0, 3.0] { - run(&mut app, vec![egui::Event::PointerMoved(at + vec2(13.0, 7.0) * step)]); + run(&mut app, &mut side, vec![egui::Event::PointerMoved(at + vec2(13.0, 7.0) * step)]); assert!(app.canvas.key.as_ref().is_some_and(|k| k.interacting && k.dragging), "step {step}, on the worker: {on_worker}"); assert_eq!(app.canvas.from_worker, on_worker, "step {step}"); - assert!( - !moved(&app), - "the blur drawn from the still frame's raster, step {step}, on the worker: {on_worker} ({} ms)", - app.perf.render_ms - ); + assert!(!moved(&app), "the blur drawn from the still frame's raster, step {step}, on the worker: {on_worker}"); } - run(&mut app, vec![button(at + vec2(39.0, 21.0), false)]); + run(&mut app, &mut side, vec![button(at + vec2(39.0, 21.0), false)]); let info = app.run("document.inspect", json!({})).unwrap(); let children = info["layers"][0]["children"].as_array().unwrap().clone(); let x0 = |id: &serde_json::Value| children.iter().find(|c| c["id"] == *id).unwrap()["bounds"]["x"].as_f64().unwrap(); @@ -3706,6 +3754,10 @@ fn an_interaction_stays_on_the_worker_that_drew_the_frame_shown() { /// leaves the document as it was (#1257): here a drag back to where it started. #[test] fn a_drag_back_to_its_start_renders_again_after_it() { + keeping_color_settings(a_drag_back_to_its_start); +} + +fn a_drag_back_to_its_start() { let mut app = VectorcraftApp::new(Session::new(), Default::default()); app.session.execute("file.new", &json!({"width": 400, "height": 300})).unwrap(); app.canvas.worker_started = true; // render on this thread @@ -3772,6 +3824,10 @@ fn canvas_render_jobs_use_renderer_limited_dimensions() { /// controlled worker cannot finish early, even if egui repeats a layout pass. #[test] fn cached_frames_keep_their_scale_during_resize_rotation_and_dpi_changes() { + keeping_color_settings(cached_frames_keep_their_scale); +} + +fn cached_frames_keep_their_scale() { for (old_rot, new_rot, old_ppp, new_ppp, pixel, resize_only) in [ // Isolate the original panel/window resize: zoom, pan, rotation and DPI stay fixed. (0.0, 0.0, 1.0, 1.0, false, true), @@ -3867,9 +3923,13 @@ fn cached_frames_keep_their_scale_during_resize_rotation_and_dpi_changes() { /// a heavy document), the canvas draws the last frame turned until that frame arrives: each /// corner goes where the new view puts the document point that the corner showed. The new frame /// is then drawn unturned. In Pixel Preview the last frame's pixels stay over the document rect -/// they cover. +/// they cover. The worker is a controlled one ([`WorkerSide`]). #[test] fn a_turned_view_draws_the_last_frame_turned_until_its_own_arrives() { + keeping_color_settings(a_turned_view); +} + +fn a_turned_view() { let mut app = VectorcraftApp::new(Session::new(), Default::default()); app.session.execute("file.new", &json!({"width": 400, "height": 300})).unwrap(); app.session.execute("shape.rectangle", &json!({"x": 100, "y": 50, "width": 200, "height": 200})).unwrap(); @@ -3890,7 +3950,8 @@ fn a_turned_view_draws_the_last_frame_turned_until_its_own_arrives() { }) }; // With a worker and a last frame that took 50 ms, the next frame renders on the worker. - app.canvas.worker = crate::render_worker::Worker::spawn(ctx.clone()); + let (worker, mut side) = WorkerSide::start(); + app.canvas.worker = Some(worker); app.canvas.last_ms = 50.0; app.run("view.rotateReset", json!({})).unwrap(); let mesh = art(&mut app).expect("the last frame, turned"); @@ -3908,11 +3969,8 @@ fn a_turned_view_draws_the_last_frame_turned_until_its_own_arrives() { let [a, b, _, d] = [0, 1, 2, 3].map(|i| mesh.vertices[i].pos); assert!((a + (b - a) * uv.x + (d - a) * uv.y - new.to_screen(p)).length() < 0.01, "the rectangle's corner"); // The worker's frame at 0° then covers the canvas unturned. - let until = std::time::Instant::now() + std::time::Duration::from_secs(60); - while app.canvas.key.as_ref().is_some_and(|k| k.rot != 0.0) && std::time::Instant::now() < until { - std::thread::sleep(std::time::Duration::from_millis(5)); - shapes(&mut app, &ctx); - } + assert!(side.render(), "the worker renders the frame at 0°"); + shapes(&mut app, &ctx); assert!(app.canvas.key.as_ref().is_some_and(|k| k.rot == 0.0), "the worker's frame arrives"); let b = art(&mut app).expect("the worker's frame").calc_bounds(); assert!((b.min - rect.min).length() < 0.01 && (b.max - rect.max).length() < 0.01, "{b:?} over {rect:?}"); @@ -3922,7 +3980,8 @@ fn a_turned_view_draws_the_last_frame_turned_until_its_own_arrives() { app.view_mut().unwrap().zoom = 8.0; shapes(&mut app, &ctx); let [x0, y0, ..] = app.canvas.key.as_ref().and_then(|k| k.pixel).expect("the pixels rendered"); - app.canvas.worker = crate::render_worker::Worker::spawn(ctx.clone()); + let (worker, _side) = WorkerSide::start(); + app.canvas.worker = Some(worker); app.canvas.last_ms = 50.0; app.view_mut().unwrap().rotation = 30.0; let mesh = art(&mut app).expect("the last frame's pixels"); @@ -3937,6 +3996,10 @@ fn a_turned_view_draws_the_last_frame_turned_until_its_own_arrives() { /// fill is dropped. #[test] fn a_pan_fills_the_area_the_last_frame_leaves_until_the_worker_frame_arrives() { + keeping_color_settings(a_pan_fills_the_area); +} + +fn a_pan_fills_the_area() { let ctx = egui::Context::default(); let mut app = VectorcraftApp::new(Session::new(), Default::default()); app.session.execute("file.new", &json!({"width": 400, "height": 300})).unwrap(); @@ -4062,6 +4125,10 @@ fn a_pan_fills_the_area_the_last_frame_leaves_until_the_worker_frame_arrives() { /// before. #[test] fn without_a_worker_a_heavy_canvas_is_reprojected_until_the_view_is_still() { + keeping_color_settings(without_a_worker_a_heavy_canvas); +} + +fn without_a_worker_a_heavy_canvas() { let mut app = VectorcraftApp::new(Session::new(), Default::default()); app.session.execute("file.new", &json!({"width": 400, "height": 300})).unwrap(); app.session.execute("shape.rectangle", &json!({"x": 100, "y": 50, "width": 200, "height": 200})).unwrap(); @@ -4172,6 +4239,10 @@ fn the_canvas_waits_only_while_the_view_of_a_slow_frame_changes() { /// worker's pixel copy ask for that. #[test] fn a_bitmap_made_for_another_documents_file_leaves_a_pan_waiting() { + keeping_color_settings(a_bitmap_for_another_documents_file); +} + +fn a_bitmap_for_another_documents_file() { let mut app = VectorcraftApp::new(Session::new(), Default::default()); app.session.execute("file.new", &json!({"width": 400, "height": 300})).unwrap(); app.session.execute("shape.rectangle", &json!({"x": 100, "y": 50, "width": 200, "height": 200})).unwrap(); @@ -9014,6 +9085,86 @@ fn swatches_and_proxy_paints_dropped_on_art_fill_the_object_hit() { assert!(matches!(fill(&app), Paint::Gradient(g) if g.geom.is_none())); } +#[test] +fn a_color_dropped_on_a_selected_mesh_recolors_the_point_or_patch_under_it() { + use vectorcraft_color::{Color, Paint}; + use vectorcraft_doc::{GradientMesh, NodeId, NodeKind}; + use widgets::PanelDrag; + let mut app = VectorcraftApp::new(Session::new(), Default::default()); + app.session.execute("file.new", &json!({"width": 400, "height": 300})).unwrap(); + let id = app.session.execute("shape.rectangle", &json!({"x": 50, "y": 50, "width": 100, "height": 100})).unwrap()["id"].as_u64().unwrap(); + let id = NodeId(id); + app.session.execute("object.mesh.create", &json!({"ids": [id.0], "rows": 2, "columns": 2})).unwrap(); + app.session.execute("select.none", &json!({})).unwrap(); + let ctx = egui::Context::default(); + frame(&mut app, &ctx, vec![]); + let xf = Xf::new(app.canvas_rect.unwrap(), app.view().unwrap()); + let drop = |app: &mut VectorcraftApp, d: PanelDrag, at: Point| { + let at = xf.to_screen(at); + egui::DragAndDrop::set_payload(&ctx, d); + let up = egui::Event::PointerButton { pos: at, button: egui::PointerButton::Primary, pressed: false, modifiers: Default::default() }; + frame(app, &ctx, vec![egui::Event::PointerMoved(at), up]); + }; + let mesh = |app: &VectorcraftApp| -> GradientMesh { + match &app.session.active().unwrap().doc.node(id).unwrap().kind { + NodeKind::Mesh(m) => m.clone(), + _ => panic!("not a gradient mesh"), + } + }; + let colors = |app: &VectorcraftApp| mesh(app).points.iter().map(|q| q.color).collect::<Vec<_>>(); + let undo_len = |app: &VectorcraftApp| app.session.active().unwrap().history.undo.len(); + let before = colors(&app); + let m = mesh(&app); + let (center, patch) = (m.points[4].p, Point::new((m.points[0].p.x + m.points[4].p.x) / 2.0, (m.points[0].p.y + m.points[4].p.y) / 2.0)); + let (red, blue) = (Color::rgb(1.0, 0.0, 0.0), Color::rgb(0.0, 0.0, 1.0)); + app.session.execute("select.set", &json!({"ids": [id.0]})).unwrap(); + // On a mesh point: that point alone. + drop(&mut app, PanelDrag::paint(Paint::solid(red)), center); + let after = colors(&app); + assert_eq!(after[4], red); + assert_eq!((0..9).filter(|i| after[*i] != before[*i]).count(), 1, "only the point under the pointer"); + // Inside a patch: its four points. + drop(&mut app, PanelDrag::paint(Paint::solid(blue)), patch); + let after = colors(&app); + assert_eq!([0, 1, 3, 4].map(|i| after[i]), [blue; 4]); + assert_eq!([2, 5, 6, 7, 8].map(|i| after[i]), [2, 5, 6, 7, 8].map(|i| before[i])); + assert!(app.session.active().unwrap().selection.contains(id), "the selection stays"); + // The same color again changes nothing and records no undo step. + let n = undo_len(&app); + drop(&mut app, PanelDrag::paint(Paint::solid(blue)), patch); + assert_eq!(undo_len(&app), n); + // With Object Selection by Path Only, a drop inside a patch still reaches its points, and a + // drop 4 screen pixels outside a corner point still reaches that point. + app.session.execute("prefs.set", &json!({"key": "objectSelectionByPathOnly", "value": true})).unwrap(); + let green = Color::rgb(0.0, 1.0, 0.0); + let far = Point::new((m.points[4].p.x + m.points[8].p.x) / 2.0, (m.points[4].p.y + m.points[8].p.y) / 2.0); + // Art below the patch, with its outline within the selection tolerance, is not taken for it. + let h = 1.0 / xf.zoom; + let below = app.session.execute("shape.rectangle", &json!({"x": far.x - h, "y": far.y - h, "width": 2.0 * h, "height": 2.0 * h})).unwrap()["id"] + .as_u64() + .unwrap(); + app.session.execute("object.arrange.sendToBack", &json!({"ids": [below]})).unwrap(); + app.session.execute("select.set", &json!({"ids": [id.0]})).unwrap(); + drop(&mut app, PanelDrag::paint(Paint::solid(green)), far); + assert_eq!([4, 5, 7, 8].map(|i| colors(&app)[i]), [green; 4]); + assert_ne!(app.session.active().unwrap().doc.node(NodeId(below)).unwrap().appearance.fill_paint(), Paint::solid(green)); + let off = 4.0 / xf.zoom; + drop(&mut app, PanelDrag::paint(Paint::solid(red)), Point::new(m.points[0].p.x - off, m.points[0].p.y)); + assert_eq!(colors(&app)[0], red, "the corner point within reach"); + assert_eq!(colors(&app)[1], blue); + // An unselected object on top of the mesh takes the drop itself. + app.session.execute("prefs.set", &json!({"key": "objectSelectionByPathOnly", "value": false})).unwrap(); + let c = m.points[4].p; + let cover = app.session.execute("shape.rectangle", &json!({"x": c.x - 10.0, "y": c.y - 10.0, "width": 20, "height": 20})).unwrap()["id"] + .as_u64() + .unwrap(); + app.session.execute("select.set", &json!({"ids": [id.0]})).unwrap(); + let before = colors(&app); + drop(&mut app, PanelDrag::paint(Paint::solid(green)), c); + assert_eq!(colors(&app), before, "the mesh under it keeps its colors"); + assert_eq!(app.session.active().unwrap().doc.node(NodeId(cover)).unwrap().appearance.fill_paint(), Paint::solid(green)); +} + #[test] fn dropping_the_appearance_thumbnail_on_art_copies_the_appearance() { use vectorcraft_doc::NodeId; @@ -13076,6 +13227,10 @@ fn pan_doc() -> (std::sync::Arc<vectorcraft_doc::Document>, CacheKey) { /// put in that frame moves with the pan, and the frame matches a whole render where the mark is not. #[test] fn a_whole_pixel_pan_copies_the_pixels_that_stay_on_screen() { + keeping_color_settings(a_whole_pixel_pan); +} + +fn a_whole_pixel_pan() { let (doc, key) = pan_doc(); for pan in [(10.0, 0.0), (-10.0, 0.0), (0.0, 7.0), (0.0, -7.0), (-13.0, 5.0)] { let mut r = vectorcraft_render::Renderer::new(); @@ -13103,6 +13258,10 @@ fn a_whole_pixel_pan_copies_the_pixels_that_stay_on_screen() { /// plug-in registry, and the plug-in is removed after. #[test] fn a_plug_in_change_draws_the_document_s_plug_in_effects_again() { + keeping_color_settings(a_plug_in_change); +} + +fn a_plug_in_change() { use vectorcraft_plugins::wat as tpl; let id = "test.canvas.redraw"; let module = vectorcraft_format::base64_encode(&wat::parse_str(tpl::module(&tpl::manifest(id, "effect", "{}"), tpl::ECHO, "", 1)).unwrap()); @@ -13145,6 +13304,10 @@ fn a_plug_in_change_draws_the_document_s_plug_in_effects_again() { /// compares such frames with a fresh render pixel by pixel. #[test] fn a_frame_renders_whole_when_anything_but_a_whole_pixel_pan_changed() { + keeping_color_settings(a_frame_renders_whole); +} + +fn a_frame_renders_whole() { let (doc, key) = pan_doc(); let other_opts = |f: &dyn Fn(&mut vectorcraft_render::RenderOptions)| { let mut job = pan_job(&doc, &key, (10.0, 0.0)); @@ -13222,6 +13385,10 @@ fn a_frame_renders_whole_when_anything_but_a_whole_pixel_pan_changed() { /// not kept. A frame that may not copy can still be kept. #[test] fn the_render_worker_keeps_one_frame_up_to_its_limit() { + keeping_color_settings(the_render_worker_keeps_one_frame); +} + +fn the_render_worker_keeps_one_frame() { let mut app = VectorcraftApp::new(Session::new(), Default::default()); app.session.execute("file.new", &json!({"width": 256, "height": 128})).unwrap(); let id = app.run("shape.rectangle", json!({"x": 16, "y": 16, "width": 64, "height": 64})).unwrap()["id"].clone(); @@ -13268,6 +13435,10 @@ fn the_render_worker_keeps_one_frame_up_to_its_limit() { /// worker renders whole matches a fresh render, and each copied frame is within one level of it. #[test] fn worker_frames_match_a_fresh_render_through_a_session() { + keeping_color_settings(worker_frames_match_a_fresh_render); +} + +fn worker_frames_match_a_fresh_render() { let (doc, key) = pan_doc(); let mut edited = (*doc).clone(); edited.layers.reverse(); @@ -13353,6 +13524,10 @@ fn worker_frames_match_a_fresh_render_through_a_session() { /// not keep such a frame for the pan to copy from. #[test] fn a_pan_over_art_the_frame_size_decides_renders_whole() { + keeping_color_settings(a_pan_over_art); +} + +fn a_pan_over_art() { let (_, key) = pan_doc(); let effect = |effect: &str, params: serde_json::Value| { let mut app = VectorcraftApp::new(Session::new(), Default::default()); @@ -13408,6 +13583,10 @@ fn a_pan_over_art_the_frame_size_decides_renders_whole() { /// before and only once. #[test] fn a_frame_with_copied_pixels_renders_whole_once_the_view_stops() { + keeping_color_settings(a_frame_with_copied_pixels); +} + +fn a_frame_with_copied_pixels() { let mut app = VectorcraftApp::new(Session::new(), Default::default()); app.session.execute("file.new", &json!({"width": 400, "height": 300})).unwrap(); app.canvas.worker_started = true; @@ -13454,6 +13633,10 @@ fn a_frame_with_copied_pixels_renders_whole_once_the_view_stops() { /// first step of the next pan copies from it. The jobs are the ones the canvas asks for. #[test] fn a_pan_after_the_settling_frame_copies() { + keeping_color_settings(a_pan_after_the_settling_frame); +} + +fn a_pan_after_the_settling_frame() { let mut app = VectorcraftApp::new(Session::new(), Default::default()); app.session.execute("file.new", &json!({"width": 400, "height": 300})).unwrap(); app.canvas.worker_started = true; @@ -13552,6 +13735,10 @@ fn the_render_worker_thread_copies_a_pan() { /// meanwhile, does not queue the frame again while it renders, and shows it once it lands. #[test] fn a_documents_first_frame_renders_on_the_worker() { + keeping_color_settings(a_documents_first_frame); +} + +fn a_documents_first_frame() { let mut app = VectorcraftApp::new(Session::new(), Default::default()); app.session.execute("file.new", &json!({"width": 400, "height": 300})).unwrap(); app.canvas.worker_started = true; diff --git a/crates/ui-egui/src/cursors.rs b/crates/ui-egui/src/cursors.rs index bcb6744c12..4db2e5cb45 100644 --- a/crates/ui-egui/src/cursors.rs +++ b/crates/ui-egui/src/cursors.rs @@ -310,6 +310,19 @@ fn loaded_text(p: &mut Ink, o: Pos2) { } } +/// Loaded text over an object a click threads it into: the loaded text's block with a link +/// badge (two chain rings) below right. +fn loaded_text_link(p: &mut Ink, o: Pos2) { + loaded_text(p, o); + let rings = [o + vec2(13.0, 17.0), o + vec2(18.0, 17.0)]; + for c in rings { + p.circle_stroke(c, 3.2, Stroke::new(3.2, HALO)); + } + for c in rings { + p.circle_stroke(c, 3.2, Stroke::new(1.3, INK)); + } +} + /// The gradient annotator's stop cursors: the arrow with a plus (add a stop) or minus (delete it) /// badge. fn stop_badge(p: &mut Ink, o: Pos2, add: bool) { @@ -554,7 +567,7 @@ fn magnifier(p: &mut Ink, o: Pos2, out: bool) { /// Every cursor with a glyph: its own, drawn here, or the one it borrows. #[cfg(test)] -const GLYPHS: [Cursor; 98] = [ +const GLYPHS: [Cursor; 99] = [ Cursor::Hand, Cursor::HandGrab, Cursor::ZoomIn, @@ -603,6 +616,7 @@ const GLYPHS: [Cursor; 98] = [ Cursor::PathBracket, Cursor::TypeWidget, Cursor::LoadedText, + Cursor::LoadedTextLink, Cursor::ShapeBuilder, Cursor::ShapeBuilderErase, Cursor::Lasso, @@ -744,6 +758,7 @@ fn glyph(c: Cursor, p: Pos2) -> Option<Vec<Shape>> { Cursor::PathBracket => path_bracket(ink, p), Cursor::TypeWidget => type_widget(ink, p), Cursor::LoadedText => loaded_text(ink, p), + Cursor::LoadedTextLink => loaded_text_link(ink, p), Cursor::ShapeBuilder => shape_builder(ink, p, false), Cursor::ShapeBuilderErase => shape_builder(ink, p, true), Cursor::LivePaintBucket => paint_bucket(ink, p, false), @@ -789,6 +804,27 @@ pub fn os_cursors(build: bool, wayland: bool) -> bool { build && !wayland } +/// The cursor a panel shows where a click or a drop adds something, such as a stop under the +/// Gradient panel's ramp or a copy of rows Alt-dragged in the Layers panel (#8217): the white arrow +/// with a plus that Group Selection shows for a click that adds the next group. Windows has no system copy cursor (winit shows the plain arrow for +/// `CursorIcon::Copy`), so where the window shows glyphs as OS cursors ([`os_cursors`]) the panel +/// hands it this glyph; elsewhere (macOS, Wayland, the web, `VECTORCRAFT_SYSTEM_CURSORS`) the +/// system's copy cursor shows (#8241). Set every frame it shows: the canvas and egui reset it. +pub(crate) fn set_add_cursor(app: &mut crate::VectorcraftApp, ctx: &egui::Context) { + ctx.set_cursor_icon(egui::CursorIcon::Copy); + if add_cursor_is_a_glyph(app) { + // As the canvas sizes its glyphs (User Interface › Scale Cursor Proportional to UI). + let ui_scale = if app.session.prefs.scale_cursor_with_ui { 1.0 } else { ctx.zoom_factor() }; + ctx.set_cursor_image(app.canvas.cursors.get(Cursor::GroupSelection, ctx.pixels_per_point() / ui_scale)); + } +} + +/// Does [`set_add_cursor`] hand the OS its glyph (rather than ask for the system copy cursor)? +/// Where the window shows glyphs as OS cursors, unless `VECTORCRAFT_SYSTEM_CURSORS` opts out. +pub(crate) fn add_cursor_is_a_glyph(app: &crate::VectorcraftApp) -> bool { + std::env::var_os("VECTORCRAFT_SYSTEM_CURSORS").is_none() && os_cursors(OS_CURSORS, app.services.wayland) +} + /// Does the window hide the pointer only while it is the key window? macOS does: winit hides it with /// a cursor rect holding a transparent cursor, and macOS applies the rect only in the key window. /// Over a window behind another app or under a sheet, the system pointer shows (#2020). diff --git a/crates/ui-egui/src/cursors/tests.rs b/crates/ui-egui/src/cursors/tests.rs index 8ac9a3ab2f..d7789949a7 100644 --- a/crates/ui-egui/src/cursors/tests.rs +++ b/crates/ui-egui/src/cursors/tests.rs @@ -79,6 +79,22 @@ fn loaded_text_cursor_is_not_the_text_i_beam() { assert!(pixel(&loaded, hx, hy)[3] > 200, "hotspot lies on the drawn frame"); } +/// Loaded text over an object a click threads it into is drawn as its own glyph: the loaded +/// text's block with a link badge below right, so it has more ink than the plain loaded text. +#[test] +fn loaded_text_link_cursor_is_the_loaded_text_with_a_link_badge() { + assert!(Cursor::LoadedTextLink.stand_in().is_none()); + for ppp in [1.0f32, 2.0] { + let link = rasterize(Cursor::LoadedTextLink, ppp).expect("link bitmap"); + let loaded = rasterize(Cursor::LoadedText, ppp).expect("loaded text bitmap"); + assert_ne!(link, loaded, "a glyph of its own at {ppp}x"); + let ink = |img: &CustomCursorImage| img.rgba.as_chunks::<4>().0.iter().filter(|p| p[0] < 64 && p[3] > 200).count(); + assert!(ink(&link) > ink(&loaded), "the badge adds ink at {ppp}x"); + let [hx, hy] = link.hotspot.map(usize::from); + assert!(pixel(&link, hx, hy)[3] > 200, "hotspot lies on the drawn frame at {ppp}x"); + } +} + #[test] fn every_glyph_becomes_a_bitmap_with_its_hotspot_inside() { for ppp in [1.0, 1.25, 1.5, 2.0, 3.0] { diff --git a/crates/ui-egui/src/dialogs.rs b/crates/ui-egui/src/dialogs.rs index dc8c6f09a8..9e54eb12f6 100644 --- a/crates/ui-egui/src/dialogs.rs +++ b/crates/ui-egui/src/dialogs.rs @@ -179,6 +179,9 @@ use crate::{VectorcraftApp, widgets}; type DialogResult = Result<Value, String>; +/// A dialog's Reset ([`DialogSpec::reset`]). +type ResetFn = fn(&VectorcraftApp, &mut Dialog) -> Result<(), String>; + /// The shared dialog frame's inner margin, and the least room it leaves at the window's edges. const MARGIN: i8 = 22; const EDGE_GAP: f32 = 8.0; @@ -219,8 +222,8 @@ pub(crate) struct DialogSpec { pub alternate: Option<(&'static str, &'static str)>, /// Puts the fields back to their defaults. While Alt (Option on macOS) is held, the Cancel /// button of a dialog with an `ok` reads Reset; Reset (or `ui.dialogReset`) runs this and the - /// dialog stays open. - pub reset: Option<fn(&VectorcraftApp, &mut Dialog)>, + /// dialog stays open. An error leaves the dialog as it was. + pub reset: Option<ResetFn>, pub min_width: f32, pub max_width: Option<f32>, /// The body runs a live preview interaction that Cancel rolls back. @@ -728,12 +731,12 @@ pub(crate) fn can_reset(app: &VectorcraftApp) -> bool { } /// Reset (`ui.dialogReset`, or Cancel while Alt or Option is held): the open dialog's fields go -/// back to their defaults and it stays open → the dialog; an error when no dialog is open or the -/// open one has no Reset. +/// back to their defaults and it stays open → the dialog; an error when no dialog is open, the +/// open one has no Reset, or its Reset fails (the dialog is then left as it was). pub(crate) fn reset(app: &mut VectorcraftApp) -> DialogResult { let Some(mut d) = app.ui.dialog.clone() else { return Err("no dialog open".into()) }; let Some(reset) = spec(&d.kind).reset else { return Err("the open dialog has no Reset".into()) }; - reset(app, &mut d); + reset(app, &mut d)?; let out = serde_json::to_value(&d).unwrap_or_default(); app.ui.dialog = Some(d); Ok(out) diff --git a/crates/ui-egui/src/dialogs/command.rs b/crates/ui-egui/src/dialogs/command.rs index 9cd92b5428..9cb59853a6 100644 --- a/crates/ui-egui/src/dialogs/command.rs +++ b/crates/ui-egui/src/dialogs/command.rs @@ -201,10 +201,35 @@ fn choices(command: &str, key: &str) -> Option<form::Choices> { (crate::addons::pathtools::COMMON_TANGENTS, "tangents") => Some(crate::addons::pathtools::TANGENT_KINDS), (crate::addons::image::REMOVE_BACKGROUND | crate::addons::image::COLOR_MASK, "background") => Some(crate::addons::image::BACKGROUNDS), (crate::addons::image::REMOVE_BACKGROUND | crate::addons::image::COLOR_MASK, "match") => Some(crate::addons::image::MATCHES), + ("object.rasterize", "antiAlias") => Some(RASTERIZE_ANTI_ALIAS), + ("object.rasterize", "background") => Some(RASTERIZE_BACKGROUNDS), + ("object.mesh.create", "appearance") => Some(MESH_APPEARANCES), + ("object.repeat.options", "gridType") => Some(REPEAT_GRID_TYPES), _ => None, } } +/// Object › Rasterize › Anti-aliasing: the modes `vectorcraft_render::AntiAlias` names, with its +/// labels, as the Rasterize effect's dialog lists them (`effect.rs`, `own_choices`). +const RASTERIZE_ANTI_ALIAS: form::Choices = &[("None", "none"), ("Art Optimized", "art"), ("Type Optimized", "type")]; + +/// Object › Rasterize › Background, as Document Raster Effects Settings and the Rasterize effect +/// list it. A color the command was given another way (black, a hex color) shows as it is. +const RASTERIZE_BACKGROUNDS: form::Choices = &[("White", "white"), ("Transparent", "transparent")]; + +/// Object › Create Gradient Mesh › Appearance: the values `object.mesh.create` takes. +const MESH_APPEARANCES: form::Choices = &[("Flat", "flat"), ("To Center", "center"), ("To Edge", "edge")]; + +/// Repeat Options › Grid Type of a grid repeat: the tile types, labeled as the Pattern Options +/// panel labels them (`panels/pattern_options.rs`, `TILE_LABELS`). +const REPEAT_GRID_TYPES: form::Choices = &[ + ("Grid", "grid"), + ("Brick by Row", "brickByRow"), + ("Brick by Column", "brickByColumn"), + ("Hex by Column", "hexByColumn"), + ("Hex by Row", "hexByRow"), +]; + /// Object › Rasterize › Color Model: the values `object.rasterize` takes, the document's own /// colour model first (#5660). fn rasterize_color_models(command: &str, key: &str, cmyk: bool) -> Option<form::Choices> { @@ -688,4 +713,147 @@ mod tests { h.event(egui::Event::PointerButton { pos: ok, button, pressed: false, modifiers }); h.run_steps(3); } + + /// The dialog that is open in `app`, drawn by a kittest harness (the first frame installs the + /// fonts). + fn dialog_harness(app: VectorcraftApp) -> egui_kittest::Harness<'static, VectorcraftApp> { + let mut fonts = false; + let mut h = egui_kittest::Harness::builder().with_size(egui::vec2(1100.0, 900.0)).build_ui_state( + move |ui, app: &mut VectorcraftApp| { + if !std::mem::replace(&mut fonts, true) { + crate::theme::install_fonts(ui.ctx()); + return; + } + crate::dialogs::show(app, ui.ctx()); + }, + app, + ); + h.run_steps(5); + h + } + + /// Opens the dropdown labeled `label` and picks `choice` in it: the field must be a dropdown, + /// not a text field. + fn pick(h: &mut egui_kittest::Harness<'_, VectorcraftApp>, label: &str, choice: &str) { + use egui::accesskit::Role; + use egui_kittest::kittest::Queryable; + assert!(h.query_by_role_and_label(Role::TextInput, label).is_none(), "{label} is not a text field"); + h.get_by_role_and_label(Role::ComboBox, label).click(); + h.run_steps(3); + h.get_by_label(choice).click(); + h.run_steps(3); + } + + /// The choices this dialog lists for Rasterize, Create Gradient Mesh and Repeat Options are the + /// values their commands take (#8020, #7991): each one runs, and every language with complete + /// menus has a row for each label. + #[test] + fn choice_fields_list_the_values_their_commands_take() { + use vectorcraft_doc::pattern::TileType; + use vectorcraft_render::AntiAlias; + let listed = |command: &str, key: &str| choices(command, key).unwrap_or_else(|| panic!("{command} {key}: a choice")); + let aa: Vec<(&str, &str)> = AntiAlias::ALL.iter().map(|a| (a.label(), a.id())).collect(); + assert_eq!(listed("object.rasterize", "antiAlias"), aa.as_slice()); + for (_, value) in listed("object.rasterize", "background") { + assert!(vectorcraft_doc::Background::parse(value).is_some(), "{value}"); + } + for (label, value) in listed("object.repeat.options", "gridType") { + let tile = TileType::parse(value, None).unwrap_or_else(|| panic!("{value}")); + assert_eq!((tile.id(), tile.label()), (*value, *label)); + } + let run = |command: &str, key: &str, value: &str| { + let mut s = Session::new(); + s.execute("file.new", &json!({"width": 100, "height": 100})).unwrap(); + let id = s.execute("shape.rectangle", &json!({"x": 10, "y": 10, "width": 20, "height": 20})).unwrap()["id"].clone(); + if command == "object.repeat.options" { + s.execute("object.repeat.grid", &json!({"ids": [id], "rows": 2, "cols": 2})).unwrap(); + } + s.execute(command, &json!({ key: value })).unwrap_or_else(|e| panic!("{command} {key} {value}: {e}")); + }; + let fields = [ + ("object.rasterize", "antiAlias"), + ("object.rasterize", "background"), + ("object.mesh.create", "appearance"), + ("object.repeat.options", "gridType"), + ]; + for (command, key) in fields { + for (label, value) in listed(command, key) { + run(command, key, value); + for lang in crate::i18n::Lang::all().filter(|l| l.complete_menus()) { + assert!(crate::i18n::has(lang, label), "{}: {label}", lang.code()); + } + } + } + } + + /// Object › Rasterize… shows Anti Alias and Background as dropdowns of the values + /// `object.rasterize` takes. OK rasterizes with the picked ones as one undo step, and a value + /// the dialog doesn't list (black) shows as it is and is sent unchanged. + #[test] + fn rasterize_anti_alias_and_background_are_dropdowns() { + let corner = |app: &VectorcraftApp| { + let st = app.session.active().unwrap(); + let key = st.selection.objects.iter().find_map(|id| match st.doc.node(*id).map(|n| &n.kind) { + Some(NodeKind::Image(i)) => Some(i.key.clone()), + _ => None, + }); + let decoded = craft_image_codecs::decode(&st.doc.images[&key.expect("the ellipse became an image")].bytes).unwrap(); + image::RgbaImage::from_raw(decoded.width(), decoded.height(), decoded.to_rgba8()).unwrap().get_pixel(0, 0).0 + }; + let mut app = VectorcraftApp::new(Session::new(), Default::default()); + app.run("file.new", json!({"width": 200, "height": 200})).unwrap(); + let id = app.run("shape.ellipse", json!({"x": 10, "y": 10, "width": 40, "height": 40})).unwrap()["id"].as_u64().unwrap(); + app.run("paint.setFill", json!({"color": "#ff0000", "ids": [id]})).unwrap(); + app.run("select.set", json!({"ids": [id]})).unwrap(); + let steps = app.session.active().unwrap().history.undo.len(); + crate::menus::invoke(&mut app, "object.rasterize", json!({})); + let d = app.ui.dialog.as_ref().unwrap(); + assert_eq!((d.str("antiAlias"), d.str("background")), ("art".into(), "transparent".into())); + let mut h = dialog_harness(app); + pick(&mut h, "Anti Alias:", "Type Optimized"); + pick(&mut h, "Background:", "White"); + let d = h.state().ui.dialog.as_ref().unwrap(); + assert_eq!((d.str("antiAlias"), d.str("background")), ("type".into(), "white".into())); + let app = h.state_mut(); + crate::dialogs::confirm(app).unwrap(); + assert_eq!(app.session.active().unwrap().history.undo.len(), steps + 1, "one undo step"); + assert_eq!(corner(app), [255, 255, 255, 255], "a white background"); + // A background the dialog doesn't list stays as it is. + app.run("edit.undo", json!({})).unwrap(); + app.run("select.set", json!({"ids": [id]})).unwrap(); + crate::menus::invoke(app, "object.rasterize", json!({})); + app.ui.dialog.as_mut().unwrap().fields.insert("background".into(), json!("black")); + frame(app); + assert_eq!(app.ui.dialog.as_ref().unwrap().str("background"), "black", "drawing the dropdown keeps it"); + crate::dialogs::confirm(app).unwrap(); + assert_eq!(corner(app), [0, 0, 0, 255], "a black background"); + } + + /// Create Gradient Mesh… shows Appearance, and Repeat Options for a grid repeat its Grid Type, + /// as dropdowns of the values their commands take; OK applies the picked one. + #[test] + fn mesh_appearance_and_repeat_grid_type_are_dropdowns() { + let mut app = VectorcraftApp::new(Session::new(), Default::default()); + app.run("file.new", json!({"width": 200, "height": 200})).unwrap(); + app.run("shape.rectangle", json!({"x": 10, "y": 10, "width": 50, "height": 50})).unwrap(); + let entries = crate::menus::menu_entries(&app); + let item = entries.iter().find(|e| e.path == ["Object"] && e.label == "Create Gradient Mesh…").expect("listed"); + let (cmd, p) = crate::menus::click_target(&item.label, item.command.as_deref().unwrap(), &item.params); + crate::menus::invoke(&mut app, &cmd, p); + let mut h = dialog_harness(app); + pick(&mut h, "Appearance:", "To Center"); + let app = h.state_mut(); + assert_eq!(app.ui.dialog.as_ref().unwrap().str("appearance"), "center"); + crate::dialogs::confirm(app).unwrap(); + let st = app.session.active().unwrap(); + assert!(st.selection.objects.iter().any(|id| matches!(st.doc.node(*id).map(|n| &n.kind), Some(NodeKind::Mesh(_)))), "a mesh"); + + let mut h = dialog_harness(grid_options_app()); + pick(&mut h, "Grid Type:", "Brick by Row"); + let app = h.state_mut(); + assert_eq!(app.ui.dialog.as_ref().unwrap().str("gridType"), "brickByRow"); + crate::dialogs::confirm(app).unwrap(); + let fields = crate::panels::pattern_options::repeat_fields(app).unwrap(); + assert_eq!(fields["gridType"], json!("brickByRow")); + } } diff --git a/crates/ui-egui/src/dialogs/flare_options.rs b/crates/ui-egui/src/dialogs/flare_options.rs index b94f6a7c2e..9c374f3cf5 100644 --- a/crates/ui-egui/src/dialogs/flare_options.rs +++ b/crates/ui-egui/src/dialogs/flare_options.rs @@ -136,10 +136,11 @@ fn preview_command(app: &VectorcraftApp, d: &Dialog) -> Option<(String, Value)> /// Reset (Cancel with Alt or Option held): every option goes back to the Flare tool's default /// (`FLARE_OPTIONS`, with Rays and Rings on). The dialog keeps a click's `x` and `y`, so OK still draws there. -fn reset(_: &VectorcraftApp, d: &mut Dialog) { +fn reset(_: &VectorcraftApp, d: &mut Dialog) -> Result<(), String> { if let Value::Object(defaults) = vectorcraft_tools::create("flare").options() { d.fields.extend(defaults); } + Ok(()) } /// OK: set the tool's options; opened by a click, draw a flare there with them. diff --git a/crates/ui-egui/src/dialogs/objects_on_path_options.rs b/crates/ui-egui/src/dialogs/objects_on_path_options.rs index 8a02cd37cf..4726e0762a 100644 --- a/crates/ui-egui/src/dialogs/objects_on_path_options.rs +++ b/crates/ui-egui/src/dialogs/objects_on_path_options.rs @@ -40,9 +40,10 @@ pub fn open(app: &mut VectorcraftApp) -> Value { } /// Reset: the center and 0. -fn reset(_: &VectorcraftApp, d: &mut Dialog) { +fn reset(_: &VectorcraftApp, d: &mut Dialog) -> Result<(), String> { d.fields.insert("pivot".into(), json!(CENTER)); d.fields.insert("rotate".into(), json!(0.0)); + Ok(()) } fn body(app: &mut VectorcraftApp, ui: &mut egui::Ui, d: &mut Dialog) -> bool { @@ -61,8 +62,10 @@ fn body(app: &mut VectorcraftApp, ui: &mut egui::Ui, d: &mut Dialog) -> bool { ui.add_space(8.0); let r = widgets::flat_button(ui, tl!("Reset"), 64.0); r.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, ui.is_enabled(), tl!("Reset"))); - if r.clicked() { - reset(app, d); + if r.clicked() + && let Err(e) = reset(app, d) + { + app.status(e); } false } diff --git a/crates/ui-egui/src/dialogs/print.rs b/crates/ui-egui/src/dialogs/print.rs index 017e669d9c..ebaad1749a 100644 --- a/crates/ui-egui/src/dialogs/print.rs +++ b/crates/ui-egui/src/dialogs/print.rs @@ -746,13 +746,19 @@ fn general(app: &VectorcraftApp, ui: &mut egui::Ui, d: &mut Dialog) { let on = scaling == PrintScaling::Custom || tiles; let linked = get(d, SCALE_LINKED).as_bool() == Some(true); ui.label(tl!("W:")); - if let Some(w) = percent(ui, d, "scale.width", on).filter(|_| linked) { + let w = percent(ui, d, "scale.width", on); + if let Some(w) = w.filter(|_| linked) { set(d, "scale.height", json!(w)); } ui.label(tl!("H:")); - if let Some(h) = percent(ui, d, "scale.height", on).filter(|_| linked) { + let h = percent(ui, d, "scale.height", on); + if let Some(h) = h.filter(|_| linked) { set(d, "scale.width", json!(h)); } + // A typed W or H is what the next `ui.dialog.set` changes from. + if w.is_some() || h.is_some() { + see_scale(&mut d.fields); + } ui.add_enabled_ui(on, |ui| scale_link(ui, d, linked)); }); row(ui, tl!("Overlap:"), |ui| length(ui, d, "overlap", unit, tiles)); @@ -779,11 +785,13 @@ fn output(ui: &mut egui::Ui, d: &mut Dialog, pv: &Result<Value, String>) { flag(ui, d, "output.spotsToProcess", tl!("Convert All Spot Colors to Process"), separations); flag(ui, d, "output.overprintBlack", tl!("Overprint Black"), separations); heading(ui, tl!("Document Ink Options")); - let inks = pv.as_ref().ok().and_then(|v| v["inks"].as_array()).map(Vec::as_slice).unwrap_or_default(); + // Every ink of the document, the spot inks printing as process (no plate) included. + let inks = pv.as_ref().ok().and_then(|v| v["documentInks"].as_array()).map(Vec::as_slice).unwrap_or_default(); if !separations || inks.is_empty() { note(ui, tl!("Separations list the document's inks here: one page per ink that prints.")); return; } + let all_spots = get(d, "output.spotsToProcess").as_bool() == Some(true); let t = Tokens::get(ui.ctx()); egui::Grid::new("print-inks").num_columns(4).spacing([12.0, 4.0]).show(ui, |ui| { for h in [tl!("Print"), tl!("Ink"), tl!("Frequency"), tl!("Angle")] { @@ -792,17 +800,31 @@ fn output(ui: &mut egui::Ui, d: &mut Dialog, pv: &Result<Value, String>) { ui.end_row(); for ink in inks { let name = ink["name"].as_str().unwrap_or_default(); + // A spot ink printing as process has no plate: its plate options wait, dimmed, for it + // to print as a spot ink again. + let process = ink["convertToProcess"] == true; let on = ink["print"].as_bool().unwrap_or(true); - if widgets::check_box(ui, name, on, true) { + if widgets::check_box(ui, name, on, !process) { set_ink(d, name, "print", json!(!on)); } - let spot = if ink["spot"] == true { format!(" ({})", tl!("spot")) } else { String::new() }; - ui.label(egui::RichText::new(format!("{name}{spot}")).color(t.text)); + ui.horizontal(|ui| { + if ink["spot"] == true { + if ink_kind_button(ui, name, process, !all_spots) { + set_ink(d, name, "convertToProcess", json!(!process)); + } + } else { + ui.add_space(INK_KIND); + } + let spot = if ink["spot"] == true { format!(" ({})", tl!("spot")) } else { String::new() }; + ui.label(egui::RichText::new(format!("{name}{spot}")).color(t.text)); + }); for (k, suffix) in [("frequency", " lpi"), ("angle", "°")] { let v = ink[k].as_f64().unwrap_or(0.0); let heading = if k == "frequency" { tl!("Frequency") } else { tl!("Angle") }; let field_name = format!("{heading} {name}"); - if let Some(x) = widgets::plain_field_named(ui, ("print-ink", name, k), Some(&field_name), v, suffix, 2, 72.0) { + let typed = + ui.add_enabled_ui(!process, |ui| widgets::plain_field_named(ui, ("print-ink", name, k), Some(&field_name), v, suffix, 2, 72.0)); + if let Some(x) = typed.inner { set_ink(d, name, k, json!(x)); } } @@ -812,6 +834,42 @@ fn output(ui: &mut egui::Ui, d: &mut Dialog, pv: &Result<Value, String>) { note(ui, tl!("Frequencies and angles are the output device's to apply.")); } +/// The size of the spot or process icon before a spot ink's name. +const INK_KIND: f32 = 18.0; + +/// The icon before spot ink `name`'s name: a spot icon while it prints as a spot ink, the four +/// process inks while it prints as process (`process`). A click switches it; dimmed (`enabled` +/// off) while Convert All Spot Colors to Process converts every spot ink. Whether it was clicked. +fn ink_kind_button(ui: &mut egui::Ui, name: &str, process: bool, enabled: bool) -> bool { + let label = if process { + crate::i18n::fmt(tl!("Keep {name} as spot"), &[("name", name)]) + } else { + crate::i18n::fmt(tl!("Convert {name} to process"), &[("name", name)]) + }; + let sense = if enabled { egui::Sense::click() } else { egui::Sense::hover() }; + let (rect, resp) = ui.allocate_exact_size(egui::Vec2::splat(INK_KIND), sense); + let t = Tokens::get(ui.ctx()); + if enabled && resp.hovered() { + ui.painter().rect_filled(rect, 3.0, t.hover); + } + let icon = rect.shrink(4.0); + if process { + let q = icon.size() / 2.0; + for (i, c) in crate::panels::swatches::CMYK_INKS.into_iter().enumerate() { + let c = if enabled { c } else { c.gamma_multiply(0.4) }; + let at = icon.min + egui::vec2((i % 2) as f32 * q.x, (i / 2) as f32 * q.y); + ui.painter().rect_filled(egui::Rect::from_min_size(at, q), 0.0, c); + } + } else { + let color = if enabled { t.icon } else { t.text_disabled }; + ui.painter().circle_stroke(icon.center(), icon.width() / 2.0, egui::Stroke::new(1.0, color)); + ui.painter().circle_filled(icon.center(), icon.width() / 5.0, color); + } + resp.widget_info(|| widgets::icon_button_info(enabled, false, &label)); + let resp = resp.on_hover_text(label); + enabled && resp.clicked() +} + /// Set option `key` of ink `name` in `output.inks` (the ink gets its own entry the first time). fn set_ink(d: &mut Dialog, name: &str, key: &str, value: Value) { let mut inks = get(d, "output.inks").as_array().cloned().unwrap_or_default(); diff --git a/crates/ui-egui/src/dialogs/save_for_web.rs b/crates/ui-egui/src/dialogs/save_for_web.rs index fb5e47823f..589d1dfdce 100644 --- a/crates/ui-egui/src/dialogs/save_for_web.rs +++ b/crates/ui-egui/src/dialogs/save_for_web.rs @@ -9,7 +9,10 @@ //! `ui.dialog.set`, or `preset` to load a preset), plus the dialog's own: `__view` (`original`, //! `optimized`, `2up`, `4up`), `__zoom` (`fit` or a percentage), `__kbps` (connection speed), //! `__color` (the colour table's selected colour, by source), `__presetName` (shown while saving a -//! preset) and `__hasSlices`. Save… remembers +//! preset) and `__hasSlices`. Optimize to File Size… (`__optimizeOpen: true`) shows `__optimizeK` (the desired size in K), +//! `__optimizeStart` (`current`, `auto`) and with slices `__optimizeUse` (`allSlices`, +//! `eachSlice`, `currentSlice`); `__optimizeGo: true` runs `webExport.optimizeToFileSize` and +//! takes the settings it finds, and `__optimized` holds its result. Save… remembers //! the settings and writes the files (`file.saveForWeb`); Done only remembers them; Preview in //! Browser opens the HTML page (`file.saveForWeb.browser`). While Alt (Option on macOS) is held, //! Cancel reads Reset, which puts the remembered settings back and leaves the dialog open @@ -71,6 +74,11 @@ const MATTES: [&str; 3] = ["none", "white", "black"]; const MATTE_LABELS: [&str; 4] = ["None", "White", "Black", "Other"]; /// JPEG quality steps: (label, quality). const QUALITIES: [(&str, u8); 5] = [("Low", 10), ("Medium", 30), ("High", 60), ("Very High", 80), ("Maximum", 100)]; +/// Optimize to File Size's Start With (`__optimizeStart`) and Use (`__optimizeUse`) choices. +const START_WITH: [(&str, &str); 2] = [("current", "Current Settings"), ("auto", "Auto Select GIF/JPEG")]; +const SIZE_USE: [(&str, &str); 3] = [("allSlices", "Total of All Slices"), ("eachSlice", "Each Slice"), ("currentSlice", "Current Slice")]; +/// The fields of Optimize to File Size's rows. +const OPTIMIZE_FIELDS: [&str; 3] = ["__optimizeK", "__optimizeStart", "__optimizeUse"]; /// Open on the document's active artboard, keeping the other remembered settings. pub fn open(app: &mut VectorcraftApp) -> Result<Value, String> { @@ -101,11 +109,12 @@ fn remembered(app: &VectorcraftApp) -> WebSettings { /// pending Done (`discard`, which a failed Done leaves), the preset name being typed and the /// selected color table entry are dropped. The view, zoom, connection speed and `path` stay, /// nothing is remembered or written, and the dialog stays open. -fn reset(app: &VectorcraftApp, d: &mut Dialog) { +fn reset(app: &VectorcraftApp, d: &mut Dialog) -> Result<(), String> { for key in ["preset", "discard", "__presetName", "__color"] { d.fields.remove(key); } d.fields.extend(settings_fields(&remembered(app))); + Ok(()) } /// The settings as dialog fields. @@ -411,13 +420,11 @@ fn texture(ctx: &egui::Context, name: &str, px: &[u8], [w, h]: [u32; 2]) -> egui ctx.load_texture(name, img, opts) } -/// The rendering for `s` and the optimised image for each of `panes`, from the cache when nothing -/// they depend on changed. -fn previews(app: &VectorcraftApp, ctx: &egui::Context, s: &WebSettings, panes: &[WebSettings]) -> (Result<Shot, String>, Vec<Result<Shot, String>>) { - let Some(st) = app.session.active() else { return (Err("no document".into()), vec![]) }; - let doc = &st.doc; - let mut cache: Cache = ctx.data(|m| m.get_temp(cache_id())).unwrap_or_default(); - let render_key = format!( +/// What the rendering for `s` depends on: the active document, its revision and the settings that +/// change the image's pixels. +fn render_key(app: &VectorcraftApp, s: &WebSettings) -> Option<String> { + let st = app.session.active()?; + Some(format!( "{}:{}:{:?}:{:?}:{:?}:{}:{}:{:?}:{:?}", st.uid, st.revision, @@ -428,7 +435,15 @@ fn previews(app: &VectorcraftApp, ctx: &egui::Context, s: &WebSettings, panes: & s.clip_to_artboard, s.artboard, (!s.clip_to_artboard).then_some(s.slices) - ); + )) +} + +/// The rendering for `s` and the optimised image for each of `panes`, from the cache when nothing +/// they depend on changed. +fn previews(app: &VectorcraftApp, ctx: &egui::Context, s: &WebSettings, panes: &[WebSettings]) -> (Result<Shot, String>, Vec<Result<Shot, String>>) { + let (Some(st), Some(render_key)) = (app.session.active(), render_key(app, s)) else { return (Err("no document".into()), vec![]) }; + let doc = &st.doc; + let mut cache: Cache = ctx.data(|m| m.get_temp(cache_id())).unwrap_or_default(); if cache.render_key != render_key || cache.render.is_none() { let r = webexport::render(doc, s).map(Arc::new); cache.original = r.as_ref().ok().map(|r| Shot { @@ -507,6 +522,14 @@ fn body(app: &mut VectorcraftApp, ui: &mut egui::Ui, d: &mut Dialog) -> bool { if let Err(e) = apply_preset(app, d) { app.status(e); } + if d.fields.remove("__optimizeOpen").is_some_and(|v| v == json!(true)) { + open_optimize_rows(app, ui, d); + } + if d.fields.remove("__optimizeGo").is_some_and(|v| v == json!(true)) + && let Err(e) = optimize_to_size(app, d) + { + app.status(e); + } let settings = settings_of(app, d); let mut browser = false; ui.horizontal_top(|ui| { @@ -520,6 +543,7 @@ fn body(app: &mut VectorcraftApp, ui: &mut egui::Ui, d: &mut Dialog) -> bool { side(app, ui, d, settings.as_ref().ok()); }); }); + optimize_on_enter(ui.ctx(), d); if browser && let Err(e) = app.run("file.saveForWeb.browser", params(d)) { app.status(e); } @@ -703,6 +727,7 @@ fn pairs<T: Copy>(all: &[T], key: fn(T) -> &'static str, label: fn(T) -> &'stati fn side(app: &mut VectorcraftApp, ui: &mut egui::Ui, d: &mut Dialog, s: Option<&WebSettings>) { presets_row(app, ui, d, s); + optimize_rows(ui, d, s, &art_key(app)); widgets::divider(ui); egui::ScrollArea::vertical().id_salt("sfw-settings").max_height(PREVIEW_H - 40.0).auto_shrink([false, true]).show(ui, |ui| { let choice = |ui: &mut egui::Ui, d: &mut Dialog, key: &str, label: &str, options: &[(&str, &str)]| { @@ -804,6 +829,157 @@ fn presets_row(app: &mut VectorcraftApp, ui: &mut egui::Ui, d: &mut Dialog, s: O } } +/// The optimized file size of the settings `s` on the active document as it is now: from the preview +/// cache when the cache holds that document at its current revision, else made through [`previews`], +/// which keeps the image for the preview drawn later in the same frame. +fn previewed_bytes(app: &VectorcraftApp, ui: &egui::Ui, s: &WebSettings) -> Option<usize> { + let key = s.to_json().to_string(); + let cache: Option<Cache> = ui.ctx().data(|m| m.get_temp(cache_id())); + let cached = cache + .filter(|c| Some(&c.render_key) == render_key(app, s).as_ref()) + .and_then(|c| c.shots.into_iter().find(|(k, _)| *k == key)) + .and_then(|(_, shot)| shot.ok()) + .and_then(|shot| shot.bytes); + cached.or_else(|| previews(app, ui.ctx(), s, std::slice::from_ref(s)).1.into_iter().next()?.ok()?.bytes) +} + +/// Optimize to File Size…: the button opens rows ([`open_optimize_rows`]) for the desired size in +/// K, Start With and, with slices, Use; OK or Enter runs [`optimize_to_size`] and Cancel +/// closes the rows. A line gives the size it found and whether that is within the desired size +/// ([`optimized_result`]). +fn optimize_rows(ui: &mut egui::Ui, d: &mut Dialog, s: Option<&WebSettings>, art: &str) { + if d.fields.contains_key("__optimizeK") { + widgets::label_row(ui, tl!("Desired File Size:"), LABEL_W, |ui| { + let k = d.f64("__optimizeK", 32.0); + if let Some(v) = widgets::range_field(ui, "sfw-optimize-k", k, 0.001..=webexport::MAX_DESIRED_K, "K", 3, 100.0) { + d.fields.insert("__optimizeK".into(), json!(v)); + } + }); + form::choice(ui, d, "__optimizeStart", tl!("Start With:"), (LABEL_W, FIELD_W), &START_WITH); + if d.bool("__hasSlices") { + form::choice(ui, d, "__optimizeUse", tl!("Use:"), (LABEL_W, FIELD_W), &SIZE_USE); + } + widgets::label_row(ui, "", LABEL_W, |ui| { + if widgets::flat_button(ui, tl!("OK"), 64.0).clicked() { + d.fields.insert("__optimizeGo".into(), json!(true)); + } + if widgets::flat_button(ui, tl!("Cancel"), 64.0).clicked() { + for k in OPTIMIZE_FIELDS { + d.fields.remove(k); + } + } + }); + } else { + widgets::label_row(ui, "", LABEL_W, |ui| { + if widgets::flat_button(ui, tl!("Optimize to File Size…"), FIELD_W).clicked() { + d.fields.insert("__optimizeOpen".into(), json!(true)); + } + }); + } + if let Some(r) = optimized_result(d, s, art) { + let size = size_label(r["bytes"].as_u64().unwrap_or(0) as usize); + let target = size_label(r["targetBytes"].as_u64().unwrap_or(0) as usize); + let text = if r["achieved"] == json!(true) { + crate::i18n::fmt(tl!("{size}, within {target}"), &[("size", &size), ("target", &target)]) + } else { + crate::i18n::fmt(tl!("No setting tried fits in {target}; the smallest is {size}"), &[("size", &size), ("target", &target)]) + }; + widgets::label_row(ui, "", LABEL_W, |ui| { + widgets::dim_label(ui, &text); + }); + } +} + +/// An Enter while the Optimize to File Size rows ([`optimize_rows`]) are open is their OK: it does +/// not save. Run after every control of the dialog has drawn, it runs the search unless a control +/// took the press (an open dropdown), a field refused the value typed in it, or Ctrl, Cmd or Alt was +/// held, which the size field does not commit. +pub(super) fn optimize_on_enter(ctx: &egui::Context, d: &mut Dialog) { + if !d.fields.contains_key("__optimizeK") || !crate::shortcuts::pressed_anew(ctx, egui::Key::Enter) { + return; + } + let held = ctx.input(|i| { + i.events.iter().any(|e| matches!(e, egui::Event::Key { key: egui::Key::Enter, pressed: true, modifiers, .. } if modifiers.ctrl || modifiers.command || modifiers.alt)) + }); + let refused = ctx.data(|m| m.get_temp::<bool>(widgets::dialog_reject_commit_flag())).unwrap_or(false); + widgets::reject_dialog_commit(ctx); + if !held && !refused { + d.fields.insert("__optimizeGo".into(), json!(true)); + ctx.request_repaint(); + } +} + +/// The last Optimize to File Size result (`__optimized`) while it still holds: the settings are the +/// ones it found and the art (`art`, from [`art_key`]) is the art it measured. +pub(super) fn optimized_result<'a>(d: &'a Dialog, s: Option<&WebSettings>, art: &str) -> Option<&'a Value> { + d.fields.get("__optimized").filter(|r| r["art"] == json!(art) && s.is_some_and(|s| r["settings"] == s.to_json())) +} + +/// The active document, its revision and its selected objects and slices, which an Optimize to File +/// Size result was measured on. The selection decides the slices Save writes with `slices: selected` +/// and the slice Current Slice measures, and a selection made on the canvas or with the Slice +/// Selection tool leaves the revision as it is. +pub(super) fn art_key(app: &VectorcraftApp) -> String { + app.session.active().map_or_else(String::new, |st| format!("{}:{}:{:?}:{:?}", st.uid, st.revision, st.selection.objects, st.selection.slices)) +} + +/// `bytes` in K, rounded up to the Desired File Size field's 0.001 K so the size it asks for holds +/// them. The product is taken in `u128`, which holds any `usize` times 1000 on every target. +pub(super) fn size_k(bytes: usize) -> f64 { + (bytes as u128 * 1000).div_ceil(1024).max(1) as f64 / 1000.0 +} + +/// Optimize to File Size… (`__optimizeOpen`): opens the rows with Current Settings and Total of All +/// Slices, the desired size starting at the size the current settings give what that Use measures: +/// the image slices' files together when there are slices, else the preview's file (32 K when it +/// cannot be measured). +fn open_optimize_rows(app: &mut VectorcraftApp, ui: &egui::Ui, d: &mut Dialog) { + let bytes = if d.bool("__hasSlices") { + let mut p = params(d); + if let Some(o) = p.as_object_mut() { + o.insert("desiredK".into(), json!(webexport::MAX_DESIRED_K)); + o.insert("use".into(), json!("allSlices")); + } + let r = app.run("webExport.optimizeToFileSize", p).ok(); + r.filter(|r| r["achieved"] == json!(true)).and_then(|r| r["bytes"].as_u64()).map(|b| b as usize) + } else { + settings_of(app, d).ok().and_then(|s| previewed_bytes(app, ui, &s)) + }; + let k = bytes.map_or(32.0, size_k); + d.fields.insert("__optimizeK".into(), json!(k)); + d.fields.insert("__optimizeStart".into(), json!("current")); + d.fields.insert("__optimizeUse".into(), json!("allSlices")); +} + +/// Optimize to File Size's OK: `webExport.optimizeToFileSize` with the dialog's settings and the +/// rows' values; the settings it finds replace the dialog's, the rows close and `__optimized` +/// keeps the result. An error leaves the settings and the rows as they are. +pub(super) fn optimize_to_size(app: &mut VectorcraftApp, d: &mut Dialog) -> Result<Value, String> { + let mut p = params(d); + if let Some(o) = p.as_object_mut() { + o.insert("desiredK".into(), d.fields.get("__optimizeK").cloned().unwrap_or(Value::Null)); + let start = d.str("__optimizeStart"); + if !start.is_empty() { + o.insert("startWith".into(), json!(start)); + } + let scope = d.str("__optimizeUse"); + if d.bool("__hasSlices") && !scope.is_empty() { + o.insert("use".into(), json!(scope)); + } + } + let r = app.run("webExport.optimizeToFileSize", p)?; + if let Some(found) = r["settings"].as_object() { + d.fields.extend(found.clone()); + } + for k in OPTIMIZE_FIELDS { + d.fields.remove(k); + } + let result = + json!({ "settings": r["settings"], "bytes": r["bytes"], "targetBytes": r["targetBytes"], "achieved": r["achieved"], "art": art_key(app) }); + d.fields.insert("__optimized".into(), result); + Ok(r) +} + /// Two checkboxes side by side. fn check_pair(ui: &mut egui::Ui, d: &mut Dialog, (a, a_label): (&str, &str), (b, b_label): (&str, &str)) { widgets::label_row(ui, "", LABEL_W, |ui| { diff --git a/crates/ui-egui/src/dialogs/save_pdf.rs b/crates/ui-egui/src/dialogs/save_pdf.rs index 4f8bdf7667..af047a4cc2 100644 --- a/crates/ui-egui/src/dialogs/save_pdf.rs +++ b/crates/ui-egui/src/dialogs/save_pdf.rs @@ -7,7 +7,9 @@ //! `document.pdfSettings`. Save Preset… names the settings as a preset (`pdf.preset.save`). //! Opened from Export As with Use Artboards off (`__artBounds`), the dialog has no Artboards //! section, and OK writes one page of the visible art's bounds through [`io::export`]; opened -//! from Export Selection (`__selection` too), the page is the selection's crop. +//! from Export Selection (`__selection` too), the page is the selection's crop. While Alt (Option +//! on macOS) is held, Cancel reads Reset, which puts the options back to the chosen preset's +//! settings and leaves the dialog open (`ui.dialogReset`). //! //! The same dialog edits a preset (kind `pdfPreset`, from Edit → PDF Presets): a `name` and //! `description` instead of the preset and artboards, and OK saves the preset. @@ -30,8 +32,15 @@ use crate::{VectorcraftApp, io, widgets}; pub(super) const KIND: &str = "savePdf"; -pub(super) const SPEC: DialogSpec = - DialogSpec { heading: |_| tl!("Save PDF").into(), body, confirm, ok: Some("Save PDF"), inputs: |_| &["path"], ..DialogSpec::FORM }; +pub(super) const SPEC: DialogSpec = DialogSpec { + heading: |_| tl!("Save PDF").into(), + body, + confirm, + ok: Some("Save PDF"), + inputs: |_| &["path"], + reset: Some(reset), + ..DialogSpec::FORM +}; /// The dialog kind of the preset editor (New / Edit in Edit → PDF Presets). pub(super) const PRESET_KIND: &str = "pdfPreset"; @@ -502,13 +511,33 @@ fn preset_rows(app: &mut VectorcraftApp, ui: &mut egui::Ui, d: &mut Dialog) { fn apply_preset(app: &mut VectorcraftApp, d: &mut Dialog, name: &str) { match settings_fields(app, &json!({ "preset": name })) { Ok(settings) => { - d.fields.extend(settings); + replace_settings(d, settings); d.fields.insert("preset".into(), json!(name)); } Err(e) => app.status(e), } } +/// The UI-only fields that stand for options: the Security section's password checkboxes. +const OPTION_FLAGS: [&str; 2] = ["__requireOpenPassword", "__restrictPermissions"]; + +/// Replace every option with `settings` (from [`settings_fields`]), the password checkboxes +/// included. The preset, the artboard choice, the path and the other UI-only fields (the section, +/// the Save Preset name) stay. +fn replace_settings(d: &mut Dialog, settings: Map<String, Value>) { + d.fields.retain(|k, _| matches!(k.as_str(), "preset" | "range" | "path") || (k.starts_with("__") && !OPTION_FLAGS.contains(&k.as_str()))); + d.fields.extend(settings); +} + +/// Reset (Cancel with Alt or Option held): the options go back to the chosen preset's settings, as +/// choosing that preset sets them, and the dialog stays open. A preset that can no longer be found +/// (a saved one deleted while the dialog is open) is an error, and the dialog is left as it is. +fn reset(app: &VectorcraftApp, d: &mut Dialog) -> Result<(), String> { + let settings = settings_fields(app, &json!({ "preset": d.str("preset") }))?; + replace_settings(d, settings); + Ok(()) +} + /// General: the options, then the artboards (Save PDF) or the description (preset editor). fn general(ui: &mut egui::Ui, d: &mut Dialog, editor: bool) { heading(ui, tl!("Options")); @@ -732,7 +761,18 @@ fn advanced(app: &VectorcraftApp, ui: &mut egui::Ui, d: &mut Dialog) { } }); }); - if !flat { + if flat { + let name = get(d, "flattenerPreset").as_str().map(str::trim).filter(|n| !n.is_empty()).unwrap_or(pdf::DEFAULT_FLATTENER); + let preset_opts = FlattenOptions::for_export(Some(name), d.fields.get("flattener"), &app.session.prefs.flattener_presets).unwrap_or_default(); + let line_ppi = preset_opts.line_art_ppi.round() as u32; + let grad_ppi = preset_opts.gradient_ppi.round() as u32; + note( + ui, + &crate::i18n::fmt( + tl!("Raster resolution: {line_ppi} ppi line art and text, {grad_ppi} ppi gradient and mesh"), + &[("line_ppi", &line_ppi.to_string()), ("grad_ppi", &grad_ppi.to_string())], + ), + ); note(ui, tl!("PDF 1.3 files have no transparency: the preset flattens it.")); } } diff --git a/crates/ui-egui/src/dialogs/save_pdf/tests.rs b/crates/ui-egui/src/dialogs/save_pdf/tests.rs index b73ec294b1..91442f111c 100644 --- a/crates/ui-egui/src/dialogs/save_pdf/tests.rs +++ b/crates/ui-egui/src/dialogs/save_pdf/tests.rs @@ -346,6 +346,74 @@ fn presets_reset_the_settings_and_fields_fall_back_to_defaults() { assert!(app.run("ui.savePdfDialog", json!({"compatibility": "1.0"})).is_err(), "bad options are refused"); } +/// Reset (`ui.dialogReset`, or Cancel with Alt or Option held) puts every option back to the +/// chosen preset's settings, passwords and their checkboxes included, and keeps the preset, the +/// path, the artboard range, the section and the dialog. After another preset is chosen, Reset +/// goes back to that one, and choosing it also clears the password checkboxes. +#[test] +fn reset_puts_the_chosen_presets_settings_back_and_keeps_the_path_and_artboards() { + let (mut app, written, _) = app(); + app.run("pdf.preset.save", json!({"name": "Mine", "compatibility": "1.5", "marks": {"trim": true}})).unwrap(); + app.run("ui.savePdfDialog", json!({"path": "/tmp/reset.pdf", "preset": "Mine"})).unwrap(); + set_field(&mut app, "__allArtboards", json!(false)); + set_field(&mut app, "range", json!("2")); + set_field(&mut app, "__section", json!("Security")); + set_field(&mut app, "compatibility", json!("1.7")); + set_field(&mut app, "marks.trim", json!(false)); + set_field(&mut app, "compression.color.ppi", json!(72)); + set_field(&mut app, OPEN_PASSWORD, json!("secret")); + set_field(&mut app, "__restrictPermissions", json!(true)); + let r = app.run("ui.dialogReset", json!({})).unwrap(); + assert_eq!(r["kind"], KIND); + let d = app.ui.dialog.as_ref().expect("Reset leaves the dialog open"); + assert_eq!(get(d, "compatibility"), "1.5"); + assert_eq!(get(d, "marks.trim"), true); + assert_eq!(get(d, "compression.color.ppi"), 300.0, "a nested option goes back too"); + assert_eq!(get(d, OPEN_PASSWORD).as_str().unwrap_or_default(), "", "the password is cleared"); + assert!(!d.fields.contains_key("__restrictPermissions"), "the checkbox is cleared"); + assert_eq!( + (d.str("preset"), d.str("path"), d.str("range"), d.str("__section")), + ("Mine".to_string(), "/tmp/reset.pdf".to_string(), "2".to_string(), "Security".to_string()) + ); + assert!(!d.bool("__allArtboards")); + + let mut d = d.clone(); + d.fields.insert("__requireOpenPassword".into(), json!(true)); + apply_preset(&mut app, &mut d, pdf::DEFAULT_PRESET); + assert!(!d.fields.contains_key("__requireOpenPassword"), "choosing a preset clears the checkbox"); + app.ui.dialog = Some(d); + set_field(&mut app, "compatibility", json!("1.4")); + app.run("ui.dialogReset", json!({})).unwrap(); + let d = app.ui.dialog.as_ref().expect("the dialog stays open"); + assert_eq!(d.str("preset"), pdf::DEFAULT_PRESET); + assert_eq!(get(d, "compatibility"), "1.7"); + assert_eq!(get(d, "marks.trim"), false); + // OK writes the reset options to the kept path and range. + super::super::confirm(&mut app).unwrap(); + let w = written.borrow(); + assert_eq!((w.len(), w[0].0.as_str()), (1, "/tmp/reset.pdf")); + assert!(w[0].1.starts_with(b"%PDF-1.7")); + assert_eq!(vectorcraft_pdf::import(&w[0].1).unwrap().artboards.len(), 1, "range 2"); +} + +/// Reset with a saved preset deleted while the dialog is open is an error naming the preset, and +/// it leaves the options and the password as they are rather than switching to another preset's. +#[test] +fn reset_with_a_deleted_preset_is_an_error_and_keeps_the_options() { + let (mut app, _, _) = app(); + app.run("pdf.preset.save", json!({"name": "Gone", "compatibility": "1.5"})).unwrap(); + app.run("ui.savePdfDialog", json!({"preset": "Gone"})).unwrap(); + set_field(&mut app, "compatibility", json!("1.6")); + set_field(&mut app, OPEN_PASSWORD, json!("secret")); + app.run("pdf.preset.delete", json!({"name": "Gone"})).unwrap(); + let e = app.run("ui.dialogReset", json!({})).unwrap_err(); + assert!(e.contains("unknown PDF preset `Gone`"), "{e}"); + let d = app.ui.dialog.as_ref().expect("the dialog stays open"); + assert_eq!(d.str("preset"), "Gone"); + assert_eq!(get(d, "compatibility"), "1.6"); + assert_eq!(get(d, OPEN_PASSWORD), "secret"); +} + #[test] fn marks_and_bleeds_reach_the_pdf() { let (mut app, written, _) = app(); @@ -539,3 +607,63 @@ fn pdf_1_3_takes_a_flattener_preset_in_advanced() { let saved = app.session.prefs.pdf_presets.iter().find(|p| p.name == "Old").unwrap(); assert_eq!((saved.settings.compatibility, saved.settings.flattener_preset.as_str()), (Compatibility::Pdf13, "Low Resolution")); } + +#[test] +fn save_pdf_flattens_transparent_document_without_modal_prompt() { + let (mut app, written, _) = app(); + // Add transparent artwork to the document + app.run("transparency.set", json!({"opacity": 50})).unwrap(); + + app.run("ui.savePdfDialog", json!({"path": "/tmp/transparent.pdf", "compatibility": "1.3"})).unwrap(); + assert_eq!(app.ui.dialog.as_ref().unwrap().kind, KIND); + + // Clicking Save PDF goes ahead without stopping at a confirmation prompt + super::super::confirm(&mut app).unwrap(); + assert!(app.ui.dialog.is_none(), "Save PDF closes without a modal prompt"); + assert_eq!(written.borrow().len(), 1); + assert!(written.borrow()[0].1.starts_with(b"%PDF-1.3")); +} + +#[test] +fn summary_warnings_include_flattener_resolutions_when_flattening_transparency() { + let (mut app, _, _) = app(); + app.run("transparency.set", json!({"opacity": 50})).unwrap(); + + app.run("ui.savePdfDialog", json!({"path": "/tmp/out.pdf", "compatibility": "1.3"})).unwrap(); + let p = params(app.ui.dialog.as_ref().unwrap()); + let v = summary_of(&mut app, &egui::Context::default(), &p).unwrap(); + let warnings = v["warnings"].as_array().unwrap(); + assert!( + warnings.iter().any(|w| { + let s = w.as_str().unwrap(); + s.contains("transparency is flattened into opaque art and images") + && s.contains("at 1200 ppi line art and text, 300 ppi gradients and meshes") + }), + "{warnings:?}" + ); + + // With a custom flattener override, the resolution in the warning reflects the options + set_field(&mut app, "flattener.lineArtPpi", json!(600)); + set_field(&mut app, "flattener.gradientPpi", json!(200)); + let p2 = params(app.ui.dialog.as_ref().unwrap()); + let v2 = summary_of(&mut app, &egui::Context::default(), &p2).unwrap(); + let warnings2 = v2["warnings"].as_array().unwrap(); + assert!( + warnings2.iter().any(|w| { + let s = w.as_str().unwrap(); + s.contains("at 600 ppi line art and text, 200 ppi gradients and meshes") + }), + "{warnings2:?}" + ); +} + +#[test] +fn advanced_section_shows_raster_resolution_note() { + let (mut app, _, _) = app(); + app.run("ui.savePdfDialog", json!({"path": "/tmp/out.pdf", "compatibility": "1.3"})).unwrap(); + set_field(&mut app, "__section", json!("Advanced")); + set_field(&mut app, "flattener.lineArtPpi", json!(600)); + set_field(&mut app, "flattener.gradientPpi", json!(200)); + frame(&mut app); + assert!(app.ui.dialog.is_some()); +} diff --git a/crates/ui-egui/src/dialogs/shapes.rs b/crates/ui-egui/src/dialogs/shapes.rs index 80c13a7c4a..3040097a25 100644 --- a/crates/ui-egui/src/dialogs/shapes.rs +++ b/crates/ui-egui/src/dialogs/shapes.rs @@ -402,7 +402,15 @@ fn linked_size_form(ui: &mut egui::Ui, d: &mut Dialog, unit: Unit) { let mut rows: Option<egui::Rect> = None; egui::Grid::new("shape-size-dlg").num_columns(3).spacing([10.0, 8.0]).show(ui, |ui| { for (key, label) in [("width", "Width:"), ("height", "Height:")] { - let row = form::row_label(ui, label); + let row = if key == "height" && d.kind == "ellipse" { + let (row, pressed) = height_label_button(ui, label); + if pressed { + copy_width_to_height(d); + } + row + } else { + form::row_label(ui, label) + }; if ui.label_inputs_by(row.id, |ui| form::length(ui, d, key, unit, form::FIELD_W)) { follow_link(d, key); } @@ -424,6 +432,8 @@ fn linked_size_form(ui: &mut egui::Ui, d: &mut Dialog, unit: Unit) { let resp = ui.interact(rect, ui.scope_id().with("shape-size-link"), egui::Sense::click()); let icon = if on { "link" } else { "link-2-off" }; if widgets::paint_icon_button(ui, resp, icon, "Constrain Width and Height Proportions", on).clicked() { + // Enter on the focused button turns the link on or off; it does not also press OK. + ui.input_mut(|i| i.consume_key(egui::Modifiers::NONE, egui::Key::Enter)); d.fields.insert(LINK.into(), json!(!on)); sync_link(ui.ctx(), d); } @@ -469,6 +479,61 @@ fn follow_link(d: &mut Dialog, typed: &str) { } } +/// The Ellipse dialog's Height label: a button drawn as the other rows' labels are. Whether it was +/// pressed: a click, or Enter or Space while it has the keyboard focus; that Enter does not also +/// press OK. A click whose press took the focus from a field that then refused its text (Width +/// left empty or not a distance) does not count, as such a click on OK does not. Screen readers +/// read it as the button "Height:" (which also names the Height field) with the description "Copy +/// Width to Height". +fn height_label_button(ui: &mut egui::Ui, label: &str) -> (egui::Response, bool) { + let t = crate::theme::Tokens::get(ui.ctx()); + let text = egui::RichText::new(tl!(label)).color(t.text_dim); + let resp = ui.add(egui::Button::new(text).frame(false)).on_hover_cursor(egui::CursorIcon::PointingHand); + let resp = resp.on_hover_text(tl!("Copy Width to Height")); + let press = resp.id.with("press-pass"); + if resp.contains_pointer() && ui.input(|i| i.pointer.any_pressed()) { + let pass = ui.ctx().cumulative_pass_nr(); + ui.data_mut(|m| m.insert_temp(press, pass)); + } + if !resp.clicked() { + // A press let go without a click (dragged off the button) leaves no press behind. + if ui.input(|i| i.pointer.any_released()) { + ui.data_mut(|m| m.remove::<u64>(press)); + } + return (resp, false); + } + ui.input_mut(|i| i.consume_key(egui::Modifiers::NONE, egui::Key::Enter)); + let (pressed_at, refused_at, refused_now) = ui.data_mut(|m| { + let pressed_at = m.get_temp::<u64>(press); + m.remove::<u64>(press); + (pressed_at, m.get_temp::<u64>(widgets::dialog_reject_pass()), m.get_temp::<bool>(widgets::dialog_reject_commit_flag())) + }); + let refused = refused_now == Some(true) || matches!((refused_at, pressed_at), (Some(r), Some(p)) if r >= p); + (resp, !refused) +} + +/// Height takes the Width the dialog holds (help page "Draw ellipses", +/// <https://web.archive.org/web/20210601162814/https://helpx.adobe.com/pdf/illustrator_reference.pdf#page=140>). +/// A Width that is missing, empty, not a distance or not finite leaves Height as it is. With the +/// link on, the link keeps the circle from then on (proportions 1 : 1), or keeps no proportions +/// when Width is 0; the link stays on. +fn copy_width_to_height(d: &mut Dialog) { + let width = match d.fields.get("width") { + Some(Value::Number(n)) => n.as_f64(), + Some(Value::String(s)) => Unit::Points.parse(s), + _ => None, + }; + let Some(width) = width.filter(|w| w.is_finite()) else { return }; + d.fields.insert("height".into(), json!(width)); + if d.bool(LINK) { + if width != 0.0 { + d.fields.insert(RATIO.into(), json!(1.0)); + } else { + d.fields.remove(RATIO); + } + } +} + /// The Ellipse dialog's Anchors: the nearest whole number from 2 to 1000 (4, a live ellipse, when /// left empty or not a number). fn ellipse_anchors(d: &Dialog) -> u64 { @@ -644,6 +709,26 @@ mod tests { assert_eq!(app.session.tool_options_of("spiral"), json!({"decay": 65.0, "segments": 12, "clockwise": true})); } + /// With General › Constrain Angle at 90°, the Spiral dialog's spiral starts straight up from the + /// click, and the tool's options keep no turn. + #[test] + fn spiral_click_dialog_starts_along_the_constrain_angle() { + let mut app = VectorcraftApp::new(Session::new(), Default::default()); + app.run("file.new", json!({"width": 300, "height": 200})).unwrap(); + app.run("prefs.set", json!({"key": "constrainAngle", "value": 90})).unwrap(); + app.run("tool.select", json!({"tool": "spiral"})).unwrap(); + super::super::open_tool_dialog(&mut app, "spiral", json!({"x": 40.0, "y": 60.0})); + app.ui.dialog.as_mut().expect("Spiral dialog").fields.insert("radius".into(), json!(35.0)); + super::super::confirm(&mut app).unwrap(); + + let st = app.session.doc().unwrap(); + let id = *st.selection.objects.first().unwrap(); + let path = st.doc.node(id).unwrap().path_data().unwrap(); + let outer = path.subpaths[0].anchors.last().unwrap().p; + assert_eq!(outer, vectorcraft_geom::Point::new(40.0, 25.0)); + assert!(app.session.tool_options_of("spiral").get("rotation").is_none()); + } + #[test] fn alt_click_centres_the_typed_size_on_the_click() { let fields = |alt: bool| Dialog::new("rectangle", json!({"x": 100.0, "y": 50.0, "alt": alt, "width": "40 pt", "height": "20 pt"})); @@ -1063,6 +1148,237 @@ mod tests { assert_eq!(ellipse_anchors(h.state().ui.dialog.as_ref().unwrap()), 4); } + /// A harness drawing `app`'s dialog, with the app's fonts installed on its first frame. + fn dialog_harness(app: VectorcraftApp) -> egui_kittest::Harness<'static, VectorcraftApp> { + let mut fonts = false; + let mut h = egui_kittest::Harness::builder().with_size(egui::vec2(1100.0, 900.0)).build_ui_state( + move |ui, app: &mut VectorcraftApp| { + if !std::mem::replace(&mut fonts, true) { + crate::theme::install_fonts(ui.ctx()); + return; + } + super::super::show(app, ui.ctx()); + }, + app, + ); + h.run_steps(5); + h + } + + /// The dialog's Width and Height in points. + fn dialog_size(h: &egui_kittest::Harness<'_, VectorcraftApp>) -> (f64, f64) { + let d = h.state().ui.dialog.as_ref().expect("the dialog is open"); + (d.f64("width", -1.0), d.f64("height", -1.0)) + } + + /// Replaces the text of the field named `name` with `text` and leaves it with Tab. + fn retype(h: &mut egui_kittest::Harness<'_, VectorcraftApp>, name: &str, text: &str) { + use egui::accesskit::Role; + use egui_kittest::kittest::Queryable; + let all = egui::Modifiers { ctrl: true, command: true, ..Default::default() }; + h.get_by_role_and_label(Role::TextInput, name).focus(); + h.run_steps(2); + h.key_press_modifiers(all, egui::Key::A); + h.get_by_role_and_label(Role::TextInput, name).type_text(text); + h.run_steps(2); + h.key_press(egui::Key::Tab); + h.run_steps(2); + } + + /// In the Ellipse dialog, a click on the word Height copies Width into Height, also a Width + /// typed and not yet committed; the fields keep their names. Cancel discards it; OK draws the + /// circle as one undo step. + #[test] + fn clicking_height_in_the_ellipse_dialog_copies_width_into_height() { + use egui::accesskit::Role; + use egui_kittest::kittest::{NodeT, Queryable}; + let mut app = VectorcraftApp::new(Session::new(), Default::default()); + app.run("file.new", json!({"width": 300, "height": 300})).unwrap(); + super::super::open_tool_dialog(&mut app, "ellipse", json!({"x": 10.0, "y": 10.0})); + let d = app.ui.dialog.as_mut().unwrap(); + d.fields.insert("width".into(), json!(80.0)); + d.fields.insert("height".into(), json!(30.0)); + let mut h = dialog_harness(app); + h.check_accessibility(); + let button = h.get_by_role_and_label(Role::Button, "Height:"); + assert_eq!(button.accesskit_node().description().as_deref(), Some("Copy Width to Height")); + h.get_by_role_and_label(Role::Button, "Height:").click(); + h.run_steps(2); + assert_eq!(dialog_size(&h), (80.0, 80.0)); + let d = h.state().ui.dialog.as_ref().unwrap(); + assert!(!d.bool(LINK) && !d.fields.contains_key(RATIO), "the link stays off"); + // The value fields keep their names. + h.get_by_role_and_label(Role::TextInput, "Width:"); + h.get_by_role_and_label(Role::TextInput, "Height:"); + + // A Width typed and not committed with Enter or Tab is the one copied. + let all = egui::Modifiers { ctrl: true, command: true, ..Default::default() }; + h.get_by_role_and_label(Role::TextInput, "Width:").focus(); + h.run_steps(2); + h.key_press_modifiers(all, egui::Key::A); + h.get_by_role_and_label(Role::TextInput, "Width:").type_text("50 pt"); + h.run_steps(2); + h.get_by_role_and_label(Role::Button, "Height:").click(); + h.run_steps(3); + assert_eq!(dialog_size(&h), (50.0, 50.0)); + + // A Width the field refuses when the click takes its focus (not a distance, or empty) + // is not copied: Height keeps its value. + h.state_mut().ui.dialog.as_mut().unwrap().fields.insert("height".into(), json!(30.0)); + h.run_steps(2); + for typed in ["wide", ""] { + h.get_by_role_and_label(Role::TextInput, "Width:").focus(); + h.run_steps(2); + h.key_press_modifiers(all, egui::Key::A); + if typed.is_empty() { + h.key_press(egui::Key::Backspace); + } else { + h.get_by_role_and_label(Role::TextInput, "Width:").type_text(typed); + } + h.run_steps(2); + h.get_by_role_and_label(Role::Button, "Height:").click(); + h.run_steps(3); + assert_eq!(dialog_size(&h), (50.0, 30.0), "{typed:?}"); + } + // The field shows its value again, and the next click copies it. + h.get_by_role_and_label(Role::Button, "Height:").click(); + h.run_steps(3); + assert_eq!(dialog_size(&h), (50.0, 50.0)); + + // A Height typed and not committed does not outlast the copy: a distance is replaced by + // Width, and a Height the field refuses keeps the copy from happening, as it keeps OK from + // confirming. + for (typed, after) in [("70 pt", (50.0, 50.0)), ("tall", (50.0, 30.0))] { + h.state_mut().ui.dialog.as_mut().unwrap().fields.insert("height".into(), json!(30.0)); + h.run_steps(2); + h.get_by_role_and_label(Role::TextInput, "Height:").focus(); + h.run_steps(2); + h.key_press_modifiers(all, egui::Key::A); + h.get_by_role_and_label(Role::TextInput, "Height:").type_text(typed); + h.run_steps(2); + h.get_by_role_and_label(Role::Button, "Height:").click(); + h.run_steps(3); + assert_eq!(dialog_size(&h), after, "{typed:?}"); + } + + // Cancel: nothing is drawn. + let undo = |h: &egui_kittest::Harness<'_, VectorcraftApp>| h.state().session.active().unwrap().history.undo.len(); + let before = undo(&h); + crate::dialogs::cancel(h.state_mut()); + h.run_steps(2); + assert!(h.state().session.doc().unwrap().doc.layers[0].children().unwrap().is_empty()); + assert_eq!(undo(&h), before); + + // OK: one circle, one undo step. + super::super::open_tool_dialog(h.state_mut(), "ellipse", json!({"x": 10.0, "y": 10.0})); + h.state_mut().ui.dialog.as_mut().unwrap().fields.insert("width".into(), json!(64.0)); + h.run_steps(2); + h.get_by_role_and_label(Role::Button, "Height:").click(); + h.run_steps(2); + super::super::confirm(h.state_mut()).unwrap(); + assert!(h.state().ui.dialog.is_none()); + assert_eq!(undo(&h), before + 1); + let doc = &h.state().session.doc().unwrap().doc; + let b = doc.layers[0].children().unwrap()[0].geometric_bounds().unwrap(); + assert!((b.width() - 64.0).abs() < 1e-6 && (b.height() - 64.0).abs() < 1e-6, "{b:?}"); + } + + /// The Height button works from the keyboard: Space and Enter copy Width into Height, and + /// that Enter does not press OK. With the link on, the link stays on and keeps the circle when + /// Width is typed next; a Width of 0 is copied and leaves the link no proportions to keep. + #[test] + fn the_ellipse_height_button_copies_width_from_the_keyboard_and_keeps_the_link_round() { + use egui::accesskit::Role; + use egui_kittest::kittest::Queryable; + let mut app = VectorcraftApp::new(Session::new(), Default::default()); + app.run("file.new", json!({"width": 300, "height": 300})).unwrap(); + super::super::open_tool_dialog(&mut app, "ellipse", json!({"x": 10.0, "y": 10.0})); + let d = app.ui.dialog.as_mut().unwrap(); + d.fields.insert("width".into(), json!(80.0)); + d.fields.insert("height".into(), json!(20.0)); + d.fields.insert(LINK.into(), json!(true)); + let mut h = dialog_harness(app); + assert_eq!(h.state().ui.dialog.as_ref().unwrap().f64(RATIO, 0.0), 0.25); + h.get_by_role_and_label(Role::Button, "Height:").focus(); + h.run_steps(2); + h.key_press(egui::Key::Space); + h.run_steps(2); + assert_eq!(dialog_size(&h), (80.0, 80.0)); + let d = h.state().ui.dialog.as_ref().unwrap(); + assert!(d.bool(LINK), "the link stays on"); + assert_eq!(d.f64(RATIO, 0.0), 1.0); + // The link now keeps the circle. + retype(&mut h, "Width:", "40 pt"); + assert_eq!(dialog_size(&h), (40.0, 40.0)); + + // Enter on the button copies, and the dialog stays open. + h.state_mut().ui.dialog.as_mut().unwrap().fields.insert("width".into(), json!(0.0)); + h.run_steps(2); + h.get_by_role_and_label(Role::Button, "Height:").focus(); + h.run_steps(2); + h.key_press(egui::Key::Enter); + h.run_steps(2); + assert!(h.state().ui.dialog.is_some(), "Enter on the Height button does not press OK"); + assert_eq!(dialog_size(&h), (0.0, 0.0)); + let d = h.state().ui.dialog.as_ref().unwrap(); + assert!(d.bool(LINK) && !d.fields.contains_key(RATIO), "no proportions to keep at 0"); + assert!(h.state().session.doc().unwrap().doc.layers[0].children().unwrap().is_empty()); + } + + /// Enter on the focused link button turns the link on and leaves the dialog open, as Space does. + #[test] + fn enter_on_the_link_button_turns_the_link_on_without_pressing_ok() { + use egui::accesskit::Role; + use egui_kittest::kittest::Queryable; + const LINK_NAME: &str = "Constrain Width and Height Proportions"; + let mut app = VectorcraftApp::new(Session::new(), Default::default()); + app.run("file.new", json!({"width": 300, "height": 300})).unwrap(); + super::super::open_tool_dialog(&mut app, "rectangle", json!({"x": 10.0, "y": 10.0})); + let mut h = dialog_harness(app); + assert!(!h.state().ui.dialog.as_ref().unwrap().bool(LINK)); + h.get_by_role_and_label(Role::Button, LINK_NAME).focus(); + h.run_steps(2); + h.key_press(egui::Key::Enter); + h.run_steps(2); + let d = h.state().ui.dialog.as_ref().expect("Enter on the link button does not press OK"); + assert!(d.bool(LINK)); + assert!(h.state().session.doc().unwrap().doc.layers[0].children().unwrap().is_empty()); + } + + /// Rectangle and Rounded Rectangle keep plain Width and Height labels. + #[test] + fn only_the_ellipse_dialog_has_the_height_button() { + use egui::accesskit::Role; + use egui_kittest::kittest::Queryable; + for kind in ["rectangle", "roundedRectangle"] { + let mut app = VectorcraftApp::new(Session::new(), Default::default()); + app.run("file.new", json!({"width": 300, "height": 300})).unwrap(); + super::super::open_tool_dialog(&mut app, kind, json!({"x": 10.0, "y": 10.0})); + let h = dialog_harness(app); + h.get_by_role_and_label(Role::TextInput, "Height:"); + assert!(h.query_by_role_and_label(Role::Button, "Height:").is_none(), "{kind}"); + } + } + + /// A Width that is missing, empty, not a distance or not finite leaves Height as it is; a + /// Width with a unit is copied in points, and 0 is copied. + #[test] + fn copying_width_takes_only_a_width_that_reads() { + for width in [None, Some(json!("")), Some(json!("wide")), Some(json!("inf")), Some(json!(null)), Some(json!(true))] { + let mut d = Dialog::new("ellipse", json!({"height": 30.0})); + if let Some(w) = width.clone() { + d.fields.insert("width".into(), w); + } + copy_width_to_height(&mut d); + assert_eq!(d.fields.get("height"), Some(&json!(30.0)), "{width:?}"); + } + for (width, want) in [(json!("1 in"), 72.0), (json!(0), 0.0), (json!(12.5), 12.5)] { + let mut d = Dialog::new("ellipse", json!({"width": width.clone(), "height": 30.0})); + copy_width_to_height(&mut d); + assert_eq!(d.f64("height", -1.0), want, "{width}"); + } + } + #[test] fn ellipse_anchors_take_the_nearest_whole_number_from_2_to_1000() { let d = |v: Value| Dialog::new("ellipse", json!({ "anchors": v })); diff --git a/crates/ui-egui/src/dialogs/tests.rs b/crates/ui-egui/src/dialogs/tests.rs index 9a00fceafa..08968d5e93 100644 --- a/crates/ui-egui/src/dialogs/tests.rs +++ b/crates/ui-egui/src/dialogs/tests.rs @@ -2524,6 +2524,31 @@ fn flare_options_alt_turns_cancel_into_reset() { ); } +/// While Alt is held, Save PDF's Cancel button reads Reset; Reset puts the chosen preset's settings +/// back and leaves the dialog open with its path, letting Alt go shows Cancel again, and Cancel +/// closes the dialog. +#[test] +fn save_pdf_alt_turns_cancel_into_reset() { + let mut app = app(); + app.run("ui.savePdfDialog", json!({"path": "/tmp/alt.pdf"})).unwrap(); + app.ui.dialog.as_mut().unwrap().fields.insert("compatibility".into(), json!("1.4")); + let mut f = Frames::new(); + f.button(&mut app, "Cancel"); + f.run(&mut app, vec![egui::Event::ModifiersChanged(egui::Modifiers::ALT)]); + let reset = f.button(&mut app, "Reset"); + let texts = f.texts(&mut app); + assert!(!texts.iter().any(|(t, _)| t == "Cancel"), "Reset takes Cancel's place: {texts:?}"); + f.press(&mut app, reset, true); + f.press(&mut app, reset, false); + let d = app.ui.dialog.as_ref().expect("Reset leaves the dialog open"); + assert_eq!((d.str("compatibility"), d.str("path")), ("1.7".to_string(), "/tmp/alt.pdf".to_string())); + f.run(&mut app, vec![egui::Event::ModifiersChanged(egui::Modifiers::NONE)]); + let cancel = f.button(&mut app, "Cancel"); + f.press(&mut app, cancel, true); + f.press(&mut app, cancel, false); + assert!(app.ui.dialog.is_none(), "Cancel closes the dialog"); +} + /// While Alt is held, Save for Web's Cancel button reads Reset; Reset puts the remembered settings /// back without remembering anything and leaves the dialog open, and letting Alt go shows Cancel again. #[test] diff --git a/crates/ui-egui/src/dialogs/tests_print.rs b/crates/ui-egui/src/dialogs/tests_print.rs index f1baabc1b9..cad38bb984 100644 --- a/crates/ui-egui/src/dialogs/tests_print.rs +++ b/crates/ui-egui/src/dialogs/tests_print.rs @@ -422,6 +422,54 @@ fn a_scale_set_through_the_dialog_keeps_the_percentage_it_changes() { assert_eq!(saved["scale"], json!({"width": 250.0, "height": 250.0, "linked": true})); } +/// An accessibility action on the node `target_node`. +fn request(action: egui::accesskit::Action, target_node: egui::accesskit::NodeId) -> egui::Event { + use egui::accesskit::{ActionRequest, TreeId}; + egui::Event::AccessKitActionRequest(ActionRequest { action, target_node, target_tree: TreeId::ROOT, data: None }) +} + +/// Type `typed` into Scale W, which shows `shown` (the first field that does, before H), and Tab out. +fn type_w(screen: &mut Screen, app: &mut VectorcraftApp, shown: &str, typed: &str) { + let key = |key, modifiers| egui::Event::Key { key, physical_key: None, pressed: true, repeat: false, modifiers }; + screen.run(app, vec![]); + let out = screen.run(app, vec![]); + let nodes = &out.platform_output.accesskit_update.as_ref().expect("an accessibility tree").nodes; + let w = nodes.iter().find(|(_, n)| n.role() == egui::accesskit::Role::TextInput && n.value().is_some_and(|v| v.starts_with(shown))); + screen.run(app, vec![request(egui::accesskit::Action::Focus, w.expect("the Scale W field").0)]); + screen.run(app, vec![key(egui::Key::A, egui::Modifiers::COMMAND), egui::Event::Text(typed.into())]); + screen.run(app, vec![key(egui::Key::Tab, egui::Modifiers::NONE)]); +} + +#[test] +fn a_scale_set_after_a_typed_percentage_follows_the_link() { + let (mut app, _) = app(); + app.run("file.print", json!({})).unwrap(); + let mut screen = Screen::new(); + set(&mut app, "scaling", json!("custom")); + dialog(&mut app).fields["scale"]["width"] = json!(40); + screen.run(&mut app, vec![]); + assert_eq!(scale(&mut app), (40.0, 40.0, true)); + // W typed with the link on sets H as well. + type_w(&mut screen, &mut app, "40", "60"); + assert_eq!(scale(&mut app), (60.0, 60.0, true)); + // A new H set before the next frame: W follows it, and Done saves both. + dialog(&mut app).fields["scale"]["height"] = json!(50); + set(&mut app, "discard", json!(true)); + super::confirm(&mut app).unwrap(); + let saved = app.session.active().unwrap().doc.print_setup.clone().unwrap(); + assert_eq!(saved["scale"], json!({"width": 50.0, "height": 50.0, "linked": true})); + // W typed with the link off changes W alone; turning the link on then sets H to W. + app.run("file.print", json!({})).unwrap(); + let (link, _, _) = screen.link(&mut app); + screen.run(&mut app, vec![request(egui::accesskit::Action::Click, link)]); + assert_eq!(scale(&mut app), (50.0, 50.0, false)); + type_w(&mut screen, &mut app, "50", "70"); + assert_eq!(scale(&mut app), (70.0, 50.0, false)); + screen.run(&mut app, vec![request(egui::accesskit::Action::Click, link)]); + screen.run(&mut app, vec![]); + assert_eq!(scale(&mut app), (70.0, 70.0, true)); +} + #[test] fn the_dimmed_scale_link_ignores_the_keyboard() { use egui::accesskit::{Action, ActionRequest, TreeId}; @@ -440,3 +488,43 @@ fn the_dimmed_scale_link_ignores_the_keyboard() { screen.run(&mut app, vec![]); assert_eq!(scale(&mut app), (100.0, 100.0, true)); } + +/// The node screen readers call `label` with role `role`, and whether it is dimmed. +fn node(screen: &mut Screen, app: &mut VectorcraftApp, label: &str, role: egui::accesskit::Role) -> Option<(egui::accesskit::NodeId, bool)> { + screen.run(app, vec![]); + let out = screen.run(app, vec![]); + let nodes = &out.platform_output.accesskit_update.as_ref().expect("an accessibility tree").nodes; + nodes.iter().find(|(_, n)| n.label() == Some(label) && n.role() == role).map(|(id, n)| (*id, n.is_disabled())) +} + +#[test] +fn a_spot_inks_icon_converts_it_to_process_and_back() { + use egui::accesskit::{Action, ActionRequest, Role, TreeId}; + let (mut app, _) = app(); + app.run("swatch.new", json!({"name": "Gold", "color": {"model": "cmyk", "c": 0, "m": 0.2, "y": 0.8, "k": 0.1}, "spot": true})).unwrap(); + app.run("file.print", json!({})).unwrap(); + set(&mut app, "__section", json!("Output")); + set(&mut app, "output", json!({"mode": "separations"})); + let mut screen = Screen::new(); + let click = |target_node| { + egui::Event::AccessKitActionRequest(ActionRequest { action: Action::Click, target_node, target_tree: TreeId::ROOT, data: None }) + }; + // Only the spot ink has the icon. + assert!(node(&mut screen, &mut app, "Convert Cyan to process", Role::Button).is_none()); + let (convert, dimmed) = node(&mut screen, &mut app, "Convert Gold to process", Role::Button).expect("Gold's icon"); + assert!(!dimmed); + assert_eq!(node(&mut screen, &mut app, "Gold", Role::CheckBox).map(|n| n.1), Some(false)); + screen.run(&mut app, vec![click(convert)]); + assert_eq!(dialog(&mut app).fields["output"]["inks"], json!([{"name": "Gold", "print": true, "convertToProcess": true}])); + // Converted, it has no plate: its Print box is dimmed, and the icon turns it back. + assert_eq!(node(&mut screen, &mut app, "Gold", Role::CheckBox).map(|n| n.1), Some(true)); + let (keep, _) = node(&mut screen, &mut app, "Keep Gold as spot", Role::Button).expect("the process icon"); + screen.run(&mut app, vec![click(keep)]); + assert_eq!(dialog(&mut app).fields["output"]["inks"], json!([{"name": "Gold", "print": true, "convertToProcess": false}])); + // Convert All Spot Colors to Process converts it and dims the icon, keeping its own choice. + dialog(&mut app).fields["output"]["spotsToProcess"] = json!(true); + let (keep, dimmed) = node(&mut screen, &mut app, "Keep Gold as spot", Role::Button).expect("the process icon"); + assert!(dimmed); + screen.run(&mut app, vec![click(keep)]); + assert_eq!(dialog(&mut app).fields["output"]["inks"], json!([{"name": "Gold", "print": true, "convertToProcess": false}])); +} diff --git a/crates/ui-egui/src/dialogs/tests_save_for_web.rs b/crates/ui-egui/src/dialogs/tests_save_for_web.rs index 9e92f57cdc..17c565e454 100644 --- a/crates/ui-egui/src/dialogs/tests_save_for_web.rs +++ b/crates/ui-egui/src/dialogs/tests_save_for_web.rs @@ -726,3 +726,192 @@ fn colour_table_buttons_edit_the_lists() { save_for_web::set_table(&mut d, "sort", json!("hue")); assert_eq!(d.fields["colorTable"], json!({"locked": [], "webShift": ["#123456"], "sort": "hue"})); } + +#[test] +fn optimize_to_file_size_takes_the_settings_that_fit() { + let dir = vectorcraft_testkit::temp_dir("sfw-optimize"); + let (mut app, _) = app(&dir, false); + app.run("file.saveForWeb", json!({})).unwrap(); + set(&mut app, "format", json!("jpg")); + set(&mut app, "quality", json!(100)); + frame(&mut app); + let full = app.session.execute("document.exportForWeb.preview", &json!({"format": "jpg", "quality": 100})).unwrap()["bytes"].as_u64().unwrap(); + let field = |app: &VectorcraftApp, k: &str| app.ui.dialog.as_ref().unwrap().fields.get(k).cloned(); + // A size of 0 is refused: the settings and the rows stay. + set(&mut app, "__optimizeK", json!(0)); + set(&mut app, "__optimizeStart", json!("current")); + set(&mut app, "__optimizeGo", json!(true)); + frame(&mut app); + assert_eq!(field(&app, "quality"), Some(json!(100))); + assert_eq!(field(&app, "__optimizeK"), Some(json!(0))); + assert_eq!((field(&app, "__optimized"), field(&app, "__optimizeGo")), (None, None)); + // OK takes the settings found and closes the rows. + set(&mut app, "__optimizeK", json!(full as f64 * 0.8 / 1024.0)); + set(&mut app, "__optimizeGo", json!(true)); + frame(&mut app); + let found = field(&app, "__optimized").unwrap(); + assert_eq!(found["achieved"], json!(true), "{found}"); + let quality = field(&app, "quality").unwrap().as_u64().unwrap(); + assert!(quality < 100, "{found}"); + assert_eq!(field(&app, "__optimizeK"), None); + // The result holds for the settings found on the art it measured. + let settings = app.session.web_settings(&found["settings"]).unwrap(); + let shown = |app: &VectorcraftApp| { + save_for_web::optimized_result(app.ui.dialog.as_ref().unwrap(), Some(&settings), &save_for_web::art_key(app)).is_some() + }; + assert!(shown(&app)); + // The result line draws, and Save writes the size found. + frame(&mut app); + let r = confirm(&mut app).unwrap(); + let written = std::fs::read(r["path"].as_str().unwrap()).unwrap(); + assert_eq!(written.len() as u64, found["bytes"].as_u64().unwrap()); + assert!(written.len() as u64 <= found["targetBytes"].as_u64().unwrap()); + assert_eq!(app.session.last_web_settings().quality as u64, quality); + // A change to the art drops the result. + app.run("file.saveForWeb", json!({})).unwrap(); + app.ui.dialog.as_mut().unwrap().fields.insert("__optimized".into(), found.clone()); + assert!(shown(&app)); + app.run("shape.rectangle", json!({"x": 0, "y": 0, "width": 5, "height": 5})).unwrap(); + assert!(!shown(&app)); + // So does a change to the selection, which decides the slices Save writes with `slices: selected`, + // also one that leaves the revision as it is (a click on the canvas). + let mut current = found.clone(); + current["art"] = json!(save_for_web::art_key(&app)); + app.ui.dialog.as_mut().unwrap().fields.insert("__optimized".into(), current); + assert!(shown(&app)); + let st = app.session.active_mut().unwrap(); + assert!(!st.selection.objects.is_empty()); + st.selection.objects.clear(); + assert!(!shown(&app)); + // And a change to the selected slices alone (the Slice Selection tool). + let mut current = found.clone(); + current["art"] = json!(save_for_web::art_key(&app)); + app.ui.dialog.as_mut().unwrap().fields.insert("__optimized".into(), current); + assert!(shown(&app)); + let st = app.session.active_mut().unwrap(); + let any = st.doc.layers[0].id; + st.selection.slices.push(any); + assert!(!shown(&app)); +} + +/// Enter while the Optimize to File Size rows are open runs the search and writes nothing; once the +/// search has closed the rows, Enter saves with the settings it found. +#[test] +fn enter_in_the_optimize_rows_runs_the_search_and_saves_nothing() { + let dir = vectorcraft_testkit::temp_dir("sfw-optimize-enter"); + let (mut app, _) = app(&dir, false); + app.run("file.saveForWeb", json!({})).unwrap(); + set(&mut app, "format", json!("jpg")); + set(&mut app, "quality", json!(100)); + frame(&mut app); + let full = app.session.execute("document.exportForWeb.preview", &json!({"format": "jpg", "quality": 100})).unwrap()["bytes"].as_u64().unwrap(); + set(&mut app, "__optimizeK", json!(full as f64 * 0.8 / 1024.0)); + set(&mut app, "__optimizeStart", json!("current")); + let files = |dir: &std::path::Path| std::fs::read_dir(dir).map_or(0, |r| r.count()); + let enter_with = |app: &mut VectorcraftApp, modifiers: egui::Modifiers| { + let key = egui::Event::Key { key: egui::Key::Enter, physical_key: None, pressed: true, repeat: false, modifiers }; + let ctx = egui::Context::default(); + crate::theme::install_fonts(&ctx); + let mut out = ctx.run_ui(egui::RawInput { events: vec![key], ..Default::default() }, |ui| show(app, ui.ctx())); + out.textures_delta.clear(); + }; + let enter = |app: &mut VectorcraftApp| enter_with(app, egui::Modifiers::NONE); + // Ctrl+Enter, which the size field does not commit, neither searches nor saves. + enter_with(&mut app, egui::Modifiers::CTRL); + frame(&mut app); + assert_eq!(kind(&app), Some(save_for_web::KIND), "Ctrl+Enter in the rows does not save"); + assert!(app.ui.dialog.as_ref().unwrap().fields.contains_key("__optimizeK"), "the rows stay open"); + assert!(!app.ui.dialog.as_ref().unwrap().fields.contains_key("__optimized")); + assert_eq!(files(&dir), 0); + enter(&mut app); + assert_eq!(kind(&app), Some(save_for_web::KIND), "Enter in the rows does not save"); + assert_eq!(files(&dir), 0); + frame(&mut app); + let d = app.ui.dialog.as_ref().unwrap(); + let found = d.fields.get("__optimized").cloned().unwrap(); + assert_eq!(found["achieved"], json!(true), "{found}"); + assert!(!d.fields.contains_key("__optimizeK"), "the search closed the rows"); + enter(&mut app); + assert!(app.ui.dialog.is_none()); + assert_eq!(files(&dir), 1); +} + +/// An Enter in the Optimize to File Size rows runs no search when a field of the dialog, one drawn +/// after the rows included, refused the value typed in it on that press, or when a control drawn +/// after the rows (an open dropdown) took the press. +#[test] +fn enter_in_the_optimize_rows_runs_nothing_when_a_later_control_refused_or_took_it() { + // `before` stands for the controls drawn after the rows, which act on the press first. + let go = |before: fn(&egui::Context)| { + let mut d = Dialog::new(save_for_web::KIND, json!({"__optimizeK": 10})); + let key = egui::Event::Key { key: egui::Key::Enter, physical_key: None, pressed: true, repeat: false, modifiers: Default::default() }; + let ctx = egui::Context::default(); + let mut out = ctx.run_ui(egui::RawInput { events: vec![key], ..Default::default() }, |ui| { + before(ui.ctx()); + save_for_web::optimize_on_enter(ui.ctx(), &mut d); + }); + out.textures_delta.clear(); + assert!(d.fields.contains_key("__optimizeK"), "the rows stay open"); + d.fields.contains_key("__optimizeGo") + }; + assert!(go(|_| {}), "a plain Enter runs the search"); + assert!(!go(crate::widgets::reject_dialog_commit), "a refused value runs nothing"); + assert!(!go(|ctx| ctx.input_mut(|i| _ = i.consume_key(egui::Modifiers::NONE, egui::Key::Enter))), "a taken press runs nothing"); +} + +#[test] +fn optimize_to_file_size_starts_at_the_size_of_the_slices_files() { + let dir = vectorcraft_testkit::temp_dir("sfw-optimize-slices"); + let (mut app, _) = app(&dir, false); + app.run("object.slice.create", json!({"x": 0, "y": 0, "width": 30, "height": 20})).unwrap(); + app.run("file.saveForWeb", json!({})).unwrap(); + set(&mut app, "format", json!("png24")); + frame(&mut app); + let slices = app.session.execute("webExport.optimizeToFileSize", &json!({"format": "png24", "desiredK": 1048576})).unwrap(); + let whole = app.session.execute("document.exportForWeb.preview", &json!({"format": "png24"})).unwrap()["bytes"].as_u64().unwrap(); + let k = |b: u64| json!(save_for_web::size_k(b as usize)); + assert_ne!(k(slices["bytes"].as_u64().unwrap()), k(whole), "{slices}"); + // The size asked for holds the files measured. + let b = slices["bytes"].as_u64().unwrap(); + assert!((save_for_web::size_k(b as usize) * 1024.0).floor() as u64 >= b); + set(&mut app, "__optimizeOpen", json!(true)); + frame(&mut app); + let d = app.ui.dialog.as_ref().unwrap(); + assert_eq!(d.fields.get("__optimizeK"), Some(&k(slices["bytes"].as_u64().unwrap()))); + assert_eq!((d.fields.get("__optimizeUse"), d.fields.get("__optimizeOpen")), (Some(&json!("allSlices")), None)); +} + +#[test] +fn optimize_to_file_size_starts_at_the_size_of_the_art_as_it_is_now() { + let dir = vectorcraft_testkit::temp_dir("sfw-optimize-revision"); + let (mut app, _) = app(&dir, false); + // One context for every frame, so the preview cache of the first frame is still there. + let ctx = egui::Context::default(); + crate::theme::install_fonts(&ctx); + let frame = |app: &mut VectorcraftApp| ctx.run_ui(Default::default(), |ui| show(app, ui.ctx())).textures_delta.clear(); + app.run("file.saveForWeb", json!({})).unwrap(); + set(&mut app, "format", json!("png24")); + frame(&mut app); + let bytes = |app: &mut VectorcraftApp| { + app.session.execute("document.exportForWeb.preview", &json!({"format": "png24"})).unwrap()["bytes"].as_u64().unwrap() + }; + let before = bytes(&mut app); + // The art changes after the preview drew and before the button's click is handled. + app.run("shape.rectangle", json!({"x": 0, "y": 0, "width": 60, "height": 40})).unwrap(); + app.run("paint.setFill", json!({"color": "#3366ff"})).unwrap(); + let after = bytes(&mut app); + assert_ne!(save_for_web::size_k(before as usize), save_for_web::size_k(after as usize)); + set(&mut app, "__optimizeOpen", json!(true)); + frame(&mut app); + let d = app.ui.dialog.as_ref().unwrap(); + assert_eq!(d.fields.get("__optimizeK"), Some(&json!(save_for_web::size_k(after as usize)))); +} + +#[test] +fn size_in_k_holds_sizes_past_4_mib_on_every_target() { + assert_eq!(save_for_web::size_k(5 * 1024 * 1024), 5120.0); + assert_eq!(save_for_web::size_k(0), 0.001); + assert_eq!(save_for_web::size_k(1), 0.001); + // The largest size a target can hold still rounds up to a size that holds it. + assert!(save_for_web::size_k(usize::MAX) * 1024.0 >= usize::MAX as f64 * 0.999); +} diff --git a/crates/ui-egui/src/edit_toolbar/tests.rs b/crates/ui-egui/src/edit_toolbar/tests.rs index ecb6f15ea9..8983199324 100644 --- a/crates/ui-egui/src/edit_toolbar/tests.rs +++ b/crates/ui-egui/src/edit_toolbar/tests.rs @@ -142,17 +142,52 @@ fn every_tool_is_listed_once_under_a_heading() { assert!(!heads.contains(&"More"), "every tool has a named heading: {heads:?}"); } +/// The Enclosing Lasso Tool is in the Lasso tool's flyout in both toolbars, right after the Lasso, +/// once in the All Tools drawer (under Select) and in Keyboard Shortcuts' list, with no shortcut; +/// Reset Toolbar keeps it there. #[test] -fn enclosing_lasso_is_an_optional_addon_tool() { +fn enclosing_lasso_is_in_the_lasso_flyout() { let mut app = app(); let id = vectorcraft_tools::addons::enclosing_lasso::ID; - assert_eq!(heading(id), "Enclosing Lasso"); - assert!(slot_of(&app, id).is_none()); - app.run("toolbar.addTool", json!({"tool": id})).unwrap(); - assert!(slot_of(&app, id).is_some()); + for advanced in [false, true] { + if advanced { + app.run("window.toolbarAdvanced", json!({})).unwrap(); + } + let s = slots(&app); + let slot = slot_of(&app, "lasso").map(|i| s[i].clone()).expect("a Lasso slot"); + let lasso = slot.iter().position(|t| *t == "lasso").expect("the Lasso"); + assert_eq!(slot.get(lasso + 1), Some(&id), "advanced: {advanced}"); + assert_eq!(s.iter().filter(|ids| ids.contains(&id)).count(), 1, "advanced: {advanced}"); + } + assert_eq!(heading(id), "Select"); + assert_eq!(sections().iter().flat_map(|(_, tools)| tools.iter()).filter(|t| t.id == id).count(), 1, "listed once in the drawer"); + assert_eq!(vectorcraft_tools::catalog::all_tools().filter(|t| t.id == id).count(), 1, "listed once for Keyboard Shortcuts"); + assert_eq!(vectorcraft_tools::tool_info(id).map(|t| (t.label, t.shortcut)), Some(("Enclosing Lasso Tool", None))); app.run("tool.select", json!({"tool": id})).unwrap(); + assert_eq!(app.session.tool_id(), id); + let shown = slot_of(&app, id).map(|i| crate::toolbar::shown_tool(&app, &slots(&app)[i])); + assert_eq!(shown, Some(id), "the slot's button shows the tool once chosen"); + app.run("toolbar.removeTool", json!({"tool": id})).unwrap(); + assert!(slot_of(&app, id).is_none(), "it can be taken out"); app.run("toolbar.reset", json!({})).unwrap(); + let after_reset = slot_of(&app, "lasso").map(|i| slots(&app)[i].contains(&id)); + assert_eq!(after_reset, Some(true), "Reset Toolbar puts it back"); +} + +/// A toolbar edited and saved before the Enclosing Lasso Tool joined the Lasso group keeps its +/// saved layout: the tool stays in the drawer until Reset Toolbar or a drag adds it. +#[test] +fn a_saved_toolbar_without_enclosing_lasso_keeps_its_layout() { + let mut app = app(); + let id = vectorcraft_tools::addons::enclosing_lasso::ID; + let saved = ToolbarCategory { name: Some("Select".into()), slots: vec![["lasso", "magicWand"].iter().map(|t| t.to_string()).collect()] }; + app.ui.toolbar_edits = ToolbarEdits { basic: Some(vec![saved]), advanced: None }; + app.ui = std::mem::take(&mut app.ui).sanitized(); + assert_eq!(slots(&app), [["lasso", "magicWand"]]); assert!(slot_of(&app, id).is_none()); + app.run("toolbar.reset", json!({})).unwrap(); + let slot = slot_of(&app, "lasso").map(|i| slots(&app)[i].clone()); + assert!(slot.is_some_and(|s| s.contains(&id)), "Reset Toolbar adds it"); } #[test] @@ -166,7 +201,7 @@ fn the_commands_add_move_remove_and_reset_tools() { // Before the first slot, moved out of its group. app.run("toolbar.addTool", json!({"tool": "magicWand", "slot": 0})).unwrap(); assert_eq!(&slots(&app)[..3], [&["magicWand"][..], &["selection"], &["directSelection", "groupSelection"]]); - assert_eq!(slots(&app)[3], ["lasso"]); + assert_eq!(slots(&app)[3], ["lasso", "enclosingLasso"]); // After a slot, and into a group (last), moved out of the Rectangle group. app.run("toolbar.addTool", json!({"tool": "slice", "slot": 1, "place": "after"})).unwrap(); assert_eq!(slots(&app)[2], ["slice"]); @@ -359,7 +394,7 @@ fn tools_drag_between_the_drawer_and_the_toolbar() { // Within the toolbar: Selection onto the divider over the Lasso. let tools = crate::toolbar::tests::widget_rects(&ctx, BUTTON); drag(&mut app, &ctx, 5.0, tools[0].center(), tools[2].center_top() + vec2(0.0, 3.0)); - assert_eq!(&slots(&app)[..3], [&["directSelection", "groupSelection"][..], &["selection"], &["lasso", "magicWand"]]); + assert_eq!(&slots(&app)[..3], [&["directSelection", "groupSelection"][..], &["selection"], &["lasso", "enclosingLasso", "magicWand"]]); // The drawer closed, the toolbar is locked: the same drag moves nothing. app.run("window.editToolbar", json!({"open": false})).unwrap(); frame(&mut app, &ctx, 6.0, vec![]); @@ -677,12 +712,11 @@ fn a_saved_toolbar_without_trim_at_crossings_keeps_its_layout() { } /// The add-ons' tools are in neither toolbar as they ship (the Trim at Crossings Tool, in the -/// Scissors tool's group, aside): the drawer lists them under their add-on's heading, and they can -/// be added from there. +/// Scissors tool's group, and the Enclosing Lasso Tool, in the Lasso tool's group, aside): the +/// drawer lists them under their add-on's heading, and they can be added from there. #[test] fn addon_tools_are_in_the_drawer_not_the_toolbars() { let mut app = app(); - let enclosing = vectorcraft_tools::addons::enclosing_lasso::ID; let contour = vectorcraft_tools::addons::contour::ID; let box3d = vectorcraft_tools::addons::box3d::ID; let polygonal = vectorcraft_tools::addons::polygonal_lasso::ID; @@ -698,7 +732,6 @@ fn addon_tools_are_in_the_drawer_not_the_toolbars() { "slideAnchor", "sharedEdge", "smartPen", - enclosing, contour, box3d, polygonal @@ -715,11 +748,10 @@ fn addon_tools_are_in_the_drawer_not_the_toolbars() { }; assert_eq!(listed("extendPath"), Some(("Path Precision Tools", addon[..7].to_vec()))); assert_eq!(listed("smartPen"), Some(("Smart Pen", vec!["smartPen"]))); - assert_eq!(listed(enclosing), Some(("Enclosing Lasso", vec![enclosing]))); assert_eq!(listed(contour), Some(("Contour", vec![contour]))); assert_eq!(listed(box3d), Some(("3D Box", vec![box3d]))); assert_eq!(listed(polygonal), Some(("Polygonal Lasso", vec![polygonal]))); - for tool in ["extendPath", "smartPen", enclosing, contour, box3d, polygonal] { + for tool in ["extendPath", "smartPen", contour, box3d, polygonal] { app.run("toolbar.addTool", json!({"tool": tool})).unwrap(); assert!(slot_of(&app, tool).is_some(), "{tool}"); } diff --git a/crates/ui-egui/src/i18n.rs b/crates/ui-egui/src/i18n.rs index 758272f60a..07dffda0d2 100644 --- a/crates/ui-egui/src/i18n.rs +++ b/crates/ui-egui/src/i18n.rs @@ -688,8 +688,10 @@ const MESSAGE_DEPTH: usize = 5; /// parts of them (file names, numbers, a reason with no entry, a JSON object or array such as /// `{"objects": [...]}`, a value the message quotes in `"…"`, `“…”`, `'…'` or backticks, such as a /// symbol's or a script property's name, and an `{ident}` placeholder's value, a script identifier), -/// stay as they are. A part that starts with `{` is translated only when it is a whole message with -/// an exact entry. A part that starts with `[` is translated when it has an exact entry, such as +/// stay as they are. A `{to}` placeholder's value that is not quoted, a printer's name such as +/// `Office Laser (Floor 2)`, is translated only when it has an exact entry, such as +/// `the default printer`. A part that starts with `{` is translated only when it is a whole message +/// with an exact entry. A part that starts with `[` is translated when it has an exact entry, such as /// `[x, y] (two numbers)`, or when it fits a template that starts with `[` and an index of digits, /// such as an effect's refusal ``[0] `id`: {why}``. pub fn message(lang: Lang, s: &str) -> String { @@ -732,6 +734,7 @@ fn fill_message(lang: Lang, s: &str, found: Option<(&[String], catalog::Captures (Some((tool, _)), "_1") => (k, tool.clone()), (Some((_, kinds)), "_2") => (k, kinds.clone()), (_, "ident") => (k, v.to_string()), + (_, "to") if !quoted(v) => (k, exact_translation(lang.catalog(), v).unwrap_or_else(|| v.to_string())), _ => (k, nested(v)), }) .collect(); diff --git a/crates/ui-egui/src/i18n/bg.tsv b/crates/ui-egui/src/i18n/bg.tsv index 06ded5c5a3..bdf2405d68 100644 --- a/crates/ui-egui/src/i18n/bg.tsv +++ b/crates/ui-egui/src/i18n/bg.tsv @@ -592,6 +592,7 @@ font-technology Variable Променливи Consolidate All Windows Обединяване на всички прозорци Constrain Angle Заключване на ъгъла Constrain Width and Height Proportions Запазване на пропорциите на ширина и височина + Copy Width to Height Копиране на ширината във височината Construction Guides Конструкционни водачи Contextual Alternates Контекстни алтернативи Contextual Task Bar Контекстна лента със задачи @@ -602,6 +603,8 @@ font-technology Variable Променливи Control Контрол Convert Конвертиране Convert All Spot Colors to Process Конвертиране на всички спот цветове в трихромни + Convert {name} to process Конвертиране на {name} в трихромен + Keep {name} as spot Запазване на {name} като спот Convert All Strokes to Outlines Конвертиране на всички щрихове в контури Convert All Text to Outlines Конвертиране на целия текст в контури Convert Anchor Point Преобразуване на опорна точка @@ -670,6 +673,9 @@ font-technology Variable Променливи Create from Selection Създаване от селекцията Create From: Създаване от: Create Gradient Mesh… Създаване на градиентна мрежа… + Flat Плоско + To Center Към центъра + To Edge Към ръба Create Graph Създаване на диаграма Create New Layer Създаване на нов слой Create New Sublayer Създаване на нов подслой @@ -2631,6 +2637,18 @@ font-technology Variable Променливи Preview: Преглед: Preview All Layers Преглед на всички слоеве Preview in Browser Преглед в браузър + Optimize to File Size… Оптимизиране до размер на файла… + Optimize to File Size Оптимизиране до размер на файла + Desired File Size: Желан размер на файла: + Start With: Начало с: + Use: Използване: + Current Settings Текущи настройки + Auto Select GIF/JPEG Автоматичен избор на GIF/JPEG + Total of All Slices Общо за всички откъси + Each Slice Всеки откъс + Current Slice Текущ откъс + {size}, within {target} {size}, в рамките на {target} + No setting tried fits in {target}; the smallest is {size} Никоя изпробвана настройка не се побира в {target}; най-малкият размер е {size} Preview in Browser needs the desktop app (the web downloads files instead) Прегледът в браузър изисква настолното приложение (уеб версията изтегля файловете вместо това) Preview Mode Режим на преглед Preview the document as it is now Преглед на документа в текущия му вид @@ -2975,12 +2993,85 @@ digits Malayalam Малаялам Responsive Адаптивен Restore Възстановяване Restore every preference to its default (applied on OK) Възстановяване на всички настройки по подразбиране (прилага се при ОПК) + Shows a bar of commands for the selection or tool on the canvas; it hides while you drag and in Presentation Mode. Показва върху платното лента с команди за селекцията или инструмента; тя се скрива по време на влачене и в режим на презентация. + How far an arrow key moves the selection; with Shift, it moves ten times as far. Колко далеч клавиш със стрелка премества селекцията; с Shift я премества десет пъти по-далеч. + The angle of the axes that arrow keys move along and that Shift holds drawing and moving to. Ъгълът на осите, по които преместват клавишите със стрелки и към които Shift ограничава рисуването и преместването. + The corner radius the Rounded Rectangle tool draws with; changing the radius while drawing changes this value too. Радиусът на ъгъла, с който рисува инструментът „Закръглен правоъгълник“; промяната на радиуса по време на рисуване променя и тази стойност. + How far right and down Paste moves the copy when it is given no position, as from a script; Paste in the app centers it in the view. Колко надясно и надолу „Поставяне“ премества копието, когато не е зададена позиция, например от скрипт; „Поставяне“ в приложението го поставя в центъра на изгледа. + Stops the Pen tool from deleting the anchor you click on a selected path, or adding one where you click its segment. Спира инструмента „Перо“ да изтрива опорната точка, върху която щракнете на избран контур, или да добавя точка там, където щракнете върху сегмента му. + Drawing tools show a crosshair pointer instead of their icon; Caps Lock does the same while it is on. Инструментите за рисуване показват показалец във форма на кръст вместо иконата си; Caps Lock прави същото, докато е включен. + Shows a tip when the pointer rests on a button or field that has one. Показва подсказка, когато показалецът спре върху бутон или поле, които имат такава. + Shows a warning before a script you choose runs. Показва предупреждение, преди да се изпълни скрипт, който изберете. + Smooths the edges of artwork on the canvas. Изглажда ръбовете на графиката върху платното. + Select › Same › Fill Color, Stroke Color and Fill & Stroke match only the same tint of a global or spot swatch, not any tint of it. „Селекция › Същото › Цвят на запълване“, „Цвят на щриха“ и „Запълване и щрих“ намират само същия нюанс на глобална или плътна мостра, а не всеки неин нюанс. + Shows the Home screen when no document is open; off, the window stays empty until you click Home. Показва началния екран, когато няма отворен документ; ако е изключено, прозорецът остава празен, докато не щракнете „Начало“. + Measures objects with their strokes and shape-changing effects for size, position and alignment; shadows, glows and blurs are not measured. Измерва обектите заедно с щрихите и ефектите, които променят формата, за размер, позиция и подравняване; сенките, сиянията и замъгляванията не се измерват. + At 100% zoom, one inch of the document takes 96 screen points instead of 72. При мащаб 100 % един инч от документа заема 96 екранни точки вместо 72. + Double-clicking a group, path or image with the Selection tool opens it in isolation mode. Двойно щракване върху група, контур или изображение с инструмента „Селекция“ ги отваря в режим на изолация. + Pattern fills and strokes transform with the art, unless a transform or the Transform panel's menu chooses otherwise. Запълванията и щрихите с мостра се трансформират заедно с графиката, освен ако трансформацията или менюто на панела „Трансформиране“ не избере друго. + Live corner radii scale with the art, unless the scale chooses otherwise. Радиусите на динамичните ъгли се мащабират заедно с графиката, освен ако мащабирането не избере друго. + Stroke weights, dashes and effect distances scale with the art, unless the scale chooses otherwise. Дебелините на щрихите, тиретата и разстоянията на ефектите се мащабират заедно с графиката, освен ако мащабирането не избере друго. + The mouse wheel zooms the canvas instead of scrolling it. Колелцето на мишката мащабира платното, вместо да го превърта. + The mouse wheel with Cmd/Ctrl held scrolls the canvas sideways. Колелцето на мишката с натиснат Cmd/Ctrl превърта платното настрани. + Dragging sideways on a numeric field's label changes the field's value. Влаченето настрани върху етикета на числово поле променя стойността на полето. + A two-finger rotate gesture on a trackpad rotates the canvas view. Жест за завъртане с два пръста върху тъчпад завърта изгледа на платното. + Holding a tool's shortcut key chooses the tool until you let go, and then the previous tool is chosen again. Задържането на клавишната комбинация на инструмент го избира, докато я пуснете, а след това отново се избира предишният инструмент. + Shows the bounding box while you move the selection or draw a shape. Показва ограничителната рамка, докато премествате селекцията или рисувате форма. + Create Trim Marks draws Japanese-style marks instead of Roman ones. „Създаване на режещи знаци“ рисува знаци в японски стил вместо в римски. + New art takes only the fill and stroke of the selection; off, it takes the selected object's whole appearance. Новата графика взема само запълването и щриха на селекцията; ако е изключено, взема целия облик на избрания обект. + Changing the width or height in the Transform panel, the Properties panel or the Control bar changes the other in proportion. Промяната на ширината или височината в панела „Трансформиране“, панела „Свойства“ или контролния панел пропорционално променя другия размер. + A live rectangle's properties show one Corner Radius field for all four corners; off, each corner has its own field. Свойствата на динамичен правоъгълник показват едно поле „Радиус на ъгъла“ за четирите ъгъла; ако е изключено, всеки ъгъл има свое поле. + What edits in the Transform panel transform: the object, its pattern tiles or both; Default follows Transform Pattern Tiles. Какво трансформират промените в панела „Трансформиране“: обекта, плочките на мострата му или и двете; „По подразбиране“ следва „Трансформиране на плочките на мострата“. + With one symbol instance selected, the Transform panel uses the symbol's registration point as its reference point. Когато е избран един екземпляр на символ, панелът „Трансформиране“ използва регистрационната точка на символа като опорна точка. + Darkens the canvas outside the artboards while the Artboard tool is active. Затъмнява платното извън работните области, докато инструментът „Работна област“ е активен. + With Fade Region Outside Artboard on, the area outside the artboards stays dark while you drag with the Artboard tool. Когато „Затъмняване на областта извън работната област“ е включено, областта извън работните области остава тъмна, докато влачите с инструмента „Работна област“. + How near, in pixels, the pointer must be to an object, anchor or handle for a click to select it. Колко близо в пиксели трябва да е показалецът до обект, опорна точка или дръжка, за да го избере щракване. + Whether the Selection tool's box selects objects it touches or only those fully inside; Drag Direction selects those inside on a drag to the right. E reverses it mid-drag. Дали рамката на инструмента „Селекция“ избира докоснатите обекти или само изцяло обхванатите; „Посока на плъзгане“ избира обхванатите при плъзгане надясно. E обръща правилото по време на плъзгане. + A click selects a filled object only on its path, not inside its fill. Щракване избира запълнен обект само по контура му, а не в запълването. + How near, in pixels, a point must come to an anchor or ruler guide for Snap to Point to snap it; with Smart Guides on, Smart Guides' Snapping Tolerance applies instead. Колко близо в пиксели трябва да стигне точка до опорна точка или водач от линийката, за да я прилепи „Прилепване към точка“; при включени интелигентни водачи важи техният толеранс на прилепване. + With the Selection tool, Cmd/Ctrl-click selects the object under the selected one at the pointer; each further click goes one object deeper. С инструмента „Селекция“ Cmd/Ctrl-щракване избира обекта под избрания при показалеца; всяко следващо щракване слиза с един обект по-надолу. + Zoom In and Zoom Out bring the center of the selection to the middle of the view. „Увеличаване“ и „Намаляване“ поставят центъра на селекцията в средата на изгледа. + Locked and hidden artwork inside an artboard moves, scales and is copied with the artboard, as the other artwork does. Заключените и скритите обекти в работна област се местят, мащабират и копират с нея като останалите обекти. + The size of anchor points and direction handle ends on the canvas; larger anchors can also be picked from farther away. Размерът на опорните точки и краищата на дръжките за посока върху платното; по-големите опорни точки се хващат и от по-далеч. + Draws the ends of direction handles as solid dots, hollow dots or larger solid dots. Рисува краищата на дръжките за посока като плътни точки, кухи точки или по-големи плътни точки. + With the Direct Selection tool, the anchor under the pointer is highlighted. С инструмента „Директен избор“ опорната точка под показалеца се осветява. + Shows direction handles when more than one anchor is selected; off, they show only while a single anchor is selected. Показва дръжките за посока, когато са избрани повече от една опорна точка; ако е изключено, те се виждат само при една избрана опорна точка. + Corner widgets hide on corners whose angle is greater than this many degrees. Приспособленията за ъгли се скриват при ъгли, по-големи от толкова градуса. + The Pen tool previews the next segment from the last anchor to the pointer before you click. Инструментът „Перо“ показва следващия сегмент от последната опорна точка до показалеца, преди да щракнете. + The Curvature tool previews the curve to the pointer before you place the next point. Инструментът „Кривина“ показва кривата до показалеца, преди да поставите следващата точка. The unit for new documents from built-in sizes other than pixel sizes and for opened files that record no unit; choosing one here and clicking OK also sets the active document's units. Единицата за новите документи от вградените размери, освен тези в пиксели, и за отворените файлове без записана единица; ако я изберете тук и натиснете ОК, тя става и единица на активния документ. Stroke weights, dashes and gaps show in this unit, and numbers typed for them are read in it. Дебелините на щрихите, тиретата и междините се показват в тази единица и въведените за тях числа се четат в нея. Type sizes, leading and baseline shift show in this unit, and numbers typed for them are read in it. Размерите на текста, междуредието и отстъпът на базовата линия се показват в тази единица и въведените за тях числа се четат в нея. The unit for East Asian type measurements, which no field uses yet. Единицата за мерките на източноазиатски текст, която засега не се използва от нито едно поле. When on, a number typed without a unit into a field in picas is read in points. Когато е включено, число, въведено без единица в поле в пики, се чете в точки. With XML ID, object names show as XML IDs in the Layers panel, the Variables panel and Layer Options. При XML ID имената на обектите се показват като XML ID в Слоеве, Променливи и Опции за слоя. + Snaps drawing, moving and scaling to the grid's subdivisions, even while the grid is hidden; while it is on, Snap to Pixel does not apply. Прилепва рисуването, преместването и мащабирането към подразделенията на мрежата, дори когато мрежата е скрита; докато е включено, „Прилепване към пиксел“ не действа. + The color of guides that are not selected; an artboard with a Guide Label draws its own guides in the label's color instead. Цветът на водачите, които не са избрани; работна област с „Етикет на водачите“ рисува своите водачи в цвета на етикета. + Draws guides as solid lines or as dots, including the guides already in the document. Рисува водачите като плътни линии или като точки, включително водачите, които вече са в документа. + With this on, guides are locked when VectorCraft starts; changing this option locks or unlocks them at once, and View › Guides › Lock Guides still changes the lock. Когато е включено, водачите са заключени при стартиране на VectorCraft; промяната на опцията веднага ги заключва или отключва, а „Изглед › Водачи › Заключване на водачите“ продължава да променя заключването. + With this on, holding Cmd/Ctrl as you start dragging from a ruler makes a guide on the active artboard only, or a canvas guide with the Artboard tool. Когато е включено, задържането на Cmd/Ctrl в началото на плъзгане от линийка създава водач само в активната работна област, а с инструмента „Работна област“ създава водач за цялото платно. + The color of the grid; the lines between major gridlines are drawn in a fainter shade of it. Цветът на мрежата; линиите между основните линии на мрежата се рисуват в по-блед нюанс на този цвят. + Draws the grid as lines, or as dots along the major gridlines at each subdivision. Рисува мрежата като линии или като точки по основните линии на мрежата при всяко подразделение. + The distance between major gridlines, in every open document and in new ones; a VectorCraft document opens with the grid it was saved with. Разстоянието между основните линии на мрежата във всеки отворен документ и в новите; документ на VectorCraft се отваря с мрежата, с която е записан. + How many parts each major grid square is divided into; Snap to Grid snaps to these parts, even when the zoom hides their lines. На колко части се дели всеки основен квадрат на мрежата; „Прилепване към мрежа“ прилепва към тези части, дори когато мащабът скрива линиите им. + Draws the grid behind the artwork; off, the grid is drawn over it. Рисува мрежата зад графиката; когато е изключено, мрежата се рисува върху нея. + In Pixel Preview at 600% zoom or more, the active view shows a line at the edge of every document pixel over the artwork. В „Пикселен преглед“ при увеличение 600% или повече активният изглед показва линия по ръба на всеки пиксел на документа върху графиката. + The color of the tile edge and the dashed swatch bounds shown while you edit a pattern. Цветът на ръба на плочката и на пунктирните граници на образеца, които се показват, докато редактирате мостра. + Snaps drawing, moving and transforming to nearby art and shows guides and labels; Pixel Preview turns them off, and Snap to Grid snaps to the grid instead. Прилепва рисуването, преместването и трансформирането към близки обекти и показва водачи и етикети; „Пикселен преглед“ ги изключва, а „Прилепване към мрежа“ прилепва към мрежата вместо тях. + The color of Smart Guide lines and labels. Цветът на линиите и етикетите на интелигентните водачи. + Shows a line along the edge or center that art lines up with; off, art still lines up without the line, and Snap to Glyph does not apply. Показва линия по ръба или центъра, с който обектите се подравняват; когато е изключено, те пак се подравняват без линията, а „Прилепване към глиф“ не действа. + With a selection tool, outlines the unselected object under the pointer in its layer color while you are not dragging. С инструмент за селекция очертава неселектирания обект под показалеца в цвета на неговия слой, докато не влачите. + Shows the size or angle next to the pointer while you scale, rotate, shear or reflect art. Показва размера или ъгъла до показалеца, докато мащабирате, завъртате, срязвате или отразявате обекти. + While you draw, points snap to lines at the chosen Angles through the point the segment or shape starts from. Докато рисувате, точките прилепват към линии под избраните ъгли през точката, от която започва сегментът или фигурата. + The set of angles the construction guides follow while Construction Guides is on. Наборът ъгли, които конструкционните водачи следват, докато „Конструкционни водачи“ е включено. + Names what a point snaps to, such as an anchor, a path or an alignment; off, points snap the same way without the names. Назовава към какво прилепва точката, например опорна точка, път или подравняване; когато е изключено, точките прилепват по същия начин без имената. + Shows distances, angles and how far art has moved next to the pointer while you draw or move it. Показва до показалеца разстояния, ъгли и колко е преместен обектът, докато рисувате или премествате. + Snaps moved or resized art to the same gap as between nearby objects, and marks the equal gaps. Прилепва преместени или преоразмерени обекти към същата междина като между близките обекти и отбелязва равните междини. + With something selected, holding Alt/Option over another object or an artboard shows the distances between it and the selection. При избран обект задържането на Alt/Option над друг обект или работна област показва разстоянията между него и селекцията. + A selection dragged back to within the Snapping Tolerance of where the drag began goes back to exactly that place; a copy does not. Селекция, върната с влачене в рамките на толеранса на прилепване от мястото, където е започнало влаченето, се връща точно там; копие не се връща. + How near on screen the pointer or a dragged point must come to art for Smart Guides to snap to it; the distance is the same at every zoom. Колко близо на екрана показалецът или влачена точка трябва да стигне до обект, за да прилепнат интелигентните водачи; разстоянието е еднакво при всеки мащаб. + Snaps the end of a line segment, or a circle drawn from its center, so that it touches a nearby curve. Прилепва края на линеен сегмент или окръжност, начертана от центъра си, така че да докосва близка крива. + Snaps the end of a line segment so that it meets a nearby straight segment at a right angle. Прилепва края на линеен сегмент така, че да среща близък прав сегмент под прав ъгъл. Reset all preferences to their defaults? Да се нулират ли всички настройки до стойностите по подразбиране? The defaults are applied when you click OK in Preferences. Cancel there keeps your current preferences. Стойностите по подразбиране се прилагат, когато щракнете върху ОК в Настройки. Отказ там запазва текущите ви настройки. Restore Recovered Documents Възстановяване на възстановените документи @@ -4341,6 +4432,11 @@ axis Both И двете @msg PDF writer error: {0} Грешка на PDF записа: {0} @msgplural Packaged {n} file ({note}) in {folder}|Packaged {n} files ({note}) in {folder} Пакетиран е {n} файл в {folder} ({note})|Пакетирани са {n} файла в {folder} ({note}) @msg Preview in Browser needs the desktop app (the web downloads files instead) Прегледът в браузър изисква настолното приложение (уеб версията изтегля файловете вместо това) +@msg give `desiredK`, the desired file size in K (1024 bytes): a number above 0 and at most 1048576 задайте `desiredK`, желания размер на файла в K (1024 байта): число над 0 и най-много 1048576 +@msg `startWith` is `current` or `auto` `startWith` е `current` или `auto` +@msg `use` is `allSlices`, `eachSlice` or `currentSlice` `use` е `allSlices`, `eachSlice` или `currentSlice` +@msg `slice` is a slice number from `slice.list`, with `use: currentSlice` `slice` е номер на откъс от `slice.list`, заедно с `use: currentSlice` +@msg Optimize to File Size: there is no image to measure Оптимизиране до размер на файла: няма изображение за измерване @msg Release Guides: no guides Освобождаване на водачи: няма водачи @msg Release: no layer to put the rectangle in Освобождаване: няма слой, в който да се постави правоъгълникът @msg Replace Spine: select a blend and a path Замяна на оста: изберете плавно преливане и път @@ -5375,6 +5471,19 @@ lighting Light Светлина Transform Objects Трансформиране на обекти @msg unknown parameter `{key}`; did you mean `{near}`? неизвестен параметър `{key}`; имахте ли предвид `{near}`? @msg unknown parameter `{key}`; the command takes no parameters неизвестен параметър `{key}`; командата не приема параметри +@msg unknown parameter `{key}`; `{object}` takes: {keys} неизвестен параметър `{key}`; `{object}` приема: {keys} +@msg unknown parameter `{key}`; {why_not} неизвестен параметър `{key}`; {why_not} +@msg no format takes it (see document.formats) никой формат не го приема (вижте document.formats) +@msg no save format takes it (see file.formatOptions) никой формат за записване не го приема (вижте file.formatOptions) +@msg PDF doesn't take it (see document.formats) PDF не го приема (вижте document.formats) +@msg EPS doesn't take it (see document.formats) EPS не го приема (вижте document.formats) +@msg DXF doesn't take it (see document.formats) DXF не го приема (вижте document.formats) +@msg {name} must be {range} (got {v}) {name} трябва да бъде {range} (получено {v}) +@msg The graphics processor tried first couldn't show the window, so VectorCraft started again on {summary} (Settings › Performance › Graphics Processor › Automatic uses the one that drives your display) Първият опит на графичния процесор да покаже прозореца не успя, затова VectorCraft стартира отново на {summary} (Настройки › Производителност › Графичен процесор › Автоматично използва този, който управлява вашия дисплей) +@msg Sent “{title}” to {to} “{title}” е изпратено към {to} +@msg Sent “{title}” to {to}. The spooler replied: {note} “{title}” е изпратено към {to}. Отговор на опашката за печат: {note} +@msg the default printer принтера по подразбиране +@msg raster effects on object {object}: requested {requested} ppi, achieved {achieved} ppi due to the 64 million pixel cap растерни ефекти върху обект {object}: поискани {requested} ppi, постигнати {achieved} ppi заради ограничението от 64 милиона пиксела @msg unknown parameter `{key}`; the command takes: {keys} неизвестен параметър `{key}`; командата приема: {keys} 1 Layer 1 слой 1 bit 1 бит diff --git a/crates/ui-egui/src/i18n/bs.tsv b/crates/ui-egui/src/i18n/bs.tsv index 3bf3e333b4..a837f88ce9 100644 --- a/crates/ui-egui/src/i18n/bs.tsv +++ b/crates/ui-egui/src/i18n/bs.tsv @@ -218,6 +218,9 @@ Mask Maska Rasterize… Rasteriziraj… Create Gradient Mesh… Kreiraj gradijentnu mrežu… + Flat Ravno + To Center Prema sredini + To Edge Prema ivici Create Object Mosaic… Kreiraj mozaik objekata… Vector Halftone… Vektorski polutonovi… Create Trim Marks Kreiraj oznake za obrezivanje @@ -1167,6 +1170,18 @@ lighting Light Svjetlo Placement Options… Opcije postavljanja… Plug-in… Dodatak… Preview in Browser Pregledaj u pregledniku + Optimize to File Size… Optimiziraj na veličinu datoteke… + Optimize to File Size Optimiziraj na veličinu datoteke + Desired File Size: Željena veličina datoteke: + Start With: Počni sa: + Use: Koristi: + Current Settings Trenutne postavke + Auto Select GIF/JPEG Automatski odaberi GIF/JPEG + Total of All Slices Ukupno svih isječaka + Each Slice Svaki isječak + Current Slice Trenutni isječak + {size}, within {target} {size}, unutar {target} + No setting tried fits in {target}; the smallest is {size} Nijedna isprobana postavka ne stane u {target}; najmanja je {size} Printer Setup… Podešavanje štampača… Printers Štampači Recent File Nedavna datoteka @@ -2841,6 +2856,8 @@ digits Malayalam Malajalam Collate Složi po kopijama Composite colours are converted to it; separations separate with it when it is a CMYK profile. Kompozitne boje se pretvaraju u njega; separacije se razdvajaju njime kad je CMYK profil. Convert All Spot Colors to Process Pretvori sve spot boje u procesne + Convert {name} to process Pretvori {name} u procesnu + Keep {name} as spot Zadrži {name} kao spot Overprint Black Pretisak crne Default Printer Zadani štampač Document Ink Options Opcije tinti dokumenta @@ -3890,6 +3907,7 @@ theme Appearance Izgled Command Click to Select Objects Behind Command-klik za odabir objekata iza Constrain Angle Ograniči ugao Constrain Width and Height Proportions Zadrži proporcije širine i visine + Copy Width to Height Kopiraj širinu u visinu Construction Guides Konstrukcijske vodilice Curvature Tool Alat zakrivljenost Data Recovery Oporavak podataka @@ -4413,12 +4431,85 @@ font-technology Variable Varijabilni Preferences Postavke Previous Prethodno Restore every preference to its default (applied on OK) Vrati svaku postavku na zadanu vrijednost (primjenjuje se na U redu) + Shows a bar of commands for the selection or tool on the canvas; it hides while you drag and in Presentation Mode. Prikazuje na platnu traku s naredbama za odabir ili alat; skriva se dok prevlačite i u načinu prezentacije. + How far an arrow key moves the selection; with Shift, it moves ten times as far. Koliko daleko tipka sa strelicom pomjera odabir; uz Shift ga pomjera deset puta dalje. + The angle of the axes that arrow keys move along and that Shift holds drawing and moving to. Ugao osa duž kojih pomjeraju tipke sa strelicama i na koje Shift ograničava crtanje i pomjeranje. + The corner radius the Rounded Rectangle tool draws with; changing the radius while drawing changes this value too. Poluprečnik ugla kojim crta alat Zaobljeni pravougaonik; promjena poluprečnika tokom crtanja mijenja i ovu vrijednost. + How far right and down Paste moves the copy when it is given no position, as from a script; Paste in the app centers it in the view. Koliko udesno i nadolje Zalijepi pomjera kopiju kada položaj nije zadan, na primjer iz skripte; Zalijepi u aplikaciji je stavlja u sredinu prikaza. + Stops the Pen tool from deleting the anchor you click on a selected path, or adding one where you click its segment. Sprječava da alat Pero briše sidrenu tačku na koju kliknete na odabranoj putanji ili dodaje tačku tamo gdje kliknete na njen segment. + Drawing tools show a crosshair pointer instead of their icon; Caps Lock does the same while it is on. Alati za crtanje prikazuju pokazivač u obliku krstića umjesto svoje ikone; Caps Lock čini isto dok je uključen. + Shows a tip when the pointer rests on a button or field that has one. Prikazuje savjet kada se pokazivač zadrži na dugmetu ili polju koje ga ima. + Shows a warning before a script you choose runs. Prikazuje upozorenje prije nego što se pokrene skripta koju odaberete. + Smooths the edges of artwork on the canvas. Izglađuje rubove grafike na platnu. + Select › Same › Fill Color, Stroke Color and Fill & Stroke match only the same tint of a global or spot swatch, not any tint of it. Odabir › Isto › Boja ispune, Boja poteza i Ispuna i potez pronalaze samo istu nijansu globalnog ili spot uzorka, a ne bilo koju njegovu nijansu. + Shows the Home screen when no document is open; off, the window stays empty until you click Home. Prikazuje početni ekran kada nijedan dokument nije otvoren; kada je isključeno, prozor ostaje prazan dok ne kliknete Početna. + Measures objects with their strokes and shape-changing effects for size, position and alignment; shadows, glows and blurs are not measured. Mjeri objekte zajedno s potezima i efektima koji mijenjaju oblik za veličinu, položaj i poravnanje; sjene, sjaj i zamućenja se ne mjere. + At 100% zoom, one inch of the document takes 96 screen points instead of 72. Pri zumu od 100% jedan inč dokumenta zauzima 96 tačaka ekrana umjesto 72. + Double-clicking a group, path or image with the Selection tool opens it in isolation mode. Dvostruki klik na grupu, putanju ili sliku alatom Odabir otvara ih u načinu izolacije. + Pattern fills and strokes transform with the art, unless a transform or the Transform panel's menu chooses otherwise. Ispune i potezi s uzorkom transformišu se zajedno s grafikom, osim ako transformacija ili meni panela Transformiši ne odabere drugačije. + Live corner radii scale with the art, unless the scale chooses otherwise. Poluprečnici dinamičnih uglova skaliraju se zajedno s grafikom, osim ako skaliranje ne odabere drugačije. + Stroke weights, dashes and effect distances scale with the art, unless the scale chooses otherwise. Debljine poteza, crtice i udaljenosti efekata skaliraju se zajedno s grafikom, osim ako skaliranje ne odabere drugačije. + The mouse wheel zooms the canvas instead of scrolling it. Točkić miša zumira platno umjesto da ga pomjera. + The mouse wheel with Cmd/Ctrl held scrolls the canvas sideways. Točkić miša uz pritisnut Cmd/Ctrl pomjera platno u stranu. + Dragging sideways on a numeric field's label changes the field's value. Prevlačenje u stranu po oznaci brojčanog polja mijenja vrijednost polja. + A two-finger rotate gesture on a trackpad rotates the canvas view. Pokret rotacije s dva prsta na dodirnoj podlozi rotira prikaz platna. + Holding a tool's shortcut key chooses the tool until you let go, and then the previous tool is chosen again. Držanje prečice alata bira taj alat dok je ne pustite, a zatim se ponovo bira prethodni alat. + Shows the bounding box while you move the selection or draw a shape. Prikazuje granični okvir dok pomjerate odabir ili crtate oblik. + Create Trim Marks draws Japanese-style marks instead of Roman ones. Kreiraj oznake za obrezivanje crta oznake u japanskom stilu umjesto rimskih. + New art takes only the fill and stroke of the selection; off, it takes the selected object's whole appearance. Nova grafika preuzima samo ispunu i potez odabira; kada je isključeno, preuzima cijeli izgled odabranog objekta. + Changing the width or height in the Transform panel, the Properties panel or the Control bar changes the other in proportion. Promjena širine ili visine u panelu Transformiši, panelu Svojstva ili kontrolnom panelu proporcionalno mijenja drugu dimenziju. + A live rectangle's properties show one Corner Radius field for all four corners; off, each corner has its own field. Svojstva dinamičnog pravougaonika prikazuju jedno polje Poluprečnik ugla za sva četiri ugla; kada je isključeno, svaki ugao ima svoje polje. + What edits in the Transform panel transform: the object, its pattern tiles or both; Default follows Transform Pattern Tiles. Šta transformišu izmjene u panelu Transformiši: objekat, pločice njegovog uzorka ili oboje; Zadano prati Transformiši pločice uzorka. + With one symbol instance selected, the Transform panel uses the symbol's registration point as its reference point. Kada je odabrana jedna instanca simbola, panel Transformiši koristi tačku registracije simbola kao referentnu tačku. + Darkens the canvas outside the artboards while the Artboard tool is active. Zatamnjuje platno izvan radnih ploča dok je alat Radna ploča aktivan. + With Fade Region Outside Artboard on, the area outside the artboards stays dark while you drag with the Artboard tool. Kada je uključeno Zatamni područje izvan radne ploče, područje izvan radnih ploča ostaje tamno dok prevlačite alatom Radna ploča. + How near, in pixels, the pointer must be to an object, anchor or handle for a click to select it. Koliko blizu, u pikselima, pokazivač mora biti objektu, sidrenoj tački ili ručki da bi ga klik odabrao. + Whether the Selection tool's box selects objects it touches or only those fully inside; Drag Direction selects those inside on a drag to the right. E reverses it mid-drag. Da li okvir alata za odabir bira objekte koje dodiruje ili samo one potpuno unutar njega; Smjer povlačenja bira one unutra pri povlačenju udesno. E obrće pravilo tokom povlačenja. + A click selects a filled object only on its path, not inside its fill. Klik bira popunjen objekat samo na njegovoj putanji, ne unutar ispune. + How near, in pixels, a point must come to an anchor or ruler guide for Snap to Point to snap it; with Smart Guides on, Smart Guides' Snapping Tolerance applies instead. Koliko blizu, u pikselima, tačka mora doći sidrenoj tački ili vodilici lenjira da bi je Prilijepi uz tačku prilijepio; uz uključene pametne vodilice važi njihova tolerancija hvatanja. + With the Selection tool, Cmd/Ctrl-click selects the object under the selected one at the pointer; each further click goes one object deeper. Uz alat za odabir, Cmd/Ctrl-klik bira objekat ispod odabranog na mjestu pokazivača; svaki sljedeći klik ide jedan objekat dublje. + Zoom In and Zoom Out bring the center of the selection to the middle of the view. Uvećaj i Umanji dovode središte odabira u sredinu prikaza. + Locked and hidden artwork inside an artboard moves, scales and is copied with the artboard, as the other artwork does. Zaključana i skrivena grafika unutar radne ploče pomjera se, skalira i kopira s radnom pločom kao i ostala grafika. + The size of anchor points and direction handle ends on the canvas; larger anchors can also be picked from farther away. Veličina sidrenih tačaka i krajeva ručki smjera na platnu; veće sidrene tačke mogu se uhvatiti i s veće udaljenosti. + Draws the ends of direction handles as solid dots, hollow dots or larger solid dots. Crta krajeve ručki smjera kao pune tačke, šuplje tačke ili veće pune tačke. + With the Direct Selection tool, the anchor under the pointer is highlighted. Uz alat za direktni odabir, sidrena tačka ispod pokazivača se ističe. + Shows direction handles when more than one anchor is selected; off, they show only while a single anchor is selected. Prikazuje ručke smjera kada je odabrano više od jedne sidrene tačke; kad je isključeno, vide se samo dok je odabrana jedna sidrena tačka. + Corner widgets hide on corners whose angle is greater than this many degrees. Widgeti uglova se skrivaju na uglovima čiji je ugao veći od ovoliko stepeni. + The Pen tool previews the next segment from the last anchor to the pointer before you click. Alat pero prikazuje sljedeći segment od posljednje sidrene tačke do pokazivača prije nego kliknete. + The Curvature tool previews the curve to the pointer before you place the next point. Alat zakrivljenost prikazuje krivulju do pokazivača prije nego postavite sljedeću tačku. The unit for new documents from built-in sizes other than pixel sizes and for opened files that record no unit; choosing one here and clicking OK also sets the active document's units. Jedinica za nove dokumente ugrađenih veličina, osim onih u pikselima, i za otvorene datoteke bez zapisane jedinice; ako je odaberete ovdje i kliknete U redu, postaje i jedinica aktivnog dokumenta. Stroke weights, dashes and gaps show in this unit, and numbers typed for them are read in it. Debljine poteza, crtice i razmaci prikazuju se u ovoj jedinici, a brojevi uneseni za njih čitaju se u njoj. Type sizes, leading and baseline shift show in this unit, and numbers typed for them are read in it. Veličine teksta, prored i pomak osnovne linije prikazuju se u ovoj jedinici, a brojevi uneseni za njih čitaju se u njoj. The unit for East Asian type measurements, which no field uses yet. Jedinica za mjere istočnoazijskog teksta, koju još nijedno polje ne koristi. When on, a number typed without a unit into a field in picas is read in points. Kad je uključeno, broj unesen bez jedinice u polje u picama čita se u tačkama. With XML ID, object names show as XML IDs in the Layers panel, the Variables panel and Layer Options. Uz XML ID nazivi objekata prikazuju se kao XML ID u Slojevima, Varijablama i Opcijama sloja. + Snaps drawing, moving and scaling to the grid's subdivisions, even while the grid is hidden; while it is on, Snap to Pixel does not apply. Priljepljuje crtanje, pomicanje i skaliranje uz podjele mreže, čak i dok je mreža skrivena; dok je uključeno, „Prilijepi uz piksel“ se ne primjenjuje. + The color of guides that are not selected; an artboard with a Guide Label draws its own guides in the label's color instead. Boja vodilica koje nisu odabrane; radna ploča s „Oznakom vodilica“ crta svoje vodilice u boji oznake. + Draws guides as solid lines or as dots, including the guides already in the document. Crta vodilice kao pune linije ili kao tačke, uključujući vodilice koje su već u dokumentu. + With this on, guides are locked when VectorCraft starts; changing this option locks or unlocks them at once, and View › Guides › Lock Guides still changes the lock. Kad je uključeno, vodilice su zaključane pri pokretanju VectorCrafta; promjena ove opcije ih odmah zaključava ili otključava, a Prikaz › Vodilice › Zaključaj vodilice i dalje mijenja zaključavanje. + With this on, holding Cmd/Ctrl as you start dragging from a ruler makes a guide on the active artboard only, or a canvas guide with the Artboard tool. Kad je uključeno, držanje tipke Cmd/Ctrl na početku povlačenja s ravnala pravi vodilicu samo na aktivnoj radnoj ploči, a s alatom radna ploča vodilicu cijelog platna. + The color of the grid; the lines between major gridlines are drawn in a fainter shade of it. Boja mreže; linije između glavnih linija mreže crtaju se u blijeđoj nijansi te boje. + Draws the grid as lines, or as dots along the major gridlines at each subdivision. Crta mrežu kao linije ili kao tačke duž glavnih linija mreže na svakoj podjeli. + The distance between major gridlines, in every open document and in new ones; a VectorCraft document opens with the grid it was saved with. Razmak između glavnih linija mreže u svakom otvorenom dokumentu i u novim; dokument VectorCrafta otvara se s mrežom s kojom je sačuvan. + How many parts each major grid square is divided into; Snap to Grid snaps to these parts, even when the zoom hides their lines. Na koliko dijelova se dijeli svaki glavni kvadrat mreže; „Priljepi uz mrežu“ priljepljuje uz te dijelove, čak i kad zum skriva njihove linije. + Draws the grid behind the artwork; off, the grid is drawn over it. Crta mrežu iza crteža; kad je isključeno, mreža se crta preko njega. + In Pixel Preview at 600% zoom or more, the active view shows a line at the edge of every document pixel over the artwork. U pregledu piksela pri zumu od 600% ili više aktivni prikaz pokazuje liniju na rubu svakog piksela dokumenta preko crteža. + The color of the tile edge and the dashed swatch bounds shown while you edit a pattern. Boja ivice pločice i isprekidanih granica uzorka boje koje se prikazuju dok uređujete uzorak. + Snaps drawing, moving and transforming to nearby art and shows guides and labels; Pixel Preview turns them off, and Snap to Grid snaps to the grid instead. Hvata crtanje, pomjeranje i transformisanje uz obližnje objekte i prikazuje vodilice i oznake; Pregled piksela ih isključuje, a Priljepi uz mrežu umjesto toga hvata uz mrežu. + The color of Smart Guide lines and labels. Boja linija i oznaka pametnih vodilica. + Shows a line along the edge or center that art lines up with; off, art still lines up without the line, and Snap to Glyph does not apply. Prikazuje liniju duž ivice ili centra s kojim se objekti poravnavaju; kad je isključeno, objekti se i dalje poravnavaju bez linije, a Prilijepi uz glif ne djeluje. + With a selection tool, outlines the unselected object under the pointer in its layer color while you are not dragging. S alatom za odabir ocrtava neodabrani objekat ispod pokazivača bojom njegovog sloja dok ne prevlačite. + Shows the size or angle next to the pointer while you scale, rotate, shear or reflect art. Prikazuje veličinu ili ugao pored pokazivača dok skalirate, rotirate, smičete ili odražavate objekte. + While you draw, points snap to lines at the chosen Angles through the point the segment or shape starts from. Dok crtate, tačke se hvataju uz linije pod odabranim uglovima kroz tačku od koje počinje segment ili oblik. + The set of angles the construction guides follow while Construction Guides is on. Skup uglova koje prate konstrukcijske vodilice dok su Konstrukcijske vodilice uključene. + Names what a point snaps to, such as an anchor, a path or an alignment; off, points snap the same way without the names. Imenuje za šta se tačka hvata, npr. sidrenu tačku, putanju ili poravnanje; kad je isključeno, tačke se hvataju isto, bez naziva. + Shows distances, angles and how far art has moved next to the pointer while you draw or move it. Prikazuje pored pokazivača udaljenosti, uglove i koliko je objekat pomjeren dok crtate ili pomjerate. + Snaps moved or resized art to the same gap as between nearby objects, and marks the equal gaps. Hvata pomjerene objekte ili objekte promijenjene veličine uz isti razmak kao između obližnjih objekata i označava jednake razmake. + With something selected, holding Alt/Option over another object or an artboard shows the distances between it and the selection. Kad je nešto odabrano, držanje tipke Alt/Option iznad drugog objekta ili radne ploče prikazuje udaljenosti između njega i odabira. + A selection dragged back to within the Snapping Tolerance of where the drag began goes back to exactly that place; a copy does not. Odabir vraćen prevlačenjem unutar tolerancije hvatanja od mjesta gdje je prevlačenje počelo vraća se tačno na to mjesto; kopija ne. + How near on screen the pointer or a dragged point must come to art for Smart Guides to snap to it; the distance is the same at every zoom. Koliko blizu na ekranu pokazivač ili prevučena tačka mora doći do objekta da bi ga pametne vodilice uhvatile; udaljenost je ista pri svakom zumu. + Snaps the end of a line segment, or a circle drawn from its center, so that it touches a nearby curve. Hvata kraj segmenta linije ili krug nacrtan iz središta tako da dodiruje obližnju krivu. + Snaps the end of a line segment so that it meets a nearby straight segment at a right angle. Hvata kraj segmenta linije tako da pod pravim uglom susreće obližnji ravni segment. Reset all preferences to their defaults? Vratiti sve postavke na zadane vrijednosti? The defaults are applied when you click OK in Preferences. Cancel there keeps your current preferences. Zadane vrijednosti primjenjuju se kada kliknete U redu u Postavkama. Otkaži tamo zadržava vaše trenutne postavke. Smaller ↔ Larger Manje ↔ veće @@ -4719,6 +4810,11 @@ imageTrace Outline Obris @msg PDF writer error: {0} greška PDF zapisivača: {0} @msgplural Packaged {n} file ({note}) in {folder}|Packaged {n} files ({note}) in {folder} Upakovano datoteka u {folder}: {n} ({note}) @msg Preview in Browser needs the desktop app (the web downloads files instead) Pregledaj u pregledniku zahtijeva desktop aplikaciju (web umjesto toga preuzima datoteke) +@msg give `desiredK`, the desired file size in K (1024 bytes): a number above 0 and at most 1048576 navedite `desiredK`, željenu veličinu datoteke u K (1024 bajta): broj veći od 0 i najviše 1048576 +@msg `startWith` is `current` or `auto` `startWith` je `current` ili `auto` +@msg `use` is `allSlices`, `eachSlice` or `currentSlice` `use` je `allSlices`, `eachSlice` ili `currentSlice` +@msg `slice` is a slice number from `slice.list`, with `use: currentSlice` `slice` je broj isječka iz `slice.list`, uz `use: currentSlice` +@msg Optimize to File Size: there is no image to measure Optimiziraj na veličinu datoteke: nema slike za mjerenje @msg Release Guides: no guides Oslobodi vodilice: nema vodilica @msg Release: no layer to put the rectangle in Oslobodi: nema sloja u koji bi se stavio pravougaonik @msg Replace Spine: select a blend and a path Zamijeni kičmu: odaberite stapanje i putanju @@ -5890,6 +5986,19 @@ mark-style Japanese Japanski Transform Objects Transformiši objekte @msg unknown parameter `{key}`; did you mean `{near}`? nepoznat parametar `{key}`; da li ste mislili `{near}`? @msg unknown parameter `{key}`; the command takes no parameters nepoznat parametar `{key}`; naredba ne prima parametre +@msg unknown parameter `{key}`; `{object}` takes: {keys} nepoznat parametar `{key}`; `{object}` prima: {keys} +@msg unknown parameter `{key}`; {why_not} nepoznat parametar `{key}`; {why_not} +@msg no format takes it (see document.formats) nijedan format ga ne prima (pogledajte document.formats) +@msg no save format takes it (see file.formatOptions) nijedan format za spremanje ga ne prima (pogledajte file.formatOptions) +@msg PDF doesn't take it (see document.formats) PDF ga ne prima (pogledajte document.formats) +@msg EPS doesn't take it (see document.formats) EPS ga ne prima (pogledajte document.formats) +@msg DXF doesn't take it (see document.formats) DXF ga ne prima (pogledajte document.formats) +@msg {name} must be {range} (got {v}) {name} mora biti {range} (dobiveno {v}) +@msg The graphics processor tried first couldn't show the window, so VectorCraft started again on {summary} (Settings › Performance › Graphics Processor › Automatic uses the one that drives your display) Grafički procesor koji je prvi pokušan nije mogao prikazati prozor, pa se VectorCraft ponovo pokrenuo na {summary} (Postavke › Performanse › Grafički procesor › Automatski koristi onaj koji pokreće vaš ekran) +@msg Sent “{title}” to {to} “{title}” je poslano na {to} +@msg Sent “{title}” to {to}. The spooler replied: {note} “{title}” je poslano na {to}. Odgovor reda za štampanje: {note} +@msg the default printer zadani štampač +@msg raster effects on object {object}: requested {requested} ppi, achieved {achieved} ppi due to the 64 million pixel cap rasterski efekti na objektu {object}: traženo {requested} ppi, postignuto {achieved} ppi zbog ograničenja od 64 miliona piksela @msg unknown parameter `{key}`; the command takes: {keys} nepoznat parametar `{key}`; naredba prima: {keys} Load EPS into Clipboard Učitaj EPS u međuspremnik @msg an image of {w} × {h} pixels is too large to draw slika od {w} × {h} piksela prevelika je za crtanje diff --git a/crates/ui-egui/src/i18n/ca.tsv b/crates/ui-egui/src/i18n/ca.tsv index 3f80eda352..ce5ac903bd 100644 --- a/crates/ui-egui/src/i18n/ca.tsv +++ b/crates/ui-egui/src/i18n/ca.tsv @@ -884,6 +884,7 @@ antiAlias Sharp Nítid Constrain Restringeix Constrain Angle Angle de restricció Constrain Width and Height Proportions Restringeix les proporcions d’amplada i alçada + Copy Width to Height Copia l’amplada a l’alçada Construction Guides Guies de construcció Contextual Alternates Alternatives contextuals Contextual Task Bar Barra de tasques contextual @@ -896,6 +897,8 @@ antiAlias Sharp Nítid Conté Crayon… Llapis Conté… Convert Converteix Convert All Spot Colors to Process Converteix tots els colors directes a quadricromia + Convert {name} to process Converteix {name} a quadricromia + Keep {name} as spot Mantén {name} com a color directe Convert All Strokes to Outlines Converteix tots els traços en contorns Convert All Text to Outlines Converteix tot el text en contorns Convert Anchor Point Converteix el punt d’ancoratge @@ -989,6 +992,9 @@ antiAlias Sharp Nítid Create from Selection Crea a partir de la selecció Create From: Crea a partir de: Create Gradient Mesh… Crea una malla de degradat… + Flat Pla + To Center Cap al centre + To Edge Cap a la vora Create Graph Crea un gràfic Create New Fields by Crea camps nous mitjançant Create New Layer Crea una capa nova @@ -3419,6 +3425,18 @@ digits Malayalam Malaiàlam Preview (1 inch on the page) Previsualització (1 polzada a la pàgina) Preview All Layers Previsualitza totes les capes Preview in Browser Previsualitza al navegador + Optimize to File Size… Optimitza segons la mida del fitxer… + Optimize to File Size Optimitza segons la mida del fitxer + Desired File Size: Mida de fitxer desitjada: + Start With: Comença amb: + Use: Utilitza: + Current Settings Configuració actual + Auto Select GIF/JPEG Selecció automàtica GIF/JPEG + Total of All Slices Total de tots els talls + Each Slice Cada tall + Current Slice Tall actual + {size}, within {target} {size}, dins de {target} + No setting tried fits in {target}; the smallest is {size} Cap configuració provada no cap a {target}; la més petita és {size} Preview in Browser needs the desktop app (the web downloads files instead) La previsualització al navegador necessita l’aplicació d’escriptori (al web, en canvi, es descarreguen els fitxers) Preview Mode Mode de previsualització Preview the document as it is now Previsualitza el document tal com és ara @@ -3805,12 +3823,85 @@ digits Malayalam Malaiàlam Responsive Adaptatiu Restore Restaura Restore every preference to its default (applied on OK) Restaura cada preferència al seu valor predeterminat (s’aplica en prémer D’acord) + Shows a bar of commands for the selection or tool on the canvas; it hides while you drag and in Presentation Mode. Mostra al llenç una barra d’ordres per a la selecció o l’eina; s’amaga mentre arrossegueu i en el mode de presentació. + How far an arrow key moves the selection; with Shift, it moves ten times as far. Quant mou la selecció una tecla de fletxa; amb Maj, la mou deu vegades més. + The angle of the axes that arrow keys move along and that Shift holds drawing and moving to. L’angle dels eixos al llarg dels quals mouen les tecles de fletxa i als quals Maj restringeix el dibuix i el moviment. + The corner radius the Rounded Rectangle tool draws with; changing the radius while drawing changes this value too. El radi de cantonada amb què dibuixa l’eina Rectangle arrodonit; canviar el radi mentre dibuixeu també canvia aquest valor. + How far right and down Paste moves the copy when it is given no position, as from a script; Paste in the app centers it in the view. Quant desplaça Enganxa la còpia cap a la dreta i cap avall quan no es dona cap posició, com des d’un script; Enganxa a l’aplicació la centra a la vista. + Stops the Pen tool from deleting the anchor you click on a selected path, or adding one where you click its segment. Impedeix que l’eina Ploma suprimeixi el punt d’ancoratge on feu clic en un traçat seleccionat o n’afegeixi un on feu clic al seu segment. + Drawing tools show a crosshair pointer instead of their icon; Caps Lock does the same while it is on. Les eines de dibuix mostren un punter en creu en lloc de la seva icona; Bloq Maj fa el mateix mentre està activat. + Shows a tip when the pointer rests on a button or field that has one. Mostra un consell quan el punter s’atura sobre un botó o un camp que en té. + Shows a warning before a script you choose runs. Mostra un avís abans que s’executi un script que trieu. + Smooths the edges of artwork on the canvas. Suavitza les vores de la il·lustració al llenç. + Select › Same › Fill Color, Stroke Color and Fill & Stroke match only the same tint of a global or spot swatch, not any tint of it. Selecció › Igual › Color de farciment, Color del traç i Farciment i traç només coincideixen amb el mateix matís d’una mostra global o de tinta plana, no amb qualsevol matís seu. + Shows the Home screen when no document is open; off, the window stays empty until you click Home. Mostra la pantalla d’inici quan no hi ha cap document obert; desactivada, la finestra queda buida fins que feu clic a Inici. + Measures objects with their strokes and shape-changing effects for size, position and alignment; shadows, glows and blurs are not measured. Mesura els objectes amb els traços i els efectes que en canvien la forma per a la mida, la posició i l’alineació; les ombres, les lluïsors i els desenfocaments no es mesuren. + At 100% zoom, one inch of the document takes 96 screen points instead of 72. Amb un zoom del 100 %, una polzada del document ocupa 96 punts de pantalla en lloc de 72. + Double-clicking a group, path or image with the Selection tool opens it in isolation mode. Fer doble clic en un grup, traçat o imatge amb l’eina Selecció l’obre en mode d’aïllament. + Pattern fills and strokes transform with the art, unless a transform or the Transform panel's menu chooses otherwise. Els farciments i traços de motiu es transformen amb la il·lustració, tret que una transformació o el menú del panell Transforma triï una altra cosa. + Live corner radii scale with the art, unless the scale chooses otherwise. Els radis de cantonada dinàmics s’escalen amb la il·lustració, tret que l’escalat triï una altra cosa. + Stroke weights, dashes and effect distances scale with the art, unless the scale chooses otherwise. Els gruixos de traç, els guions i les distàncies dels efectes s’escalen amb la il·lustració, tret que l’escalat triï una altra cosa. + The mouse wheel zooms the canvas instead of scrolling it. La roda del ratolí fa zoom al llenç en lloc de desplaçar-lo. + The mouse wheel with Cmd/Ctrl held scrolls the canvas sideways. La roda del ratolí amb Cmd/Ctrl premut desplaça el llenç en horitzontal. + Dragging sideways on a numeric field's label changes the field's value. Arrossegar en horitzontal sobre l’etiqueta d’un camp numèric canvia el valor del camp. + A two-finger rotate gesture on a trackpad rotates the canvas view. Un gest de rotació amb dos dits al trackpad gira la vista del llenç. + Holding a tool's shortcut key chooses the tool until you let go, and then the previous tool is chosen again. Mantenir premuda la drecera d’una eina la tria fins que la deixeu anar, i després es torna a triar l’eina anterior. + Shows the bounding box while you move the selection or draw a shape. Mostra el quadre delimitador mentre moveu la selecció o dibuixeu una forma. + Create Trim Marks draws Japanese-style marks instead of Roman ones. Crea marques de retall dibuixa marques d’estil japonès en lloc de romanes. + New art takes only the fill and stroke of the selection; off, it takes the selected object's whole appearance. La il·lustració nova pren només el farciment i el traç de la selecció; desactivada, pren tota l’aparença de l’objecte seleccionat. + Changing the width or height in the Transform panel, the Properties panel or the Control bar changes the other in proportion. Canviar l’amplada o l’alçada al panell Transforma, al panell Propietats o al panell Control canvia l’altra proporcionalment. + A live rectangle's properties show one Corner Radius field for all four corners; off, each corner has its own field. Les propietats d’un rectangle dinàmic mostren un sol camp Radi de cantonada per a les quatre cantonades; desactivada, cada cantonada té el seu propi camp. + What edits in the Transform panel transform: the object, its pattern tiles or both; Default follows Transform Pattern Tiles. Què transformen els canvis al panell Transforma: l’objecte, les peces del seu motiu o tots dos; Predeterminat segueix Transforma les peces del motiu. + With one symbol instance selected, the Transform panel uses the symbol's registration point as its reference point. Amb una instància de símbol seleccionada, el panell Transforma fa servir el punt de registre del símbol com a punt de referència. + Darkens the canvas outside the artboards while the Artboard tool is active. Enfosqueix el llenç fora dels taulers mentre l’eina Tauler està activa. + With Fade Region Outside Artboard on, the area outside the artboards stays dark while you drag with the Artboard tool. Amb Enfosqueix la regió fora del tauler activat, l’àrea fora dels taulers continua fosca mentre arrossegueu amb l’eina Tauler. + How near, in pixels, the pointer must be to an object, anchor or handle for a click to select it. A quina distància, en píxels, ha d’estar el punter d’un objecte, punt d’ancoratge o tirador perquè un clic el seleccioni. + Whether the Selection tool's box selects objects it touches or only those fully inside; Drag Direction selects those inside on a drag to the right. E reverses it mid-drag. Si el requadre de l’eina de selecció tria els objectes que toca o només els que hi queden del tot dins; Direcció de l’arrossegament tria els de dins en arrossegar cap a la dreta. E ho inverteix en arrossegar. + A click selects a filled object only on its path, not inside its fill. Un clic selecciona un objecte emplenat només pel seu traçat, no dins de l’emplenament. + How near, in pixels, a point must come to an anchor or ruler guide for Snap to Point to snap it; with Smart Guides on, Smart Guides' Snapping Tolerance applies instead. A quina distància, en píxels, ha d’arribar un punt d’un punt d’ancoratge o d’una guia de regle perquè Ajusta al punt l’hi ajusti; amb les guies intel·ligents activades s’aplica la seva tolerància d’ajust. + With the Selection tool, Cmd/Ctrl-click selects the object under the selected one at the pointer; each further click goes one object deeper. Amb l’eina de selecció, Cmd/Ctrl+clic selecciona l’objecte de sota del seleccionat al punter; cada clic següent baixa un objecte més. + Zoom In and Zoom Out bring the center of the selection to the middle of the view. Amplia i Redueix porten el centre de la selecció al mig de la vista. + Locked and hidden artwork inside an artboard moves, scales and is copied with the artboard, as the other artwork does. L’art bloquejat i ocult dins d’un tauler es mou, s’escala i es copia amb el tauler, com la resta de l’art. + The size of anchor points and direction handle ends on the canvas; larger anchors can also be picked from farther away. La mida dels punts d’ancoratge i dels extrems dels tiradors de direcció al llenç; els punts d’ancoratge més grans també es poden agafar des de més lluny. + Draws the ends of direction handles as solid dots, hollow dots or larger solid dots. Dibuixa els extrems dels tiradors de direcció com a punts plens, punts buits o punts plens més grans. + With the Direct Selection tool, the anchor under the pointer is highlighted. Amb l’eina de selecció directa, el punt d’ancoratge sota el punter es ressalta. + Shows direction handles when more than one anchor is selected; off, they show only while a single anchor is selected. Mostra els tiradors de direcció quan hi ha més d’un punt d’ancoratge seleccionat; desactivat, només es mostren amb un sol punt d’ancoratge seleccionat. + Corner widgets hide on corners whose angle is greater than this many degrees. Els ginys d’angles s’amaguen en els angles més grans que aquests graus. + The Pen tool previews the next segment from the last anchor to the pointer before you click. L’eina de ploma mostra el segment següent des de l’últim punt d’ancoratge fins al punter abans de fer clic. + The Curvature tool previews the curve to the pointer before you place the next point. L’eina de curvatura mostra la corba fins al punter abans de col·locar el punt següent. The unit for new documents from built-in sizes other than pixel sizes and for opened files that record no unit; choosing one here and clicking OK also sets the active document's units. La unitat dels documents nous de mides predefinides, excepte les mides en píxels, i dels fitxers oberts que no registren cap unitat; si la trieu aquí i feu clic a D’acord, també passa a ser la unitat del document actiu. Stroke weights, dashes and gaps show in this unit, and numbers typed for them are read in it. Els gruixos de traç, els guions i els espais es mostren en aquesta unitat, i els nombres que s’hi escriuen es llegeixen en aquesta unitat. Type sizes, leading and baseline shift show in this unit, and numbers typed for them are read in it. Les mides del text, l’interlineat i el desplaçament de la línia de base es mostren en aquesta unitat, i els nombres que s’hi escriuen es llegeixen en aquesta unitat. The unit for East Asian type measurements, which no field uses yet. La unitat per a les mesures del text d’Àsia oriental, que encara no fa servir cap camp. When on, a number typed without a unit into a field in picas is read in points. Quan està activat, un nombre escrit sense unitat en un camp en piques es llegeix en punts. With XML ID, object names show as XML IDs in the Layers panel, the Variables panel and Layer Options. Amb ID XML, els noms dels objectes es mostren com a ID XML a Capes, Variables i Opcions de la capa. + Snaps drawing, moving and scaling to the grid's subdivisions, even while the grid is hidden; while it is on, Snap to Pixel does not apply. Ajusta el dibuix, el desplaçament i l’escalat a les subdivisions de la quadrícula, fins i tot quan la quadrícula està amagada; mentre està activat, Ajusta al píxel no s’aplica. + The color of guides that are not selected; an artboard with a Guide Label draws its own guides in the label's color instead. El color de les guies no seleccionades; un tauler amb una Etiqueta de les guies dibuixa les seves guies amb el color de l’etiqueta. + Draws guides as solid lines or as dots, including the guides already in the document. Dibuixa les guies com a línies contínues o com a punts, incloses les guies que ja són al document. + With this on, guides are locked when VectorCraft starts; changing this option locks or unlocks them at once, and View › Guides › Lock Guides still changes the lock. Amb aquesta opció activada, les guies queden bloquejades quan s’inicia VectorCraft; canviar l’opció les bloca o desbloca a l’instant, i Visualitza › Guies › Bloca les guies continua canviant el bloqueig. + With this on, holding Cmd/Ctrl as you start dragging from a ruler makes a guide on the active artboard only, or a canvas guide with the Artboard tool. Amb aquesta opció activada, mantenir premuda Cmd/Ctrl en començar a arrossegar des d’un regle crea una guia només al tauler actiu, o una guia de tot el llenç amb l’eina de tauler. + The color of the grid; the lines between major gridlines are drawn in a fainter shade of it. El color de la quadrícula; les línies entre les línies principals es dibuixen amb un to més suau d’aquest color. + Draws the grid as lines, or as dots along the major gridlines at each subdivision. Dibuixa la quadrícula com a línies, o com a punts al llarg de les línies principals a cada subdivisió. + The distance between major gridlines, in every open document and in new ones; a VectorCraft document opens with the grid it was saved with. La distància entre les línies principals de la quadrícula, a tots els documents oberts i als nous; un document de VectorCraft s’obre amb la quadrícula amb què es va desar. + How many parts each major grid square is divided into; Snap to Grid snaps to these parts, even when the zoom hides their lines. En quantes parts es divideix cada quadrat principal de la quadrícula; Ajusta a la quadrícula s’ajusta a aquestes parts, fins i tot quan el zoom n’amaga les línies. + Draws the grid behind the artwork; off, the grid is drawn over it. Dibuixa la quadrícula darrere de l’obra; desactivat, la quadrícula es dibuixa a sobre. + In Pixel Preview at 600% zoom or more, the active view shows a line at the edge of every document pixel over the artwork. A la previsualització de píxels, amb un zoom del 600% o més, la vista activa mostra una línia a la vora de cada píxel del document sobre l’obra. + The color of the tile edge and the dashed swatch bounds shown while you edit a pattern. El color de la vora del mosaic i dels límits discontinus de la mostra que es mostren mentre editeu un motiu. + Snaps drawing, moving and transforming to nearby art and shows guides and labels; Pixel Preview turns them off, and Snap to Grid snaps to the grid instead. Ajusta el dibuix, el desplaçament i la transformació a l’art proper i mostra guies i etiquetes; la previsualització de píxels les desactiva, i Ajusta a la quadrícula ajusta a la quadrícula en el seu lloc. + The color of Smart Guide lines and labels. El color de les línies i les etiquetes de les guies intel·ligents. + Shows a line along the edge or center that art lines up with; off, art still lines up without the line, and Snap to Glyph does not apply. Mostra una línia al llarg de la vora o el centre amb què s’alinea l’art; desactivada, l’art continua alineant-se sense la línia, i Ajusta al glif no s’aplica. + With a selection tool, outlines the unselected object under the pointer in its layer color while you are not dragging. Amb una eina de selecció, contorneja l’objecte no seleccionat sota el punter amb el color de la seva capa mentre no arrossegueu. + Shows the size or angle next to the pointer while you scale, rotate, shear or reflect art. Mostra la mida o l’angle al costat del punter mentre escaleu, gireu, inclineu o reflectiu l’art. + While you draw, points snap to lines at the chosen Angles through the point the segment or shape starts from. Mentre dibuixeu, els punts s’ajusten a línies amb els angles triats que passen pel punt on comença el segment o la forma. + The set of angles the construction guides follow while Construction Guides is on. El conjunt d’angles que segueixen les guies de construcció mentre Guies de construcció està activat. + Names what a point snaps to, such as an anchor, a path or an alignment; off, points snap the same way without the names. Indica a què s’ajusta un punt, com un punt d’ancoratge, un traçat o una alineació; desactivat, els punts s’ajusten igual sense els noms. + Shows distances, angles and how far art has moved next to the pointer while you draw or move it. Mostra al costat del punter distàncies, angles i quant s’ha mogut l’art mentre dibuixeu o moveu. + Snaps moved or resized art to the same gap as between nearby objects, and marks the equal gaps. Ajusta l’art moguda o redimensionada a la mateixa separació que hi ha entre objectes propers i marca les separacions iguals. + With something selected, holding Alt/Option over another object or an artboard shows the distances between it and the selection. Amb alguna cosa seleccionada, mantenir premuda Alt/Option sobre un altre objecte o un tauler mostra les distàncies entre aquest i la selecció. + A selection dragged back to within the Snapping Tolerance of where the drag began goes back to exactly that place; a copy does not. Una selecció arrossegada de tornada fins a la tolerància d’ajust del lloc on va començar l’arrossegament torna exactament a aquell lloc; una còpia no. + How near on screen the pointer or a dragged point must come to art for Smart Guides to snap to it; the distance is the same at every zoom. Com d’a prop a la pantalla han d’arribar el punter o un punt arrossegat a l’art perquè les guies intel·ligents s’hi ajustin; la distància és la mateixa a qualsevol zoom. + Snaps the end of a line segment, or a circle drawn from its center, so that it touches a nearby curve. Ajusta l’extrem d’un segment de línia, o un cercle dibuixat des del centre, perquè toqui una corba propera. + Snaps the end of a line segment so that it meets a nearby straight segment at a right angle. Ajusta l’extrem d’un segment de línia perquè trobi un segment recte proper en angle recte. Reset all preferences to their defaults? Voleu restablir totes les preferències als valors predeterminats? The defaults are applied when you click OK in Preferences. Cancel there keeps your current preferences. Els valors predeterminats s’apliquen quan feu clic a D’acord a Preferències. Cancel·la allà conserva les preferències actuals. Restore Recovered Documents Restaura els documents recuperats @@ -6291,6 +6382,11 @@ liquify-list-end {0}, {1} {0} i {1} @msg plug-in trapped: {0} el complement ha quedat atrapat: {0} @msg precision must be from 0.001 to 10 pt precision ha de ser d’entre 0,001 i 10 pt @msg Preview in Browser needs the desktop app (the web downloads files instead) La previsualització al navegador necessita l’aplicació d’escriptori (a la web es baixen els fitxers) +@msg give `desiredK`, the desired file size in K (1024 bytes): a number above 0 and at most 1048576 indica `desiredK`, la mida de fitxer desitjada en K (1024 bytes): un nombre més gran que 0 i com a màxim 1048576 +@msg `startWith` is `current` or `auto` `startWith` és `current` o `auto` +@msg `use` is `allSlices`, `eachSlice` or `currentSlice` `use` és `allSlices`, `eachSlice` o `currentSlice` +@msg `slice` is a slice number from `slice.list`, with `use: currentSlice` `slice` és un número de tall de `slice.list`, amb `use: currentSlice` +@msg Optimize to File Size: there is no image to measure Optimitza segons la mida del fitxer: no hi ha cap imatge per mesurar @msg print settings are not an object la configuració d’impressió no és un objecte @msg printing isn't available here la impressió no està disponible aquí @msg range `{s}` is empty el rang `{s}` és buit @@ -6690,6 +6786,19 @@ liquify-list-end {0}, {1} {0} i {1} @msg panels can't be shown in Presentation Mode els panells no es poden mostrar en el mode de presentació @msg unknown parameter `{key}`; did you mean `{near}`? paràmetre desconegut `{key}`; volies dir `{near}`? @msg unknown parameter `{key}`; the command takes no parameters paràmetre desconegut `{key}`; l’ordre no admet cap paràmetre +@msg unknown parameter `{key}`; `{object}` takes: {keys} paràmetre desconegut `{key}`; `{object}` admet: {keys} +@msg unknown parameter `{key}`; {why_not} paràmetre desconegut `{key}`; {why_not} +@msg no format takes it (see document.formats) cap format no l’admet (vegeu document.formats) +@msg no save format takes it (see file.formatOptions) cap format de desament no l’admet (vegeu file.formatOptions) +@msg PDF doesn't take it (see document.formats) el PDF no l’admet (vegeu document.formats) +@msg EPS doesn't take it (see document.formats) l’EPS no l’admet (vegeu document.formats) +@msg DXF doesn't take it (see document.formats) el DXF no l’admet (vegeu document.formats) +@msg {name} must be {range} (got {v}) {name} ha de ser {range} (rebut {v}) +@msg The graphics processor tried first couldn't show the window, so VectorCraft started again on {summary} (Settings › Performance › Graphics Processor › Automatic uses the one that drives your display) El processador gràfic provat primer no ha pogut mostrar la finestra, així que VectorCraft s’ha iniciat de nou amb {summary} (Configuració › Rendiment › Processador gràfic › Automàtic fa servir el que controla la pantalla) +@msg Sent “{title}” to {to} S’ha enviat “{title}” a {to} +@msg Sent “{title}” to {to}. The spooler replied: {note} S’ha enviat “{title}” a {to}. Resposta de la cua d’impressió: {note} +@msg the default printer la impressora per defecte +@msg raster effects on object {object}: requested {requested} ppi, achieved {achieved} ppi due to the 64 million pixel cap efectes de ràster a l’objecte {object}: s’han demanat {requested} ppi i s’han obtingut {achieved} ppi a causa del límit de 64 milions de píxels @msg unknown parameter `{key}`; the command takes: {keys} paràmetre desconegut `{key}`; l’ordre admet: {keys} @msg the params must be an object, not {got} els paràmetres han de ser un objecte, no {got} @msg unknown parameter `{path}`; the object takes no keys paràmetre desconegut `{path}`; l’objecte no admet claus @@ -7842,6 +7951,11 @@ breakText Glyphs Glifs @msg Some islands could not be joined to the area around the art Algunes illes no s’han pogut unir a l’àrea que envolta la il·lustració @msg `width` must be from {lo} to {hi} pt `width` ha d’estar entre {lo} i {hi} pt @msg `angle` must be from -180 to 180 degrees `angle` ha d’estar entre -180 i 180 graus +@msg `roundness` must be from 0 to 100% `roundness` ha d’estar entre 0 i 100% +@msg `fidelity` must be from 0.01 to 100 pt `fidelity` ha d’estar entre 0.01 i 100 pt +@msg style must be "pencil" or "brush" style ha de ser "pencil" o "brush" +@msg extend end must be "start" or "end" l’extrem d’extend ha de ser "start" o "end" +@msg connect end must be "start" or "end" l’extrem de connect ha de ser "start" o "end" @msg `roundness` must be from 1 to 100% `roundness` ha d’estar entre 1 i 100% @msg `count` must be a whole number from 1 to {MAX_BRIDGES_PER_ISLAND} `count` ha de ser un nombre enter d’1 a {MAX_BRIDGES_PER_ISLAND} Weed Box and Lines… Caixa i línies de pelat… diff --git a/crates/ui-egui/src/i18n/catalog.rs b/crates/ui-egui/src/i18n/catalog.rs index 01d88af108..6f2176be3e 100644 --- a/crates/ui-egui/src/i18n/catalog.rs +++ b/crates/ui-egui/src/i18n/catalog.rs @@ -194,6 +194,26 @@ pub fn parse_entries(text: &str) -> (Vec<Entry>, Vec<String>) { (entries, errors) } +/// Whether a message can be matched against the template `source`: it has literal text and no two +/// placeholders in a row. +#[cfg(test)] +pub fn matchable(source: &str) -> bool { + Template::parse(source, Vec::new(), false).is_some() +} + +/// The sources of the `@msg` and `@msgplural` rows of a catalog file that [`Catalog::parse`] leaves +/// out, because no message can be matched against them. The interface shows the messages of such a +/// row in English. +#[cfg(test)] +pub fn unmatchable_rows(text: &str) -> Vec<String> { + let left_out = |(ctx, src, _): &Entry| match ctx.as_str() { + "@msg" => src.contains(['{', '}']) && !matchable(src), + "@msgplural" => src.split('|').any(|english| !matchable(english)), + _ => false, + }; + parse_entries(text).0.into_iter().filter(left_out).map(|(_, src, _)| src).collect() +} + impl Catalog { pub fn parse(text: &str) -> Catalog { let mut c = Catalog::default(); diff --git a/crates/ui-egui/src/i18n/cs.tsv b/crates/ui-egui/src/i18n/cs.tsv index fb0d3e93b1..2cc59bab39 100644 --- a/crates/ui-egui/src/i18n/cs.tsv +++ b/crates/ui-egui/src/i18n/cs.tsv @@ -224,6 +224,9 @@ Mask Maska Rasterize… Rastrovat… Create Gradient Mesh… Vytvořit přechodovou síť… + Flat Ploché + To Center Ke středu + To Edge K okraji Create Object Mosaic… Vytvořit mozaiku objektů… Vector Halftone… Vektorový polotón… Create Trim Marks Vytvořit značky ořezu @@ -1191,6 +1194,18 @@ lighting Light Světlo Placement Options… Možnosti umístění… Plug-in… Zásuvný modul… Preview in Browser Náhled v prohlížeči + Optimize to File Size… Optimalizovat na velikost souboru… + Optimize to File Size Optimalizovat na velikost souboru + Desired File Size: Požadovaná velikost souboru: + Start With: Začít s: + Use: Použít: + Current Settings Aktuální nastavení + Auto Select GIF/JPEG Automaticky vybrat GIF/JPEG + Total of All Slices Součet všech řezů + Each Slice Každý řez + Current Slice Aktuální řez + {size}, within {target} {size}, v rámci {target} + No setting tried fits in {target}; the smallest is {size} Žádné vyzkoušené nastavení se nevejde do {target}; nejmenší má {size} Printer Setup… Nastavení tiskárny… Printers Tiskárny Recent File Nedávný soubor @@ -2925,6 +2940,8 @@ digits Malayalam Malajálamské Collate Kompletovat Composite colours are converted to it; separations separate with it when it is a CMYK profile. Kompozitní barvy se na něj převádějí; separace podle něj separují, pokud je to profil CMYK. Convert All Spot Colors to Process Převést všechny přímé barvy na procesní + Convert {name} to process Převést {name} na procesní + Keep {name} as spot Ponechat {name} jako přímou barvu Default Printer Výchozí tiskárna Document Ink Options Možnosti inkoustů dokumentu Download: Stahování: @@ -3992,6 +4009,7 @@ theme Appearance Motiv Command Click to Select Objects Behind Kliknutím s Cmd vybírat objekty vzadu Constrain Angle Úhel omezení Constrain Width and Height Proportions Zachovat proporce šířky a výšky + Copy Width to Height Kopírovat šířku do výšky Construction Guides Konstrukční vodítka Curvature Tool Nástroj Zakřivení Data Recovery Obnovení dat @@ -4517,12 +4535,85 @@ font-technology Variable Variabilní Preferences Předvolby Previous Předchozí Restore every preference to its default (applied on OK) Obnovit všechny předvolby na výchozí hodnoty (použije se po OK) + Shows a bar of commands for the selection or tool on the canvas; it hides while you drag and in Presentation Mode. Zobrazí na plátně lištu příkazů pro výběr nebo nástroj; při tažení a v režimu prezentace se skryje. + How far an arrow key moves the selection; with Shift, it moves ten times as far. Jak daleko klávesa se šipkou posune výběr; s klávesou Shift ho posune desetkrát dál. + The angle of the axes that arrow keys move along and that Shift holds drawing and moving to. Úhel os, podél kterých posouvají klávesy se šipkami a ke kterým Shift váže kreslení a přesouvání. + The corner radius the Rounded Rectangle tool draws with; changing the radius while drawing changes this value too. Poloměr rohu, kterým kreslí nástroj Zaoblený obdélník; změna poloměru během kreslení změní i tuto hodnotu. + How far right and down Paste moves the copy when it is given no position, as from a script; Paste in the app centers it in the view. Jak daleko doprava a dolů Vložit posune kopii, když není zadána poloha, například ze skriptu; Vložit v aplikaci ji umístí doprostřed zobrazení. + Stops the Pen tool from deleting the anchor you click on a selected path, or adding one where you click its segment. Zabrání nástroji Pero odstranit kotvicí bod, na který klepnete na vybrané cestě, nebo přidat bod tam, kde klepnete na její segment. + Drawing tools show a crosshair pointer instead of their icon; Caps Lock does the same while it is on. Kreslicí nástroje zobrazí místo své ikony nitkový kříž; Caps Lock udělá totéž, dokud je zapnutý. + Shows a tip when the pointer rests on a button or field that has one. Zobrazí tip, když ukazatel spočine na tlačítku nebo poli, které ho má. + Shows a warning before a script you choose runs. Zobrazí upozornění před spuštěním skriptu, který zvolíte. + Smooths the edges of artwork on the canvas. Vyhladí okraje kresby na plátně. + Select › Same › Fill Color, Stroke Color and Fill & Stroke match only the same tint of a global or spot swatch, not any tint of it. Výběr › Stejné › Barva výplně, Barva tahu a Výplň a tah najdou jen stejný odstín globálního nebo přímého vzorku, ne libovolný jeho odstín. + Shows the Home screen when no document is open; off, the window stays empty until you click Home. Zobrazí domovskou obrazovku, když není otevřený žádný dokument; když je vypnuto, okno zůstane prázdné, dokud neklepnete na Domů. + Measures objects with their strokes and shape-changing effects for size, position and alignment; shadows, glows and blurs are not measured. Měří objekty včetně tahů a efektů měnících tvar pro velikost, polohu a zarovnání; stíny, záře a rozostření se neměří. + At 100% zoom, one inch of the document takes 96 screen points instead of 72. Při zvětšení 100 % zabere jeden palec dokumentu 96 obrazovkových bodů místo 72. + Double-clicking a group, path or image with the Selection tool opens it in isolation mode. Poklepání na skupinu, cestu nebo obraz nástrojem Výběr je otevře v izolačním režimu. + Pattern fills and strokes transform with the art, unless a transform or the Transform panel's menu chooses otherwise. Výplně a tahy se vzorkem se transformují s kresbou, pokud transformace nebo nabídka panelu Transformace nezvolí jinak. + Live corner radii scale with the art, unless the scale chooses otherwise. Poloměry živých rohů se mění s velikostí kresby, pokud změna velikosti nezvolí jinak. + Stroke weights, dashes and effect distances scale with the art, unless the scale chooses otherwise. Tloušťky tahů, čárky a vzdálenosti efektů se mění s velikostí kresby, pokud změna velikosti nezvolí jinak. + The mouse wheel zooms the canvas instead of scrolling it. Kolečko myši plátno zvětšuje a zmenšuje místo posouvání. + The mouse wheel with Cmd/Ctrl held scrolls the canvas sideways. Kolečko myši s podrženou klávesou Cmd/Ctrl posouvá plátno do stran. + Dragging sideways on a numeric field's label changes the field's value. Tažení do stran po popisku číselného pole mění hodnotu pole. + A two-finger rotate gesture on a trackpad rotates the canvas view. Gesto otočení dvěma prsty na trackpadu otáčí zobrazení plátna. + Holding a tool's shortcut key chooses the tool until you let go, and then the previous tool is chosen again. Podržení zkratky nástroje vybere nástroj, dokud ji nepustíte, a pak se znovu vybere předchozí nástroj. + Shows the bounding box while you move the selection or draw a shape. Zobrazí ohraničovací rámeček, když přesouváte výběr nebo kreslíte tvar. + Create Trim Marks draws Japanese-style marks instead of Roman ones. Vytvořit značky ořezu nakreslí značky v japonském stylu místo římských. + New art takes only the fill and stroke of the selection; off, it takes the selected object's whole appearance. Nová kresba převezme jen výplň a tah výběru; když je vypnuto, převezme celý vzhled vybraného objektu. + Changing the width or height in the Transform panel, the Properties panel or the Control bar changes the other in proportion. Změna šířky nebo výšky v panelu Transformace, v panelu Vlastnosti nebo v ovládacím panelu úměrně změní i druhý rozměr. + A live rectangle's properties show one Corner Radius field for all four corners; off, each corner has its own field. Vlastnosti živého obdélníku zobrazí jedno pole Poloměr rohu pro všechny čtyři rohy; když je vypnuto, má každý roh vlastní pole. + What edits in the Transform panel transform: the object, its pattern tiles or both; Default follows Transform Pattern Tiles. Co úpravy v panelu Transformace transformují: objekt, dlaždice jeho vzorku nebo obojí; Výchozí se řídí volbou Transformovat dlaždice vzorku. + With one symbol instance selected, the Transform panel uses the symbol's registration point as its reference point. Když je vybraná jedna instance symbolu, panel Transformace použije registrační bod symbolu jako referenční bod. + Darkens the canvas outside the artboards while the Artboard tool is active. Ztmaví plátno mimo pracovní plochy, dokud je aktivní nástroj Pracovní plocha. + With Fade Region Outside Artboard on, the area outside the artboards stays dark while you drag with the Artboard tool. Když je zapnuto Ztmavit oblast mimo pracovní plochu, zůstane oblast mimo pracovní plochy tmavá i při tažení nástrojem Pracovní plocha. + How near, in pixels, the pointer must be to an object, anchor or handle for a click to select it. Jak blízko v obrazových bodech musí být ukazatel k objektu, kotevnímu bodu nebo úchytu, aby jej kliknutí vybralo. + Whether the Selection tool's box selects objects it touches or only those fully inside; Drag Direction selects those inside on a drag to the right. E reverses it mid-drag. Zda rámeček nástroje Výběr vybírá objekty, kterých se dotkne, nebo jen ty zcela uvnitř; Směr tažení vybírá ty uvnitř při tažení doprava. E pravidlo během tažení obrátí. + A click selects a filled object only on its path, not inside its fill. Kliknutí vybere vyplněný objekt jen na jeho cestě, ne uvnitř výplně. + How near, in pixels, a point must come to an anchor or ruler guide for Snap to Point to snap it; with Smart Guides on, Smart Guides' Snapping Tolerance applies instead. Jak blízko v obrazových bodech se musí bod dostat ke kotevnímu bodu nebo vodítku pravítka, aby jej Přichytávat k bodům přichytilo; se zapnutými chytrými vodítky platí jejich tolerance přichytávání. + With the Selection tool, Cmd/Ctrl-click selects the object under the selected one at the pointer; each further click goes one object deeper. S nástrojem Výběr vybere Cmd/Ctrl+kliknutí objekt pod vybraným v místě ukazatele; každé další kliknutí jde o objekt hlouběji. + Zoom In and Zoom Out bring the center of the selection to the middle of the view. Zvětšit a Zmenšit přesunou střed výběru doprostřed zobrazení. + Locked and hidden artwork inside an artboard moves, scales and is copied with the artboard, as the other artwork does. Zamknutá a skrytá kresba uvnitř pracovní plochy se s ní přesouvá, mění velikost a kopíruje jako ostatní kresba. + The size of anchor points and direction handle ends on the canvas; larger anchors can also be picked from farther away. Velikost kotevních bodů a konců směrových úchytů na plátně; větší kotevní body lze zachytit i z větší vzdálenosti. + Draws the ends of direction handles as solid dots, hollow dots or larger solid dots. Kreslí konce směrových úchytů jako plné tečky, duté tečky nebo větší plné tečky. + With the Direct Selection tool, the anchor under the pointer is highlighted. S nástrojem Přímý výběr se kotevní bod pod ukazatelem zvýrazní. + Shows direction handles when more than one anchor is selected; off, they show only while a single anchor is selected. Zobrazuje směrové úchyty, když je vybráno více kotevních bodů; vypnuto, zobrazí se jen při jednom vybraném kotevním bodu. + Corner widgets hide on corners whose angle is greater than this many degrees. Ovladače rohů se skryjí u rohů, jejichž úhel je větší než tento počet stupňů. + The Pen tool previews the next segment from the last anchor to the pointer before you click. Nástroj Pero ukazuje náhled dalšího segmentu od posledního kotevního bodu k ukazateli, než kliknete. + The Curvature tool previews the curve to the pointer before you place the next point. Nástroj Zakřivení ukazuje náhled křivky k ukazateli, než umístíte další bod. The unit for new documents from built-in sizes other than pixel sizes and for opened files that record no unit; choosing one here and clicking OK also sets the active document's units. Jednotka nových dokumentů z vestavěných velikostí kromě velikostí v obrazových bodech a otevřených souborů bez uložené jednotky; když ji zde zvolíte a kliknete na OK, nastaví se i jako jednotka aktivního dokumentu. Stroke weights, dashes and gaps show in this unit, and numbers typed for them are read in it. Tloušťky tahů, čárky a mezery se zobrazují v této jednotce a čísla pro ně zadaná se v ní čtou. Type sizes, leading and baseline shift show in this unit, and numbers typed for them are read in it. Velikosti písma, proklad a posun účaří se zobrazují v této jednotce a čísla pro ně zadaná se v ní čtou. The unit for East Asian type measurements, which no field uses yet. Jednotka pro míry východoasijského písma, kterou zatím žádné pole nepoužívá. When on, a number typed without a unit into a field in picas is read in points. Když je zapnuto, číslo zadané bez jednotky do pole v pica se čte v bodech. With XML ID, object names show as XML IDs in the Layers panel, the Variables panel and Layer Options. S volbou XML ID se názvy objektů zobrazují jako XML ID ve Vrstvách, Proměnných a Možnostech vrstvy. + Snaps drawing, moving and scaling to the grid's subdivisions, even while the grid is hidden; while it is on, Snap to Pixel does not apply. Přichytává kreslení, přesouvání a změnu velikosti k dělení mřížky, i když je mřížka skrytá; dokud je zapnuto, Přichytávat k obrazovým bodům se neuplatní. + The color of guides that are not selected; an artboard with a Guide Label draws its own guides in the label's color instead. Barva vodítek, která nejsou vybraná; pracovní plocha se Štítkem vodítek kreslí svá vodítka v barvě štítku. + Draws guides as solid lines or as dots, including the guides already in the document. Kreslí vodítka jako plné čáry nebo jako tečky, včetně vodítek, která už v dokumentu jsou. + With this on, guides are locked when VectorCraft starts; changing this option locks or unlocks them at once, and View › Guides › Lock Guides still changes the lock. Je-li zapnuto, vodítka jsou při spuštění VectorCraftu zamknutá; změna této volby je hned zamkne nebo odemkne a Zobrazení › Vodítka › Zamknout vodítka zámek dál mění. + With this on, holding Cmd/Ctrl as you start dragging from a ruler makes a guide on the active artboard only, or a canvas guide with the Artboard tool. Je-li zapnuto, podržení Cmd/Ctrl na začátku tažení z pravítka vytvoří vodítko jen na aktivní pracovní ploše, nebo s nástrojem Pracovní plocha vodítko celého plátna. + The color of the grid; the lines between major gridlines are drawn in a fainter shade of it. Barva mřížky; čáry mezi hlavními čarami mřížky se kreslí ve slabším odstínu této barvy. + Draws the grid as lines, or as dots along the major gridlines at each subdivision. Kreslí mřížku jako čáry, nebo jako tečky podél hlavních čar mřížky v každém dělení. + The distance between major gridlines, in every open document and in new ones; a VectorCraft document opens with the grid it was saved with. Vzdálenost mezi hlavními čarami mřížky ve všech otevřených dokumentech i v nových; dokument VectorCraftu se otevře s mřížkou, se kterou byl uložen. + How many parts each major grid square is divided into; Snap to Grid snaps to these parts, even when the zoom hides their lines. Na kolik dílů se dělí každý hlavní čtverec mřížky; Přichytávat k mřížce přichytává k těmto dílům, i když jejich čáry při daném zvětšení nejsou vidět. + Draws the grid behind the artwork; off, the grid is drawn over it. Kreslí mřížku za kresbou; je-li vypnuto, kreslí se mřížka přes ni. + In Pixel Preview at 600% zoom or more, the active view shows a line at the edge of every document pixel over the artwork. V náhledu obrazových bodů při zvětšení 600 % a více ukazuje aktivní zobrazení přes kresbu čáru na okraji každého obrazového bodu dokumentu. + The color of the tile edge and the dashed swatch bounds shown while you edit a pattern. Barva okraje dlaždice a přerušovaných hranic položky vzorníku, které se ukazují při úpravě vzorku. + Snaps drawing, moving and transforming to nearby art and shows guides and labels; Pixel Preview turns them off, and Snap to Grid snaps to the grid instead. Přichytává kreslení, přesouvání a transformace k blízké kresbě a ukazuje vodítka a popisky; Náhled obrazových bodů je vypíná a Přichytávat k mřížce místo nich přichytává k mřížce. + The color of Smart Guide lines and labels. Barva čar a popisků chytrých vodítek. + Shows a line along the edge or center that art lines up with; off, art still lines up without the line, and Snap to Glyph does not apply. Ukazuje čáru podél okraje nebo středu, ke kterému se kresba zarovnává; když je vypnuto, kresba se zarovnává i bez čáry a Přichytávat ke glyfům neplatí. + With a selection tool, outlines the unselected object under the pointer in its layer color while you are not dragging. S nástrojem pro výběr obtáhne nevybraný objekt pod ukazatelem barvou jeho vrstvy, dokud netáhnete. + Shows the size or angle next to the pointer while you scale, rotate, shear or reflect art. Ukazuje u ukazatele velikost nebo úhel, když měníte velikost kresby nebo ji otáčíte, zkosujete či zrcadlíte. + While you draw, points snap to lines at the chosen Angles through the point the segment or shape starts from. Při kreslení se body přichytávají k čarám ve zvolených úhlech procházejícím bodem, kde začíná segment nebo tvar. + The set of angles the construction guides follow while Construction Guides is on. Sada úhlů, které konstrukční vodítka sledují, když jsou Konstrukční vodítka zapnutá. + Names what a point snaps to, such as an anchor, a path or an alignment; off, points snap the same way without the names. Pojmenuje, k čemu se bod přichytí, například kotevní bod, cestu nebo zarovnání; když je vypnuto, body se přichytávají stejně, jen bez názvů. + Shows distances, angles and how far art has moved next to the pointer while you draw or move it. Ukazuje u ukazatele vzdálenosti, úhly a o kolik se kresba posunula, když kreslíte nebo přesouváte. + Snaps moved or resized art to the same gap as between nearby objects, and marks the equal gaps. Přichytí přesunutou kresbu nebo kresbu se změněnou velikostí na stejnou mezeru jako mezi blízkými objekty a vyznačí stejné mezery. + With something selected, holding Alt/Option over another object or an artboard shows the distances between it and the selection. Když je něco vybráno, podržení Alt/Option nad jiným objektem nebo pracovní plochou ukáže vzdálenosti mezi ním a výběrem. + A selection dragged back to within the Snapping Tolerance of where the drag began goes back to exactly that place; a copy does not. Výběr přetažený zpět do tolerance přichytávání od místa, kde tažení začalo, se vrátí přesně na to místo; kopie ne. + How near on screen the pointer or a dragged point must come to art for Smart Guides to snap to it; the distance is the same at every zoom. Jak blízko na obrazovce musí ukazatel nebo tažený bod přijít ke kresbě, aby se chytrá vodítka přichytila; vzdálenost je stejná při každém zvětšení. + Snaps the end of a line segment, or a circle drawn from its center, so that it touches a nearby curve. Přichytí konec úsečky nebo kružnici kreslenou od středu tak, aby se dotýkala blízké křivky. + Snaps the end of a line segment so that it meets a nearby straight segment at a right angle. Přichytí konec úsečky tak, aby se s blízkým rovným segmentem setkal v pravém úhlu. Reset all preferences to their defaults? Obnovit všechny předvolby na výchozí hodnoty? The defaults are applied when you click OK in Preferences. Cancel there keeps your current preferences. Výchozí hodnoty se použijí po klepnutí na OK v Předvolbách. Zrušit tam zachová vaše současné předvolby. Smaller ↔ Larger Menší ↔ Větší @@ -4975,6 +5066,11 @@ liquify-list-end {0}, {1} {0} a {1} @msg PDF writer error: {0} chyba zápisu PDF: {0} @msgplural Packaged {n} file ({note}) in {folder}|Packaged {n} files ({note}) in {folder} Zabalen {n} soubor do {folder} ({note})|Zabaleny {n} soubory do {folder} ({note})|Zabaleno {n} souborů do {folder} ({note}) @msg Preview in Browser needs the desktop app (the web downloads files instead) Náhled v prohlížeči vyžaduje desktopovou aplikaci (webová verze místo toho stahuje soubory) +@msg give `desiredK`, the desired file size in K (1024 bytes): a number above 0 and at most 1048576 zadejte `desiredK`, požadovanou velikost souboru v K (1024 bajtů): číslo větší než 0 a nejvýše 1048576 +@msg `startWith` is `current` or `auto` `startWith` je `current` nebo `auto` +@msg `use` is `allSlices`, `eachSlice` or `currentSlice` `use` je `allSlices`, `eachSlice` nebo `currentSlice` +@msg `slice` is a slice number from `slice.list`, with `use: currentSlice` `slice` je číslo řezu ze `slice.list`, s `use: currentSlice` +@msg Optimize to File Size: there is no image to measure Optimalizovat na velikost souboru: není žádný obraz k měření @msg Release Guides: no guides Uvolnit vodítka: žádná vodítka @msg Release: no layer to put the rectangle in Uvolnit: chybí vrstva, do které by šel obdélník umístit @msg Replace Spine: select a blend and a path Nahradit páteř: vyberte prolnutí a cestu @@ -6303,6 +6399,19 @@ mark-style Japanese Japonské Transform Objects Transformovat objekty @msg unknown parameter `{key}`; did you mean `{near}`? neznámý parametr `{key}`; mysleli jste `{near}`? @msg unknown parameter `{key}`; the command takes no parameters neznámý parametr `{key}`; příkaz nemá žádné parametry +@msg unknown parameter `{key}`; `{object}` takes: {keys} neznámý parametr `{key}`; `{object}` přijímá: {keys} +@msg unknown parameter `{key}`; {why_not} neznámý parametr `{key}`; {why_not} +@msg no format takes it (see document.formats) žádný formát jej nepřijímá (viz document.formats) +@msg no save format takes it (see file.formatOptions) žádný formát pro ukládání jej nepřijímá (viz file.formatOptions) +@msg PDF doesn't take it (see document.formats) PDF jej nepřijímá (viz document.formats) +@msg EPS doesn't take it (see document.formats) EPS jej nepřijímá (viz document.formats) +@msg DXF doesn't take it (see document.formats) DXF jej nepřijímá (viz document.formats) +@msg {name} must be {range} (got {v}) {name} musí být {range} (zadáno {v}) +@msg The graphics processor tried first couldn't show the window, so VectorCraft started again on {summary} (Settings › Performance › Graphics Processor › Automatic uses the one that drives your display) Grafický procesor zkoušený jako první nedokázal zobrazit okno, proto se VectorCraft znovu spustil na {summary} (Nastavení › Výkon › Grafický procesor › Automaticky použije ten, který obsluhuje váš displej) +@msg Sent “{title}” to {to} “{title}” odesláno do {to} +@msg Sent “{title}” to {to}. The spooler replied: {note} “{title}” odesláno do {to}. Odpověď tiskové fronty: {note} +@msg the default printer výchozí tiskárny +@msg raster effects on object {object}: requested {requested} ppi, achieved {achieved} ppi due to the 64 million pixel cap rastrové efekty na objektu {object}: požadováno {requested} ppi, dosaženo {achieved} ppi kvůli limitu 64 milionů pixelů @msg unknown parameter `{key}`; the command takes: {keys} neznámý parametr `{key}`; příkaz přijímá: {keys} @msg the params must be an object, not {got} parametry musí být objekt, nikoli {got} @msg unknown parameter `{path}`; the object takes no keys neznámý parametr `{path}`; objekt nepřijímá žádné klíče @@ -7936,6 +8045,11 @@ breakText Glyphs Glyfy @msg Some islands could not be joined to the area around the art Některé ostrůvky nebylo možné připojit k oblasti kolem kresby @msg `width` must be from {lo} to {hi} pt `width` musí být od {lo} do {hi} pt @msg `angle` must be from -180 to 180 degrees `angle` musí být od -180 do 180 stupňů +@msg `roundness` must be from 0 to 100% `roundness` musí být od 0 do 100 % +@msg `fidelity` must be from 0.01 to 100 pt `fidelity` musí být od 0.01 do 100 pt +@msg style must be "pencil" or "brush" style musí být "pencil" nebo "brush" +@msg extend end must be "start" or "end" konec extend musí být "start" nebo "end" +@msg connect end must be "start" or "end" konec connect musí být "start" nebo "end" @msg `roundness` must be from 1 to 100% `roundness` musí být od 1 do 100 % @msg `count` must be a whole number from 1 to {MAX_BRIDGES_PER_ISLAND} `count` musí být celé číslo od 1 do {MAX_BRIDGES_PER_ISLAND} Weed Box and Lines… Rámeček a linie pro vybírání… @@ -8457,7 +8571,6 @@ breakText Glyphs Glyfy @msg anchor `smooth` must be true or false `smooth` kotevního bodu musí být true nebo false @msg anchor `{key}` must be [x, y] `{key}` kotevního bodu musí být [x, y] @msg anchor `{key}` must be a number `{key}` kotevního bodu musí být číslo -@msg angle and roundness must be finite úhel a zaoblení musí být konečné @msg angles must be a list as long as pins (degrees or null) angles musí být seznam stejně dlouhý jako pins (stupně nebo null) @msg appearance must be flat|center|edge appearance musí být flat|center|edge @msg apply is "fill" or "stroke", not `{other}` apply je "fill" nebo "stroke", ne `{other}` @@ -9612,8 +9725,6 @@ breakText Glyphs Glyfy @msg unknown panel neznámý panel @msg unknown panel `{panel}` neznámý panel `{panel}` @msg unknown parameter `{key}` neznámý parametr `{key}` -@msg unknown parameter `{within}settings.{format}`; {why} neznámý parametr `{within}settings.{format}`; {why} -@msg unknown parameter `{within}{key}`; {why} neznámý parametr `{within}{key}`; {why} @msg unknown pieLegend `{v}` (none, standard or wedges) neznámé pieLegend `{v}` (none, standard nebo wedges) @msg unknown piePosition `{v}` (even, ratio or stacked) neznámé piePosition `{v}` (even, ratio nebo stacked) @msg unknown pieSort `{v}` (none, all or first) neznámé pieSort `{v}` (none, all nebo first) @@ -9741,7 +9852,6 @@ breakText Glyphs Glyfy @msg {name} `{s}`: {ids} {name} `{s}`: {ids} @msg {name} is built in and can't be deleted {name} je vestavěné a nelze ho odstranit @msg {name} must be a number {name} musí být číslo -@msg {name} must be {lo}–{hi}{unit} (got {v}) {name} musí být {lo}–{hi}{unit} (zadáno {v}) @msg {name}: CRC or size mismatch {name}: nesouhlasí CRC nebo velikost @msg {name}: only this Affinity file's embedded preview could be read; use File › Open to see it with its warning, or export SVG or PDF from Affinity before placing {name}: z tohoto souboru Affinity šlo přečíst jen vložený náhled; pomocí Soubor › Otevřít ho zobrazíte s varováním, nebo před umístěním exportujte SVG či PDF z Affinity @msg {name}: {e} {name}: {e} diff --git a/crates/ui-egui/src/i18n/da.tsv b/crates/ui-egui/src/i18n/da.tsv index 66801933fd..f5aca19b98 100644 --- a/crates/ui-egui/src/i18n/da.tsv +++ b/crates/ui-egui/src/i18n/da.tsv @@ -726,6 +726,11 @@ liquify-list-end {0}, {1} {0} og {1} @msg Some islands could not be joined to the area around the art Nogle øer kunne ikke forbindes med området omkring grafikken @msg `width` must be from {lo} to {hi} pt `width` skal være fra {lo} til {hi} pt @msg `angle` must be from -180 to 180 degrees `angle` skal være fra -180 til 180 grader +@msg `roundness` must be from 0 to 100% `roundness` skal være fra 0 til 100 % +@msg `fidelity` must be from 0.01 to 100 pt `fidelity` skal være fra 0.01 til 100 pt +@msg style must be "pencil" or "brush" style skal være "pencil" eller "brush" +@msg extend end must be "start" or "end" enden for extend skal være "start" eller "end" +@msg connect end must be "start" or "end" enden for connect skal være "start" eller "end" @msg `roundness` must be from 1 to 100% `roundness` skal være fra 1 til 100 % @msg `count` must be a whole number from 1 to {MAX_BRIDGES_PER_ISLAND} `count` skal være et heltal fra 1 til {MAX_BRIDGES_PER_ISLAND} @@ -2905,6 +2910,9 @@ liquify-list-end {0}, {1} {0} og {1} Mask Maskér Rasterize… Rasterisér… Create Gradient Mesh… Opret gradientnet… + Flat Flad + To Center Mod midten + To Edge Mod kanten Create Object Mosaic… Opret objektmosaik… Vector Halftone… Vektorhalvtone… Create Trim Marks Opret beskæringsmærker @@ -3788,6 +3796,18 @@ lighting Light Lys Placement Options… Placeringsindstillinger… Plug-in… Plug-in… Preview in Browser Forhåndsvis i browser + Optimize to File Size… Optimer til filstørrelse… + Optimize to File Size Optimer til filstørrelse + Desired File Size: Ønsket filstørrelse: + Start With: Start med: + Use: Brug: + Current Settings Aktuelle indstillinger + Auto Select GIF/JPEG Vælg GIF/JPEG automatisk + Total of All Slices Alle udsnit i alt + Each Slice Hvert udsnit + Current Slice Aktuelt udsnit + {size}, within {target} {size}, inden for {target} + No setting tried fits in {target}; the smallest is {size} Ingen afprøvet indstilling passer i {target}; den mindste er {size} Printer Setup… Printeropsætning… Printers Printere Recent File Seneste fil @@ -5393,6 +5413,8 @@ digits Malayalam Malayalam Collate Sortér Composite colours are converted to it; separations separate with it when it is a CMYK profile. Kompositfarver konverteres til den; separationer separeres med den, når det er en CMYK-profil. Convert All Spot Colors to Process Konvertér alle spotfarver til procesfarver + Convert {name} to process Konvertér {name} til procesfarve + Keep {name} as spot Behold {name} som spotfarve Default Printer Standardprinter Document Ink Options Indstillinger for dokumentblæk Download: Download: @@ -6409,6 +6431,7 @@ theme Appearance Udseende Command Click to Select Objects Behind Command-klik for at markere objekter bagved Constrain Angle Fastlåsningsvinkel Constrain Width and Height Proportions Fasthold forholdet mellem bredde og højde + Copy Width to Height Kopiér bredde til højde Construction Guides Konstruktionshjælpelinjer Curvature Tool Krumningsværktøj Data Recovery Datgendannelse @@ -6911,12 +6934,85 @@ font-technology Variable Variable Preferences Præferencer Previous Forrige Restore every preference to its default (applied on OK) Gendan alle præferencer til standard (anvendes ved OK) + Shows a bar of commands for the selection or tool on the canvas; it hides while you drag and in Presentation Mode. Viser en bjælke med kommandoer for markeringen eller værktøjet på lærredet; den skjules, mens du trækker, og i præsentationstilstand. + How far an arrow key moves the selection; with Shift, it moves ten times as far. Hvor langt en piletast flytter markeringen; med Skift flytter den ti gange så langt. + The angle of the axes that arrow keys move along and that Shift holds drawing and moving to. Vinklen på de akser, som piletasterne flytter langs, og som Skift låser tegning og flytning til. + The corner radius the Rounded Rectangle tool draws with; changing the radius while drawing changes this value too. Den hjørneradius, som værktøjet Afrundet rektangel tegner med; ændrer du radius under tegning, ændres denne værdi også. + How far right and down Paste moves the copy when it is given no position, as from a script; Paste in the app centers it in the view. Hvor langt til højre og ned Indsæt flytter kopien, når der ikke er angivet en position, som fra et script; Indsæt i appen placerer den midt i visningen. + Stops the Pen tool from deleting the anchor you click on a selected path, or adding one where you click its segment. Forhindrer værktøjet Pen i at slette det ankerpunkt, du klikker på en markeret sti, eller tilføje et, hvor du klikker på dens segment. + Drawing tools show a crosshair pointer instead of their icon; Caps Lock does the same while it is on. Tegneværktøjer viser en trådkorsmarkør i stedet for deres ikon; Caps Lock gør det samme, mens den er slået til. + Shows a tip when the pointer rests on a button or field that has one. Viser et tip, når markøren hviler på en knap eller et felt, der har et. + Shows a warning before a script you choose runs. Viser en advarsel, før et script, du vælger, køres. + Smooths the edges of artwork on the canvas. Udglatter kanterne på grafikken på lærredet. + Select › Same › Fill Color, Stroke Color and Fill & Stroke match only the same tint of a global or spot swatch, not any tint of it. Markér › Samme › Fyldfarve, Stregfarve og Fyld og streg finder kun samme nuance af en global farveprøve eller staffagefarve, ikke en hvilken som helst nuance af den. + Shows the Home screen when no document is open; off, the window stays empty until you click Home. Viser startskærmen, når intet dokument er åbent; når den er slået fra, forbliver vinduet tomt, indtil du klikker på Home. + Measures objects with their strokes and shape-changing effects for size, position and alignment; shadows, glows and blurs are not measured. Måler objekter med deres streger og formændrende effekter til størrelse, position og justering; skygger, glød og sløringer måles ikke. + At 100% zoom, one inch of the document takes 96 screen points instead of 72. Ved 100 % zoom fylder en tomme af dokumentet 96 skærmpunkter i stedet for 72. + Double-clicking a group, path or image with the Selection tool opens it in isolation mode. Dobbeltklik på en gruppe, en sti eller et billede med værktøjet Markering åbner det i isolationstilstand. + Pattern fills and strokes transform with the art, unless a transform or the Transform panel's menu chooses otherwise. Mønsterfyld og -streger transformeres med grafikken, medmindre en transformation eller menuen i panelet Transformér vælger andet. + Live corner radii scale with the art, unless the scale chooses otherwise. Live-hjørneradier skaleres med grafikken, medmindre skaleringen vælger andet. + Stroke weights, dashes and effect distances scale with the art, unless the scale chooses otherwise. Stregtykkelser, streger i stiplede linjer og effektafstande skaleres med grafikken, medmindre skaleringen vælger andet. + The mouse wheel zooms the canvas instead of scrolling it. Musehjulet zoomer lærredet i stedet for at rulle det. + The mouse wheel with Cmd/Ctrl held scrolls the canvas sideways. Musehjulet med Cmd/Ctrl holdt nede ruller lærredet sidelæns. + Dragging sideways on a numeric field's label changes the field's value. Når du trækker sidelæns på et talfelts etiket, ændres feltets værdi. + A two-finger rotate gesture on a trackpad rotates the canvas view. En rotationsbevægelse med to fingre på en pegeplade roterer visningen af lærredet. + Holding a tool's shortcut key chooses the tool until you let go, and then the previous tool is chosen again. Når du holder et værktøjs genvejstast nede, er værktøjet valgt, indtil du slipper, og derefter vælges det forrige værktøj igen. + Shows the bounding box while you move the selection or draw a shape. Viser afgrænsningsboksen, mens du flytter markeringen eller tegner en form. + Create Trim Marks draws Japanese-style marks instead of Roman ones. Opret beskæringsmærker tegner mærker i japansk stil i stedet for romerske. + New art takes only the fill and stroke of the selection; off, it takes the selected object's whole appearance. Ny grafik får kun markeringens fyld og streg; når den er slået fra, får den hele det markerede objekts udseende. + Changing the width or height in the Transform panel, the Properties panel or the Control bar changes the other in proportion. Ændrer du bredden eller højden i panelet Transformér, panelet Egenskaber eller kontrolpanelet, ændres den anden forholdsmæssigt. + A live rectangle's properties show one Corner Radius field for all four corners; off, each corner has its own field. Egenskaberne for et live-rektangel viser ét felt Hjørneradius for alle fire hjørner; når den er slået fra, har hvert hjørne sit eget felt. + What edits in the Transform panel transform: the object, its pattern tiles or both; Default follows Transform Pattern Tiles. Hvad ændringer i panelet Transformér transformerer: objektet, dets mønsterfliser eller begge; Standard følger Transformer mønsterfliser. + With one symbol instance selected, the Transform panel uses the symbol's registration point as its reference point. Når én symbolforekomst er markeret, bruger panelet Transformér symbolets registreringspunkt som referencepunkt. + Darkens the canvas outside the artboards while the Artboard tool is active. Gør lærredet uden for kunstpladerne mørkere, mens værktøjet Kunstplade er aktivt. + With Fade Region Outside Artboard on, the area outside the artboards stays dark while you drag with the Artboard tool. Når Ton området uden for kunstpladen ned er slået til, forbliver området uden for kunstpladerne mørkt, mens du trækker med værktøjet Kunstplade. + How near, in pixels, the pointer must be to an object, anchor or handle for a click to select it. Hvor tæt markøren i pixels skal være på et objekt, ankerpunkt eller håndtag, for at et klik markerer det. + Whether the Selection tool's box selects objects it touches or only those fully inside; Drag Direction selects those inside on a drag to the right. E reverses it mid-drag. Om markeringsværktøjets felt markerer objekter, det rører, eller kun dem helt indenfor; Trækretning markerer dem indenfor, når du trækker mod højre. E vender reglen under trækket. + A click selects a filled object only on its path, not inside its fill. Et klik markerer et udfyldt objekt kun på dets sti, ikke inde i udfyldningen. + How near, in pixels, a point must come to an anchor or ruler guide for Snap to Point to snap it; with Smart Guides on, Smart Guides' Snapping Tolerance applies instead. Hvor tæt et punkt i pixels skal komme på et ankerpunkt eller en linealhjælpelinje, for at Fastgør til punkt fastgør det; med smarte hjælpelinjer slået til gælder deres snap-tolerance i stedet. + With the Selection tool, Cmd/Ctrl-click selects the object under the selected one at the pointer; each further click goes one object deeper. Med markeringsværktøjet markerer Cmd/Ctrl-klik objektet under det markerede ved markøren; hvert nyt klik går et objekt dybere. + Zoom In and Zoom Out bring the center of the selection to the middle of the view. Zoom ind og Zoom ud flytter markeringens midte til midten af visningen. + Locked and hidden artwork inside an artboard moves, scales and is copied with the artboard, as the other artwork does. Låst og skjult grafik inde i en kunstplade flyttes, skaleres og kopieres med kunstpladen ligesom den øvrige grafik. + The size of anchor points and direction handle ends on the canvas; larger anchors can also be picked from farther away. Størrelsen af ankerpunkter og retningshåndtagenes ender på lærredet; større ankerpunkter kan også gribes længere fra. + Draws the ends of direction handles as solid dots, hollow dots or larger solid dots. Tegner retningshåndtagenes ender som fyldte prikker, hule prikker eller større fyldte prikker. + With the Direct Selection tool, the anchor under the pointer is highlighted. Med det direkte markeringsværktøj fremhæves ankerpunktet under markøren. + Shows direction handles when more than one anchor is selected; off, they show only while a single anchor is selected. Viser retningshåndtag, når mere end ét ankerpunkt er markeret; slået fra vises de kun, mens ét ankerpunkt er markeret. + Corner widgets hide on corners whose angle is greater than this many degrees. Hjørnehåndtag skjules på hjørner, hvis vinkel er større end dette antal grader. + The Pen tool previews the next segment from the last anchor to the pointer before you click. Pen-værktøjet viser det næste segment fra det sidste ankerpunkt til markøren, før du klikker. + The Curvature tool previews the curve to the pointer before you place the next point. Krumningsværktøjet viser kurven til markøren, før du placerer det næste punkt. The unit for new documents from built-in sizes other than pixel sizes and for opened files that record no unit; choosing one here and clicking OK also sets the active document's units. Enheden for nye dokumenter i de indbyggede størrelser, bortset fra størrelser i pixels, og for åbnede filer, der ikke angiver en enhed; vælger du den her og klikker på OK, får det aktive dokument også denne enhed. Stroke weights, dashes and gaps show in this unit, and numbers typed for them are read in it. Stregtykkelser, streger og mellemrum vises i denne enhed, og tal, der skrives til dem, læses i den. Type sizes, leading and baseline shift show in this unit, and numbers typed for them are read in it. Tekststørrelser, linjeafstand og grundlinjeforskydning vises i denne enhed, og tal, der skrives til dem, læses i den. The unit for East Asian type measurements, which no field uses yet. Enheden for mål i østasiatisk tekst, som intet felt bruger endnu. When on, a number typed without a unit into a field in picas is read in points. Når den er slået til, læses et tal, der skrives uden enhed i et felt i pica, i punkter. With XML ID, object names show as XML IDs in the Layers panel, the Variables panel and Layer Options. Med XML-id vises objektnavne som XML-id'er i Lag, Variabler og Lagindstillinger. + Snaps drawing, moving and scaling to the grid's subdivisions, even while the grid is hidden; while it is on, Snap to Pixel does not apply. Fastgør tegning, flytning og skalering til gitterets underinddelinger, også mens gitteret er skjult; mens den er slået til, gælder Fastgør til pixel ikke. + The color of guides that are not selected; an artboard with a Guide Label draws its own guides in the label's color instead. Farven på hjælpelinjer, der ikke er markeret; en kunstplade med en hjælpelinjeetiket tegner sine egne hjælpelinjer i etikettens farve. + Draws guides as solid lines or as dots, including the guides already in the document. Tegner hjælpelinjer som hele linjer eller som prikker, også de hjælpelinjer, der allerede er i dokumentet. + With this on, guides are locked when VectorCraft starts; changing this option locks or unlocks them at once, and View › Guides › Lock Guides still changes the lock. Når den er slået til, er hjælpelinjerne låst, når VectorCraft starter; når indstillingen ændres, låses de eller låses op med det samme, og Vis › Hjælpelinjer › Lås hjælpelinjer ændrer stadig låsen. + With this on, holding Cmd/Ctrl as you start dragging from a ruler makes a guide on the active artboard only, or a canvas guide with the Artboard tool. Når den er slået til, laver Cmd/Ctrl holdt nede i starten af et træk fra en lineal en hjælpelinje kun på den aktive kunstplade, eller med tegnebrætværktøjet en hjælpelinje over hele lærredet. + The color of the grid; the lines between major gridlines are drawn in a fainter shade of it. Gitterets farve; linjerne mellem hovedgitterlinjerne tegnes i en svagere nuance af den. + Draws the grid as lines, or as dots along the major gridlines at each subdivision. Tegner gitteret som linjer eller som prikker langs hovedgitterlinjerne ved hver underinddeling. + The distance between major gridlines, in every open document and in new ones; a VectorCraft document opens with the grid it was saved with. Afstanden mellem hovedgitterlinjer i alle åbne dokumenter og i nye; et VectorCraft-dokument åbnes med det gitter, det blev gemt med. + How many parts each major grid square is divided into; Snap to Grid snaps to these parts, even when the zoom hides their lines. Hvor mange dele hvert hovedgitterfelt deles i; Fastgør til gitter fastgør til disse dele, også når zoomniveauet skjuler deres linjer. + Draws the grid behind the artwork; off, the grid is drawn over it. Tegner gitteret bag illustrationen; slået fra tegnes gitteret oven på den. + In Pixel Preview at 600% zoom or more, the active view shows a line at the edge of every document pixel over the artwork. I pixel-forhåndsvisning ved 600 % zoom eller mere viser den aktive visning en linje ved kanten af hver dokumentpixel oven på illustrationen. + The color of the tile edge and the dashed swatch bounds shown while you edit a pattern. Farven på flisekanten og de stiplede farveprøvegrænser, der vises, mens du redigerer et mønster. + Snaps drawing, moving and transforming to nearby art and shows guides and labels; Pixel Preview turns them off, and Snap to Grid snaps to the grid instead. Fastgør tegning, flytning og transformering til nærliggende grafik og viser hjælpelinjer og etiketter; Pixel-forhåndsvisning slår dem fra, og Fastgør til gitter fastgør i stedet til gitteret. + The color of Smart Guide lines and labels. Farven på de smarte hjælpelinjers linjer og etiketter. + Shows a line along the edge or center that art lines up with; off, art still lines up without the line, and Snap to Glyph does not apply. Viser en linje langs den kant eller midte, som grafikken flugter med; når den er slået fra, flugter grafikken stadig uden linjen, og Fastgør til tegn gælder ikke. + With a selection tool, outlines the unselected object under the pointer in its layer color while you are not dragging. Med et markeringsværktøj får det ikke-markerede objekt under markøren en kontur i lagets farve, mens du ikke trækker. + Shows the size or angle next to the pointer while you scale, rotate, shear or reflect art. Viser størrelsen eller vinklen ved markøren, mens du skalerer, roterer, vrider eller spejler grafik. + While you draw, points snap to lines at the chosen Angles through the point the segment or shape starts from. Mens du tegner, fastgøres punkter til linjer i de valgte vinkler gennem det punkt, segmentet eller formen starter fra. + The set of angles the construction guides follow while Construction Guides is on. Det sæt vinkler, som konstruktionshjælpelinjerne følger, mens Konstruktionshjælpelinjer er slået til. + Names what a point snaps to, such as an anchor, a path or an alignment; off, points snap the same way without the names. Navngiver det, et punkt fastgøres til, f.eks. et ankerpunkt, en kurve eller en justering; når den er slået fra, fastgøres punkter på samme måde uden navnene. + Shows distances, angles and how far art has moved next to the pointer while you draw or move it. Viser afstande, vinkler og hvor langt grafikken er flyttet ved markøren, mens du tegner eller flytter. + Snaps moved or resized art to the same gap as between nearby objects, and marks the equal gaps. Fastgør flyttet grafik eller grafik med ændret størrelse til samme mellemrum som mellem nærliggende objekter og markerer de ens mellemrum. + With something selected, holding Alt/Option over another object or an artboard shows the distances between it and the selection. Når noget er markeret, viser Alt/Option holdt over et andet objekt eller en kunstplade afstandene mellem det og markeringen. + A selection dragged back to within the Snapping Tolerance of where the drag began goes back to exactly that place; a copy does not. En markering, der trækkes tilbage til inden for snap-tolerancen af stedet, hvor trækket begyndte, vender præcis tilbage dertil; en kopi gør ikke. + How near on screen the pointer or a dragged point must come to art for Smart Guides to snap to it; the distance is the same at every zoom. Hvor tæt på skærmen markøren eller et trukket punkt skal komme på grafik, for at de smarte hjælpelinjer fastgør til den; afstanden er den samme ved alle zoomniveauer. + Snaps the end of a line segment, or a circle drawn from its center, so that it touches a nearby curve. Fastgør enden af et linjesegment eller en cirkel tegnet fra midten, så den rører en nærliggende kurve. + Snaps the end of a line segment so that it meets a nearby straight segment at a right angle. Fastgør enden af et linjesegment, så det møder et nærliggende lige segment i en ret vinkel. Reset all preferences to their defaults? Nulstil alle præferencer til standard? The defaults are applied when you click OK in Preferences. Cancel there keeps your current preferences. Standardværdierne anvendes, når du klikker på OK i Præferencer. Annullér der beholder dine nuværende præferencer. Smaller ↔ Larger Mindre ↔ Større @@ -7206,6 +7302,11 @@ imageTrace Outline Kontur @msg PDF writer error: {0} PDF-skriverfejl: {0} @msgplural Packaged {n} file ({note}) in {folder}|Packaged {n} files ({note}) in {folder} Pakkede {n} fil i {folder} ({note})|Pakkede {n} filer i {folder} ({note}) @msg Preview in Browser needs the desktop app (the web downloads files instead) Forhåndsvisning i browser kræver skrivebordsappen (webversionen downloader filer i stedet) +@msg give `desiredK`, the desired file size in K (1024 bytes): a number above 0 and at most 1048576 angiv `desiredK`, den ønskede filstørrelse i K (1024 byte): et tal over 0 og højst 1048576 +@msg `startWith` is `current` or `auto` `startWith` er `current` eller `auto` +@msg `use` is `allSlices`, `eachSlice` or `currentSlice` `use` er `allSlices`, `eachSlice` eller `currentSlice` +@msg `slice` is a slice number from `slice.list`, with `use: currentSlice` `slice` er et udsnitsnummer fra `slice.list`, med `use: currentSlice` +@msg Optimize to File Size: there is no image to measure Optimer til filstørrelse: der er intet billede at måle @msg Release Guides: no guides Frigiv hjælpelinjer: ingen hjælpelinjer @msg Release: no layer to put the rectangle in Frigiv: intet lag at lægge rektanglet i @msg Replace Spine: select a blend and a path Erstat rygrad: markér en blanding og en kurve @@ -8280,6 +8381,19 @@ mark-style Japanese Japansk Transform Objects Transformér objekter @msg unknown parameter `{key}`; did you mean `{near}`? ukendt parameter `{key}`; mente du `{near}`? @msg unknown parameter `{key}`; the command takes no parameters ukendt parameter `{key}`; kommandoen tager ingen parametre +@msg unknown parameter `{key}`; `{object}` takes: {keys} ukendt parameter `{key}`; `{object}` tager: {keys} +@msg unknown parameter `{key}`; {why_not} ukendt parameter `{key}`; {why_not} +@msg no format takes it (see document.formats) intet format tager den (se document.formats) +@msg no save format takes it (see file.formatOptions) intet arkivformat tager den (se file.formatOptions) +@msg PDF doesn't take it (see document.formats) PDF tager den ikke (se document.formats) +@msg EPS doesn't take it (see document.formats) EPS tager den ikke (se document.formats) +@msg DXF doesn't take it (see document.formats) DXF tager den ikke (se document.formats) +@msg {name} must be {range} (got {v}) {name} skal være {range} (fik {v}) +@msg The graphics processor tried first couldn't show the window, so VectorCraft started again on {summary} (Settings › Performance › Graphics Processor › Automatic uses the one that drives your display) Den grafikprocessor, der blev prøvet først, kunne ikke vise vinduet, så VectorCraft startede igen med {summary} (Indstillinger › Ydeevne › Grafikprocessor › Automatisk bruger den, der driver din skærm) +@msg Sent “{title}” to {to} Sendte “{title}” til {to} +@msg Sent “{title}” to {to}. The spooler replied: {note} Sendte “{title}” til {to}. Svar fra udskriftskøen: {note} +@msg the default printer standardprinteren +@msg raster effects on object {object}: requested {requested} ppi, achieved {achieved} ppi due to the 64 million pixel cap rastereffekter på objekt {object}: anmodet om {requested} ppi, opnåede {achieved} ppi på grund af grænsen på 64 millioner pixel @msg unknown parameter `{key}`; the command takes: {keys} ukendt parameter `{key}`; kommandoen tager: {keys} Load EPS into Clipboard Indlæs EPS i udklipsholderen @msg an image of {w} × {h} pixels is too large to draw et billede på {w} × {h} pixels er for stort til at tegne diff --git a/crates/ui-egui/src/i18n/de.tsv b/crates/ui-egui/src/i18n/de.tsv index 31fe782de6..7c0f90446b 100644 --- a/crates/ui-egui/src/i18n/de.tsv +++ b/crates/ui-egui/src/i18n/de.tsv @@ -180,6 +180,8 @@ antiAlias Sharp Scharf Crisp Klar Strong Stark Anti-aliasing: Glättung: + Art Optimized Für Grafik optimiert + Type Optimized Für Text optimiert Any Kind Beliebige Art Font Technology Schrifttechnologie font-technology Variable Variabel @@ -585,6 +587,7 @@ font-technology Variable Variabel Consolidate All Windows Alle Fenster zusammenführen Constrain Angle Winkelbeschränkung Constrain Width and Height Proportions Proportionen von Breite und Höhe beibehalten + Copy Width to Height Breite in Höhe kopieren Construction Guides Konstruktionslinien Contextual Alternates Kontextbedingte Varianten Contextual Task Bar Kontextbezogene Taskleiste @@ -595,6 +598,8 @@ font-technology Variable Variabel Control Steuerung Convert Konvertieren Convert All Spot Colors to Process Alle Volltonfarben in Prozessfarben konvertieren + Convert {name} to process {name} in Prozessfarbe konvertieren + Keep {name} as spot {name} als Volltonfarbe beibehalten Convert All Strokes to Outlines Alle Konturen in Pfade umwandeln Convert All Text to Outlines Gesamten Text in Pfade umwandeln Convert Anchor Point Ankerpunkt umwandeln @@ -670,6 +675,9 @@ font-technology Variable Variabel Create from Selection Aus Auswahl erstellen Create From: Erstellen aus: Create Gradient Mesh… Verlaufsgitter erstellen… + Flat Flach + To Center Zur Mitte + To Edge Zum Rand Create Graph Diagramm erstellen Create New Layer Neue Ebene erstellen Create New Sublayer Neue Unterebene erstellen @@ -2677,6 +2685,18 @@ diagnostics ui Oberfläche Preview: Vorschau: Preview All Layers Vorschau aller Ebenen Preview in Browser Vorschau im Browser + Optimize to File Size… Auf Dateigröße optimieren… + Optimize to File Size Auf Dateigröße optimieren + Desired File Size: Gewünschte Dateigröße: + Start With: Beginnen mit: + Use: Verwenden: + Current Settings Aktuelle Einstellungen + Auto Select GIF/JPEG GIF/JPEG automatisch wählen + Total of All Slices Summe aller Slices + Each Slice Jedes Slice + Current Slice Aktuelles Slice + {size}, within {target} {size}, innerhalb von {target} + No setting tried fits in {target}; the smallest is {size} Keine getestete Einstellung passt in {target}; die kleinste ist {size} Preview in Browser needs the desktop app (the web downloads files instead) „Vorschau im Browser“ erfordert die Desktop-App (im Web werden stattdessen Dateien heruntergeladen) Preview Mode Vorschaumodus Preview the document as it is now Vorschau des Dokuments im aktuellen Zustand @@ -3025,12 +3045,85 @@ digits Malayalam Malayalam Responsive Responsiv Restore Wiederherstellen Restore every preference to its default (applied on OK) Alle Voreinstellungen auf ihre Standardwerte zurücksetzen (wird bei OK angewendet) + Shows a bar of commands for the selection or tool on the canvas; it hides while you drag and in Presentation Mode. Zeigt auf der Arbeitsfläche eine Leiste mit Befehlen für die Auswahl oder das Werkzeug; sie wird beim Ziehen und im Präsentationsmodus ausgeblendet. + How far an arrow key moves the selection; with Shift, it moves ten times as far. Wie weit eine Pfeiltaste die Auswahl verschiebt; mit Umschalt verschiebt sie sie zehnmal so weit. + The angle of the axes that arrow keys move along and that Shift holds drawing and moving to. Der Winkel der Achsen, entlang derer Pfeiltasten verschieben und an die Umschalt das Zeichnen und Verschieben bindet. + The corner radius the Rounded Rectangle tool draws with; changing the radius while drawing changes this value too. Der Eckenradius, mit dem das Werkzeug „Abgerundetes Rechteck“ zeichnet; wird der Radius beim Zeichnen geändert, ändert sich auch dieser Wert. + How far right and down Paste moves the copy when it is given no position, as from a script; Paste in the app centers it in the view. Wie weit „Einfügen“ die Kopie nach rechts und unten versetzt, wenn keine Position angegeben ist, etwa aus einem Skript; „Einfügen“ in der App setzt sie in die Mitte der Ansicht. + Stops the Pen tool from deleting the anchor you click on a selected path, or adding one where you click its segment. Verhindert, dass der Zeichenstift einen angeklickten Ankerpunkt eines ausgewählten Pfads löscht oder an einem angeklickten Segment einen hinzufügt. + Drawing tools show a crosshair pointer instead of their icon; Caps Lock does the same while it is on. Zeichenwerkzeuge zeigen statt ihres Symbols ein Fadenkreuz; die Feststelltaste bewirkt dasselbe, solange sie aktiv ist. + Shows a tip when the pointer rests on a button or field that has one. Zeigt einen Tipp an, wenn der Zeiger auf einer Schaltfläche oder einem Feld mit Tipp ruht. + Shows a warning before a script you choose runs. Zeigt eine Warnung an, bevor ein von Ihnen gewähltes Skript ausgeführt wird. + Smooths the edges of artwork on the canvas. Glättet die Kanten des Bildmaterials auf der Arbeitsfläche. + Select › Same › Fill Color, Stroke Color and Fill & Stroke match only the same tint of a global or spot swatch, not any tint of it. „Auswahl › Gleich › Flächenfarbe“, „Konturfarbe“ und „Fläche und Kontur“ finden nur denselben Farbton eines globalen oder Volltonfarbfelds, nicht jeden Farbton davon. + Shows the Home screen when no document is open; off, the window stays empty until you click Home. Zeigt den Startbildschirm, wenn kein Dokument geöffnet ist; ist die Option aus, bleibt das Fenster leer, bis Sie auf „Start“ klicken. + Measures objects with their strokes and shape-changing effects for size, position and alignment; shadows, glows and blurs are not measured. Misst Objekte für Größe, Position und Ausrichtung mit ihren Konturen und formverändernden Effekten; Schatten, Schein und Weichzeichnungen werden nicht gemessen. + At 100% zoom, one inch of the document takes 96 screen points instead of 72. Bei 100 % Zoom nimmt ein Zoll des Dokuments 96 statt 72 Bildschirmpunkte ein. + Double-clicking a group, path or image with the Selection tool opens it in isolation mode. Ein Doppelklick mit dem Auswahl-Werkzeug auf eine Gruppe, einen Pfad oder ein Bild öffnet sie im Isolationsmodus. + Pattern fills and strokes transform with the art, unless a transform or the Transform panel's menu chooses otherwise. Musterflächen und -konturen werden mit dem Bildmaterial transformiert, sofern die Transformation oder das Menü des Bedienfelds „Transformieren“ nichts anderes wählt. + Live corner radii scale with the art, unless the scale chooses otherwise. Live-Eckenradien skalieren mit dem Bildmaterial, sofern die Skalierung nichts anderes wählt. + Stroke weights, dashes and effect distances scale with the art, unless the scale chooses otherwise. Konturstärken, Striche und Effektabstände skalieren mit dem Bildmaterial, sofern die Skalierung nichts anderes wählt. + The mouse wheel zooms the canvas instead of scrolling it. Das Mausrad zoomt die Arbeitsfläche, statt sie zu scrollen. + The mouse wheel with Cmd/Ctrl held scrolls the canvas sideways. Mit gedrückter Befehls-/Strg-Taste scrollt das Mausrad die Arbeitsfläche seitwärts. + Dragging sideways on a numeric field's label changes the field's value. Seitliches Ziehen auf der Beschriftung eines Zahlenfelds ändert den Wert des Felds. + A two-finger rotate gesture on a trackpad rotates the canvas view. Eine Drehgeste mit zwei Fingern auf einem Trackpad dreht die Ansicht der Arbeitsfläche. + Holding a tool's shortcut key chooses the tool until you let go, and then the previous tool is chosen again. Solange Sie das Tastaturkürzel eines Werkzeugs gedrückt halten, ist dieses Werkzeug gewählt; danach wird wieder das vorherige gewählt. + Shows the bounding box while you move the selection or draw a shape. Zeigt den Begrenzungsrahmen an, während Sie die Auswahl verschieben oder eine Form zeichnen. + Create Trim Marks draws Japanese-style marks instead of Roman ones. „Schnittmarken erstellen“ zeichnet japanische statt römische Marken. + New art takes only the fill and stroke of the selection; off, it takes the selected object's whole appearance. Neues Bildmaterial übernimmt nur Fläche und Kontur der Auswahl; ist die Option aus, übernimmt es das gesamte Aussehen des ausgewählten Objekts. + Changing the width or height in the Transform panel, the Properties panel or the Control bar changes the other in proportion. Wenn Sie Breite oder Höhe im Bedienfeld „Transformieren“, im Bedienfeld „Eigenschaften“ oder im Steuerungsbedienfeld ändern, ändert sich der andere Wert proportional. + A live rectangle's properties show one Corner Radius field for all four corners; off, each corner has its own field. Die Eigenschaften eines Live-Rechtecks zeigen ein Feld „Eckenradius“ für alle vier Ecken; ist die Option aus, hat jede Ecke ihr eigenes Feld. + What edits in the Transform panel transform: the object, its pattern tiles or both; Default follows Transform Pattern Tiles. Was Änderungen im Bedienfeld „Transformieren“ transformieren: das Objekt, seine Musterkacheln oder beides; „Standard“ folgt „Musterkacheln transformieren“. + With one symbol instance selected, the Transform panel uses the symbol's registration point as its reference point. Ist eine Symbolinstanz ausgewählt, verwendet das Bedienfeld „Transformieren“ den Registrierungspunkt des Symbols als Referenzpunkt. + Darkens the canvas outside the artboards while the Artboard tool is active. Dunkelt die Arbeitsfläche außerhalb der Zeichenflächen ab, solange das Zeichenflächen-Werkzeug aktiv ist. + With Fade Region Outside Artboard on, the area outside the artboards stays dark while you drag with the Artboard tool. Ist „Bereich außerhalb der Zeichenfläche abblenden“ an, bleibt der Bereich außerhalb der Zeichenflächen dunkel, während Sie mit dem Zeichenflächen-Werkzeug ziehen. + How near, in pixels, the pointer must be to an object, anchor or handle for a click to select it. Wie nah der Zeiger in Pixeln an einem Objekt, Ankerpunkt oder Griff sein muss, damit ein Klick es auswählt. + Whether the Selection tool's box selects objects it touches or only those fully inside; Drag Direction selects those inside on a drag to the right. E reverses it mid-drag. Ob das Rechteck des Auswahl-Werkzeugs berührte Objekte auswählt oder nur vollständig umschlossene; „Ziehrichtung“ wählt beim Ziehen nach rechts die umschlossenen. E kehrt die Regel beim Ziehen um. + A click selects a filled object only on its path, not inside its fill. Ein Klick wählt ein gefülltes Objekt nur auf seinem Pfad aus, nicht innerhalb seiner Fläche. + How near, in pixels, a point must come to an anchor or ruler guide for Snap to Point to snap it; with Smart Guides on, Smart Guides' Snapping Tolerance applies instead. Wie nah ein Punkt in Pixeln einem Ankerpunkt oder einer Linealhilfslinie kommen muss, damit „An Punkt ausrichten“ ihn einrastet; bei eingeschalteten intelligenten Hilfslinien gilt stattdessen deren Einrasttoleranz. + With the Selection tool, Cmd/Ctrl-click selects the object under the selected one at the pointer; each further click goes one object deeper. Mit dem Auswahl-Werkzeug wählt Cmd/Ctrl-Klick das Objekt unter dem ausgewählten am Zeiger aus; jeder weitere Klick geht ein Objekt tiefer. + Zoom In and Zoom Out bring the center of the selection to the middle of the view. „Einzoomen“ und „Auszoomen“ rücken die Mitte der Auswahl in die Mitte der Ansicht. + Locked and hidden artwork inside an artboard moves, scales and is copied with the artboard, as the other artwork does. Gesperrtes und ausgeblendetes Bildmaterial in einer Zeichenfläche wird wie das übrige Bildmaterial mit der Zeichenfläche verschoben, skaliert und kopiert. + The size of anchor points and direction handle ends on the canvas; larger anchors can also be picked from farther away. Die Größe von Ankerpunkten und Griffenden auf der Arbeitsfläche; größere Ankerpunkte lassen sich auch aus größerer Entfernung greifen. + Draws the ends of direction handles as solid dots, hollow dots or larger solid dots. Zeichnet die Enden der Richtungsgriffe als gefüllte Punkte, hohle Punkte oder größere gefüllte Punkte. + With the Direct Selection tool, the anchor under the pointer is highlighted. Mit dem Direktauswahl-Werkzeug wird der Ankerpunkt unter dem Zeiger hervorgehoben. + Shows direction handles when more than one anchor is selected; off, they show only while a single anchor is selected. Zeigt Richtungsgriffe, wenn mehr als ein Ankerpunkt ausgewählt ist; ist die Option aus, erscheinen sie nur bei einem ausgewählten Ankerpunkt. + Corner widgets hide on corners whose angle is greater than this many degrees. Ecken-Widgets werden an Ecken ausgeblendet, deren Winkel größer als diese Gradzahl ist. + The Pen tool previews the next segment from the last anchor to the pointer before you click. Der Zeichenstift zeigt das nächste Segment vom letzten Ankerpunkt bis zum Zeiger, bevor Sie klicken. + The Curvature tool previews the curve to the pointer before you place the next point. Der Kurvenzeichner zeigt die Kurve bis zum Zeiger, bevor Sie den nächsten Punkt setzen. The unit for new documents from built-in sizes other than pixel sizes and for opened files that record no unit; choosing one here and clicking OK also sets the active document's units. Die Einheit für neue Dokumente in den integrierten Größen außer Pixelgrößen und für geöffnete Dateien ohne gespeicherte Einheit; wenn Sie sie hier wählen und auf OK klicken, erhält auch das aktive Dokument diese Einheit. Stroke weights, dashes and gaps show in this unit, and numbers typed for them are read in it. Konturstärken, Striche und Lücken werden in dieser Einheit angezeigt, und dafür eingegebene Zahlen werden in ihr gelesen. Type sizes, leading and baseline shift show in this unit, and numbers typed for them are read in it. Schriftgrade, Zeilenabstand und Grundlinienversatz werden in dieser Einheit angezeigt, und dafür eingegebene Zahlen werden in ihr gelesen. The unit for East Asian type measurements, which no field uses yet. Die Einheit für Maße in ostasiatischem Text, die noch kein Feld verwendet. When on, a number typed without a unit into a field in picas is read in points. Wenn aktiviert, wird eine ohne Einheit eingegebene Zahl in einem Feld in Pica als Punkt gelesen. With XML ID, object names show as XML IDs in the Layers panel, the Variables panel and Layer Options. Mit XML-ID werden Objektnamen in „Ebenen“, „Variablen“ und „Ebenenoptionen“ als XML-IDs angezeigt. + Snaps drawing, moving and scaling to the grid's subdivisions, even while the grid is hidden; while it is on, Snap to Pixel does not apply. Richtet Zeichnen, Verschieben und Skalieren an den Unterteilungen des Rasters aus, auch wenn das Raster ausgeblendet ist; solange die Option an ist, wirkt „An Pixel ausrichten“ nicht. + The color of guides that are not selected; an artboard with a Guide Label draws its own guides in the label's color instead. Die Farbe nicht ausgewählter Hilfslinien; eine Zeichenfläche mit einer „Farbmarkierung der Hilfslinien“ zeichnet ihre eigenen Hilfslinien stattdessen in dieser Farbe. + Draws guides as solid lines or as dots, including the guides already in the document. Zeichnet Hilfslinien als durchgezogene Linien oder als Punkte, auch die Hilfslinien, die bereits im Dokument sind. + With this on, guides are locked when VectorCraft starts; changing this option locks or unlocks them at once, and View › Guides › Lock Guides still changes the lock. Ist die Option an, sind Hilfslinien beim Start von VectorCraft gesperrt; eine Änderung der Option sperrt oder entsperrt sie sofort, und „Ansicht › Hilfslinien › Hilfslinien sperren“ ändert die Sperre weiterhin. + With this on, holding Cmd/Ctrl as you start dragging from a ruler makes a guide on the active artboard only, or a canvas guide with the Artboard tool. Ist die Option an, erstellt Cmd/Ctrl zu Beginn eines Ziehens aus einem Lineal eine Hilfslinie nur auf der aktiven Zeichenfläche, mit dem Zeichenflächen-Werkzeug eine Hilfslinie für die ganze Arbeitsfläche. + The color of the grid; the lines between major gridlines are drawn in a fainter shade of it. Die Farbe des Rasters; die Linien zwischen den Hauptrasterlinien werden in einem blasseren Ton davon gezeichnet. + Draws the grid as lines, or as dots along the major gridlines at each subdivision. Zeichnet das Raster als Linien oder als Punkte entlang der Hauptrasterlinien an jeder Unterteilung. + The distance between major gridlines, in every open document and in new ones; a VectorCraft document opens with the grid it was saved with. Der Abstand zwischen den Hauptrasterlinien in jedem geöffneten Dokument und in neuen; ein VectorCraft-Dokument öffnet sich mit dem Raster, mit dem es gespeichert wurde. + How many parts each major grid square is divided into; Snap to Grid snaps to these parts, even when the zoom hides their lines. In wie viele Teile jedes Hauptrasterquadrat geteilt wird; „Am Raster ausrichten“ richtet an diesen Teilen aus, auch wenn der Zoom ihre Linien ausblendet. + Draws the grid behind the artwork; off, the grid is drawn over it. Zeichnet das Raster hinter dem Bildmaterial; ist die Option aus, wird das Raster darüber gezeichnet. + In Pixel Preview at 600% zoom or more, the active view shows a line at the edge of every document pixel over the artwork. In der Pixelvorschau ab 600 % Zoom zeigt die aktive Ansicht über dem Bildmaterial eine Linie am Rand jedes Dokumentpixels. + The color of the tile edge and the dashed swatch bounds shown while you edit a pattern. Die Farbe der Kachelkante und der gestrichelten Farbfeldbegrenzung, die beim Bearbeiten eines Musters angezeigt werden. + Snaps drawing, moving and transforming to nearby art and shows guides and labels; Pixel Preview turns them off, and Snap to Grid snaps to the grid instead. Richtet Zeichnen, Verschieben und Transformieren an nahem Bildmaterial aus und zeigt Hilfslinien und Beschriftungen; die Pixelvorschau schaltet sie aus, und „Am Raster ausrichten“ richtet stattdessen am Raster aus. + The color of Smart Guide lines and labels. Die Farbe der Linien und Beschriftungen intelligenter Hilfslinien. + Shows a line along the edge or center that art lines up with; off, art still lines up without the line, and Snap to Glyph does not apply. Zeigt eine Linie an der Kante oder Mitte, an der Bildmaterial ausgerichtet ist; ist die Option aus, wird es ohne Linie ausgerichtet, und „An Glyphe ausrichten“ wirkt nicht. + With a selection tool, outlines the unselected object under the pointer in its layer color while you are not dragging. Umrandet mit einem Auswahlwerkzeug das nicht ausgewählte Objekt unter dem Zeiger in seiner Ebenenfarbe, solange Sie nicht ziehen. + Shows the size or angle next to the pointer while you scale, rotate, shear or reflect art. Zeigt beim Skalieren, Drehen, Verbiegen oder Spiegeln von Bildmaterial die Größe oder den Winkel neben dem Zeiger an. + While you draw, points snap to lines at the chosen Angles through the point the segment or shape starts from. Beim Zeichnen rasten Punkte an Linien in den gewählten Winkeln ein, die durch den Anfangspunkt des Segments oder der Form gehen. + The set of angles the construction guides follow while Construction Guides is on. Die Winkel, denen die Konstruktionslinien folgen, solange „Konstruktionslinien“ an ist. + Names what a point snaps to, such as an anchor, a path or an alignment; off, points snap the same way without the names. Benennt, woran ein Punkt einrastet, etwa einen Ankerpunkt, einen Pfad oder eine Ausrichtung; ist die Option aus, rasten Punkte gleich ein, nur ohne Namen. + Shows distances, angles and how far art has moved next to the pointer while you draw or move it. Zeigt beim Zeichnen oder Verschieben neben dem Zeiger Abstände, Winkel und wie weit das Bildmaterial bewegt wurde. + Snaps moved or resized art to the same gap as between nearby objects, and marks the equal gaps. Richtet verschobenes oder in der Größe geändertes Bildmaterial am gleichen Abstand wie zwischen nahen Objekten aus und markiert die gleichen Abstände. + With something selected, holding Alt/Option over another object or an artboard shows the distances between it and the selection. Ist etwas ausgewählt, zeigt Alt/Option über einem anderen Objekt oder einer Zeichenfläche die Abstände zwischen diesem und der Auswahl. + A selection dragged back to within the Snapping Tolerance of where the drag began goes back to exactly that place; a copy does not. Eine Auswahl, die bis auf die Einrasttoleranz an den Beginn des Ziehens zurückgezogen wird, kehrt genau dorthin zurück; eine Kopie nicht. + How near on screen the pointer or a dragged point must come to art for Smart Guides to snap to it; the distance is the same at every zoom. Wie nah der Zeiger oder ein gezogener Punkt auf dem Bildschirm an Bildmaterial kommen muss, damit intelligente Hilfslinien einrasten; der Abstand ist bei jedem Zoom gleich. + Snaps the end of a line segment, or a circle drawn from its center, so that it touches a nearby curve. Richtet das Ende eines Liniensegments oder einen von der Mitte aus gezeichneten Kreis so aus, dass er eine nahe Kurve berührt. + Snaps the end of a line segment so that it meets a nearby straight segment at a right angle. Richtet das Ende eines Liniensegments so aus, dass es ein nahes gerades Segment im rechten Winkel trifft. Reset all preferences to their defaults? Alle Voreinstellungen auf ihre Standardwerte zurücksetzen? The defaults are applied when you click OK in Preferences. Cancel there keeps your current preferences. Die Standardwerte werden angewendet, wenn Sie in den Voreinstellungen auf OK klicken. Abbrechen dort behält Ihre aktuellen Voreinstellungen. Restore Recovered Documents Wiederhergestellte Dokumente öffnen @@ -4573,6 +4666,11 @@ liquify-list-end {0}, {1} {0} und {1} @msg PDF writer error: {0} Fehler beim Schreiben der PDF-Datei: {0} @msgplural Packaged {n} file ({note}) in {folder}|Packaged {n} files ({note}) in {folder} {n} Datei in {folder} verpackt ({note})|{n} Dateien in {folder} verpackt ({note}) @msg Preview in Browser needs the desktop app (the web downloads files instead) „Vorschau im Browser“ erfordert die Desktop-App (im Web werden stattdessen Dateien heruntergeladen) +@msg give `desiredK`, the desired file size in K (1024 bytes): a number above 0 and at most 1048576 Geben Sie `desiredK` an, die gewünschte Dateigröße in K (1024 Byte): eine Zahl über 0 und höchstens 1048576 +@msg `startWith` is `current` or `auto` `startWith` ist `current` oder `auto` +@msg `use` is `allSlices`, `eachSlice` or `currentSlice` `use` ist `allSlices`, `eachSlice` oder `currentSlice` +@msg `slice` is a slice number from `slice.list`, with `use: currentSlice` `slice` ist eine Slice-Nummer aus `slice.list`, mit `use: currentSlice` +@msg Optimize to File Size: there is no image to measure Auf Dateigröße optimieren: Es gibt kein Bild zum Messen @msg Release Guides: no guides Hilfslinien zurückwandeln: keine Hilfslinien @msg Release: no layer to put the rectangle in Zurückwandeln: keine Ebene, die das Rechteck aufnehmen könnte @msg Replace Spine: select a blend and a path Achse ersetzen: Wählen Sie eine Angleichung und einen Pfad aus @@ -5874,6 +5972,19 @@ lighting Light Licht Transform Objects Objekte transformieren @msg unknown parameter `{key}`; did you mean `{near}`? unbekannter Parameter `{key}`; meinten Sie `{near}`? @msg unknown parameter `{key}`; the command takes no parameters unbekannter Parameter `{key}`; der Befehl hat keine Parameter +@msg unknown parameter `{key}`; `{object}` takes: {keys} unbekannter Parameter `{key}`; `{object}` akzeptiert: {keys} +@msg unknown parameter `{key}`; {why_not} unbekannter Parameter `{key}`; {why_not} +@msg no format takes it (see document.formats) kein Format akzeptiert ihn (siehe document.formats) +@msg no save format takes it (see file.formatOptions) kein Speicherformat akzeptiert ihn (siehe file.formatOptions) +@msg PDF doesn't take it (see document.formats) PDF akzeptiert ihn nicht (siehe document.formats) +@msg EPS doesn't take it (see document.formats) EPS akzeptiert ihn nicht (siehe document.formats) +@msg DXF doesn't take it (see document.formats) DXF akzeptiert ihn nicht (siehe document.formats) +@msg {name} must be {range} (got {v}) {name} muss {range} sein (erhalten: {v}) +@msg The graphics processor tried first couldn't show the window, so VectorCraft started again on {summary} (Settings › Performance › Graphics Processor › Automatic uses the one that drives your display) Der zuerst verwendete Grafikprozessor konnte das Fenster nicht anzeigen, daher wurde VectorCraft auf {summary} neu gestartet (Einstellungen › Leistung › Grafikprozessor › Automatisch verwendet den, der Ihren Bildschirm ansteuert) +@msg Sent “{title}” to {to} “{title}” an {to} gesendet +@msg Sent “{title}” to {to}. The spooler replied: {note} “{title}” an {to} gesendet. Antwort der Druckwarteschlange: {note} +@msg the default printer den Standarddrucker +@msg raster effects on object {object}: requested {requested} ppi, achieved {achieved} ppi due to the 64 million pixel cap Rastereffekte auf Objekt {object}: {requested} ppi angefordert, {achieved} ppi erreicht wegen der Obergrenze von 64 Millionen Pixeln @msg unknown parameter `{key}`; the command takes: {keys} unbekannter Parameter `{key}`; der Befehl akzeptiert: {keys} @msg the params must be an object, not {got} die Parameter müssen ein Objekt sein, nicht {got} @msg unknown parameter `{path}`; the object takes no keys unbekannter Parameter `{path}`; das Objekt akzeptiert keine Schlüssel @@ -7410,6 +7521,10 @@ breakText Glyphs Glyphen @msg Some islands could not be joined to the area around the art Einige Inseln konnten nicht mit der Fläche um das Bildmaterial verbunden werden @msg `width` must be from {lo} to {hi} pt `width` muss zwischen {lo} und {hi} pt liegen @msg `angle` must be from -180 to 180 degrees `angle` muss zwischen -180 und 180 Grad liegen +@msg `roundness` must be from 0 to 100% `roundness` muss zwischen 0 und 100 % liegen +@msg `fidelity` must be from 0.01 to 100 pt `fidelity` muss zwischen 0.01 und 100 pt liegen +@msg style must be "pencil" or "brush" style muss "pencil" oder "brush" sein +@msg extend end must be "start" or "end" Das Ende von extend muss "start" oder "end" sein @msg `roundness` must be from 1 to 100% `roundness` muss zwischen 1 und 100 % liegen @msg `count` must be a whole number from 1 to {MAX_BRIDGES_PER_ISLAND} `count` muss eine ganze Zahl von 1 bis {MAX_BRIDGES_PER_ISLAND} sein Weed Box and Lines… Entgitterrahmen und -linien… @@ -7780,8 +7895,6 @@ breakText Glyphs Glyphen @msg unknown dither `{d}` (diffusion, pattern, noise or none) unbekanntes Dithering `{d}` (diffusion, pattern, noise oder none) @msg unknown panel `{panel}` unbekanntes Bedienfeld `{panel}` @msg unknown parameter `{key}` unbekannter Parameter `{key}` -@msg unknown parameter `{within}settings.{format}`; {why} unbekannter Parameter `{within}settings.{format}`; {why} -@msg unknown parameter `{within}{key}`; {why} unbekannter Parameter `{within}{key}`; {why} @msg unknown reduction `{reduction}` (selective, perceptual, adaptive, web, gray, blackWhite, uniform or document) unbekannte Reduzierung `{reduction}` (selective, perceptual, adaptive, web, gray, blackWhite, uniform oder document) @msg unmatched ')' ')' ohne Gegenstück @msg unterminated character class nicht abgeschlossene Zeichenklasse @@ -8150,7 +8263,6 @@ breakText Glyphs Glyphen @msg anchor `smooth` must be true or false Ankerpunkt-`smooth` muss true oder false sein @msg anchor `{key}` must be [x, y] Ankerpunkt-`{key}` muss [x, y] sein @msg anchor `{key}` must be a number Ankerpunkt-`{key}` muss eine Zahl sein -@msg angle and roundness must be finite angle und roundness müssen endlich sein @msg angles must be a list as long as pins (degrees or null) angles muss eine Liste so lang wie pins sein (Grad oder null) @msg appearance must be flat|center|edge appearance muss flat|center|edge sein @msg apply is "fill" or "stroke", not `{other}` apply ist „fill“ oder „stroke“, nicht `{other}` @@ -9203,7 +9315,6 @@ breakText Glyphs Glyphen @msg {label} must be a number from 1 to 10000 {label} muss eine Zahl von 1 bis 10000 sein @msg {name} `{s}`: {ids} {name} `{s}`: {ids} @msg {name} is built in and can't be deleted {name} ist integriert und kann nicht gelöscht werden -@msg {name} must be {lo}–{hi}{unit} (got {v}) {name} muss {lo}–{hi}{unit} sein (erhalten: {v}) @msg {name}: CRC or size mismatch {name}: CRC oder Größe stimmt nicht überein @msg {name}: only this Affinity file's embedded preview could be read; use File › Open to see it with its warning, or export SVG or PDF from Affinity before placing {name}: nur die eingebettete Vorschau dieser Affinity-Datei konnte gelesen werden; verwenden Sie Datei › Öffnen, um sie mit ihrer Warnung zu sehen, oder exportieren Sie vor dem Platzieren SVG oder PDF aus Affinity @msg {name}: {e} {name}: {e} diff --git a/crates/ui-egui/src/i18n/el.tsv b/crates/ui-egui/src/i18n/el.tsv index 1764b0d657..ab4fc4de7a 100644 --- a/crates/ui-egui/src/i18n/el.tsv +++ b/crates/ui-egui/src/i18n/el.tsv @@ -566,6 +566,7 @@ font-technology Variable Μεταβλητές Consolidate All Windows Συγχώνευση όλων των παραθύρων Constrain Angle Περιορισμός γωνίας Constrain Width and Height Proportions Διατήρηση αναλογιών πλάτους και ύψους + Copy Width to Height Αντιγραφή πλάτους στο ύψος Construction Guides Οδηγοί κατασκευής Contextual Alternates Εναλλακτικοί χαρακτήρες βάσει συμφραζομένων Contextual Task Bar Γραμμή εργασιών βάσει περιβάλλοντος @@ -576,6 +577,8 @@ font-technology Variable Μεταβλητές Control Έλεγχος Convert Μετατροπή Convert All Spot Colors to Process Μετατροπή όλων των πλακάτων χρωμάτων σε χρώματα τετραχρωμίας + Convert {name} to process Μετατροπή του {name} σε χρώμα τετραχρωμίας + Keep {name} as spot Διατήρηση του {name} ως πλακάτου χρώματος Convert All Strokes to Outlines Μετατροπή όλων των περιγραμμάτων σε διαδρομές Convert All Text to Outlines Μετατροπή όλου του κειμένου σε περιγράμματα Convert Anchor Point Μετατροπή σημείου αγκύρωσης @@ -651,6 +654,9 @@ font-technology Variable Μεταβλητές Create from Selection Δημιουργία από επιλογή Create From: Δημιουργία από: Create Gradient Mesh… Δημιουργία πλέγματος ντεγκραντέ… + Flat Επίπεδο + To Center Προς το κέντρο + To Edge Προς την ακμή Create Graph Δημιουργία γραφήματος Create New Layer Δημιουργία νέου επιπέδου Create New Sublayer Δημιουργία νέου υποεπιπέδου @@ -2658,6 +2664,11 @@ liquify-list-end {0}, {1} {0} και {1} @msg PDF writer error: {0} Σφάλμα εγγραφής PDF: {0} @msgplural Packaged {n} file ({note}) in {folder}|Packaged {n} files ({note}) in {folder} Συσκευάστηκε {n} αρχείο στον φάκελο {folder} ({note})|Συσκευάστηκαν {n} αρχεία στον φάκελο {folder} ({note}) @msg Preview in Browser needs the desktop app (the web downloads files instead) Η προεπισκόπηση σε πρόγραμμα περιήγησης απαιτεί την εφαρμογή υπολογιστή (η έκδοση ιστού πραγματοποιεί λήψη αρχείων) +@msg give `desiredK`, the desired file size in K (1024 bytes): a number above 0 and at most 1048576 δώστε `desiredK`, το επιθυμητό μέγεθος αρχείου σε K (1024 byte): αριθμό πάνω από 0 και το πολύ 1048576 +@msg `startWith` is `current` or `auto` το `startWith` είναι `current` ή `auto` +@msg `use` is `allSlices`, `eachSlice` or `currentSlice` το `use` είναι `allSlices`, `eachSlice` ή `currentSlice` +@msg `slice` is a slice number from `slice.list`, with `use: currentSlice` το `slice` είναι αριθμός τομής από το `slice.list`, με `use: currentSlice` +@msg Optimize to File Size: there is no image to measure Βελτιστοποίηση σε μέγεθος αρχείου: δεν υπάρχει εικόνα για μέτρηση @msg Release Guides: no guides Αποδέσμευση οδηγών: δεν υπάρχουν οδηγοί @msg Release: no layer to put the rectangle in Αποδέσμευση: δεν υπάρχει επίπεδο για να τοποθετηθεί το ορθογώνιο @msg Replace Spine: select a blend and a path Αντικατάσταση κεντρικής καμπύλης: επιλέξτε ανάμειξη και διαδρομή @@ -3567,6 +3578,18 @@ theme Appearance Εμφάνιση Presets you save with the Save Preset button appear here. Οι προεπιλογές που αποθηκεύετε με το κουμπί Αποθήκευση προεπιλογής εμφανίζονται εδώ. Preview All Layers Προεπισκόπηση όλων των επιπέδων Preview in Browser Προεπισκόπηση στο πρόγραμμα περιήγησης + Optimize to File Size… Βελτιστοποίηση σε μέγεθος αρχείου… + Optimize to File Size Βελτιστοποίηση σε μέγεθος αρχείου + Desired File Size: Επιθυμητό μέγεθος αρχείου: + Start With: Έναρξη με: + Use: Χρήση: + Current Settings Τρέχουσες ρυθμίσεις + Auto Select GIF/JPEG Αυτόματη επιλογή GIF/JPEG + Total of All Slices Σύνολο όλων των τομών + Each Slice Κάθε τομή + Current Slice Τρέχουσα τομή + {size}, within {target} {size}, εντός {target} + No setting tried fits in {target}; the smallest is {size} Καμία ρύθμιση που δοκιμάστηκε δεν χωρά σε {target}· η μικρότερη είναι {size} Preview in Browser needs the desktop app (the web downloads files instead) Η προεπισκόπηση στο πρόγραμμα περιήγησης απαιτεί την εφαρμογή υπολογιστή (στο web πραγματοποιείται λήψη αρχείων) Preview Mode Λειτουργία προεπισκόπησης Preview the document as it is now Προεπισκόπηση του εγγράφου στην τρέχουσα κατάστασή του @@ -3840,12 +3863,85 @@ digits Malayalam Μαλαγιάλαμ Reshape Type Area Αναδιαμόρφωση περιοχής κειμένου Responsive Αποκρινόμενο Restore every preference to its default (applied on OK) Επαναφορά όλων των προτιμήσεων στις προεπιλογές τους (εφαρμογή με το Εντάξει) + Shows a bar of commands for the selection or tool on the canvas; it hides while you drag and in Presentation Mode. Εμφανίζει στον καμβά μια γραμμή εντολών για την επιλογή ή το εργαλείο· κρύβεται όσο σύρετε και στη λειτουργία παρουσίασης. + How far an arrow key moves the selection; with Shift, it moves ten times as far. Πόσο μετακινεί την επιλογή ένα πλήκτρο βέλους· με το Shift τη μετακινεί δέκα φορές περισσότερο. + The angle of the axes that arrow keys move along and that Shift holds drawing and moving to. Η γωνία των αξόνων κατά μήκος των οποίων μετακινούν τα πλήκτρα βέλους και στους οποίους το Shift περιορίζει τη σχεδίαση και τη μετακίνηση. + The corner radius the Rounded Rectangle tool draws with; changing the radius while drawing changes this value too. Η ακτίνα γωνίας με την οποία σχεδιάζει το εργαλείο Στρογγυλεμένο ορθογώνιο· η αλλαγή της ακτίνας κατά τη σχεδίαση αλλάζει και αυτή την τιμή. + How far right and down Paste moves the copy when it is given no position, as from a script; Paste in the app centers it in the view. Πόσο δεξιά και κάτω μετακινεί η Επικόλληση το αντίγραφο όταν δεν δίνεται θέση, όπως από ένα σενάριο· η Επικόλληση στην εφαρμογή το τοποθετεί στο κέντρο της προβολής. + Stops the Pen tool from deleting the anchor you click on a selected path, or adding one where you click its segment. Εμποδίζει το εργαλείο Πένα να διαγράφει το σημείο αγκύρωσης που κάνετε κλικ σε επιλεγμένη διαδρομή ή να προσθέτει ένα όπου κάνετε κλικ στο τμήμα της. + Drawing tools show a crosshair pointer instead of their icon; Caps Lock does the same while it is on. Τα εργαλεία σχεδίασης εμφανίζουν δείκτη σταυρονήματος αντί για το εικονίδιό τους· το Caps Lock κάνει το ίδιο όσο είναι ενεργό. + Shows a tip when the pointer rests on a button or field that has one. Εμφανίζει μια συμβουλή όταν ο δείκτης σταματά πάνω σε κουμπί ή πεδίο που έχει. + Shows a warning before a script you choose runs. Εμφανίζει μια προειδοποίηση πριν εκτελεστεί ένα σενάριο που επιλέγετε. + Smooths the edges of artwork on the canvas. Εξομαλύνει τα άκρα του γραφικού στον καμβά. + Select › Same › Fill Color, Stroke Color and Fill & Stroke match only the same tint of a global or spot swatch, not any tint of it. Τα Επιλογή › Ίδιο › Χρώμα γεμίσματος, Χρώμα περιγράμματος και Γέμισμα και περίγραμμα βρίσκουν μόνο την ίδια απόχρωση ενός καθολικού ή σημειακού δείγματος, όχι οποιαδήποτε απόχρωσή του. + Shows the Home screen when no document is open; off, the window stays empty until you click Home. Εμφανίζει την αρχική οθόνη όταν δεν είναι ανοιχτό κανένα έγγραφο· όταν είναι ανενεργό, το παράθυρο μένει κενό μέχρι να κάνετε κλικ στην Αρχική οθόνη. + Measures objects with their strokes and shape-changing effects for size, position and alignment; shadows, glows and blurs are not measured. Μετρά τα αντικείμενα μαζί με τα περιγράμματα και τα εφέ που αλλάζουν το σχήμα τους για μέγεθος, θέση και στοίχιση· οι σκιές, οι λάμψεις και οι θολώσεις δεν μετρώνται. + At 100% zoom, one inch of the document takes 96 screen points instead of 72. Σε ζουμ 100%, μία ίντσα του εγγράφου καταλαμβάνει 96 στιγμές οθόνης αντί για 72. + Double-clicking a group, path or image with the Selection tool opens it in isolation mode. Το διπλό κλικ σε ομάδα, διαδρομή ή εικόνα με το εργαλείο Επιλογή την ανοίγει σε λειτουργία απομόνωσης. + Pattern fills and strokes transform with the art, unless a transform or the Transform panel's menu chooses otherwise. Τα γεμίσματα και τα περιγράμματα μοτίβου μετασχηματίζονται μαζί με το γραφικό, εκτός αν ένας μετασχηματισμός ή το μενού του πλαισίου Μετασχηματισμός επιλέξει κάτι άλλο. + Live corner radii scale with the art, unless the scale chooses otherwise. Οι ακτίνες των δυναμικών γωνιών κλιμακώνονται μαζί με το γραφικό, εκτός αν η κλιμάκωση επιλέξει κάτι άλλο. + Stroke weights, dashes and effect distances scale with the art, unless the scale chooses otherwise. Τα πάχη περιγράμματος, οι παύλες και οι αποστάσεις των εφέ κλιμακώνονται μαζί με το γραφικό, εκτός αν η κλιμάκωση επιλέξει κάτι άλλο. + The mouse wheel zooms the canvas instead of scrolling it. Ο τροχός του ποντικιού κάνει ζουμ στον καμβά αντί να τον κυλά. + The mouse wheel with Cmd/Ctrl held scrolls the canvas sideways. Ο τροχός του ποντικιού με πατημένο το Cmd/Ctrl κυλά τον καμβά οριζόντια. + Dragging sideways on a numeric field's label changes the field's value. Η μεταφορά προς τα πλάγια πάνω στην ετικέτα ενός αριθμητικού πεδίου αλλάζει την τιμή του πεδίου. + A two-finger rotate gesture on a trackpad rotates the canvas view. Μια κίνηση περιστροφής με δύο δάχτυλα σε επιφάνεια αφής περιστρέφει την προβολή του καμβά. + Holding a tool's shortcut key chooses the tool until you let go, and then the previous tool is chosen again. Όσο κρατάτε πατημένη τη συντόμευση ενός εργαλείου, το εργαλείο είναι επιλεγμένο, και μετά επιλέγεται ξανά το προηγούμενο εργαλείο. + Shows the bounding box while you move the selection or draw a shape. Εμφανίζει το πλαίσιο οριοθέτησης όσο μετακινείτε την επιλογή ή σχεδιάζετε ένα σχήμα. + Create Trim Marks draws Japanese-style marks instead of Roman ones. Η Δημιουργία σημαδιών ξακρίσματος σχεδιάζει σημάδια ιαπωνικού τύπου αντί για ρωμαϊκά. + New art takes only the fill and stroke of the selection; off, it takes the selected object's whole appearance. Τα νέα γραφικά παίρνουν μόνο το γέμισμα και το περίγραμμα της επιλογής· όταν είναι ανενεργό, παίρνουν όλη την εμφάνιση του επιλεγμένου αντικειμένου. + Changing the width or height in the Transform panel, the Properties panel or the Control bar changes the other in proportion. Η αλλαγή του πλάτους ή του ύψους στο πλαίσιο Μετασχηματισμός, στο πλαίσιο Ιδιότητες ή στη γραμμή Έλεγχος αλλάζει αναλογικά και το άλλο. + A live rectangle's properties show one Corner Radius field for all four corners; off, each corner has its own field. Οι ιδιότητες ενός δυναμικού ορθογωνίου εμφανίζουν ένα πεδίο Ακτίνα γωνίας και για τις τέσσερις γωνίες· όταν είναι ανενεργό, κάθε γωνία έχει δικό της πεδίο. + What edits in the Transform panel transform: the object, its pattern tiles or both; Default follows Transform Pattern Tiles. Τι μετασχηματίζουν οι αλλαγές στο πλαίσιο Μετασχηματισμός: το αντικείμενο, τα πλακίδια του μοτίβου του ή και τα δύο· η Προεπιλογή ακολουθεί τον Μετασχηματισμό πλακιδίων μοτίβου. + With one symbol instance selected, the Transform panel uses the symbol's registration point as its reference point. Όταν είναι επιλεγμένη μία παρουσία συμβόλου, το πλαίσιο Μετασχηματισμός χρησιμοποιεί το σημείο καταχώρισης του συμβόλου ως σημείο αναφοράς. + Darkens the canvas outside the artboards while the Artboard tool is active. Σκουραίνει τον καμβά έξω από τους πίνακες σχεδίασης όσο είναι ενεργό το εργαλείο Πίνακας σχεδίασης. + With Fade Region Outside Artboard on, the area outside the artboards stays dark while you drag with the Artboard tool. Όταν είναι ενεργή η Σκίαση περιοχής εκτός πίνακα σχεδίασης, η περιοχή έξω από τους πίνακες σχεδίασης μένει σκοτεινή όσο σύρετε με το εργαλείο Πίνακας σχεδίασης. + How near, in pixels, the pointer must be to an object, anchor or handle for a click to select it. Πόσο κοντά, σε εικονοστοιχεία, πρέπει να είναι ο δείκτης σε αντικείμενο, σημείο αγκύρωσης ή λαβή για να το επιλέξει ένα κλικ. + Whether the Selection tool's box selects objects it touches or only those fully inside; Drag Direction selects those inside on a drag to the right. E reverses it mid-drag. Αν το πλαίσιο του εργαλείου Επιλογή επιλέγει τα αντικείμενα που αγγίζει ή μόνο όσα είναι πλήρως μέσα· η Κατεύθυνση σύρσης επιλέγει όσα είναι μέσα όταν σύρετε δεξιά. Το E αντιστρέφει τον κανόνα κατά τη σύρση. + A click selects a filled object only on its path, not inside its fill. Ένα κλικ επιλέγει ένα γεμάτο αντικείμενο μόνο πάνω στη διαδρομή του, όχι μέσα στο γέμισμα. + How near, in pixels, a point must come to an anchor or ruler guide for Snap to Point to snap it; with Smart Guides on, Smart Guides' Snapping Tolerance applies instead. Πόσο κοντά, σε εικονοστοιχεία, πρέπει να φτάσει ένα σημείο σε σημείο αγκύρωσης ή οδηγό χάρακα για να το προσκολλήσει η Προσκόλληση σε σημείο· με τους έξυπνους οδηγούς ενεργούς ισχύει η δική τους ανοχή προσκόλλησης. + With the Selection tool, Cmd/Ctrl-click selects the object under the selected one at the pointer; each further click goes one object deeper. Με το εργαλείο Επιλογή, το Cmd/Ctrl-κλικ επιλέγει το αντικείμενο κάτω από το επιλεγμένο στο σημείο του δείκτη· κάθε επόμενο κλικ πηγαίνει ένα αντικείμενο βαθύτερα. + Zoom In and Zoom Out bring the center of the selection to the middle of the view. Η Μεγέθυνση και η Σμίκρυνση φέρνουν το κέντρο της επιλογής στη μέση της προβολής. + Locked and hidden artwork inside an artboard moves, scales and is copied with the artboard, as the other artwork does. Τα κλειδωμένα και κρυφά γραφικά μέσα σε έναν πίνακα σχεδίασης μετακινούνται, κλιμακώνονται και αντιγράφονται μαζί του, όπως τα υπόλοιπα γραφικά. + The size of anchor points and direction handle ends on the canvas; larger anchors can also be picked from farther away. Το μέγεθος των σημείων αγκύρωσης και των άκρων των λαβών κατεύθυνσης στον καμβά· μεγαλύτερα σημεία αγκύρωσης πιάνονται και από πιο μακριά. + Draws the ends of direction handles as solid dots, hollow dots or larger solid dots. Σχεδιάζει τα άκρα των λαβών κατεύθυνσης ως γεμάτες κουκκίδες, κούφιες κουκκίδες ή μεγαλύτερες γεμάτες κουκκίδες. + With the Direct Selection tool, the anchor under the pointer is highlighted. Με το εργαλείο Άμεση επιλογή, το σημείο αγκύρωσης κάτω από τον δείκτη επισημαίνεται. + Shows direction handles when more than one anchor is selected; off, they show only while a single anchor is selected. Εμφανίζει τις λαβές κατεύθυνσης όταν είναι επιλεγμένα περισσότερα από ένα σημεία αγκύρωσης· όταν είναι ανενεργό, εμφανίζονται μόνο με ένα επιλεγμένο σημείο αγκύρωσης. + Corner widgets hide on corners whose angle is greater than this many degrees. Τα χειριστήρια γωνιών κρύβονται σε γωνίες μεγαλύτερες από αυτές τις μοίρες. + The Pen tool previews the next segment from the last anchor to the pointer before you click. Το εργαλείο Πένα δείχνει το επόμενο τμήμα από το τελευταίο σημείο αγκύρωσης ως τον δείκτη πριν κάνετε κλικ. + The Curvature tool previews the curve to the pointer before you place the next point. Το εργαλείο Καμπυλότητα δείχνει την καμπύλη ως τον δείκτη πριν τοποθετήσετε το επόμενο σημείο. The unit for new documents from built-in sizes other than pixel sizes and for opened files that record no unit; choosing one here and clicking OK also sets the active document's units. Η μονάδα για τα νέα έγγραφα από ενσωματωμένα μεγέθη, εκτός από μεγέθη σε εικονοστοιχεία, και για τα ανοιγμένα αρχεία χωρίς καταγεγραμμένη μονάδα· αν την επιλέξετε εδώ και πατήσετε Εντάξει, γίνεται και μονάδα του ενεργού εγγράφου. Stroke weights, dashes and gaps show in this unit, and numbers typed for them are read in it. Τα πάχη περιγράμματος, οι παύλες και τα διάκενα εμφανίζονται σε αυτή τη μονάδα και οι αριθμοί που πληκτρολογούνται γι’ αυτά διαβάζονται σε αυτή. Type sizes, leading and baseline shift show in this unit, and numbers typed for them are read in it. Τα μεγέθη κειμένου, το διάστιχο και η μετατόπιση γραμμής βάσης εμφανίζονται σε αυτή τη μονάδα και οι αριθμοί που πληκτρολογούνται γι’ αυτά διαβάζονται σε αυτή. The unit for East Asian type measurements, which no field uses yet. Η μονάδα για τις μετρήσεις κειμένου Ανατολικής Ασίας, την οποία δεν χρησιμοποιεί ακόμη κανένα πεδίο. When on, a number typed without a unit into a field in picas is read in points. Όταν είναι ενεργό, ένας αριθμός που πληκτρολογείται χωρίς μονάδα σε πεδίο σε πίκες διαβάζεται σε σημεία. With XML ID, object names show as XML IDs in the Layers panel, the Variables panel and Layer Options. Με το Αναγνωριστικό XML, τα ονόματα αντικειμένων εμφανίζονται ως αναγνωριστικά XML στα Επίπεδα, στις Μεταβλητές και στις Επιλογές επιπέδου. + Snaps drawing, moving and scaling to the grid's subdivisions, even while the grid is hidden; while it is on, Snap to Pixel does not apply. Προσκολλά τη σχεδίαση, τη μετακίνηση και την κλιμάκωση στις υποδιαιρέσεις του πλέγματος, ακόμη και όταν το πλέγμα είναι κρυφό· όσο είναι ενεργό, η Προσκόλληση σε εικονοστοιχείο δεν ισχύει. + The color of guides that are not selected; an artboard with a Guide Label draws its own guides in the label's color instead. Το χρώμα των οδηγών που δεν είναι επιλεγμένοι· ένας πίνακας σχεδίασης με Ετικέτα οδηγών σχεδιάζει τους δικούς του οδηγούς στο χρώμα της ετικέτας. + Draws guides as solid lines or as dots, including the guides already in the document. Σχεδιάζει τους οδηγούς ως συνεχείς γραμμές ή ως κουκκίδες, μαζί με τους οδηγούς που υπάρχουν ήδη στο έγγραφο. + With this on, guides are locked when VectorCraft starts; changing this option locks or unlocks them at once, and View › Guides › Lock Guides still changes the lock. Όταν είναι ενεργό, οι οδηγοί κλειδώνονται κατά την εκκίνηση του VectorCraft· η αλλαγή της επιλογής τους κλειδώνει ή τους ξεκλειδώνει αμέσως, και το Προβολή › Οδηγοί › Κλείδωμα οδηγών αλλάζει ακόμη το κλείδωμα. + With this on, holding Cmd/Ctrl as you start dragging from a ruler makes a guide on the active artboard only, or a canvas guide with the Artboard tool. Όταν είναι ενεργό, το Cmd/Ctrl πατημένο στην αρχή μιας μεταφοράς από χάρακα δημιουργεί οδηγό μόνο στον ενεργό πίνακα σχεδίασης, ή οδηγό σε όλο τον καμβά με το εργαλείο πίνακα σχεδίασης. + The color of the grid; the lines between major gridlines are drawn in a fainter shade of it. Το χρώμα του πλέγματος· οι γραμμές ανάμεσα στις κύριες γραμμές πλέγματος σχεδιάζονται σε πιο αχνή απόχρωσή του. + Draws the grid as lines, or as dots along the major gridlines at each subdivision. Σχεδιάζει το πλέγμα ως γραμμές ή ως κουκκίδες κατά μήκος των κύριων γραμμών πλέγματος σε κάθε υποδιαίρεση. + The distance between major gridlines, in every open document and in new ones; a VectorCraft document opens with the grid it was saved with. Η απόσταση ανάμεσα στις κύριες γραμμές πλέγματος σε κάθε ανοιχτό έγγραφο και στα νέα· ένα έγγραφο VectorCraft ανοίγει με το πλέγμα με το οποίο αποθηκεύτηκε. + How many parts each major grid square is divided into; Snap to Grid snaps to these parts, even when the zoom hides their lines. Σε πόσα μέρη χωρίζεται κάθε κύριο τετράγωνο του πλέγματος· η Προσκόλληση στο πλέγμα προσκολλά σε αυτά τα μέρη, ακόμη κι όταν το ζουμ κρύβει τις γραμμές τους. + Draws the grid behind the artwork; off, the grid is drawn over it. Σχεδιάζει το πλέγμα πίσω από το έργο· όταν είναι ανενεργό, το πλέγμα σχεδιάζεται από πάνω του. + In Pixel Preview at 600% zoom or more, the active view shows a line at the edge of every document pixel over the artwork. Στην Προεπισκόπηση εικονοστοιχείων με ζουμ 600% ή περισσότερο, η ενεργή προβολή δείχνει πάνω από το έργο μια γραμμή στην άκρη κάθε εικονοστοιχείου του εγγράφου. + The color of the tile edge and the dashed swatch bounds shown while you edit a pattern. Το χρώμα της ακμής του πλακιδίου και των διακεκομμένων ορίων του δείγματος χρώματος που εμφανίζονται όσο επεξεργάζεστε ένα μοτίβο. + Snaps drawing, moving and transforming to nearby art and shows guides and labels; Pixel Preview turns them off, and Snap to Grid snaps to the grid instead. Προσκολλά τη σχεδίαση, τη μετακίνηση και τον μετασχηματισμό σε κοντινά γραφικά και εμφανίζει οδηγούς και ετικέτες· η Προεπισκόπηση εικονοστοιχείων τούς απενεργοποιεί, και η Προσκόλληση στο πλέγμα προσκολλά στο πλέγμα αντί γι’ αυτούς. + The color of Smart Guide lines and labels. Το χρώμα των γραμμών και των ετικετών των έξυπνων οδηγών. + Shows a line along the edge or center that art lines up with; off, art still lines up without the line, and Snap to Glyph does not apply. Εμφανίζει μια γραμμή κατά μήκος της ακμής ή του κέντρου με το οποίο ευθυγραμμίζονται τα γραφικά· όταν είναι ανενεργό, ευθυγραμμίζονται χωρίς τη γραμμή, και η Προσκόλληση σε γλυφή δεν ισχύει. + With a selection tool, outlines the unselected object under the pointer in its layer color while you are not dragging. Με ένα εργαλείο επιλογής, περιγράφει το μη επιλεγμένο αντικείμενο κάτω από τον δείκτη με το χρώμα του επιπέδου του, όσο δεν σύρετε. + Shows the size or angle next to the pointer while you scale, rotate, shear or reflect art. Εμφανίζει το μέγεθος ή τη γωνία δίπλα στον δείκτη όσο αλλάζετε κλίμακα, περιστρέφετε, εφαρμόζετε διάτμηση ή κατοπτρίζετε γραφικά. + While you draw, points snap to lines at the chosen Angles through the point the segment or shape starts from. Όσο σχεδιάζετε, τα σημεία προσκολλώνται σε γραμμές στις επιλεγμένες γωνίες μέσω του σημείου από το οποίο ξεκινά το τμήμα ή το σχήμα. + The set of angles the construction guides follow while Construction Guides is on. Το σύνολο γωνιών που ακολουθούν οι οδηγοί κατασκευής όσο οι Οδηγοί κατασκευής είναι ενεργοί. + Names what a point snaps to, such as an anchor, a path or an alignment; off, points snap the same way without the names. Ονομάζει σε τι προσκολλάται ένα σημείο, όπως σημείο αγκύρωσης, διαδρομή ή στοίχιση· όταν είναι ανενεργό, τα σημεία προσκολλώνται με τον ίδιο τρόπο χωρίς τα ονόματα. + Shows distances, angles and how far art has moved next to the pointer while you draw or move it. Εμφανίζει δίπλα στον δείκτη αποστάσεις, γωνίες και πόσο μετακινήθηκαν τα γραφικά όσο σχεδιάζετε ή μετακινείτε. + Snaps moved or resized art to the same gap as between nearby objects, and marks the equal gaps. Προσκολλά γραφικά που μετακινούνται ή αλλάζουν μέγεθος στο ίδιο κενό με αυτό ανάμεσα σε κοντινά αντικείμενα και σημειώνει τα ίσα κενά. + With something selected, holding Alt/Option over another object or an artboard shows the distances between it and the selection. Με κάτι επιλεγμένο, κρατώντας πατημένο το Alt/Option πάνω από άλλο αντικείμενο ή πίνακα σχεδίασης εμφανίζονται οι αποστάσεις ανάμεσα σε αυτό και την επιλογή. + A selection dragged back to within the Snapping Tolerance of where the drag began goes back to exactly that place; a copy does not. Μια επιλογή που σύρεται πίσω εντός της ανοχής προσκόλλησης από το σημείο όπου ξεκίνησε η μεταφορά επιστρέφει ακριβώς εκεί· ένα αντίγραφο όχι. + How near on screen the pointer or a dragged point must come to art for Smart Guides to snap to it; the distance is the same at every zoom. Πόσο κοντά στην οθόνη πρέπει να φτάσει ο δείκτης ή ένα σημείο που σύρεται σε γραφικά για να προσκολληθούν οι έξυπνοι οδηγοί· η απόσταση είναι ίδια σε κάθε ζουμ. + Snaps the end of a line segment, or a circle drawn from its center, so that it touches a nearby curve. Προσκολλά το άκρο ενός ευθύγραμμου τμήματος ή έναν κύκλο που σχεδιάζεται από το κέντρο του ώστε να αγγίζει μια κοντινή καμπύλη. + Snaps the end of a line segment so that it meets a nearby straight segment at a right angle. Προσκολλά το άκρο ενός ευθύγραμμου τμήματος ώστε να συναντά ένα κοντινό ευθύ τμήμα σε ορθή γωνία. Reset all preferences to their defaults? Επαναφορά όλων των προτιμήσεων στις προεπιλογές τους; The defaults are applied when you click OK in Preferences. Cancel there keeps your current preferences. Οι προεπιλογές εφαρμόζονται όταν κάνετε κλικ στο Εντάξει στις Προτιμήσεις. Το Ακύρωση εκεί διατηρεί τις τρέχουσες προτιμήσεις σας. Restore Recovered Documents Επαναφορά ανακτημένων εγγράφων @@ -5691,6 +5787,19 @@ digits Malayalam Μαλαγιάλαμ Transform Objects Μετασχηματισμός αντικειμένων @msg unknown parameter `{key}`; did you mean `{near}`? άγνωστη παράμετρος `{key}`· μήπως εννοείτε `{near}`; @msg unknown parameter `{key}`; the command takes no parameters άγνωστη παράμετρος `{key}`· η εντολή δεν δέχεται παραμέτρους +@msg unknown parameter `{key}`; `{object}` takes: {keys} άγνωστη παράμετρος `{key}`· το `{object}` δέχεται: {keys} +@msg unknown parameter `{key}`; {why_not} άγνωστη παράμετρος `{key}`· {why_not} +@msg no format takes it (see document.formats) καμία μορφή δεν τη δέχεται (δείτε document.formats) +@msg no save format takes it (see file.formatOptions) καμία μορφή αποθήκευσης δεν τη δέχεται (δείτε file.formatOptions) +@msg PDF doesn't take it (see document.formats) το PDF δεν τη δέχεται (δείτε document.formats) +@msg EPS doesn't take it (see document.formats) το EPS δεν τη δέχεται (δείτε document.formats) +@msg DXF doesn't take it (see document.formats) το DXF δεν τη δέχεται (δείτε document.formats) +@msg {name} must be {range} (got {v}) το {name} πρέπει να είναι {range} (δόθηκε {v}) +@msg The graphics processor tried first couldn't show the window, so VectorCraft started again on {summary} (Settings › Performance › Graphics Processor › Automatic uses the one that drives your display) Ο αρχικός επεξεργαστής γραφικών δεν μπόρεσε να εμφανίσει το παράθυρο και το VectorCraft επανεκκίνησε στον {summary} (Ρυθμίσεις › Επιδόσεις › Επεξεργαστής γραφικών › Αυτόματο: χρησιμοποιεί αυτόν που οδηγεί την οθόνη σας) +@msg Sent “{title}” to {to} Το “{title}” στάλθηκε: {to} +@msg Sent “{title}” to {to}. The spooler replied: {note} Το “{title}” στάλθηκε: {to}. Απάντηση της ουράς εκτύπωσης: {note} +@msg the default printer προεπιλεγμένος εκτυπωτής +@msg raster effects on object {object}: requested {requested} ppi, achieved {achieved} ppi due to the 64 million pixel cap εφέ ράστερ στο αντικείμενο {object}: ζητήθηκαν {requested} ppi, επιτεύχθηκαν {achieved} ppi λόγω του ορίου των 64 εκατομμυρίων pixel @msg unknown parameter `{key}`; the command takes: {keys} άγνωστη παράμετρος `{key}`· η εντολή δέχεται: {keys} @msg the params must be an object, not {got} οι παράμετροι πρέπει να είναι αντικείμενο, όχι {got} @msg unknown parameter `{path}`; the object takes no keys άγνωστη παράμετρος `{path}`· το αντικείμενο δεν δέχεται κλειδιά @@ -7815,6 +7924,11 @@ breakText Glyphs Γλύφοι @msg Some islands could not be joined to the area around the art Ορισμένες νησίδες δεν ήταν δυνατό να συνδεθούν με την περιοχή γύρω από το γραφικό @msg `width` must be from {lo} to {hi} pt Το `width` πρέπει να είναι από {lo} έως {hi} pt @msg `angle` must be from -180 to 180 degrees Το `angle` πρέπει να είναι από -180 έως 180 μοίρες +@msg `roundness` must be from 0 to 100% Το `roundness` πρέπει να είναι από 0 έως 100% +@msg `fidelity` must be from 0.01 to 100 pt Το `fidelity` πρέπει να είναι από 0.01 έως 100 pt +@msg style must be "pencil" or "brush" Το style πρέπει να είναι "pencil" ή "brush" +@msg extend end must be "start" or "end" Το άκρο του extend πρέπει να είναι "start" ή "end" +@msg connect end must be "start" or "end" Το άκρο του connect πρέπει να είναι "start" ή "end" @msg `roundness` must be from 1 to 100% Το `roundness` πρέπει να είναι από 1 έως 100% @msg `count` must be a whole number from 1 to {MAX_BRIDGES_PER_ISLAND} Το `count` πρέπει να είναι ακέραιος από 1 έως {MAX_BRIDGES_PER_ISLAND} Weed Box and Lines… Πλαίσιο και γραμμές αφαίρεσης περισσευμάτων… diff --git a/crates/ui-egui/src/i18n/es.tsv b/crates/ui-egui/src/i18n/es.tsv index 5b218dfb6c..c2d219a793 100644 --- a/crates/ui-egui/src/i18n/es.tsv +++ b/crates/ui-egui/src/i18n/es.tsv @@ -607,6 +607,7 @@ font-technology Variable Variables Consolidate All Windows Consolidar todas las ventanas Constrain Angle Restringir ángulo Constrain Width and Height Proportions Restringir proporciones de anchura y altura + Copy Width to Height Copiar anchura en altura Construction Guides Guías de construcción Contextual Alternates Alternativas contextuales Contextual Task Bar Barra de tareas contextual @@ -617,6 +618,8 @@ font-technology Variable Variables Control Control Convert Convertir Convert All Spot Colors to Process Convertir todas las tintas planas en cuatricromía + Convert {name} to process Convertir {name} en cuatricromía + Keep {name} as spot Mantener {name} como tinta plana Convert All Strokes to Outlines Convertir todos los trazos en contornos Convert All Text to Outlines Convertir todo el texto en contornos Convert Anchor Point Convertir punto de ancla @@ -692,6 +695,9 @@ font-technology Variable Variables Create from Selection Crear a partir de la selección Create From: Crear a partir de: Create Gradient Mesh… Crear malla de degradado… + Flat Plano + To Center Hacia el centro + To Edge Hacia el borde Create Graph Crear gráfico Create New Layer Crear capa nueva Create New Sublayer Crear subcapa nueva @@ -2720,6 +2726,18 @@ font-technology Variable Variables Preview: Vista previa: Preview All Layers Previsualizar todas las capas Preview in Browser Previsualizar en el navegador + Optimize to File Size… Optimizar según tamaño de archivo… + Optimize to File Size Optimizar según tamaño de archivo + Desired File Size: Tamaño de archivo deseado: + Start With: Empezar con: + Use: Usar: + Current Settings Ajustes actuales + Auto Select GIF/JPEG Selección automática GIF/JPEG + Total of All Slices Total de todos los sectores + Each Slice Cada sector + Current Slice Sector actual + {size}, within {target} {size}, dentro de {target} + No setting tried fits in {target}; the smallest is {size} Ningún ajuste probado cabe en {target}; el menor es {size} Preview in Browser needs the desktop app (the web downloads files instead) Previsualizar en el navegador requiere la aplicación de escritorio (la versión web descarga los archivos) Preview Mode Modo de vista previa Preview the document as it is now Previsualizar el documento tal como está ahora @@ -3065,12 +3083,85 @@ digits Malayalam Malayálam Responsive Adaptable Restore Restaurar Restore every preference to its default (applied on OK) Restaurar todas las preferencias a sus valores predeterminados (se aplica al Aceptar) + Shows a bar of commands for the selection or tool on the canvas; it hides while you drag and in Presentation Mode. Muestra en el lienzo una barra de comandos para la selección o la herramienta; se oculta mientras arrastra y en el modo de presentación. + How far an arrow key moves the selection; with Shift, it moves ten times as far. Cuánto mueve la selección una tecla de flecha; con Mayús, la mueve diez veces más. + The angle of the axes that arrow keys move along and that Shift holds drawing and moving to. El ángulo de los ejes a lo largo de los cuales mueven las teclas de flecha y a los que Mayús restringe el dibujo y el movimiento. + The corner radius the Rounded Rectangle tool draws with; changing the radius while drawing changes this value too. El radio de esquina con el que dibuja la herramienta Rectángulo redondeado; cambiar el radio mientras dibuja también cambia este valor. + How far right and down Paste moves the copy when it is given no position, as from a script; Paste in the app centers it in the view. Cuánto desplaza Pegar la copia hacia la derecha y hacia abajo cuando no se indica ninguna posición, como desde un script; Pegar en la aplicación la centra en la vista. + Stops the Pen tool from deleting the anchor you click on a selected path, or adding one where you click its segment. Impide que la herramienta Pluma elimine el punto de ancla en el que hace clic en un trazado seleccionado o añada uno donde hace clic en su segmento. + Drawing tools show a crosshair pointer instead of their icon; Caps Lock does the same while it is on. Las herramientas de dibujo muestran un puntero en cruz en lugar de su icono; Bloq Mayús hace lo mismo mientras está activado. + Shows a tip when the pointer rests on a button or field that has one. Muestra una sugerencia cuando el puntero se detiene sobre un botón o campo que la tiene. + Shows a warning before a script you choose runs. Muestra una advertencia antes de que se ejecute un script que elija. + Smooths the edges of artwork on the canvas. Suaviza los bordes de la ilustración en el lienzo. + Select › Same › Fill Color, Stroke Color and Fill & Stroke match only the same tint of a global or spot swatch, not any tint of it. Selección › Igual › Color de relleno, Color de trazo y Relleno y trazo solo coinciden con el mismo matiz de una muestra global o de tinta plana, no con cualquier matiz de ella. + Shows the Home screen when no document is open; off, the window stays empty until you click Home. Muestra la pantalla de inicio cuando no hay ningún documento abierto; desactivada, la ventana queda vacía hasta que hace clic en Inicio. + Measures objects with their strokes and shape-changing effects for size, position and alignment; shadows, glows and blurs are not measured. Mide los objetos con sus trazos y los efectos que cambian su forma para el tamaño, la posición y la alineación; las sombras, los resplandores y los desenfoques no se miden. + At 100% zoom, one inch of the document takes 96 screen points instead of 72. Con un zoom del 100 %, una pulgada del documento ocupa 96 puntos de pantalla en lugar de 72. + Double-clicking a group, path or image with the Selection tool opens it in isolation mode. Al hacer doble clic en un grupo, trazado o imagen con la herramienta Selección, se abre en modo de aislamiento. + Pattern fills and strokes transform with the art, unless a transform or the Transform panel's menu chooses otherwise. Los rellenos y trazos de motivo se transforman con la ilustración, salvo que una transformación o el menú del panel Transformar indique otra cosa. + Live corner radii scale with the art, unless the scale chooses otherwise. Los radios de esquina dinámicos se escalan con la ilustración, salvo que el escalado indique otra cosa. + Stroke weights, dashes and effect distances scale with the art, unless the scale chooses otherwise. Los grosores de trazo, los guiones y las distancias de los efectos se escalan con la ilustración, salvo que el escalado indique otra cosa. + The mouse wheel zooms the canvas instead of scrolling it. La rueda del mouse aplica zoom al lienzo en lugar de desplazarlo. + The mouse wheel with Cmd/Ctrl held scrolls the canvas sideways. La rueda del mouse con Cmd/Ctrl pulsado desplaza el lienzo en horizontal. + Dragging sideways on a numeric field's label changes the field's value. Arrastrar en horizontal sobre la etiqueta de un campo numérico cambia el valor del campo. + A two-finger rotate gesture on a trackpad rotates the canvas view. Un gesto de giro con dos dedos en un trackpad gira la vista del lienzo. + Holding a tool's shortcut key chooses the tool until you let go, and then the previous tool is chosen again. Mantener pulsado el atajo de una herramienta la elige hasta que lo suelta, y después vuelve a elegirse la herramienta anterior. + Shows the bounding box while you move the selection or draw a shape. Muestra el cuadro delimitador mientras mueve la selección o dibuja una forma. + Create Trim Marks draws Japanese-style marks instead of Roman ones. Crear marcas de recorte dibuja marcas de estilo japonés en lugar de romanas. + New art takes only the fill and stroke of the selection; off, it takes the selected object's whole appearance. La nueva ilustración toma solo el relleno y el trazo de la selección; desactivada, toma toda la apariencia del objeto seleccionado. + Changing the width or height in the Transform panel, the Properties panel or the Control bar changes the other in proportion. Cambiar el ancho o el alto en el panel Transformar, el panel Propiedades o el panel Control cambia el otro de forma proporcional. + A live rectangle's properties show one Corner Radius field for all four corners; off, each corner has its own field. Las propiedades de un rectángulo dinámico muestran un solo campo Radio de esquina para las cuatro esquinas; desactivada, cada esquina tiene su propio campo. + What edits in the Transform panel transform: the object, its pattern tiles or both; Default follows Transform Pattern Tiles. Lo que transforman los cambios del panel Transformar: el objeto, sus mosaicos de motivo o ambos; Predeterminado sigue a Transformar mosaicos de motivo. + With one symbol instance selected, the Transform panel uses the symbol's registration point as its reference point. Con una instancia de símbolo seleccionada, el panel Transformar usa el punto de registro del símbolo como punto de referencia. + Darkens the canvas outside the artboards while the Artboard tool is active. Oscurece el lienzo fuera de las mesas de trabajo mientras la herramienta Mesa de trabajo está activa. + With Fade Region Outside Artboard on, the area outside the artboards stays dark while you drag with the Artboard tool. Con Atenuar región fuera de la mesa de trabajo activado, el área fuera de las mesas de trabajo sigue oscura mientras arrastra con la herramienta Mesa de trabajo. + How near, in pixels, the pointer must be to an object, anchor or handle for a click to select it. Qué tan cerca, en píxeles, debe estar el puntero de un objeto, ancla o manejador para que un clic lo seleccione. + Whether the Selection tool's box selects objects it touches or only those fully inside; Drag Direction selects those inside on a drag to the right. E reverses it mid-drag. Si el recuadro de la herramienta Selección selecciona los objetos que toca o solo los que quedan totalmente dentro; Dirección de arrastre selecciona los de dentro al arrastrar a la derecha. E invierte la regla al arrastrar. + A click selects a filled object only on its path, not inside its fill. Un clic selecciona un objeto relleno solo en su trazado, no dentro de su relleno. + How near, in pixels, a point must come to an anchor or ruler guide for Snap to Point to snap it; with Smart Guides on, Smart Guides' Snapping Tolerance applies instead. Qué tan cerca, en píxeles, debe llegar un punto a un ancla o guía de regla para que Ajustar a punto lo ajuste; con las guías inteligentes activadas se aplica su tolerancia de ajuste. + With the Selection tool, Cmd/Ctrl-click selects the object under the selected one at the pointer; each further click goes one object deeper. Con la herramienta Selección, Cmd/Ctrl+clic selecciona el objeto que está debajo del seleccionado en el puntero; cada clic siguiente baja un objeto más. + Zoom In and Zoom Out bring the center of the selection to the middle of the view. Acercar y Alejar llevan el centro de la selección al medio de la vista. + Locked and hidden artwork inside an artboard moves, scales and is copied with the artboard, as the other artwork does. La ilustración bloqueada y oculta dentro de una mesa de trabajo se mueve, se escala y se copia con ella, como el resto de la ilustración. + The size of anchor points and direction handle ends on the canvas; larger anchors can also be picked from farther away. El tamaño de los puntos de ancla y de los extremos de los manejadores de dirección en el lienzo; las anclas más grandes también se pueden tomar desde más lejos. + Draws the ends of direction handles as solid dots, hollow dots or larger solid dots. Dibuja los extremos de los manejadores de dirección como puntos rellenos, puntos huecos o puntos rellenos más grandes. + With the Direct Selection tool, the anchor under the pointer is highlighted. Con la herramienta Selección directa, el ancla bajo el puntero se resalta. + Shows direction handles when more than one anchor is selected; off, they show only while a single anchor is selected. Muestra los manejadores de dirección cuando hay más de un ancla seleccionada; desactivado, solo se muestran con una sola ancla seleccionada. + Corner widgets hide on corners whose angle is greater than this many degrees. Los widgets de esquina se ocultan en las esquinas cuyo ángulo supera estos grados. + The Pen tool previews the next segment from the last anchor to the pointer before you click. La herramienta Pluma muestra el siguiente segmento desde la última ancla hasta el puntero antes de hacer clic. + The Curvature tool previews the curve to the pointer before you place the next point. La herramienta Curvatura muestra la curva hasta el puntero antes de colocar el siguiente punto. The unit for new documents from built-in sizes other than pixel sizes and for opened files that record no unit; choosing one here and clicking OK also sets the active document's units. La unidad de los documentos nuevos de tamaños predefinidos, salvo los tamaños en píxeles, y de los archivos abiertos que no registran ninguna unidad; si la elige aquí y hace clic en Aceptar, también pasa a ser la unidad del documento activo. Stroke weights, dashes and gaps show in this unit, and numbers typed for them are read in it. Los grosores de trazo, los guiones y los huecos se muestran en esta unidad, y los números que se escriben para ellos se leen en ella. Type sizes, leading and baseline shift show in this unit, and numbers typed for them are read in it. Los tamaños de texto, el interlineado y el desplazamiento de línea de base se muestran en esta unidad, y los números que se escriben para ellos se leen en ella. The unit for East Asian type measurements, which no field uses yet. La unidad para las medidas del texto de Asia oriental, que todavía no usa ningún campo. When on, a number typed without a unit into a field in picas is read in points. Si está activado, un número escrito sin unidad en un campo en picas se lee en puntos. With XML ID, object names show as XML IDs in the Layers panel, the Variables panel and Layer Options. Con ID XML, los nombres de los objetos se muestran como ID XML en Capas, Variables y Opciones de capa. + Snaps drawing, moving and scaling to the grid's subdivisions, even while the grid is hidden; while it is on, Snap to Pixel does not apply. Ajusta el dibujo, el desplazamiento y el escalado a las subdivisiones de la cuadrícula, aunque la cuadrícula esté oculta; mientras está activado, Ajustar a píxel no se aplica. + The color of guides that are not selected; an artboard with a Guide Label draws its own guides in the label's color instead. El color de las guías no seleccionadas; una mesa de trabajo con una Etiqueta de las guías dibuja sus propias guías en el color de la etiqueta. + Draws guides as solid lines or as dots, including the guides already in the document. Dibuja las guías como líneas continuas o como puntos, incluidas las guías que ya están en el documento. + With this on, guides are locked when VectorCraft starts; changing this option locks or unlocks them at once, and View › Guides › Lock Guides still changes the lock. Con esta opción activada, las guías quedan bloqueadas al iniciar VectorCraft; cambiar la opción las bloquea o desbloquea al momento, y Ver › Guías › Bloquear guías sigue cambiando el bloqueo. + With this on, holding Cmd/Ctrl as you start dragging from a ruler makes a guide on the active artboard only, or a canvas guide with the Artboard tool. Con esta opción activada, mantener pulsada Cmd/Ctrl al empezar a arrastrar desde una regla crea una guía solo en la mesa de trabajo activa, o una guía de todo el lienzo con la herramienta Mesa de trabajo. + The color of the grid; the lines between major gridlines are drawn in a fainter shade of it. El color de la cuadrícula; las líneas entre las líneas principales se dibujan en un tono más tenue de ese color. + Draws the grid as lines, or as dots along the major gridlines at each subdivision. Dibuja la cuadrícula como líneas, o como puntos a lo largo de las líneas principales en cada subdivisión. + The distance between major gridlines, in every open document and in new ones; a VectorCraft document opens with the grid it was saved with. La distancia entre las líneas principales de la cuadrícula, en todos los documentos abiertos y en los nuevos; un documento de VectorCraft se abre con la cuadrícula con la que se guardó. + How many parts each major grid square is divided into; Snap to Grid snaps to these parts, even when the zoom hides their lines. En cuántas partes se divide cada cuadrado principal de la cuadrícula; Ajustar a cuadrícula se ajusta a esas partes, aunque el zoom oculte sus líneas. + Draws the grid behind the artwork; off, the grid is drawn over it. Dibuja la cuadrícula detrás de la ilustración; desactivada, la cuadrícula se dibuja encima. + In Pixel Preview at 600% zoom or more, the active view shows a line at the edge of every document pixel over the artwork. En la vista previa de píxeles, con un zoom del 600% o más, la vista activa muestra sobre la ilustración una línea en el borde de cada píxel del documento. + The color of the tile edge and the dashed swatch bounds shown while you edit a pattern. El color del borde del mosaico y de los límites discontinuos de la muestra que se ven mientras edita un motivo. + Snaps drawing, moving and transforming to nearby art and shows guides and labels; Pixel Preview turns them off, and Snap to Grid snaps to the grid instead. Ajusta el dibujo, el desplazamiento y la transformación a la ilustración cercana y muestra guías y etiquetas; la vista previa de píxeles las desactiva, y Ajustar a cuadrícula ajusta a la cuadrícula en su lugar. + The color of Smart Guide lines and labels. El color de las líneas y etiquetas de las guías inteligentes. + Shows a line along the edge or center that art lines up with; off, art still lines up without the line, and Snap to Glyph does not apply. Muestra una línea a lo largo del borde o el centro con el que se alinea la ilustración; desactivada, la ilustración se sigue alineando sin la línea, y Ajustar a glifo no se aplica. + With a selection tool, outlines the unselected object under the pointer in its layer color while you are not dragging. Con una herramienta de selección, contornea el objeto no seleccionado bajo el puntero con el color de su capa mientras no arrastra. + Shows the size or angle next to the pointer while you scale, rotate, shear or reflect art. Muestra el tamaño o el ángulo junto al puntero mientras escala, gira, inclina o refleja la ilustración. + While you draw, points snap to lines at the chosen Angles through the point the segment or shape starts from. Mientras dibuja, los puntos se ajustan a líneas con los ángulos elegidos que pasan por el punto donde empieza el segmento o la forma. + The set of angles the construction guides follow while Construction Guides is on. El conjunto de ángulos que siguen las guías de construcción mientras Guías de construcción está activado. + Names what a point snaps to, such as an anchor, a path or an alignment; off, points snap the same way without the names. Nombra a qué se ajusta un punto, como un punto de ancla, un trazado o una alineación; desactivado, los puntos se ajustan igual, sin los nombres. + Shows distances, angles and how far art has moved next to the pointer while you draw or move it. Muestra junto al puntero distancias, ángulos y cuánto se ha movido la ilustración mientras dibuja o mueve. + Snaps moved or resized art to the same gap as between nearby objects, and marks the equal gaps. Ajusta la ilustración movida o redimensionada a la misma separación que hay entre objetos cercanos y marca las separaciones iguales. + With something selected, holding Alt/Option over another object or an artboard shows the distances between it and the selection. Con algo seleccionado, mantener pulsada Alt/Option sobre otro objeto o una mesa de trabajo muestra las distancias entre este y la selección. + A selection dragged back to within the Snapping Tolerance of where the drag began goes back to exactly that place; a copy does not. Una selección arrastrada de vuelta hasta la tolerancia de ajuste del lugar donde empezó el arrastre vuelve exactamente a ese lugar; una copia no. + How near on screen the pointer or a dragged point must come to art for Smart Guides to snap to it; the distance is the same at every zoom. Cuánto debe acercarse en pantalla el puntero o un punto arrastrado a la ilustración para que las guías inteligentes se ajusten a ella; la distancia es la misma con cualquier zoom. + Snaps the end of a line segment, or a circle drawn from its center, so that it touches a nearby curve. Ajusta el extremo de un segmento de línea, o un círculo dibujado desde su centro, para que toque una curva cercana. + Snaps the end of a line segment so that it meets a nearby straight segment at a right angle. Ajusta el extremo de un segmento de línea para que encuentre un segmento recto cercano en ángulo recto. Reset all preferences to their defaults? ¿Restablecer todas las preferencias a sus valores predeterminados? The defaults are applied when you click OK in Preferences. Cancel there keeps your current preferences. Los valores predeterminados se aplican al hacer clic en Aceptar en Preferencias. Cancelar ahí conserva sus preferencias actuales. Restore Recovered Documents Restaurar documentos recuperados @@ -4679,6 +4770,11 @@ liquify-list-end {0}, {1} {0}, {1} @msg PDF writer error: {0} error del escritor de PDF: {0} @msgplural Packaged {n} file ({note}) in {folder}|Packaged {n} files ({note}) in {folder} Se empaquetó {n} archivo en {folder} ({note})|Se empaquetaron {n} archivos en {folder} ({note}) @msg Preview in Browser needs the desktop app (the web downloads files instead) Previsualizar en el navegador requiere la aplicación de escritorio (la versión web descarga los archivos) +@msg give `desiredK`, the desired file size in K (1024 bytes): a number above 0 and at most 1048576 indica `desiredK`, el tamaño de archivo deseado en K (1024 bytes): un número mayor que 0 y como máximo 1048576 +@msg `startWith` is `current` or `auto` `startWith` es `current` o `auto` +@msg `use` is `allSlices`, `eachSlice` or `currentSlice` `use` es `allSlices`, `eachSlice` o `currentSlice` +@msg `slice` is a slice number from `slice.list`, with `use: currentSlice` `slice` es un número de sector de `slice.list`, con `use: currentSlice` +@msg Optimize to File Size: there is no image to measure Optimizar según tamaño de archivo: no hay ninguna imagen que medir @msg Release Guides: no guides Soltar guías: no hay guías @msg Release: no layer to put the rectangle in Soltar: no hay ninguna capa donde poner el rectángulo @msg Replace Spine: select a blend and a path Reemplazar eje: selecciona una fusión y un trazado @@ -6271,6 +6367,19 @@ mark-style Japanese Japonesas Transform Objects Transformar objetos @msg unknown parameter `{key}`; did you mean `{near}`? parámetro desconocido `{key}`; ¿quiso decir `{near}`? @msg unknown parameter `{key}`; the command takes no parameters parámetro desconocido `{key}`; el comando no tiene parámetros +@msg unknown parameter `{key}`; `{object}` takes: {keys} parámetro desconocido `{key}`; `{object}` acepta: {keys} +@msg unknown parameter `{key}`; {why_not} parámetro desconocido `{key}`; {why_not} +@msg no format takes it (see document.formats) ningún formato lo acepta (consulte document.formats) +@msg no save format takes it (see file.formatOptions) ningún formato de guardado lo acepta (consulte file.formatOptions) +@msg PDF doesn't take it (see document.formats) PDF no lo acepta (consulte document.formats) +@msg EPS doesn't take it (see document.formats) EPS no lo acepta (consulte document.formats) +@msg DXF doesn't take it (see document.formats) DXF no lo acepta (consulte document.formats) +@msg {name} must be {range} (got {v}) {name} debe ser {range} (se recibió {v}) +@msg The graphics processor tried first couldn't show the window, so VectorCraft started again on {summary} (Settings › Performance › Graphics Processor › Automatic uses the one that drives your display) El procesador gráfico probado primero no pudo mostrar la ventana, así que VectorCraft se inició de nuevo con {summary} (Ajustes › Rendimiento › Procesador gráfico › Automático usa el que controla su pantalla) +@msg Sent “{title}” to {to} Se envió “{title}” a {to} +@msg Sent “{title}” to {to}. The spooler replied: {note} Se envió “{title}” a {to}. Respuesta de la cola de impresión: {note} +@msg the default printer la impresora predeterminada +@msg raster effects on object {object}: requested {requested} ppi, achieved {achieved} ppi due to the 64 million pixel cap efectos de rasterizado en el objeto {object}: se solicitaron {requested} ppi y se alcanzaron {achieved} ppi debido al límite de 64 millones de píxeles @msg unknown parameter `{key}`; the command takes: {keys} parámetro desconocido `{key}`; el comando acepta: {keys} @msg the params must be an object, not {got} los parámetros deben ser un objeto, no {got} @msg unknown parameter `{path}`; the object takes no keys parámetro desconocido `{path}`; el objeto no acepta claves @@ -7920,6 +8029,11 @@ breakText Glyphs Glifos @msg Some islands could not be joined to the area around the art Algunas islas no se pudieron unir al área que rodea la ilustración @msg `width` must be from {lo} to {hi} pt `width` debe estar entre {lo} y {hi} pt @msg `angle` must be from -180 to 180 degrees `angle` debe estar entre -180 y 180 grados +@msg `roundness` must be from 0 to 100% `roundness` debe estar entre 0 y 100 % +@msg `fidelity` must be from 0.01 to 100 pt `fidelity` debe estar entre 0.01 y 100 pt +@msg style must be "pencil" or "brush" style debe ser "pencil" o "brush" +@msg extend end must be "start" or "end" el extremo de extend debe ser "start" o "end" +@msg connect end must be "start" or "end" el extremo de connect debe ser "start" o "end" @msg `roundness` must be from 1 to 100% `roundness` debe estar entre 1 y 100 % @msg `count` must be a whole number from 1 to {MAX_BRIDGES_PER_ISLAND} `count` debe ser un número entero entre 1 y {MAX_BRIDGES_PER_ISLAND} Weed Box and Lines… Caja y líneas de pelado… diff --git a/crates/ui-egui/src/i18n/fi.tsv b/crates/ui-egui/src/i18n/fi.tsv index ea4297ed9a..0bd239cbf1 100644 --- a/crates/ui-egui/src/i18n/fi.tsv +++ b/crates/ui-egui/src/i18n/fi.tsv @@ -231,6 +231,9 @@ Mask Maski Rasterize… Rasteroi… Create Gradient Mesh… Luo liukuväriverkko… + Flat Tasainen + To Center Keskustaa kohti + To Edge Reunaa kohti Create Object Mosaic… Luo objektimosaiikki… Vector Halftone… Vektorirasterointi… Create Trim Marks Luo leikkuumerkit @@ -1169,6 +1172,18 @@ lighting Light Valo Placement Options… Sijoitusasetukset… Plug-in… Laajennus… Preview in Browser Esikatsele selaimessa + Optimize to File Size… Optimoi tiedostokokoon… + Optimize to File Size Optimoi tiedostokokoon + Desired File Size: Haluttu tiedostokoko: + Start With: Aloita: + Use: Käytä: + Current Settings Nykyiset asetukset + Auto Select GIF/JPEG Valitse GIF/JPEG automaattisesti + Total of All Slices Kaikki siivut yhteensä + Each Slice Jokainen siivu + Current Slice Nykyinen siivu + {size}, within {target} {size}, enintään {target} + No setting tried fits in {target}; the smallest is {size} Mikään kokeiltu asetus ei mahdu kokoon {target}; pienin on {size} Printer Setup… Tulostimen asetukset… Printers Tulostimet Recent File Viimeisin tiedosto @@ -2869,6 +2884,8 @@ digits Malayalam Malajalam Collate Lajittele Composite colours are converted to it; separations separate with it when it is a CMYK profile. Yhdistelmävärit muunnetaan siihen; erottelut tehdään sen mukaan, kun se on CMYK-profiili. Convert All Spot Colors to Process Muunna kaikki spottivärit prosessiväreiksi + Convert {name} to process Muunna {name} prosessiväriksi + Keep {name} as spot Säilytä {name} spottivärinä Default Printer Oletustulostin Document Ink Options Asiakirjan musteasetukset Download: Lataus: @@ -3930,6 +3947,7 @@ theme Appearance Ulkoasu Command Click to Select Objects Behind Valitse takana olevat objektit Komento-napsautuksella Constrain Angle Rajoita kulmaa Constrain Width and Height Proportions Säilytä leveyden ja korkeuden suhde + Copy Width to Height Kopioi leveys korkeudeksi Construction Guides Rakenneapuviivat Curvature Tool Kaarevuustyökalu Data Recovery Tietojen palautus @@ -4436,12 +4454,85 @@ font-technology Variable Muuttuvat Preferences Asetukset Previous Edellinen Restore every preference to its default (applied on OK) Palauta kaikki asetukset oletuksiin (käytetään, kun valitaan OK) + Shows a bar of commands for the selection or tool on the canvas; it hides while you drag and in Presentation Mode. Näyttää piirtopinnalla komentopalkin valinnalle tai työkalulle; se piiloutuu vetämisen ajaksi ja esitystilassa. + How far an arrow key moves the selection; with Shift, it moves ten times as far. Kuinka pitkälle nuolinäppäin siirtää valintaa; vaihtonäppäimen kanssa se siirtää kymmenen kertaa pidemmälle. + The angle of the axes that arrow keys move along and that Shift holds drawing and moving to. Niiden akselien kulma, joita pitkin nuolinäppäimet siirtävät ja joihin vaihtonäppäin rajoittaa piirtämisen ja siirtämisen. + The corner radius the Rounded Rectangle tool draws with; changing the radius while drawing changes this value too. Kulman säde, jolla Pyöristetty suorakulmio -työkalu piirtää; säteen muuttaminen piirtämisen aikana muuttaa myös tätä arvoa. + How far right and down Paste moves the copy when it is given no position, as from a script; Paste in the app centers it in the view. Kuinka paljon oikealle ja alas Liitä siirtää kopiota, kun sijaintia ei anneta, kuten komentosarjasta; sovelluksessa Liitä keskittää kopion näkymään. + Stops the Pen tool from deleting the anchor you click on a selected path, or adding one where you click its segment. Estää Kynä-työkalua poistamasta ankkuripistettä, jota napsautat valitulla polulla, tai lisäämästä pistettä kohtaan, jossa napsautat sen segmenttiä. + Drawing tools show a crosshair pointer instead of their icon; Caps Lock does the same while it is on. Piirtotyökalut näyttävät kuvakkeensa sijaan ristikko-osoittimen; Caps Lock tekee saman, kun se on käytössä. + Shows a tip when the pointer rests on a button or field that has one. Näyttää vihjeen, kun osoitin pysähtyy painikkeen tai kentän päälle, jolla on vihje. + Shows a warning before a script you choose runs. Näyttää varoituksen ennen kuin valitsemasi komentosarja suoritetaan. + Smooths the edges of artwork on the canvas. Pehmentää piirtopinnalla olevan grafiikan reunat. + Select › Same › Fill Color, Stroke Color and Fill & Stroke match only the same tint of a global or spot swatch, not any tint of it. Valinta › Sama › Täyttöväri, Viivan väri sekä Täyttö ja viiva löytävät vain globaalin tai spottivärimallin saman sävyn, eivät mitä tahansa sen sävyä. + Shows the Home screen when no document is open; off, the window stays empty until you click Home. Näyttää aloitusnäytön, kun yhtään asiakirjaa ei ole auki; kun asetus ei ole käytössä, ikkuna pysyy tyhjänä, kunnes napsautat Aloitus. + Measures objects with their strokes and shape-changing effects for size, position and alignment; shadows, glows and blurs are not measured. Mittaa objektit viivoineen ja muotoa muuttavine tehosteineen kokoa, sijaintia ja tasausta varten; varjoja, hehkuja ja sumennuksia ei mitata. + At 100% zoom, one inch of the document takes 96 screen points instead of 72. 100 %:n zoomauksella asiakirjan tuuma vie 96 näyttöpistettä 72:n sijaan. + Double-clicking a group, path or image with the Selection tool opens it in isolation mode. Ryhmän, polun tai kuvan kaksoisnapsautus Valinta-työkalulla avaa sen eristystilaan. + Pattern fills and strokes transform with the art, unless a transform or the Transform panel's menu chooses otherwise. Kuviotäytöt ja -viivat muuntuvat grafiikan mukana, ellei muunnos tai Muunna-paneelin valikko valitse toisin. + Live corner radii scale with the art, unless the scale chooses otherwise. Dynaamisten kulmien säteet skaalautuvat grafiikan mukana, ellei skaalaus valitse toisin. + Stroke weights, dashes and effect distances scale with the art, unless the scale chooses otherwise. Viivojen paksuudet, katkoviivat ja tehosteiden etäisyydet skaalautuvat grafiikan mukana, ellei skaalaus valitse toisin. + The mouse wheel zooms the canvas instead of scrolling it. Hiiren rulla zoomaa piirtopintaa vierittämisen sijaan. + The mouse wheel with Cmd/Ctrl held scrolls the canvas sideways. Hiiren rulla vierittää piirtopintaa sivuttain, kun Cmd/Ctrl on painettuna. + Dragging sideways on a numeric field's label changes the field's value. Numerokentän nimiön vetäminen sivuttain muuttaa kentän arvoa. + A two-finger rotate gesture on a trackpad rotates the canvas view. Kahden sormen kiertoele kosketuslevyllä kiertää piirtopinnan näkymää. + Holding a tool's shortcut key chooses the tool until you let go, and then the previous tool is chosen again. Työkalun pikanäppäimen pitäminen painettuna valitsee työkalun, kunnes päästät irti, ja sitten edellinen työkalu valitaan uudelleen. + Shows the bounding box while you move the selection or draw a shape. Näyttää rajausruudun, kun siirrät valintaa tai piirrät muotoa. + Create Trim Marks draws Japanese-style marks instead of Roman ones. Luo leikkuumerkit piirtää japanilaistyyliset merkit roomalaisten sijaan. + New art takes only the fill and stroke of the selection; off, it takes the selected object's whole appearance. Uusi grafiikka saa vain valinnan täytön ja viivan; kun asetus ei ole käytössä, se saa valitun objektin koko ulkoasun. + Changing the width or height in the Transform panel, the Properties panel or the Control bar changes the other in proportion. Leveyden tai korkeuden muuttaminen Muunna-paneelissa, Ominaisuudet-paneelissa tai ohjauspalkissa muuttaa toista samassa suhteessa. + A live rectangle's properties show one Corner Radius field for all four corners; off, each corner has its own field. Dynaamisen suorakulmion ominaisuuksissa on yksi Kulman säde -kenttä kaikille neljälle kulmalle; kun asetus ei ole käytössä, jokaisella kulmalla on oma kenttänsä. + What edits in the Transform panel transform: the object, its pattern tiles or both; Default follows Transform Pattern Tiles. Mitä Muunna-paneelin muokkaukset muuntavat: objektin, sen kuvioruudut tai molemmat; Oletus noudattaa asetusta Muunna kuvioruudut. + With one symbol instance selected, the Transform panel uses the symbol's registration point as its reference point. Kun yksi symbolin esiintymä on valittuna, Muunna-paneeli käyttää symbolin kohdistuspistettä viitepisteenä. + Darkens the canvas outside the artboards while the Artboard tool is active. Tummentaa piirtopinnan piirtoalustojen ulkopuolelta, kun Piirtoalusta-työkalu on käytössä. + With Fade Region Outside Artboard on, the area outside the artboards stays dark while you drag with the Artboard tool. Kun Himmennä piirtoalustan ulkopuolinen alue on käytössä, piirtoalustojen ulkopuolinen alue pysyy tummana, kun vedät Piirtoalusta-työkalulla. + How near, in pixels, the pointer must be to an object, anchor or handle for a click to select it. Kuinka lähellä, pikseleinä, osoittimen on oltava objektia, ankkuripistettä tai kahvaa, jotta napsautus valitsee sen. + Whether the Selection tool's box selects objects it touches or only those fully inside; Drag Direction selects those inside on a drag to the right. E reverses it mid-drag. Valitseeko valintatyökalun kehys objektit, joita se koskettaa, vai vain kokonaan sisällä olevat; Vetosuunta valitsee sisällä olevat, kun vedät oikealle. E kääntää säännön vedon aikana. + A click selects a filled object only on its path, not inside its fill. Napsautus valitsee täytetyn objektin vain sen polulta, ei täytön sisältä. + How near, in pixels, a point must come to an anchor or ruler guide for Snap to Point to snap it; with Smart Guides on, Smart Guides' Snapping Tolerance applies instead. Kuinka lähelle, pikseleinä, pisteen on tultava ankkuripistettä tai viivaimen apuviivaa, jotta Kohdista pisteeseen kohdistaa sen; kun älykkäät apuviivat ovat käytössä, käytetään niiden tartuntatoleranssia. + With the Selection tool, Cmd/Ctrl-click selects the object under the selected one at the pointer; each further click goes one object deeper. Valintatyökalulla Cmd/Ctrl-napsautus valitsee valitun alla olevan objektin osoittimen kohdalta; jokainen seuraava napsautus menee yhden objektin syvemmälle. + Zoom In and Zoom Out bring the center of the selection to the middle of the view. Lähennä ja Loitonna tuovat valinnan keskipisteen näkymän keskelle. + Locked and hidden artwork inside an artboard moves, scales and is copied with the artboard, as the other artwork does. Lukittu ja piilotettu kuvitus piirtoalustan sisällä siirtyy, skaalautuu ja kopioituu piirtoalustan mukana kuten muukin kuvitus. + The size of anchor points and direction handle ends on the canvas; larger anchors can also be picked from farther away. Ankkuripisteiden ja suuntakahvojen päiden koko piirtoalueella; suurempiin ankkuripisteisiin voi tarttua myös kauempaa. + Draws the ends of direction handles as solid dots, hollow dots or larger solid dots. Piirtää suuntakahvojen päät täytettyinä pisteinä, onttoina pisteinä tai suurempina täytettyinä pisteinä. + With the Direct Selection tool, the anchor under the pointer is highlighted. Suoravalintatyökalulla osoittimen alla oleva ankkuripiste korostetaan. + Shows direction handles when more than one anchor is selected; off, they show only while a single anchor is selected. Näyttää suuntakahvat, kun valittuna on useampi kuin yksi ankkuripiste; pois päältä ne näkyvät vain, kun valittuna on yksi ankkuripiste. + Corner widgets hide on corners whose angle is greater than this many degrees. Kulmasäätimet piilotetaan kulmista, joiden kulma on suurempi kuin tämä astemäärä. + The Pen tool previews the next segment from the last anchor to the pointer before you click. Kynätyökalu esikatselee seuraavan segmentin viimeisestä ankkuripisteestä osoittimeen ennen napsautusta. + The Curvature tool previews the curve to the pointer before you place the next point. Kaarevuustyökalu esikatselee käyrän osoittimeen asti ennen kuin sijoitat seuraavan pisteen. The unit for new documents from built-in sizes other than pixel sizes and for opened files that record no unit; choosing one here and clicking OK also sets the active document's units. Yksikkö uusille asiakirjoille valmiissa kooissa pikselikokoja lukuun ottamatta ja avatuille tiedostoille, joihin ei ole tallennettu yksikköä; kun valitset sen tässä ja napsautat OK, siitä tulee myös aktiivisen asiakirjan yksikkö. Stroke weights, dashes and gaps show in this unit, and numbers typed for them are read in it. Viivan paksuudet, katkoviivat ja välit näytetään tässä yksikössä, ja niille kirjoitetut luvut luetaan siinä. Type sizes, leading and baseline shift show in this unit, and numbers typed for them are read in it. Tekstin koot, riviväli ja perusviivan siirto näytetään tässä yksikössä, ja niille kirjoitetut luvut luetaan siinä. The unit for East Asian type measurements, which no field uses yet. Itä-Aasian tekstin mittojen yksikkö, jota mikään kenttä ei vielä käytä. When on, a number typed without a unit into a field in picas is read in points. Kun asetus on käytössä, picoina näytettävään kenttään ilman yksikköä kirjoitettu luku luetaan pisteinä. With XML ID, object names show as XML IDs in the Layers panel, the Variables panel and Layer Options. XML-tunnus-asetuksella objektien nimet näytetään XML-tunnuksina kohteissa Tasot, Muuttujat ja Tason asetukset. + Snaps drawing, moving and scaling to the grid's subdivisions, even while the grid is hidden; while it is on, Snap to Pixel does not apply. Kohdistaa piirtämisen, siirtämisen ja skaalaamisen ruudukon jakoihin myös silloin, kun ruudukko on piilossa; kun asetus on päällä, Kohdista pikseliin ei ole käytössä. + The color of guides that are not selected; an artboard with a Guide Label draws its own guides in the label's color instead. Valitsemattomien apuviivojen väri; piirtoalusta, jolla on apuviivojen tunniste, piirtää omat apuviivansa tunnisteen värillä. + Draws guides as solid lines or as dots, including the guides already in the document. Piirtää apuviivat yhtenäisinä viivoina tai pisteinä, myös asiakirjassa jo olevat apuviivat. + With this on, guides are locked when VectorCraft starts; changing this option locks or unlocks them at once, and View › Guides › Lock Guides still changes the lock. Kun asetus on päällä, apuviivat ovat lukittuina VectorCraftin käynnistyessä; asetuksen muuttaminen lukitsee tai avaa ne heti, ja Näytä › Apuviivat › Lukitse apuviivat muuttaa lukitusta edelleen. + With this on, holding Cmd/Ctrl as you start dragging from a ruler makes a guide on the active artboard only, or a canvas guide with the Artboard tool. Kun asetus on päällä, Cmd/Ctrl pohjassa viivaimesta vetämisen alussa tekee apuviivan vain aktiiviselle piirtoalustalle, tai piirtoalustatyökalulla koko piirtopohjan apuviivan. + The color of the grid; the lines between major gridlines are drawn in a fainter shade of it. Ruudukon väri; pääruudukkoviivojen väliset viivat piirretään sen vaaleammalla sävyllä. + Draws the grid as lines, or as dots along the major gridlines at each subdivision. Piirtää ruudukon viivoina tai pisteinä pääruudukkoviivoja pitkin jokaisen jaon kohdalla. + The distance between major gridlines, in every open document and in new ones; a VectorCraft document opens with the grid it was saved with. Pääruudukkoviivojen etäisyys kaikissa avoimissa asiakirjoissa ja uusissa; VectorCraft-asiakirja avautuu ruudukolla, jonka kanssa se tallennettiin. + How many parts each major grid square is divided into; Snap to Grid snaps to these parts, even when the zoom hides their lines. Moneenko osaan kukin pääruudukon ruutu jaetaan; Kohdista ruudukkoon kohdistaa näihin osiin myös silloin, kun zoomaus piilottaa niiden viivat. + Draws the grid behind the artwork; off, the grid is drawn over it. Piirtää ruudukon kuvituksen taakse; pois päältä ruudukko piirretään sen päälle. + In Pixel Preview at 600% zoom or more, the active view shows a line at the edge of every document pixel over the artwork. Pikseliesikatselussa 600 %:n tai suuremmalla zoomauksella aktiivinen näkymä näyttää kuvituksen päällä viivan jokaisen asiakirjan pikselin reunassa. + The color of the tile edge and the dashed swatch bounds shown while you edit a pattern. Ruudun reunan ja katkoviivaisten värimallin rajojen väri, jotka näkyvät kuviota muokattaessa. + Snaps drawing, moving and transforming to nearby art and shows guides and labels; Pixel Preview turns them off, and Snap to Grid snaps to the grid instead. Kohdistaa piirtämisen, siirtämisen ja muuntamisen lähellä olevaan grafiikkaan ja näyttää apuviivat ja selitteet; pikseliesikatselu poistaa ne käytöstä, ja Kohdista ruudukkoon kohdistaa niiden sijaan ruudukkoon. + The color of Smart Guide lines and labels. Älykkäiden apuviivojen viivojen ja selitteiden väri. + Shows a line along the edge or center that art lines up with; off, art still lines up without the line, and Snap to Glyph does not apply. Näyttää viivan sitä reunaa tai keskikohtaa pitkin, johon grafiikka tasautuu; pois päältä grafiikka tasautuu yhä ilman viivaa, eikä Kohdista merkkiin ole käytössä. + With a selection tool, outlines the unselected object under the pointer in its layer color while you are not dragging. Valintatyökalulla osoittimen alla oleva valitsematon objekti saa ääriviivan tasonsa värillä, kun et vedä. + Shows the size or angle next to the pointer while you scale, rotate, shear or reflect art. Näyttää koon tai kulman osoittimen vieressä, kun skaalaat, kierrät, vinoutat tai peilaat grafiikkaa. + While you draw, points snap to lines at the chosen Angles through the point the segment or shape starts from. Piirtäessä pisteet kohdistuvat valituissa kulmissa kulkeviin viivoihin, jotka kulkevat segmentin tai muodon alkupisteen kautta. + The set of angles the construction guides follow while Construction Guides is on. Kulmat, joita rakenneapuviivat seuraavat, kun Rakenneapuviivat on käytössä. + Names what a point snaps to, such as an anchor, a path or an alignment; off, points snap the same way without the names. Nimeää, mihin piste kohdistuu, esimerkiksi ankkuripisteen, polun tai tasauksen; pois päältä pisteet kohdistuvat samoin ilman nimiä. + Shows distances, angles and how far art has moved next to the pointer while you draw or move it. Näyttää osoittimen vieressä etäisyydet, kulmat ja kuinka paljon grafiikka on siirtynyt, kun piirrät tai siirrät. + Snaps moved or resized art to the same gap as between nearby objects, and marks the equal gaps. Kohdistaa siirretyn tai koon muuttaneen grafiikan samaan väliin kuin lähellä olevien objektien välillä ja merkitsee yhtä suuret välit. + With something selected, holding Alt/Option over another object or an artboard shows the distances between it and the selection. Kun jotain on valittuna, Alt/Option-näppäimen pitäminen toisen objektin tai piirtoalustan päällä näyttää etäisyydet sen ja valinnan välillä. + A selection dragged back to within the Snapping Tolerance of where the drag began goes back to exactly that place; a copy does not. Valinta, joka vedetään takaisin tartuntatoleranssin sisään vedon alkukohdasta, palaa täsmälleen siihen kohtaan; kopio ei palaa. + How near on screen the pointer or a dragged point must come to art for Smart Guides to snap to it; the distance is the same at every zoom. Kuinka lähelle grafiikkaa osoittimen tai vedettävän pisteen on tultava näytöllä, jotta älykkäät apuviivat kohdistavat siihen; etäisyys on sama kaikilla zoomauksilla. + Snaps the end of a line segment, or a circle drawn from its center, so that it touches a nearby curve. Kohdistaa janan pään tai keskipisteestä piirretyn ympyrän niin, että se koskettaa lähellä olevaa käyrää. + Snaps the end of a line segment so that it meets a nearby straight segment at a right angle. Kohdistaa janan pään niin, että se kohtaa lähellä olevan suoran segmentin suorassa kulmassa. Reset all preferences to their defaults? Palautetaanko kaikki asetukset oletuksiin? The defaults are applied when you click OK in Preferences. Cancel there keeps your current preferences. Oletukset otetaan käyttöön, kun valitset Asetuksissa OK. Peruuta siellä säilyttää nykyiset asetuksesi. Smaller ↔ Larger Pienempi ↔ Suurempi @@ -4912,6 +5003,11 @@ liquify-list-end {0}, {1} {0} ja {1} @msg PDF writer error: {0} PDF-kirjoittimen virhe: {0} @msgplural Packaged {n} file ({note}) in {folder}|Packaged {n} files ({note}) in {folder} Paketoitiin {n} tiedosto kansioon {folder} ({note})|Paketoitiin {n} tiedostoa kansioon {folder} ({note}) @msg Preview in Browser needs the desktop app (the web downloads files instead) Esikatselu selaimessa vaatii työpöytäsovelluksen (verkkoversio lataa tiedostot sen sijaan) +@msg give `desiredK`, the desired file size in K (1024 bytes): a number above 0 and at most 1048576 anna `desiredK`, haluttu tiedostokoko yksikössä K (1024 tavua): luku, joka on yli 0 ja enintään 1048576 +@msg `startWith` is `current` or `auto` `startWith` on `current` tai `auto` +@msg `use` is `allSlices`, `eachSlice` or `currentSlice` `use` on `allSlices`, `eachSlice` tai `currentSlice` +@msg `slice` is a slice number from `slice.list`, with `use: currentSlice` `slice` on siivun numero luettelosta `slice.list`, kun `use: currentSlice` +@msg Optimize to File Size: there is no image to measure Optimoi tiedostokokoon: mitattavaa kuvaa ei ole @msg Release Guides: no guides Vapauta apuviivat: ei apuviivoja @msg Release: no layer to put the rectangle in Vapauta: ei tasoa, johon suorakulmion voisi sijoittaa @msg Replace Spine: select a blend and a path Korvaa selkäranka: valitse sulautus ja polku @@ -6212,6 +6308,19 @@ mark-style Japanese Japanilainen Transform Objects Muunna objekteja @msg unknown parameter `{key}`; did you mean `{near}`? tuntematon parametri `{key}`; tarkoititko `{near}`? @msg unknown parameter `{key}`; the command takes no parameters tuntematon parametri `{key}`; komento ei ota parametreja +@msg unknown parameter `{key}`; `{object}` takes: {keys} tuntematon parametri `{key}`; kohteen `{object}` avaimet: {keys} +@msg unknown parameter `{key}`; {why_not} tuntematon parametri `{key}`; {why_not} +@msg no format takes it (see document.formats) mikään muoto ei käytä sitä (katso document.formats) +@msg no save format takes it (see file.formatOptions) mikään tallennusmuoto ei käytä sitä (katso file.formatOptions) +@msg PDF doesn't take it (see document.formats) PDF ei käytä sitä (katso document.formats) +@msg EPS doesn't take it (see document.formats) EPS ei käytä sitä (katso document.formats) +@msg DXF doesn't take it (see document.formats) DXF ei käytä sitä (katso document.formats) +@msg {name} must be {range} (got {v}) arvon {name} on oltava {range} (saatiin {v}) +@msg The graphics processor tried first couldn't show the window, so VectorCraft started again on {summary} (Settings › Performance › Graphics Processor › Automatic uses the one that drives your display) Ensin kokeiltu grafiikkasuoritin ei pystynyt näyttämään ikkunaa, joten VectorCraft käynnistyi uudelleen: {summary} (Asetukset › Suorituskyky › Grafiikkasuoritin › Automaattinen käyttää näyttöäsi ohjaavaa suoritinta) +@msg Sent “{title}” to {to} “{title}” lähetettiin kohteeseen {to} +@msg Sent “{title}” to {to}. The spooler replied: {note} “{title}” lähetettiin kohteeseen {to}. Tulostusjonon vastaus: {note} +@msg the default printer oletustulostin +@msg raster effects on object {object}: requested {requested} ppi, achieved {achieved} ppi due to the 64 million pixel cap rasteritehosteet objektissa {object}: pyydettiin {requested} ppi, saatiin {achieved} ppi 64 miljoonan pikselin rajan vuoksi @msg unknown parameter `{key}`; the command takes: {keys} tuntematon parametri `{key}`; komennon parametrit: {keys} @msg the params must be an object, not {got} parametrien on oltava objekti, ei {got} @msg unknown parameter `{path}`; the object takes no keys tuntematon parametri `{path}`; objekti ei ota avaimia @@ -7896,6 +8005,11 @@ breakText Glyphs Merkit @msg Some islands could not be joined to the area around the art Joitakin saarekkeita ei voitu yhdistää grafiikkaa ympäröivään alueeseen @msg `width` must be from {lo} to {hi} pt `width`-arvon on oltava {lo}–{hi} pt @msg `angle` must be from -180 to 180 degrees `angle`-arvon on oltava -180–180 astetta +@msg `roundness` must be from 0 to 100% `roundness`-arvon on oltava 0–100 % +@msg `fidelity` must be from 0.01 to 100 pt `fidelity`-arvon on oltava 0.01–100 pt +@msg style must be "pencil" or "brush" style-arvon on oltava "pencil" tai "brush" +@msg extend end must be "start" or "end" extend-pään on oltava "start" tai "end" +@msg connect end must be "start" or "end" connect-pään on oltava "start" tai "end" @msg `roundness` must be from 1 to 100% `roundness`-arvon on oltava 1–100 % @msg `count` must be a whole number from 1 to {MAX_BRIDGES_PER_ISLAND} `count` on oltava kokonaisluku 1–{MAX_BRIDGES_PER_ISLAND} Weed Box and Lines… Karsintakehys ja -viivat… diff --git a/crates/ui-egui/src/i18n/fr.tsv b/crates/ui-egui/src/i18n/fr.tsv index d7326a5840..7abd52bf8a 100644 --- a/crates/ui-egui/src/i18n/fr.tsv +++ b/crates/ui-egui/src/i18n/fr.tsv @@ -608,6 +608,7 @@ font-technology Variable Variables Consolidate All Windows Regrouper toutes les fenêtres Constrain Angle Contraindre l’angle Constrain Width and Height Proportions Conserver les proportions de largeur et de hauteur + Copy Width to Height Copier la largeur dans la hauteur Construction Guides Repères de construction Contextual Alternates Variantes contextuelles Contextual Task Bar Barre des tâches contextuelle @@ -618,6 +619,8 @@ font-technology Variable Variables Control Contrôle Convert Convertir Convert All Spot Colors to Process Convertir tous les tons directs en couleurs quadrichromiques + Convert {name} to process Convertir {name} en couleur quadrichromique + Keep {name} as spot Conserver {name} en ton direct Convert All Strokes to Outlines Vectoriser tous les contours Convert All Text to Outlines Vectoriser tout le texte Convert Anchor Point Convertir le point d’ancrage @@ -693,6 +696,9 @@ font-technology Variable Variables Create from Selection Créer à partir de la sélection Create From: Créer à partir de : Create Gradient Mesh… Créer un filet de dégradé… + Flat Plat + To Center Vers le centre + To Edge Vers le bord Create Graph Créer un graphe Create New Layer Créer un calque Create New Sublayer Créer un sous-calque @@ -2708,6 +2714,18 @@ font-technology Variable Variables Preview: Aperçu : Preview All Layers Aperçu de tous les calques Preview in Browser Aperçu dans le navigateur + Optimize to File Size… Optimiser selon la taille du fichier… + Optimize to File Size Optimiser selon la taille du fichier + Desired File Size: Taille de fichier souhaitée : + Start With: Commencer par : + Use: Utiliser : + Current Settings Réglages actuels + Auto Select GIF/JPEG Sélection automatique GIF/JPEG + Total of All Slices Total de toutes les tranches + Each Slice Chaque tranche + Current Slice Tranche active + {size}, within {target} {size}, dans la limite de {target} + No setting tried fits in {target}; the smallest is {size} Aucun réglage essayé ne tient dans {target}, le plus petit fait {size} Preview in Browser needs the desktop app (the web downloads files instead) L’aperçu dans le navigateur nécessite l’application de bureau (la version web télécharge les fichiers à la place) Preview Mode Mode Aperçu Preview the document as it is now Afficher un aperçu du document dans son état actuel @@ -3053,12 +3071,85 @@ digits Malayalam Malayalam Responsive Adaptatif Restore Restaurer Restore every preference to its default (applied on OK) Rétablir toutes les préférences à leur valeur par défaut (appliqué avec OK) + Shows a bar of commands for the selection or tool on the canvas; it hides while you drag and in Presentation Mode. Affiche sur la zone de travail une barre de commandes pour la sélection ou l’outil. Elle se masque pendant un glissement et en mode Présentation. + How far an arrow key moves the selection; with Shift, it moves ten times as far. Distance dont une touche fléchée déplace la sélection. Avec Maj, elle la déplace dix fois plus loin. + The angle of the axes that arrow keys move along and that Shift holds drawing and moving to. Angle des axes le long desquels les touches fléchées déplacent et auxquels Maj contraint le dessin et le déplacement. + The corner radius the Rounded Rectangle tool draws with; changing the radius while drawing changes this value too. Rayon d’angle avec lequel l’outil Rectangle arrondi dessine. Modifier le rayon pendant le dessin modifie aussi cette valeur. + How far right and down Paste moves the copy when it is given no position, as from a script; Paste in the app centers it in the view. Distance vers la droite et vers le bas dont Coller décale la copie quand aucune position n’est donnée, comme depuis un script. Coller dans l’application la centre dans la vue. + Stops the Pen tool from deleting the anchor you click on a selected path, or adding one where you click its segment. Empêche l’outil Plume de supprimer le point d’ancrage cliqué sur un tracé sélectionné, ou d’en ajouter un là où vous cliquez sur son segment. + Drawing tools show a crosshair pointer instead of their icon; Caps Lock does the same while it is on. Les outils de dessin affichent un pointeur en croix au lieu de leur icône. Le Verrouillage majuscules fait de même tant qu’il est activé. + Shows a tip when the pointer rests on a button or field that has one. Affiche une info-bulle quand le pointeur s’arrête sur un bouton ou un champ qui en a une. + Shows a warning before a script you choose runs. Affiche un avertissement avant l’exécution d’un script que vous choisissez. + Smooths the edges of artwork on the canvas. Lisse les bords des illustrations sur la zone de travail. + Select › Same › Fill Color, Stroke Color and Fill & Stroke match only the same tint of a global or spot swatch, not any tint of it. Sélection › Identique › Couleur de fond, Couleur du contour et Fond et contour ne retiennent que la même teinte d’une nuance globale ou d’une couleur d’accompagnement, et non toutes ses teintes. + Shows the Home screen when no document is open; off, the window stays empty until you click Home. Affiche l’écran d’accueil quand aucun document n’est ouvert. Désactivée, la fenêtre reste vide jusqu’à ce que vous cliquiez sur Accueil. + Measures objects with their strokes and shape-changing effects for size, position and alignment; shadows, glows and blurs are not measured. Mesure les objets avec leurs contours et leurs effets qui modifient la forme pour la taille, la position et l’alignement. Les ombres, lueurs et flous ne sont pas mesurés. + At 100% zoom, one inch of the document takes 96 screen points instead of 72. À 100 % de zoom, un pouce du document occupe 96 points d’écran au lieu de 72. + Double-clicking a group, path or image with the Selection tool opens it in isolation mode. Un double-clic sur un groupe, un tracé ou une image avec l’outil Sélection l’ouvre en mode Isolation. + Pattern fills and strokes transform with the art, unless a transform or the Transform panel's menu chooses otherwise. Les fonds et contours de motif se transforment avec l’illustration, sauf si une transformation ou le menu du panneau Transformation en décide autrement. + Live corner radii scale with the art, unless the scale chooses otherwise. Les rayons d’angle dynamiques se mettent à l’échelle avec l’illustration, sauf si la mise à l’échelle en décide autrement. + Stroke weights, dashes and effect distances scale with the art, unless the scale chooses otherwise. Les épaisseurs de contour, les tirets et les distances des effets se mettent à l’échelle avec l’illustration, sauf si la mise à l’échelle en décide autrement. + The mouse wheel zooms the canvas instead of scrolling it. La molette de la souris zoome sur la zone de travail au lieu de la faire défiler. + The mouse wheel with Cmd/Ctrl held scrolls the canvas sideways. La molette de la souris avec Cmd/Ctrl enfoncée fait défiler la zone de travail latéralement. + Dragging sideways on a numeric field's label changes the field's value. Faire glisser latéralement le libellé d’un champ numérique modifie la valeur du champ. + A two-finger rotate gesture on a trackpad rotates the canvas view. Un geste de rotation à deux doigts sur un pavé tactile fait pivoter la vue de la zone de travail. + Holding a tool's shortcut key chooses the tool until you let go, and then the previous tool is chosen again. Maintenir le raccourci d’un outil choisit cet outil jusqu’à ce que vous le relâchiez, puis l’outil précédent est de nouveau choisi. + Shows the bounding box while you move the selection or draw a shape. Affiche le cadre de sélection pendant que vous déplacez la sélection ou dessinez une forme. + Create Trim Marks draws Japanese-style marks instead of Roman ones. Créer des traits de coupe dessine des traits de style japonais au lieu de traits romains. + New art takes only the fill and stroke of the selection; off, it takes the selected object's whole appearance. Une nouvelle illustration ne reprend que le fond et le contour de la sélection. Désactivée, elle reprend tout l’aspect de l’objet sélectionné. + Changing the width or height in the Transform panel, the Properties panel or the Control bar changes the other in proportion. Modifier la largeur ou la hauteur dans le panneau Transformation, le panneau Propriétés ou le panneau Contrôle modifie l’autre proportionnellement. + A live rectangle's properties show one Corner Radius field for all four corners; off, each corner has its own field. Les propriétés d’un rectangle dynamique affichent un seul champ Rayon de l’angle pour les quatre angles. Désactivée, chaque angle a son propre champ. + What edits in the Transform panel transform: the object, its pattern tiles or both; Default follows Transform Pattern Tiles. Les modifications du panneau Transformation transforment l’objet, ses carreaux de motif ou les deux, et Par défaut suit Transformer les carreaux de motif. + With one symbol instance selected, the Transform panel uses the symbol's registration point as its reference point. Quand une occurrence de symbole est sélectionnée, le panneau Transformation utilise le point d’alignement du symbole comme point de référence. + Darkens the canvas outside the artboards while the Artboard tool is active. Assombrit la zone de travail hors des plans de travail tant que l’outil Plan de travail est actif. + With Fade Region Outside Artboard on, the area outside the artboards stays dark while you drag with the Artboard tool. Avec Assombrir la zone hors du plan de travail activé, la zone hors des plans de travail reste sombre pendant que vous faites glisser avec l’outil Plan de travail. + How near, in pixels, the pointer must be to an object, anchor or handle for a click to select it. Distance en pixels à laquelle le pointeur doit se trouver d’un objet, d’un point d’ancrage ou d’une poignée pour qu’un clic le sélectionne. + Whether the Selection tool's box selects objects it touches or only those fully inside; Drag Direction selects those inside on a drag to the right. E reverses it mid-drag. Le rectangle de l’outil Sélection retient les objets qu’il touche ou seulement ceux entièrement inclus. Sens du glissement retient les objets inclus en glissant vers la droite. E inverse la règle en cours de glissement. + A click selects a filled object only on its path, not inside its fill. Un clic sélectionne un objet rempli uniquement sur son tracé, pas à l’intérieur de son fond. + How near, in pixels, a point must come to an anchor or ruler guide for Snap to Point to snap it; with Smart Guides on, Smart Guides' Snapping Tolerance applies instead. Distance en pixels à laquelle un point doit approcher un point d’ancrage ou un repère de règle pour que Magnétisme du point l’y aimante. Avec les repères commentés activés, leur tolérance du magnétisme s’applique à la place. + With the Selection tool, Cmd/Ctrl-click selects the object under the selected one at the pointer; each further click goes one object deeper. Avec l’outil Sélection, Cmd/Ctrl + clic sélectionne l’objet situé sous l’objet sélectionné à l’emplacement du pointeur. Chaque clic suivant descend d’un objet. + Zoom In and Zoom Out bring the center of the selection to the middle of the view. Zoom avant et Zoom arrière amènent le centre de la sélection au milieu de la vue. + Locked and hidden artwork inside an artboard moves, scales and is copied with the artboard, as the other artwork does. Les illustrations verrouillées et masquées d’un plan de travail sont déplacées, mises à l’échelle et copiées avec lui, comme les autres illustrations. + The size of anchor points and direction handle ends on the canvas; larger anchors can also be picked from farther away. Taille des points d’ancrage et des extrémités des poignées de direction sur la zone de travail. Les points d’ancrage plus grands se saisissent aussi de plus loin. + Draws the ends of direction handles as solid dots, hollow dots or larger solid dots. Dessine les extrémités des poignées de direction en points pleins, en points creux ou en points pleins plus grands. + With the Direct Selection tool, the anchor under the pointer is highlighted. Avec l’outil Sélection directe, le point d’ancrage sous le pointeur est mis en évidence. + Shows direction handles when more than one anchor is selected; off, they show only while a single anchor is selected. Affiche les poignées de direction quand plusieurs points d’ancrage sont sélectionnés. Désactivée, elles ne s’affichent que pour un seul point d’ancrage sélectionné. + Corner widgets hide on corners whose angle is greater than this many degrees. Les widgets d’angle se masquent sur les angles supérieurs à ce nombre de degrés. + The Pen tool previews the next segment from the last anchor to the pointer before you click. L’outil Plume affiche un aperçu du segment suivant, du dernier point d’ancrage jusqu’au pointeur, avant que vous cliquiez. + The Curvature tool previews the curve to the pointer before you place the next point. L’outil Courbure affiche un aperçu de la courbe jusqu’au pointeur avant que vous placiez le point suivant. The unit for new documents from built-in sizes other than pixel sizes and for opened files that record no unit; choosing one here and clicking OK also sets the active document's units. L’unité des nouveaux documents de tailles prédéfinies, sauf les tailles en pixels, et des fichiers ouverts qui n’enregistrent aucune unité, et si vous la choisissez ici puis cliquez sur OK, elle devient aussi l’unité du document actif. Stroke weights, dashes and gaps show in this unit, and numbers typed for them are read in it. Les épaisseurs de contour, les tirets et les espaces s’affichent dans cette unité, et les nombres saisis pour eux sont lus dans cette unité. Type sizes, leading and baseline shift show in this unit, and numbers typed for them are read in it. Les tailles de texte, l’interlignage et le décalage de la ligne de base s’affichent dans cette unité, et les nombres saisis pour eux sont lus dans cette unité. The unit for East Asian type measurements, which no field uses yet. L’unité des mesures du texte d’Asie orientale, qu’aucun champ n’utilise encore. When on, a number typed without a unit into a field in picas is read in points. Si cette option est activée, un nombre saisi sans unité dans un champ en picas est lu en points. With XML ID, object names show as XML IDs in the Layers panel, the Variables panel and Layer Options. Avec ID XML, les noms des objets s’affichent sous forme d’ID XML dans Calques, Variables et Options de calque. + Snaps drawing, moving and scaling to the grid's subdivisions, even while the grid is hidden; while it is on, Snap to Pixel does not apply. Aligne le dessin, le déplacement et la mise à l’échelle sur les subdivisions de la grille, même quand la grille est masquée. Tant que l’option est activée, Magnétisme du pixel ne s’applique pas. + The color of guides that are not selected; an artboard with a Guide Label draws its own guides in the label's color instead. La couleur des repères non sélectionnés. Un plan de travail doté d’une Étiquette des repères trace ses propres repères dans la couleur de l’étiquette. + Draws guides as solid lines or as dots, including the guides already in the document. Trace les repères en lignes continues ou en points, y compris les repères déjà présents dans le document. + With this on, guides are locked when VectorCraft starts; changing this option locks or unlocks them at once, and View › Guides › Lock Guides still changes the lock. Option activée, les repères sont verrouillés au démarrage de VectorCraft. Modifier l’option les verrouille ou les déverrouille aussitôt, et Affichage › Repères › Verrouiller les repères modifie toujours le verrouillage. + With this on, holding Cmd/Ctrl as you start dragging from a ruler makes a guide on the active artboard only, or a canvas guide with the Artboard tool. Option activée, maintenir Cmd/Ctrl au début d’un glissement depuis une règle crée un repère sur le seul plan de travail actif, ou un repère sur toute la zone de travail avec l’outil Plan de travail. + The color of the grid; the lines between major gridlines are drawn in a fainter shade of it. La couleur de la grille. Les lignes entre les lignes principales sont tracées dans une teinte plus pâle de cette couleur. + Draws the grid as lines, or as dots along the major gridlines at each subdivision. Trace la grille en lignes, ou en points le long des lignes principales à chaque subdivision. + The distance between major gridlines, in every open document and in new ones; a VectorCraft document opens with the grid it was saved with. La distance entre les lignes principales de la grille, dans chaque document ouvert et dans les nouveaux. Un document VectorCraft s’ouvre avec la grille avec laquelle il a été enregistré. + How many parts each major grid square is divided into; Snap to Grid snaps to these parts, even when the zoom hides their lines. Le nombre de parts de chaque carré principal de la grille. Magnétisme de la grille aligne sur ces parts, même quand le zoom en masque les lignes. + Draws the grid behind the artwork; off, the grid is drawn over it. Trace la grille derrière l’illustration. Désactivée, la grille est tracée par-dessus. + In Pixel Preview at 600% zoom or more, the active view shows a line at the edge of every document pixel over the artwork. En Aperçu en pixels, à partir d’un zoom de 600 %, la vue active affiche par-dessus l’illustration une ligne au bord de chaque pixel du document. + The color of the tile edge and the dashed swatch bounds shown while you edit a pattern. La couleur du bord du carreau et des limites en pointillé de la nuance affichés pendant la modification d’un motif. + Snaps drawing, moving and transforming to nearby art and shows guides and labels; Pixel Preview turns them off, and Snap to Grid snaps to the grid instead. Aimante le dessin, le déplacement et la transformation aux illustrations proches et affiche repères et étiquettes. L’aperçu en pixels les désactive, et Magnétisme de la grille aimante à la grille à leur place. + The color of Smart Guide lines and labels. La couleur des lignes et des étiquettes des repères commentés. + Shows a line along the edge or center that art lines up with; off, art still lines up without the line, and Snap to Glyph does not apply. Affiche une ligne le long du bord ou du centre avec lequel l’illustration s’aligne. Si l’option est désactivée, l’illustration s’aligne toujours sans la ligne, et Magnétisme du glyphe ne s’applique pas. + With a selection tool, outlines the unselected object under the pointer in its layer color while you are not dragging. Avec un outil de sélection, entoure l’objet non sélectionné sous le pointeur de la couleur de son calque tant que vous ne faites pas glisser. + Shows the size or angle next to the pointer while you scale, rotate, shear or reflect art. Affiche la taille ou l’angle près du pointeur pendant la mise à l’échelle, la rotation, la déformation ou la symétrie d’une illustration. + While you draw, points snap to lines at the chosen Angles through the point the segment or shape starts from. Pendant le dessin, les points s’aimantent à des lignes aux angles choisis passant par le point de départ du segment ou de la forme. + The set of angles the construction guides follow while Construction Guides is on. L’ensemble des angles que suivent les repères de construction lorsque Repères de construction est activé. + Names what a point snaps to, such as an anchor, a path or an alignment; off, points snap the same way without the names. Nomme ce sur quoi un point s’aimante, comme un point d’ancrage, un tracé ou un alignement. Si l’option est désactivée, les points s’aimantent de la même façon, sans les noms. + Shows distances, angles and how far art has moved next to the pointer while you draw or move it. Affiche près du pointeur les distances, les angles et le déplacement de l’illustration pendant le dessin ou le déplacement. + Snaps moved or resized art to the same gap as between nearby objects, and marks the equal gaps. Aimante une illustration déplacée ou redimensionnée au même écart qu’entre les objets proches et marque les écarts égaux. + With something selected, holding Alt/Option over another object or an artboard shows the distances between it and the selection. Avec une sélection, maintenir Alt/Option au-dessus d’un autre objet ou d’un plan de travail affiche les distances entre celui-ci et la sélection. + A selection dragged back to within the Snapping Tolerance of where the drag began goes back to exactly that place; a copy does not. Une sélection ramenée à moins de la tolérance du magnétisme de son point de départ revient exactement à cet endroit. Une copie n’y revient pas. + How near on screen the pointer or a dragged point must come to art for Smart Guides to snap to it; the distance is the same at every zoom. La distance à l’écran à laquelle le pointeur ou un point déplacé doit approcher une illustration pour que les repères commentés s’y aimantent. Elle est la même à tous les zooms. + Snaps the end of a line segment, or a circle drawn from its center, so that it touches a nearby curve. Aimante l’extrémité d’un segment de droite, ou un cercle tracé depuis son centre, pour qu’il touche une courbe proche. + Snaps the end of a line segment so that it meets a nearby straight segment at a right angle. Aimante l’extrémité d’un segment de droite pour qu’il rencontre un segment droit proche à angle droit. Reset all preferences to their defaults? Rétablir toutes les préférences à leur valeur par défaut ? The defaults are applied when you click OK in Preferences. Cancel there keeps your current preferences. Les valeurs par défaut sont appliquées lorsque vous cliquez sur OK dans Préférences. Annuler y conserve vos préférences actuelles. Restore Recovered Documents Restaurer les documents récupérés @@ -4641,6 +4732,11 @@ liquify-list-end {0}, {1} {0} et {1} @msg PDF writer error: {0} Erreur du générateur PDF : {0} @msgplural Packaged {n} file ({note}) in {folder}|Packaged {n} files ({note}) in {folder} {n} fichier assemblé dans {folder} ({note})|{n} fichiers assemblés dans {folder} ({note}) @msg Preview in Browser needs the desktop app (the web downloads files instead) Aperçu dans le navigateur nécessite l’application de bureau (la version web télécharge les fichiers à la place) +@msg give `desiredK`, the desired file size in K (1024 bytes): a number above 0 and at most 1048576 indiquez `desiredK`, la taille de fichier souhaitée en K (1024 octets), un nombre supérieur à 0 et au plus 1048576 +@msg `startWith` is `current` or `auto` `startWith` vaut `current` ou `auto` +@msg `use` is `allSlices`, `eachSlice` or `currentSlice` `use` vaut `allSlices`, `eachSlice` ou `currentSlice` +@msg `slice` is a slice number from `slice.list`, with `use: currentSlice` `slice` est un numéro de tranche de `slice.list`, avec `use: currentSlice` +@msg Optimize to File Size: there is no image to measure Optimiser selon la taille du fichier, aucune image à mesurer @msg Release Guides: no guides Annuler les repères : aucun repère @msg Release: no layer to put the rectangle in Annuler : aucun calque où placer le rectangle @msg Replace Spine: select a blend and a path Remplacer la dorsale : sélectionnez un dégradé de formes et un tracé @@ -5871,6 +5967,19 @@ lighting Light Lumière Transform Objects Transformer les objets @msg unknown parameter `{key}`; did you mean `{near}`? paramètre inconnu `{key}` ; vouliez-vous dire `{near}` ? @msg unknown parameter `{key}`; the command takes no parameters paramètre inconnu `{key}` ; la commande n’a aucun paramètre +@msg unknown parameter `{key}`; `{object}` takes: {keys} paramètre inconnu `{key}` ; `{object}` accepte : {keys} +@msg unknown parameter `{key}`; {why_not} paramètre inconnu `{key}` ; {why_not} +@msg no format takes it (see document.formats) aucun format ne l’accepte (voir document.formats) +@msg no save format takes it (see file.formatOptions) aucun format d’enregistrement ne l’accepte (voir file.formatOptions) +@msg PDF doesn't take it (see document.formats) PDF ne l’accepte pas (voir document.formats) +@msg EPS doesn't take it (see document.formats) EPS ne l’accepte pas (voir document.formats) +@msg DXF doesn't take it (see document.formats) DXF ne l’accepte pas (voir document.formats) +@msg {name} must be {range} (got {v}) {name} doit valoir {range} (reçu : {v}) +@msg The graphics processor tried first couldn't show the window, so VectorCraft started again on {summary} (Settings › Performance › Graphics Processor › Automatic uses the one that drives your display) Le processeur graphique essayé en premier n’a pas pu afficher la fenêtre : VectorCraft a redémarré sur {summary} (Réglages › Performances › Processeur graphique › Automatique utilise celui qui pilote votre écran) +@msg Sent “{title}” to {to} “{title}” envoyé vers {to} +@msg Sent “{title}” to {to}. The spooler replied: {note} “{title}” envoyé vers {to}. Réponse de la file d’impression : {note} +@msg the default printer l’imprimante par défaut +@msg raster effects on object {object}: requested {requested} ppi, achieved {achieved} ppi due to the 64 million pixel cap effets de pixellisation sur l’objet {object} : {requested} ppi demandés, {achieved} ppi obtenus en raison de la limite de 64 millions de pixels @msg unknown parameter `{key}`; the command takes: {keys} paramètre inconnu `{key}` ; la commande accepte : {keys} @msg the params must be an object, not {got} les paramètres doivent être un objet, pas {got} @msg unknown parameter `{path}`; the object takes no keys paramètre inconnu `{path}` ; l’objet n’accepte aucune clé @@ -7814,6 +7923,10 @@ breakText Glyphs Glyphes @msg Some islands could not be joined to the area around the art Certains îlots n’ont pas pu être reliés à la zone autour de l’illustration @msg `width` must be from {lo} to {hi} pt `width` doit être compris entre {lo} et {hi} pt @msg `angle` must be from -180 to 180 degrees `angle` doit être compris entre -180 et 180 degrés +@msg `roundness` must be from 0 to 100% `roundness` doit être compris entre 0 et 100 % +@msg `fidelity` must be from 0.01 to 100 pt `fidelity` doit être compris entre 0.01 et 100 pt +@msg style must be "pencil" or "brush" style doit être "pencil" ou "brush" +@msg extend end must be "start" or "end" l’extrémité de extend doit être "start" ou "end" @msg `roundness` must be from 1 to 100% `roundness` doit être compris entre 1 et 100 % @msg `count` must be a whole number from 1 to {MAX_BRIDGES_PER_ISLAND} `count` doit être un nombre entier compris entre 1 et {MAX_BRIDGES_PER_ISLAND} Weed Box and Lines… Cadre et lignes d’échenillage… @@ -8318,7 +8431,6 @@ breakText Glyphs Glyphes @msg anchor `smooth` must be true or false `smooth` d’un point d’ancrage doit valoir true ou false @msg anchor `{key}` must be [x, y] `{key}` d’un point d’ancrage doit être [x, y] @msg anchor `{key}` must be a number `{key}` d’un point d’ancrage doit être un nombre -@msg angle and roundness must be finite l’angle et l’arrondi doivent être finis @msg angles must be a list as long as pins (degrees or null) angles doit être une liste aussi longue que pins (degrés ou null) @msg appearance must be flat|center|edge appearance doit valoir flat|center|edge @msg apply is "fill" or "stroke", not `{other}` apply vaut "fill" ou "stroke", pas `{other}` @@ -9469,8 +9581,6 @@ breakText Glyphs Glyphes @msg unknown panel panneau inconnu @msg unknown panel `{panel}` panneau inconnu `{panel}` @msg unknown parameter `{key}` paramètre inconnu `{key}` -@msg unknown parameter `{within}settings.{format}`; {why} paramètre inconnu `{within}settings.{format}` ; {why} -@msg unknown parameter `{within}{key}`; {why} paramètre inconnu `{within}{key}` ; {why} @msg unknown pieLegend `{v}` (none, standard or wedges) pieLegend inconnu `{v}` (none, standard ou wedges) @msg unknown piePosition `{v}` (even, ratio or stacked) piePosition inconnu `{v}` (even, ratio ou stacked) @msg unknown pieSort `{v}` (none, all or first) pieSort inconnu `{v}` (none, all ou first) @@ -9597,7 +9707,6 @@ breakText Glyphs Glyphes @msg {label} must be a number from 1 to 10000 {label} doit être un nombre compris entre 1 et 10000 @msg {name} `{s}`: {ids} {name} `{s}` : {ids} @msg {name} is built in and can't be deleted {name} est intégré et ne peut pas être supprimé -@msg {name} must be {lo}–{hi}{unit} (got {v}) {name} doit être compris entre {lo} et {hi}{unit} (reçu : {v}) @msg {name}: CRC or size mismatch {name} : CRC ou taille incohérents @msg {name}: only this Affinity file's embedded preview could be read; use File › Open to see it with its warning, or export SVG or PDF from Affinity before placing {name} : seul l’aperçu incorporé de ce fichier Affinity a pu être lu ; utilisez Fichier › Ouvrir pour l’afficher avec son avertissement, ou exportez en SVG ou PDF depuis Affinity avant de l’importer @msg {name}: {e} {name} : {e} diff --git a/crates/ui-egui/src/i18n/gu.tsv b/crates/ui-egui/src/i18n/gu.tsv index bebeb18870..fdac7e6a94 100644 --- a/crates/ui-egui/src/i18n/gu.tsv +++ b/crates/ui-egui/src/i18n/gu.tsv @@ -236,6 +236,8 @@ Anti-aliased Artwork એન્ટિ-એલિયાસ્ડ આર્ટવર્ક Anti-aliasing Method એન્ટિ-એલિયાસિંગ પદ્ધતિ Anti-aliasing: એન્ટિ-એલિયાસિંગ: + Art Optimized આર્ટ માટે ઑપ્ટિમાઇઝ કરેલું + Type Optimized ટેક્સ્ટ માટે ઑપ્ટિમાઇઝ કરેલું Appearance દેખાવ Appearance Attribute દેખાવ ગુણધર્મ Appearance Item દેખાવ આઇટમ @@ -429,6 +431,10 @@ Break Text into Words ટેક્સ્ટને શબ્દોમાં તોડો Break Thread થ્રેડ તોડો Brick Offset: ઈંટ ઑફસેટ: + Brick by Row પંક્તિ પ્રમાણે ઈંટ + Brick by Column કૉલમ પ્રમાણે ઈંટ + Hex by Column કૉલમ પ્રમાણે ષટ્કોણ + Hex by Row પંક્તિ પ્રમાણે ષટ્કોણ Brightness તેજ Brightness/Contrast… તેજ/કૉન્ટ્રાસ્ટ… Brightness: તેજ: @@ -704,6 +710,7 @@ Constrain મર્યાદિત કરો Constrain Angle ખૂણો મર્યાદિત કરો Constrain Width and Height Proportions પહોળાઈ અને ઊંચાઈનો પ્રમાણ મર્યાદિત કરો + Copy Width to Height પહોળાઈને ઊંચાઈમાં નકલ કરો Construction Guides બાંધકામ ગાઇડ્સ Contextual Alternates સંદર્ભિત વૈકલ્પિક અક્ષરો Contextual Task Bar સંદર્ભિત ટાસ્ક બાર @@ -717,6 +724,8 @@ Conté Crayon… કોન્ટે ક્રેયોન… Convert રૂપાંતર કરો Convert All Spot Colors to Process બધા સ્પોટ રંગોને પ્રોસેસમાં રૂપાંતર કરો + Convert {name} to process {name} ને પ્રોસેસમાં રૂપાંતર કરો + Keep {name} as spot {name} ને સ્પોટ તરીકે રાખો Convert All Strokes to Outlines બધા સ્ટ્રોકને આઉટલાઇનમાં રૂપાંતર કરો Convert All Text to Outlines બધા ટેક્સ્ટને આઉટલાઇનમાં રૂપાંતર કરો Convert Anchor Point એન્કર પોઇન્ટ રૂપાંતર કરો @@ -791,6 +800,9 @@ Create From: આમાંથી બનાવો: Create Gradient Mesh ગ્રેડિયન્ટ મેશ બનાવો Create Gradient Mesh… ગ્રેડિયન્ટ મેશ બનાવો… + Flat સપાટ + To Center કેન્દ્ર તરફ + To Edge કિનારી તરફ Create Graph ગ્રાફ બનાવો Create New Layer નવો લેયર બનાવો Create New Library નવી લાઇબ્રેરી બનાવો @@ -2789,6 +2801,18 @@ Preview All Layers બધા લેયરનું પૂર્વાવલોકન Preview Mode પૂર્વાવલોકન મોડ Preview in Browser બ્રાઉઝરમાં પૂર્વાવલોકન + Optimize to File Size… ફાઇલ કદ મુજબ ઑપ્ટિમાઇઝ કરો… + Optimize to File Size ફાઇલ કદ મુજબ ઑપ્ટિમાઇઝ કરો + Desired File Size: ઇચ્છિત ફાઇલ કદ: + Start With: શરૂઆત: + Use: ઉપયોગ: + Current Settings વર્તમાન સેટિંગ્સ + Auto Select GIF/JPEG GIF/JPEG આપમેળે પસંદ કરો + Total of All Slices બધી સ્લાઇસનો કુલ + Each Slice દરેક સ્લાઇસ + Current Slice વર્તમાન સ્લાઇસ + {size}, within {target} {size}, {target} ની અંદર + No setting tried fits in {target}; the smallest is {size} અજમાવેલી કોઈ સેટિંગ {target} માં સમાતી નથી; સૌથી નાની {size} છે Preview the document as it is now અત્યારે જેમ છે તેમ દસ્તાવેજનું પૂર્વાવલોકન કરો Previous પાછલું Previous Artboard પાછલું આર્ટબોર્ડ @@ -3133,12 +3157,85 @@ Restore પુનઃસ્થાપિત કરો Restore Recovered Documents પુનઃપ્રાપ્ત દસ્તાવેજો પુનઃસ્થાપિત કરો Restore every preference to its default (applied on OK) દરેક પસંદગી તેના ડિફોલ્ટ પર પુનઃસ્થાપિત કરો (ઠીક પર લાગુ થશે) + Shows a bar of commands for the selection or tool on the canvas; it hides while you drag and in Presentation Mode. કેનવાસ પર પસંદગી અથવા ટૂલ માટે કમાન્ડ બાર બતાવે છે; ખેંચતી વખતે અને પ્રેઝન્ટેશન મોડમાં તે છુપાય છે. + How far an arrow key moves the selection; with Shift, it moves ten times as far. એરો કી પસંદગીને કેટલી દૂર ખસેડે છે; Shift સાથે તે દસ ગણી દૂર ખસેડે છે. + The angle of the axes that arrow keys move along and that Shift holds drawing and moving to. જે અક્ષો પર એરો કી ખસેડે છે અને જેના પર Shift દોરવાનું અને ખસેડવાનું બાંધે છે તેનો ખૂણો. + The corner radius the Rounded Rectangle tool draws with; changing the radius while drawing changes this value too. ગોળાકાર લંબચોરસ ટૂલ જે ખૂણાની ત્રિજ્યાથી દોરે છે તે; દોરતી વખતે ત્રિજ્યા બદલવાથી આ મૂલ્ય પણ બદલાય છે. + How far right and down Paste moves the copy when it is given no position, as from a script; Paste in the app centers it in the view. સ્ક્રિપ્ટની જેમ કોઈ સ્થાન ન અપાય ત્યારે ચોંટાડો નકલને જમણે અને નીચે કેટલી ખસેડે છે; એપમાં ચોંટાડો નકલને દૃશ્યની વચ્ચે મૂકે છે. + Stops the Pen tool from deleting the anchor you click on a selected path, or adding one where you click its segment. પેન ટૂલને પસંદ કરેલા પાથ પર ક્લિક કરેલો એન્કર પોઇન્ટ કાઢવાથી, અથવા તેના સેગમેન્ટ પર ક્લિક કરેલી જગ્યાએ નવો ઉમેરવાથી રોકે છે. + Drawing tools show a crosshair pointer instead of their icon; Caps Lock does the same while it is on. ડ્રોઇંગ ટૂલ્સ તેમના આઇકનને બદલે ક્રોસહેર પોઇન્ટર બતાવે છે; Caps Lock ચાલુ હોય ત્યારે પણ આવું જ થાય છે. + Shows a tip when the pointer rests on a button or field that has one. ટિપ ધરાવતા બટન કે ફીલ્ડ પર પોઇન્ટર અટકે ત્યારે ટિપ બતાવે છે. + Shows a warning before a script you choose runs. તમે પસંદ કરેલી સ્ક્રિપ્ટ ચાલે તે પહેલાં ચેતવણી બતાવે છે. + Smooths the edges of artwork on the canvas. કેનવાસ પરના આર્ટવર્કની કિનારીઓ સુંવાળી કરે છે. + Select › Same › Fill Color, Stroke Color and Fill & Stroke match only the same tint of a global or spot swatch, not any tint of it. પસંદ કરો › સમાન › ભરવાનો રંગ, સ્ટ્રોક રંગ અને ભરો અને સ્ટ્રોક ફક્ત ગ્લોબલ કે સ્પોટ સ્વૉચના એ જ ટિન્ટ સાથે મેળ ખાય છે, તેના કોઈપણ ટિન્ટ સાથે નહીં. + Shows the Home screen when no document is open; off, the window stays empty until you click Home. કોઈ દસ્તાવેજ ખુલ્લો ન હોય ત્યારે હોમ સ્ક્રીન બતાવે છે; બંધ હોય ત્યારે તમે હોમ પર ક્લિક ન કરો ત્યાં સુધી વિન્ડો ખાલી રહે છે. + Measures objects with their strokes and shape-changing effects for size, position and alignment; shadows, glows and blurs are not measured. કદ, સ્થાન અને ગોઠવણી માટે ઑબ્જેક્ટને તેમના સ્ટ્રોક અને આકાર બદલતી ઇફેક્ટ્સ સાથે માપે છે; છાયા, ગ્લો અને બ્લર માપવામાં આવતા નથી. + At 100% zoom, one inch of the document takes 96 screen points instead of 72. 100% ઝૂમ પર દસ્તાવેજનો એક ઇંચ 72 ને બદલે 96 સ્ક્રીન પોઇન્ટ લે છે. + Double-clicking a group, path or image with the Selection tool opens it in isolation mode. પસંદગી ટૂલથી ગ્રુપ, પાથ કે છબી પર ડબલ-ક્લિક કરવાથી તે આઇસોલેશન મોડમાં ખુલે છે. + Pattern fills and strokes transform with the art, unless a transform or the Transform panel's menu chooses otherwise. પૅટર્ન ભરણ અને સ્ટ્રોક આર્ટવર્ક સાથે ટ્રાન્સફોર્મ થાય છે, સિવાય કે કોઈ ટ્રાન્સફોર્મ કે ટ્રાન્સફોર્મ પેનલનું મેનૂ બીજું પસંદ કરે. + Live corner radii scale with the art, unless the scale chooses otherwise. લાઇવ ખૂણાઓની ત્રિજ્યાઓ આર્ટવર્ક સાથે સ્કેલ થાય છે, સિવાય કે સ્કેલિંગ બીજું પસંદ કરે. + Stroke weights, dashes and effect distances scale with the art, unless the scale chooses otherwise. સ્ટ્રોકની જાડાઈ, ડેશ અને ઇફેક્ટના અંતરો આર્ટવર્ક સાથે સ્કેલ થાય છે, સિવાય કે સ્કેલિંગ બીજું પસંદ કરે. + The mouse wheel zooms the canvas instead of scrolling it. માઉસ વ્હીલ કેનવાસને સ્ક્રોલ કરવાને બદલે ઝૂમ કરે છે. + The mouse wheel with Cmd/Ctrl held scrolls the canvas sideways. Cmd/Ctrl દબાવી રાખીને માઉસ વ્હીલ ફેરવવાથી કેનવાસ બાજુમાં સ્ક્રોલ થાય છે. + Dragging sideways on a numeric field's label changes the field's value. સંખ્યાત્મક ફીલ્ડના લેબલ પર બાજુમાં ખેંચવાથી ફીલ્ડનું મૂલ્ય બદલાય છે. + A two-finger rotate gesture on a trackpad rotates the canvas view. ટ્રેકપેડ પર બે આંગળીથી ફેરવવાનો હાવભાવ કેનવાસનું દૃશ્ય ફેરવે છે. + Holding a tool's shortcut key chooses the tool until you let go, and then the previous tool is chosen again. ટૂલની શોર્ટકટ કી દબાવી રાખવાથી છોડો ત્યાં સુધી તે ટૂલ પસંદ રહે છે, પછી અગાઉનું ટૂલ ફરી પસંદ થાય છે. + Shows the bounding box while you move the selection or draw a shape. તમે પસંદગી ખસેડો કે આકાર દોરો ત્યારે બાઉન્ડિંગ બોક્સ બતાવે છે. + Create Trim Marks draws Japanese-style marks instead of Roman ones. ટ્રિમ માર્ક્સ બનાવો રોમન ને બદલે જાપાની શૈલીના ચિહ્નો દોરે છે. + New art takes only the fill and stroke of the selection; off, it takes the selected object's whole appearance. નવું આર્ટવર્ક પસંદગીનું ફક્ત ભરણ અને સ્ટ્રોક લે છે; બંધ હોય ત્યારે તે પસંદ કરેલા ઑબ્જેક્ટનો સંપૂર્ણ દેખાવ લે છે. + Changing the width or height in the Transform panel, the Properties panel or the Control bar changes the other in proportion. ટ્રાન્સફોર્મ પેનલ, ગુણધર્મો પેનલ કે કંટ્રોલ બારમાં પહોળાઈ કે ઊંચાઈ બદલવાથી બીજું પ્રમાણસર બદલાય છે. + A live rectangle's properties show one Corner Radius field for all four corners; off, each corner has its own field. લાઇવ લંબચોરસના ગુણધર્મો ચારેય ખૂણા માટે ખૂણાની ત્રિજ્યાનું એક જ ફીલ્ડ બતાવે છે; બંધ હોય ત્યારે દરેક ખૂણાનું પોતાનું ફીલ્ડ હોય છે. + What edits in the Transform panel transform: the object, its pattern tiles or both; Default follows Transform Pattern Tiles. ટ્રાન્સફોર્મ પેનલમાંના ફેરફારો શું ટ્રાન્સફોર્મ કરે છે: ઑબ્જેક્ટ, તેની પૅટર્ન ટાઇલ્સ કે બંને; ડિફૉલ્ટ પૅટર્ન ટાઇલ્સ ટ્રાન્સફોર્મ કરો ને અનુસરે છે. + With one symbol instance selected, the Transform panel uses the symbol's registration point as its reference point. એક સિમ્બોલ ઇન્સ્ટન્સ પસંદ હોય ત્યારે ટ્રાન્સફોર્મ પેનલ સિમ્બોલના રજિસ્ટ્રેશન પોઇન્ટને સંદર્ભ પોઇન્ટ તરીકે વાપરે છે. + Darkens the canvas outside the artboards while the Artboard tool is active. આર્ટબોર્ડ ટૂલ સક્રિય હોય ત્યારે આર્ટબોર્ડ બહારનો કેનવાસ ઘાટો કરે છે. + With Fade Region Outside Artboard on, the area outside the artboards stays dark while you drag with the Artboard tool. આર્ટબોર્ડ બહારનો વિસ્તાર ઝાંખો કરો ચાલુ હોય ત્યારે, આર્ટબોર્ડ ટૂલથી ખેંચતી વખતે આર્ટબોર્ડ બહારનો વિસ્તાર ઘાટો રહે છે. + How near, in pixels, the pointer must be to an object, anchor or handle for a click to select it. ક્લિક કોઈ ઑબ્જેક્ટ, એન્કર પોઇન્ટ કે હૅન્ડલને પસંદ કરે તે માટે પોઇન્ટર તેનાથી કેટલા પિક્સેલ નજીક હોવો જોઈએ. + Whether the Selection tool's box selects objects it touches or only those fully inside; Drag Direction selects those inside on a drag to the right. E reverses it mid-drag. પસંદગી ટૂલનું બૉક્સ સ્પર્શેલા ઑબ્જેક્ટ પસંદ કરે છે કે ફક્ત સંપૂર્ણ અંદરના; ખેંચવાની દિશા જમણી તરફ ખેંચતાં અંદરના પસંદ કરે છે. ખેંચતી વખતે E નિયમ ઊલટાવે છે. + A click selects a filled object only on its path, not inside its fill. ક્લિક ભરેલા ઑબ્જેક્ટને ફક્ત તેના પાથ પર પસંદ કરે છે, ભરણની અંદર નહીં. + How near, in pixels, a point must come to an anchor or ruler guide for Snap to Point to snap it; with Smart Guides on, Smart Guides' Snapping Tolerance applies instead. પોઇન્ટ પર સ્નેપ તેને સ્નેપ કરે તે માટે કોઈ બિંદુએ એન્કર પોઇન્ટ કે રૂલર ગાઇડથી કેટલા પિક્સેલ નજીક આવવું જોઈએ; સ્માર્ટ ગાઇડ ચાલુ હોય ત્યારે તેમની સ્નેપિંગ સહનશીલતા લાગુ થાય છે. + With the Selection tool, Cmd/Ctrl-click selects the object under the selected one at the pointer; each further click goes one object deeper. પસંદગી ટૂલ સાથે, Cmd/Ctrl-ક્લિક પોઇન્ટર પાસે પસંદ કરેલા ઑબ્જેક્ટની નીચેનો ઑબ્જેક્ટ પસંદ કરે છે; દરેક આગળની ક્લિક એક ઑબ્જેક્ટ વધુ ઊંડે જાય છે. + Zoom In and Zoom Out bring the center of the selection to the middle of the view. ઝૂમ ઇન અને ઝૂમ આઉટ પસંદગીના કેન્દ્રને વ્યૂની મધ્યમાં લાવે છે. + Locked and hidden artwork inside an artboard moves, scales and is copied with the artboard, as the other artwork does. આર્ટબોર્ડની અંદરનું લૉક અને છુપાયેલું આર્ટવર્ક બાકીના આર્ટવર્કની જેમ આર્ટબોર્ડ સાથે ખસે છે, માપ બદલે છે અને કૉપિ થાય છે. + The size of anchor points and direction handle ends on the canvas; larger anchors can also be picked from farther away. કેનવાસ પર એન્કર પોઇન્ટ અને દિશા હૅન્ડલના છેડાનું કદ; મોટા એન્કર પોઇન્ટ વધુ દૂરથી પણ પકડી શકાય છે. + Draws the ends of direction handles as solid dots, hollow dots or larger solid dots. દિશા હૅન્ડલના છેડા ભરેલા ટપકાં, પોલા ટપકાં કે મોટા ભરેલા ટપકાં તરીકે દોરે છે. + With the Direct Selection tool, the anchor under the pointer is highlighted. ડાયરેક્ટ સિલેક્શન ટૂલ સાથે, પોઇન્ટર નીચેનો એન્કર પોઇન્ટ હાઇલાઇટ થાય છે. + Shows direction handles when more than one anchor is selected; off, they show only while a single anchor is selected. એકથી વધુ એન્કર પોઇન્ટ પસંદ હોય ત્યારે દિશા હૅન્ડલ બતાવે છે; બંધ હોય તો ફક્ત એક એન્કર પોઇન્ટ પસંદ હોય ત્યારે જ દેખાય છે. + Corner widgets hide on corners whose angle is greater than this many degrees. જે ખૂણાનો કોણ આટલા ડિગ્રીથી વધુ હોય ત્યાં કૉર્નર વિજેટ છુપાય છે. + The Pen tool previews the next segment from the last anchor to the pointer before you click. ક્લિક કરતાં પહેલાં પેન ટૂલ છેલ્લા એન્કર પોઇન્ટથી પોઇન્ટર સુધીના આગલા સેગમેન્ટનું પૂર્વાવલોકન બતાવે છે. + The Curvature tool previews the curve to the pointer before you place the next point. આગલું બિંદુ મૂકતાં પહેલાં વક્રતા ટૂલ પોઇન્ટર સુધીના વળાંકનું પૂર્વાવલોકન બતાવે છે. The unit for new documents from built-in sizes other than pixel sizes and for opened files that record no unit; choosing one here and clicking OK also sets the active document's units. પિક્સેલ સિવાયના બિલ્ટ-ઇન કદના નવા દસ્તાવેજો અને કોઈ એકમ ન નોંધતી ખોલેલી ફાઇલો માટેનો એકમ; અહીં તેને પસંદ કરીને ઠીક ક્લિક કરવાથી સક્રિય દસ્તાવેજનો એકમ પણ તે બને છે. Stroke weights, dashes and gaps show in this unit, and numbers typed for them are read in it. સ્ટ્રોકની જાડાઈ, ડૅશ અને અંતર આ એકમમાં દેખાય છે, અને તેમના માટે ટાઇપ કરેલી સંખ્યાઓ આ એકમમાં વંચાય છે. Type sizes, leading and baseline shift show in this unit, and numbers typed for them are read in it. ટાઇપના કદ, લીડિંગ અને બેઝલાઇન શિફ્ટ આ એકમમાં દેખાય છે, અને તેમના માટે ટાઇપ કરેલી સંખ્યાઓ આ એકમમાં વંચાય છે. The unit for East Asian type measurements, which no field uses yet. પૂર્વ એશિયાઈ ટાઇપના માપ માટેનો એકમ, જેનો હજી કોઈ ફીલ્ડ ઉપયોગ કરતું નથી. When on, a number typed without a unit into a field in picas is read in points. ચાલુ હોય ત્યારે, પાઇકામાં હોય તેવા ફીલ્ડમાં એકમ વિના ટાઇપ કરેલી સંખ્યા પોઇન્ટ્સમાં વંચાય છે. With XML ID, object names show as XML IDs in the Layers panel, the Variables panel and Layer Options. XML ID પસંદ હોય ત્યારે ઑબ્જેક્ટનાં નામ લેયર્સ, વેરિએબલ્સ અને લેયર વિકલ્પોમાં XML ID તરીકે દેખાય છે. + Snaps drawing, moving and scaling to the grid's subdivisions, even while the grid is hidden; while it is on, Snap to Pixel does not apply. ગ્રિડ છુપાયેલી હોય ત્યારે પણ દોરવું, ખસેડવું અને સ્કેલ કરવું ગ્રિડના ઉપવિભાગો પર સ્નેપ કરે છે; આ ચાલુ હોય ત્યાં સુધી પિક્સેલ પર સ્નેપ લાગુ પડતું નથી. + The color of guides that are not selected; an artboard with a Guide Label draws its own guides in the label's color instead. પસંદ ન કરેલી ગાઇડ્સનો રંગ; ગાઇડ લેબલવાળું આર્ટબોર્ડ પોતાની ગાઇડ્સ લેબલના રંગમાં દોરે છે. + Draws guides as solid lines or as dots, including the guides already in the document. દસ્તાવેજમાં પહેલેથી રહેલી ગાઇડ્સ સહિત, ગાઇડ્સને ઘન રેખાઓ અથવા બિંદુઓ તરીકે દોરે છે. + With this on, guides are locked when VectorCraft starts; changing this option locks or unlocks them at once, and View › Guides › Lock Guides still changes the lock. આ ચાલુ હોય ત્યારે VectorCraft શરૂ થાય ત્યારે ગાઇડ્સ લૉક હોય છે; આ વિકલ્પ બદલવાથી તે તરત લૉક કે અનલૉક થાય છે, અને વ્યૂ › ગાઇડ્સ › ગાઇડ લૉક કરો હજી પણ લૉક બદલે છે. + With this on, holding Cmd/Ctrl as you start dragging from a ruler makes a guide on the active artboard only, or a canvas guide with the Artboard tool. આ ચાલુ હોય ત્યારે રૂલરમાંથી ખેંચવાનું શરૂ કરતી વખતે Cmd/Ctrl દબાવી રાખવાથી ફક્ત સક્રિય આર્ટબોર્ડ પર ગાઇડ બને છે, અથવા આર્ટબોર્ડ ટૂલ સાથે આખા કૅનવાસની ગાઇડ બને છે. + The color of the grid; the lines between major gridlines are drawn in a fainter shade of it. ગ્રિડનો રંગ; મુખ્ય ગ્રિડલાઇન્સ વચ્ચેની રેખાઓ તેના વધુ ઝાંખા શેડમાં દોરાય છે. + Draws the grid as lines, or as dots along the major gridlines at each subdivision. ગ્રિડને રેખાઓ તરીકે, અથવા દરેક ઉપવિભાગ પર મુખ્ય ગ્રિડલાઇન્સ સાથે બિંદુઓ તરીકે દોરે છે. + The distance between major gridlines, in every open document and in new ones; a VectorCraft document opens with the grid it was saved with. દરેક ખુલ્લા દસ્તાવેજમાં અને નવા દસ્તાવેજોમાં મુખ્ય ગ્રિડલાઇન્સ વચ્ચેનું અંતર; VectorCraft દસ્તાવેજ જે ગ્રિડ સાથે સાચવાયો હતો તેની સાથે ખૂલે છે. + How many parts each major grid square is divided into; Snap to Grid snaps to these parts, even when the zoom hides their lines. દરેક મુખ્ય ગ્રિડ ચોરસના કેટલા ભાગ થાય છે; ઝૂમ તેમની રેખાઓ છુપાવે ત્યારે પણ ગ્રિડ પર સ્નેપ આ ભાગો પર સ્નેપ કરે છે. + Draws the grid behind the artwork; off, the grid is drawn over it. ગ્રિડને આર્ટવર્કની પાછળ દોરે છે; બંધ હોય ત્યારે ગ્રિડ તેની ઉપર દોરાય છે. + In Pixel Preview at 600% zoom or more, the active view shows a line at the edge of every document pixel over the artwork. પિક્સેલ પૂર્વાવલોકનમાં 600% કે વધુ ઝૂમ પર, સક્રિય વ્યૂ આર્ટવર્ક પર દસ્તાવેજના દરેક પિક્સેલની કિનારીએ રેખા બતાવે છે. + The color of the tile edge and the dashed swatch bounds shown while you edit a pattern. પેટર્ન સંપાદિત કરતી વખતે દેખાતી ટાઇલ કિનારી અને ડૅશવાળી સ્વેચ બાઉન્ડ્સનો રંગ. + Snaps drawing, moving and transforming to nearby art and shows guides and labels; Pixel Preview turns them off, and Snap to Grid snaps to the grid instead. દોરવું, ખસેડવું અને ટ્રાન્સફોર્મ કરવું નજીકના આર્ટ પર સ્નેપ કરે છે અને ગાઇડ અને લેબલ બતાવે છે; પિક્સેલ પૂર્વાવલોકન તેમને બંધ કરે છે, અને ગ્રિડ પર સ્નેપ તેના બદલે ગ્રિડ પર સ્નેપ કરે છે. + The color of Smart Guide lines and labels. સ્માર્ટ ગાઇડની રેખાઓ અને લેબલનો રંગ. + Shows a line along the edge or center that art lines up with; off, art still lines up without the line, and Snap to Glyph does not apply. આર્ટ જે કિનારી અથવા કેન્દ્ર સાથે સંરેખિત થાય તેની સાથે રેખા બતાવે છે; બંધ હોય ત્યારે આર્ટ રેખા વિના પણ સંરેખિત થાય છે, અને ગ્લિફ પર સ્નેપ લાગુ પડતું નથી. + With a selection tool, outlines the unselected object under the pointer in its layer color while you are not dragging. પસંદગી ટૂલ સાથે, તમે ખેંચતા ન હો ત્યારે પોઇન્ટર નીચેના પસંદ ન કરેલા ઑબ્જેક્ટની રૂપરેખા તેના લેયરના રંગમાં બતાવે છે. + Shows the size or angle next to the pointer while you scale, rotate, shear or reflect art. તમે આર્ટને સ્કેલ કરો, ફેરવો, શિયર કરો કે પ્રતિબિંબિત કરો ત્યારે પોઇન્ટર પાસે કદ અથવા ખૂણો બતાવે છે. + While you draw, points snap to lines at the chosen Angles through the point the segment or shape starts from. તમે દોરો ત્યારે, બિંદુઓ સેગમેન્ટ કે આકાર જ્યાંથી શરૂ થાય તે બિંદુમાંથી પસાર થતી પસંદ કરેલા ખૂણાની રેખાઓ પર સ્નેપ થાય છે. + The set of angles the construction guides follow while Construction Guides is on. બાંધકામ ગાઇડ્સ ચાલુ હોય ત્યારે બાંધકામ ગાઇડ્સ જે ખૂણાઓને અનુસરે છે તેનો સમૂહ. + Names what a point snaps to, such as an anchor, a path or an alignment; off, points snap the same way without the names. બિંદુ શેના પર સ્નેપ થાય છે તેનું નામ બતાવે છે, જેમ કે એન્કર, પાથ અથવા સંરેખણ; બંધ હોય ત્યારે બિંદુઓ નામ વિના એ જ રીતે સ્નેપ થાય છે. + Shows distances, angles and how far art has moved next to the pointer while you draw or move it. તમે દોરો કે ખસેડો ત્યારે પોઇન્ટર પાસે અંતર, ખૂણા અને આર્ટ કેટલું ખસ્યું તે બતાવે છે. + Snaps moved or resized art to the same gap as between nearby objects, and marks the equal gaps. ખસેડેલા કે કદ બદલેલા આર્ટને નજીકના ઑબ્જેક્ટ્સ વચ્ચેના જેટલા જ અંતર પર સ્નેપ કરે છે અને સમાન અંતર દર્શાવે છે. + With something selected, holding Alt/Option over another object or an artboard shows the distances between it and the selection. કંઈક પસંદ કરેલું હોય ત્યારે, બીજા ઑબ્જેક્ટ કે આર્ટબોર્ડ પર Alt/Option દબાવી રાખવાથી તેની અને પસંદગી વચ્ચેનું અંતર દેખાય છે. + A selection dragged back to within the Snapping Tolerance of where the drag began goes back to exactly that place; a copy does not. ખેંચાણ જ્યાંથી શરૂ થયું ત્યાંથી સ્નેપિંગ સહનશીલતાની અંદર પાછી ખેંચેલી પસંદગી બરાબર એ જ જગ્યાએ પાછી જાય છે; નકલ જતી નથી. + How near on screen the pointer or a dragged point must come to art for Smart Guides to snap to it; the distance is the same at every zoom. સ્માર્ટ ગાઇડ સ્નેપ કરે તે માટે પોઇન્ટર અથવા ખેંચેલું બિંદુ સ્ક્રીન પર આર્ટની કેટલું નજીક આવવું જોઈએ; આ અંતર દરેક ઝૂમ પર સમાન રહે છે. + Snaps the end of a line segment, or a circle drawn from its center, so that it touches a nearby curve. લાઇન સેગમેન્ટના છેડાને, અથવા કેન્દ્રથી દોરેલા વર્તુળને, એ રીતે સ્નેપ કરે છે કે તે નજીકના વળાંકને સ્પર્શે. + Snaps the end of a line segment so that it meets a nearby straight segment at a right angle. લાઇન સેગમેન્ટના છેડાને એ રીતે સ્નેપ કરે છે કે તે નજીકના સીધા સેગમેન્ટને કાટખૂણે મળે. Restored documents open unsaved: save them to keep them. પુનઃસ્થાપિત દસ્તાવેજો અસાચવેલા ખુલશે: તેમને રાખવા માટે સાચવો. Restrict printing, editing and other tasks છાપકામ, સંપાદન અને અન્ય કાર્યો પર પ્રતિબંધ મૂકો Reticulation… રેટિક્યુલેશન… diff --git a/crates/ui-egui/src/i18n/hi.tsv b/crates/ui-egui/src/i18n/hi.tsv index 8d8a2d0414..29f8f713a1 100644 --- a/crates/ui-egui/src/i18n/hi.tsv +++ b/crates/ui-egui/src/i18n/hi.tsv @@ -1019,6 +1019,7 @@ antiAlias Sharp शार्प Constrain सीमित करें Constrain Angle कंस्ट्रेन एंगल Constrain Width and Height Proportions चौड़ाई और ऊंचाई का अनुपात बनाए रखें + Copy Width to Height चौड़ाई को ऊंचाई में कॉपी करें Construction Guides निर्माण गाइड Conté Crayon कॉन्टे क्रेयॉन Conté Crayon… कॉन्टे क्रेयॉन… @@ -1033,6 +1034,8 @@ antiAlias Sharp शार्प Control नियंत्रण Convert कन्वर्ट करें Convert All Spot Colors to Process सभी स्पॉट कलर्स को प्रोसेस में कनवर्ट करें + Convert {name} to process {name} को प्रोसेस में कनवर्ट करें + Keep {name} as spot {name} को स्पॉट के रूप में रखें Convert All Strokes to Outlines सभी स्ट्रोक को आउटलाइन में कनवर्ट करें Convert All Text to Outlines सभी टेक्स्ट को आउटलाइन में कनवर्ट करें Convert Anchor Point एंकर पॉइंट कनवर्ट करें @@ -1133,6 +1136,9 @@ antiAlias Sharp शार्प Create From: से बनाएँ: Create Gradient Mesh ग्रेडिएंट मेश बनाएँ Create Gradient Mesh… ग्रेडिएंट मेश बनाएँ… + Flat समतल + To Center केंद्र की ओर + To Edge किनारे की ओर Create Graph ग्राफ़ बनाएँ Create New {kind} Style नई {kind} स्टाइल बनाएँ Create New Action नया एक्शन बनाएँ @@ -3755,6 +3761,18 @@ antiAlias Sharp शार्प Preview (1 inch on the page) प्रीव्यू (1 इंच पृष्ठ पर) Preview All Layers सभी लेयर्स का प्रीव्यू करें Preview in Browser ब्राउज़र में प्रीव्यू + Optimize to File Size… फ़ाइल आकार के अनुसार ऑप्टिमाइज़ करें… + Optimize to File Size फ़ाइल आकार के अनुसार ऑप्टिमाइज़ करें + Desired File Size: वांछित फ़ाइल आकार: + Start With: शुरुआत: + Use: उपयोग: + Current Settings वर्तमान सेटिंग्स + Auto Select GIF/JPEG GIF/JPEG स्वचालित रूप से चुनें + Total of All Slices सभी स्लाइस का कुल + Each Slice प्रत्येक स्लाइस + Current Slice वर्तमान स्लाइस + {size}, within {target} {size}, {target} के भीतर + No setting tried fits in {target}; the smallest is {size} आज़माई गई कोई भी सेटिंग {target} में नहीं समाती; सबसे छोटा {size} है Preview in Browser needs the desktop app (the web downloads files instead) ब्राउज़र में प्रीव्यू डेस्कटॉप ऐप (वेब डाउनलोड फ़ाइलों के बजाय) की जरूरत है Preview Mode प्रीव्यू मोड Preview the document as it is now डॉक्यूमेंट का प्रीव्यू करें क्योंकि यह अब है @@ -4175,12 +4193,85 @@ antiAlias Sharp शार्प Responsive उत्तरदायी Restore पुनर्स्थापित करें Restore every preference to its default (applied on OK) प्रत्येक वरीयता को उसके डिफ़ॉल्ट में पुनर्स्थापित करें ( OK पर लागू) + Shows a bar of commands for the selection or tool on the canvas; it hides while you drag and in Presentation Mode. कैनवास पर सिलेक्शन या टूल के लिए कमांड बार दिखाता है; ड्रैग करते समय और प्रस्तुति मोड में यह छिप जाता है। + How far an arrow key moves the selection; with Shift, it moves ten times as far. एरो कुंजी सिलेक्शन को कितनी दूर खिसकाती है; Shift के साथ यह दस गुना दूर खिसकाती है। + The angle of the axes that arrow keys move along and that Shift holds drawing and moving to. उन अक्षों का कोण जिनके साथ एरो कुंजियाँ खिसकाती हैं और जिन पर Shift ड्रॉइंग और खिसकाने को रोकता है। + The corner radius the Rounded Rectangle tool draws with; changing the radius while drawing changes this value too. वह कोने की त्रिज्या जिससे गोल आयत टूल ड्रॉ करता है; ड्रॉ करते समय त्रिज्या बदलने से यह मान भी बदल जाता है। + How far right and down Paste moves the copy when it is given no position, as from a script; Paste in the app centers it in the view. जब कोई स्थिति नहीं दी जाती, जैसे स्क्रिप्ट से, तब पेस्ट कॉपी को दाईं ओर और नीचे कितना खिसकाता है; ऐप में पेस्ट करने पर कॉपी व्यू के बीच में रखी जाती है। + Stops the Pen tool from deleting the anchor you click on a selected path, or adding one where you click its segment. पेन टूल को चुने गए पाथ पर क्लिक किए गए एंकर पॉइंट को हटाने से, या उसके सेगमेंट पर क्लिक की गई जगह नया पॉइंट जोड़ने से रोकता है। + Drawing tools show a crosshair pointer instead of their icon; Caps Lock does the same while it is on. ड्रॉइंग टूल अपने आइकन की जगह क्रॉसहेयर पॉइंटर दिखाते हैं; Caps Lock चालू रहने पर भी यही होता है। + Shows a tip when the pointer rests on a button or field that has one. जब पॉइंटर टिप वाले किसी बटन या फ़ील्ड पर रुकता है, तब टिप दिखाता है। + Shows a warning before a script you choose runs. आपकी चुनी गई स्क्रिप्ट चलने से पहले चेतावनी दिखाता है। + Smooths the edges of artwork on the canvas. कैनवास पर आर्टवर्क के किनारों को चिकना करता है। + Select › Same › Fill Color, Stroke Color and Fill & Stroke match only the same tint of a global or spot swatch, not any tint of it. सिलेक्ट › समान › फ़िल रंग, स्ट्रोक रंग और फ़िल व स्ट्रोक केवल ग्लोबल या स्पॉट स्वॉच के उसी टिंट से मेल खाते हैं, उसके किसी भी टिंट से नहीं। + Shows the Home screen when no document is open; off, the window stays empty until you click Home. कोई डॉक्यूमेंट खुला न होने पर होम स्क्रीन दिखाता है; बंद होने पर विंडो तब तक खाली रहती है जब तक आप होम पर क्लिक नहीं करते। + Measures objects with their strokes and shape-changing effects for size, position and alignment; shadows, glows and blurs are not measured. साइज़, स्थिति और संरेखण के लिए ऑब्जेक्ट को उनके स्ट्रोक और आकार बदलने वाले इफ़ेक्ट के साथ मापता है; छाया, ग्लो और ब्लर नहीं मापे जाते। + At 100% zoom, one inch of the document takes 96 screen points instead of 72. 100% ज़ूम पर डॉक्यूमेंट का एक इंच 72 की जगह 96 स्क्रीन पॉइंट लेता है। + Double-clicking a group, path or image with the Selection tool opens it in isolation mode. सिलेक्शन टूल से किसी ग्रुप, पाथ या इमेज पर डबल-क्लिक करने से वह आइसोलेशन मोड में खुलता है। + Pattern fills and strokes transform with the art, unless a transform or the Transform panel's menu chooses otherwise. पैटर्न वाले फ़िल और स्ट्रोक आर्टवर्क के साथ रूपांतरित होते हैं, जब तक कोई रूपांतरण या रूपांतरण पैनल का मेनू कुछ और न चुने। + Live corner radii scale with the art, unless the scale chooses otherwise. लाइव कोनों की त्रिज्याएँ आर्टवर्क के साथ स्केल होती हैं, जब तक स्केलिंग कुछ और न चुने। + Stroke weights, dashes and effect distances scale with the art, unless the scale chooses otherwise. स्ट्रोक की मोटाई, डैश और इफ़ेक्ट की दूरियाँ आर्टवर्क के साथ स्केल होती हैं, जब तक स्केलिंग कुछ और न चुने। + The mouse wheel zooms the canvas instead of scrolling it. माउस व्हील कैनवास को स्क्रॉल करने की जगह ज़ूम करता है। + The mouse wheel with Cmd/Ctrl held scrolls the canvas sideways. Cmd/Ctrl दबाकर माउस व्हील घुमाने से कैनवास बगल की ओर स्क्रॉल होता है। + Dragging sideways on a numeric field's label changes the field's value. किसी संख्या वाले फ़ील्ड के लेबल पर बगल की ओर ड्रैग करने से फ़ील्ड का मान बदलता है। + A two-finger rotate gesture on a trackpad rotates the canvas view. ट्रैकपैड पर दो उंगलियों से घुमाने का जेस्चर कैनवास के व्यू को घुमाता है। + Holding a tool's shortcut key chooses the tool until you let go, and then the previous tool is chosen again. किसी टूल की शॉर्टकट कुंजी दबाए रखने पर वह टूल छोड़ने तक चुना रहता है, फिर पिछला टूल दोबारा चुना जाता है। + Shows the bounding box while you move the selection or draw a shape. सिलेक्शन खिसकाते या आकार ड्रॉ करते समय बाउंडिंग बॉक्स दिखाता है। + Create Trim Marks draws Japanese-style marks instead of Roman ones. ट्रिम मार्क्स बनाएं रोमन की जगह जापानी शैली के निशान ड्रॉ करता है। + New art takes only the fill and stroke of the selection; off, it takes the selected object's whole appearance. नया आर्टवर्क सिलेक्शन का केवल फ़िल और स्ट्रोक लेता है; बंद होने पर वह चुने गए ऑब्जेक्ट का पूरा रूप लेता है। + Changing the width or height in the Transform panel, the Properties panel or the Control bar changes the other in proportion. रूपांतरण पैनल, प्रॉपर्टीज़ पैनल या नियंत्रण बार में चौड़ाई या ऊँचाई बदलने से दूसरी भी अनुपात में बदलती है। + A live rectangle's properties show one Corner Radius field for all four corners; off, each corner has its own field. लाइव आयत की प्रॉपर्टीज़ चारों कोनों के लिए कोने की त्रिज्या का एक ही फ़ील्ड दिखाती हैं; बंद होने पर हर कोने का अपना फ़ील्ड होता है। + What edits in the Transform panel transform: the object, its pattern tiles or both; Default follows Transform Pattern Tiles. रूपांतरण पैनल में किए गए बदलाव क्या रूपांतरित करते हैं: ऑब्जेक्ट, उसकी पैटर्न टाइलें या दोनों; डिफ़ॉल्ट ट्रांसफॉर्म पैटर्न टाइलें का पालन करता है। + With one symbol instance selected, the Transform panel uses the symbol's registration point as its reference point. एक सिंबल इंस्टेंस चुना होने पर रूपांतरण पैनल सिंबल के रजिस्ट्रेशन पॉइंट को संदर्भ पॉइंट के रूप में इस्तेमाल करता है। + Darkens the canvas outside the artboards while the Artboard tool is active. आर्टबोर्ड टूल सक्रिय रहने पर आर्टबोर्ड के बाहर का कैनवास गहरा करता है। + With Fade Region Outside Artboard on, the area outside the artboards stays dark while you drag with the Artboard tool. आर्टबोर्ड के बाहर का क्षेत्र धुंधला करें चालू होने पर आर्टबोर्ड टूल से ड्रैग करते समय आर्टबोर्ड के बाहर का क्षेत्र गहरा बना रहता है। + How near, in pixels, the pointer must be to an object, anchor or handle for a click to select it. किसी क्लिक से ऑब्जेक्ट, एंकर पॉइंट या हैंडल चुनने के लिए पॉइंटर को उससे कितने पिक्सेल पास होना चाहिए। + Whether the Selection tool's box selects objects it touches or only those fully inside; Drag Direction selects those inside on a drag to the right. E reverses it mid-drag. सिलेक्शन टूल का बॉक्स छुए गए ऑब्जेक्ट चुनता है या केवल पूरी तरह अंदर वाले; खींचने की दिशा दाईं ओर खींचने पर अंदर वाले चुनती है। खींचते समय E नियम उलट देता है। + A click selects a filled object only on its path, not inside its fill. क्लिक भरे हुए ऑब्जेक्ट को केवल उसके पाथ पर चुनता है, भराव के अंदर नहीं। + How near, in pixels, a point must come to an anchor or ruler guide for Snap to Point to snap it; with Smart Guides on, Smart Guides' Snapping Tolerance applies instead. पॉइंट पर स्नैप करें द्वारा स्नैप होने के लिए किसी बिंदु को एंकर पॉइंट या रूलर गाइड से कितने पिक्सेल पास आना चाहिए; स्मार्ट गाइड्स चालू होने पर उनकी स्नैपिंग सहिष्णुता लागू होती है। + With the Selection tool, Cmd/Ctrl-click selects the object under the selected one at the pointer; each further click goes one object deeper. सिलेक्शन टूल के साथ, Cmd/Ctrl-क्लिक पॉइंटर पर चुने गए ऑब्जेक्ट के नीचे वाला ऑब्जेक्ट चुनता है; हर अगला क्लिक एक ऑब्जेक्ट और नीचे जाता है। + Zoom In and Zoom Out bring the center of the selection to the middle of the view. ज़ूम इन और ज़ूम आउट चयन के केंद्र को व्यू के बीच में लाते हैं। + Locked and hidden artwork inside an artboard moves, scales and is copied with the artboard, as the other artwork does. आर्टबोर्ड के अंदर का लॉक और छिपा आर्टवर्क बाकी आर्टवर्क की तरह आर्टबोर्ड के साथ खिसकता, स्केल होता और कॉपी होता है। + The size of anchor points and direction handle ends on the canvas; larger anchors can also be picked from farther away. कैनवास पर एंकर पॉइंट और दिशा हैंडल के सिरों का आकार; बड़े एंकर पॉइंट अधिक दूर से भी पकड़े जा सकते हैं। + Draws the ends of direction handles as solid dots, hollow dots or larger solid dots. दिशा हैंडल के सिरों को भरे बिंदु, खोखले बिंदु या बड़े भरे बिंदु के रूप में बनाता है। + With the Direct Selection tool, the anchor under the pointer is highlighted. डायरेक्ट सिलेक्शन टूल के साथ, पॉइंटर के नीचे वाला एंकर पॉइंट हाइलाइट होता है। + Shows direction handles when more than one anchor is selected; off, they show only while a single anchor is selected. एक से अधिक एंकर पॉइंट चुने होने पर दिशा हैंडल दिखाता है; बंद होने पर वे केवल एक एंकर पॉइंट चुने होने पर दिखते हैं। + Corner widgets hide on corners whose angle is greater than this many degrees. जिन कोनों का कोण इतने डिग्री से अधिक है, उन पर कॉर्नर विजेट छिप जाते हैं। + The Pen tool previews the next segment from the last anchor to the pointer before you click. क्लिक करने से पहले पेन टूल अंतिम एंकर पॉइंट से पॉइंटर तक अगले सेगमेंट का पूर्वावलोकन दिखाता है। + The Curvature tool previews the curve to the pointer before you place the next point. अगला बिंदु रखने से पहले वक्रता टूल पॉइंटर तक वक्र का पूर्वावलोकन दिखाता है। The unit for new documents from built-in sizes other than pixel sizes and for opened files that record no unit; choosing one here and clicking OK also sets the active document's units. पिक्सेल को छोड़कर बिल्ट-इन साइज़ वाले नए डॉक्यूमेंट और कोई इकाई दर्ज न करने वाली खोली गई फ़ाइलों की इकाई; इसे यहाँ चुनकर ठीक है पर क्लिक करने से यह सक्रिय डॉक्यूमेंट की इकाई भी बन जाती है। Stroke weights, dashes and gaps show in this unit, and numbers typed for them are read in it. स्ट्रोक की मोटाई, डैश और गैप इस इकाई में दिखते हैं, और उनके लिए टाइप की गई संख्याएँ इसी इकाई में पढ़ी जाती हैं। Type sizes, leading and baseline shift show in this unit, and numbers typed for them are read in it. टाइप साइज़, लीडिंग और बेसलाइन शिफ़्ट इस इकाई में दिखते हैं, और उनके लिए टाइप की गई संख्याएँ इसी इकाई में पढ़ी जाती हैं। The unit for East Asian type measurements, which no field uses yet. पूर्वी एशियाई टाइप के माप की इकाई, जिसका अभी कोई फ़ील्ड उपयोग नहीं करता। When on, a number typed without a unit into a field in picas is read in points. चालू होने पर, पाइका वाले फ़ील्ड में बिना इकाई के टाइप की गई संख्या पॉइंट्स में पढ़ी जाती है। With XML ID, object names show as XML IDs in the Layers panel, the Variables panel and Layer Options. XML ID चुनने पर ऑब्जेक्ट के नाम लेयर्स, वेरिएबल्स और लेयर ऑप्शन्स में XML ID के रूप में दिखते हैं। + Snaps drawing, moving and scaling to the grid's subdivisions, even while the grid is hidden; while it is on, Snap to Pixel does not apply. ग्रिड छिपी होने पर भी ड्रॉ करना, खिसकाना और स्केल करना ग्रिड के उप-विभाजनों पर स्नैप करता है; इसके चालू रहने तक पिक्सेल के लिए स्नैप लागू नहीं होता। + The color of guides that are not selected; an artboard with a Guide Label draws its own guides in the label's color instead. उन गाइड्स का रंग जो चयनित नहीं हैं; गाइड लेबल वाला आर्टबोर्ड अपनी गाइड्स लेबल के रंग में बनाता है। + Draws guides as solid lines or as dots, including the guides already in the document. दस्तावेज़ में पहले से मौजूद गाइड्स सहित, गाइड्स को ठोस रेखाओं या बिंदुओं के रूप में बनाता है। + With this on, guides are locked when VectorCraft starts; changing this option locks or unlocks them at once, and View › Guides › Lock Guides still changes the lock. इसके चालू होने पर VectorCraft शुरू होते समय गाइड्स लॉक रहती हैं; यह विकल्प बदलने से वे तुरंत लॉक या अनलॉक होती हैं, और व्यू › गाइड्स › गाइड्स लॉक करें अब भी लॉक बदलता है। + With this on, holding Cmd/Ctrl as you start dragging from a ruler makes a guide on the active artboard only, or a canvas guide with the Artboard tool. इसके चालू होने पर रूलर से खींचना शुरू करते समय Cmd/Ctrl दबाए रखने से केवल सक्रिय आर्टबोर्ड पर गाइड बनती है, या आर्टबोर्ड टूल के साथ पूरे कैनवस की गाइड बनती है। + The color of the grid; the lines between major gridlines are drawn in a fainter shade of it. ग्रिड का रंग; मुख्य ग्रिडलाइनों के बीच की रेखाएँ उसके हल्के शेड में बनती हैं। + Draws the grid as lines, or as dots along the major gridlines at each subdivision. ग्रिड को रेखाओं के रूप में, या हर उप-विभाजन पर मुख्य ग्रिडलाइनों के साथ बिंदुओं के रूप में बनाता है। + The distance between major gridlines, in every open document and in new ones; a VectorCraft document opens with the grid it was saved with. हर खुले दस्तावेज़ और नए दस्तावेज़ों में मुख्य ग्रिडलाइनों के बीच की दूरी; VectorCraft दस्तावेज़ उसी ग्रिड के साथ खुलता है जिसके साथ वह सेव किया गया था। + How many parts each major grid square is divided into; Snap to Grid snaps to these parts, even when the zoom hides their lines. हर मुख्य ग्रिड वर्ग कितने भागों में बँटता है; ज़ूम से उनकी रेखाएँ छिपने पर भी ग्रिड पर स्नैप करें इन भागों पर स्नैप करता है। + Draws the grid behind the artwork; off, the grid is drawn over it. ग्रिड को आर्टवर्क के पीछे बनाता है; बंद होने पर ग्रिड उसके ऊपर बनती है। + In Pixel Preview at 600% zoom or more, the active view shows a line at the edge of every document pixel over the artwork. पिक्सेल प्रीव्यू में 600% या अधिक ज़ूम पर, सक्रिय व्यू आर्टवर्क के ऊपर दस्तावेज़ के हर पिक्सेल के किनारे पर रेखा दिखाता है। + The color of the tile edge and the dashed swatch bounds shown while you edit a pattern. पैटर्न संपादित करते समय दिखने वाले टाइल एज और डैश वाली स्वॉच सीमाओं का रंग। + Snaps drawing, moving and transforming to nearby art and shows guides and labels; Pixel Preview turns them off, and Snap to Grid snaps to the grid instead. ड्रॉ करने, खिसकाने और ट्रांसफ़ॉर्म करने को पास के आर्ट पर स्नैप करता है और गाइड्स व लेबल दिखाता है; पिक्सेल प्रीव्यू इन्हें बंद करता है, और ग्रिड पर स्नैप करें इनकी जगह ग्रिड पर स्नैप करता है। + The color of Smart Guide lines and labels. स्मार्ट गाइड्स की रेखाओं और लेबल का रंग। + Shows a line along the edge or center that art lines up with; off, art still lines up without the line, and Snap to Glyph does not apply. उस किनारे या केंद्र के साथ रेखा दिखाता है जिससे आर्ट संरेखित होता है; बंद होने पर आर्ट रेखा के बिना भी संरेखित होता है, और ग्लिफ़ पर स्नैप करें लागू नहीं होता। + With a selection tool, outlines the unselected object under the pointer in its layer color while you are not dragging. सिलेक्शन टूल के साथ, जब आप ड्रैग नहीं कर रहे हों, पॉइंटर के नीचे के असिलेक्टेड ऑब्जेक्ट की रूपरेखा उसकी लेयर के रंग में दिखाता है। + Shows the size or angle next to the pointer while you scale, rotate, shear or reflect art. आर्ट को स्केल करते, घुमाते, शियर करते या परावर्तित करते समय पॉइंटर के पास आकार या कोण दिखाता है। + While you draw, points snap to lines at the chosen Angles through the point the segment or shape starts from. ड्रॉ करते समय पॉइंट उन रेखाओं पर स्नैप होते हैं जो चुने गए कोणों पर उस पॉइंट से गुज़रती हैं जहाँ से सेगमेंट या आकृति शुरू होती है। + The set of angles the construction guides follow while Construction Guides is on. निर्माण गाइड चालू होने पर निर्माण गाइड जिन कोणों का पालन करते हैं, उनका समूह। + Names what a point snaps to, such as an anchor, a path or an alignment; off, points snap the same way without the names. बताता है कि पॉइंट किस पर स्नैप होता है, जैसे एंकर, पाथ या संरेखण; बंद होने पर पॉइंट नामों के बिना उसी तरह स्नैप होते हैं। + Shows distances, angles and how far art has moved next to the pointer while you draw or move it. ड्रॉ करते या खिसकाते समय पॉइंटर के पास दूरियाँ, कोण और आर्ट कितना खिसका यह दिखाता है। + Snaps moved or resized art to the same gap as between nearby objects, and marks the equal gaps. खिसकाए गए या आकार बदले गए आर्ट को पास के ऑब्जेक्ट्स के बीच जितने ही अंतर पर स्नैप करता है और बराबर अंतर चिह्नित करता है। + With something selected, holding Alt/Option over another object or an artboard shows the distances between it and the selection. कुछ सिलेक्ट होने पर, किसी दूसरे ऑब्जेक्ट या आर्टबोर्ड के ऊपर Alt/Option दबाए रखने से उसके और सिलेक्शन के बीच की दूरियाँ दिखती हैं। + A selection dragged back to within the Snapping Tolerance of where the drag began goes back to exactly that place; a copy does not. ड्रैग जहाँ से शुरू हुआ था, वहाँ से स्नैपिंग सहिष्णुता के भीतर वापस ड्रैग किया गया सिलेक्शन ठीक उसी जगह लौट जाता है; कॉपी नहीं लौटती। + How near on screen the pointer or a dragged point must come to art for Smart Guides to snap to it; the distance is the same at every zoom. स्मार्ट गाइड्स के स्नैप करने के लिए पॉइंटर या ड्रैग किया गया पॉइंट स्क्रीन पर आर्ट के कितने पास आना चाहिए; यह दूरी हर ज़ूम पर समान रहती है। + Snaps the end of a line segment, or a circle drawn from its center, so that it touches a nearby curve. लाइन सेगमेंट के सिरे को, या केंद्र से ड्रॉ किए गए वृत्त को, इस तरह स्नैप करता है कि वह पास के वक्र को छुए। + Snaps the end of a line segment so that it meets a nearby straight segment at a right angle. लाइन सेगमेंट के सिरे को इस तरह स्नैप करता है कि वह पास के सीधे सेगमेंट से समकोण पर मिले। Reset all preferences to their defaults? सभी प्रेफ़रेंसेज़ को उनके डिफ़ॉल्ट पर रीसेट करें? The defaults are applied when you click OK in Preferences. Cancel there keeps your current preferences. डिफ़ॉल्ट तब लागू होते हैं जब आप प्रेफ़रेंसेज़ में ठीक है पर क्लिक करते हैं। वहाँ रद्द करें आपकी मौजूदा प्रेफ़रेंसेज़ बनाए रखता है। Restore Recovered Documents पुनर्स्थापना डॉक्यूमेंट @@ -6075,7 +6166,7 @@ antiAlias Sharp शार्प @msg {label}… {label}... @msg {name} `{s}`: {ids} {name} `{s}`: {ids} @msg {name} is built in and can't be deleted {name} बनाया गया है और इसे हटाया नहीं जा सकता है। -@msg {name} must be {lo}–{hi}{unit} (got {v}) {name} को {lo}-{hi}{unit} ({v}) होना चाहिए। +@msg {name} must be {range} (got {v}) {name} को {range} होना चाहिए ({v} मिला) @msg {name}: {e} {name}: {e} @msg {name}: CRC mismatch {name}: CRC mismatch @msg {name}: CRC or size mismatch {name}: CRC या आकार मेल नहीं खाता @@ -6606,7 +6697,6 @@ antiAlias Sharp शार्प @msg anchor `{key}` must be a number एंकर `{key}` को एक नंबर होना चाहिए @msg anchor `smooth` must be true or false एंकर का `smooth` true या false होना चाहिए @msg anchor must name a registered panel anchor किसी पंजीकृत पैनल का नाम होना चाहिए -@msg angle and roundness must be finite कोण और गोलाई परिमित होना चाहिए @msg angles must be a list as long as pins (degrees or null) angles पिन जितनी लंबी सूची होनी चाहिए (डिग्री या null) @msg Angles require two straight segments कोणों को दो सीधे खंडों की आवश्यकता होती है @msg antiAlias `{id}`: none, art or type antiAlias `{id}`: none, art या type @@ -8015,6 +8105,11 @@ liquify-list-end {0}, {1} {0} और {1} @msg preset must be standard, diffuse, topLeft or right preset को standard, diffuse, topLeft या right होना चाहिए @msg preset must be the name of a print preset preset किसी प्रिंट प्रीसेट का नाम होना चाहिए @msg Preview in Browser needs the desktop app (the web downloads files instead) ब्राउज़र में प्रीव्यू डेस्कटॉप ऐप (वेब डाउनलोड फ़ाइलों के बजाय) की जरूरत है +@msg give `desiredK`, the desired file size in K (1024 bytes): a number above 0 and at most 1048576 `desiredK` दें, K (1024 बाइट) में वांछित फ़ाइल आकार: 0 से बड़ी और अधिकतम 1048576 संख्या +@msg `startWith` is `current` or `auto` `startWith` का मान `current` या `auto` होना चाहिए +@msg `use` is `allSlices`, `eachSlice` or `currentSlice` `use` का मान `allSlices`, `eachSlice` या `currentSlice` होना चाहिए +@msg `slice` is a slice number from `slice.list`, with `use: currentSlice` `slice`, `slice.list` से स्लाइस संख्या है, `use: currentSlice` के साथ +@msg Optimize to File Size: there is no image to measure फ़ाइल आकार के अनुसार ऑप्टिमाइज़ करें: मापने के लिए कोई इमेज नहीं है @msg previewMode must be default, pixel or overprint previewMode को default, pixel या overprint होना चाहिए @msg Print Ink Fixes works on CMYK documents: choose File › Document Color Mode › CMYK Color first प्रिंट इंक फिक्स CMYK डॉक्यूमेंट्स पर काम करता है: फ़ाइल चुनें › डॉक्यूमेंट रंग मोड › CMYK कलर फर्स्ट @msg print settings are not an object प्रिंट सेटिंग एक ऑब्जेक्ट नहीं है @@ -8812,6 +8907,18 @@ liquify-list-end {0}, {1} {0} और {1} @msg panels can't be shown in Presentation Mode प्रस्तुति मोड में पैनल्स नहीं दिखाए जा सकते @msg unknown parameter `{key}`; did you mean `{near}`? अज्ञात पैरामीटर `{key}`; क्या आपको `{near}` का मतलब है? @msg unknown parameter `{key}`; the command takes no parameters अज्ञात पैरामीटर `{key}`; कमांड कोई पैरामीटर नहीं लेता है +@msg unknown parameter `{key}`; `{object}` takes: {keys} अज्ञात पैरामीटर `{key}`; `{object}` लेता है: {keys} +@msg unknown parameter `{key}`; {why_not} अज्ञात पैरामीटर `{key}`; {why_not} +@msg no format takes it (see document.formats) कोई फ़ॉर्मैट इसे नहीं लेता (document.formats देखें) +@msg no save format takes it (see file.formatOptions) कोई सेव फ़ॉर्मैट इसे नहीं लेता (file.formatOptions देखें) +@msg PDF doesn't take it (see document.formats) PDF इसे नहीं लेता (document.formats देखें) +@msg EPS doesn't take it (see document.formats) EPS इसे नहीं लेता (document.formats देखें) +@msg DXF doesn't take it (see document.formats) DXF इसे नहीं लेता (document.formats देखें) +@msg The graphics processor tried first couldn't show the window, so VectorCraft started again on {summary} (Settings › Performance › Graphics Processor › Automatic uses the one that drives your display) पहले आज़माया गया ग्राफिक्स प्रोसेसर विंडो नहीं दिखा सका, इसलिए VectorCraft फिर से {summary} पर शुरू हुआ (सेटिंग्स › प्रदर्शन › ग्राफिक्स प्रोसेसर › स्वचालित उस प्रोसेसर का उपयोग करता है जो आपका डिस्प्ले चलाता है) +@msg Sent “{title}” to {to} “{title}” को {to} पर भेजा गया +@msg Sent “{title}” to {to}. The spooler replied: {note} “{title}” को {to} पर भेजा गया। प्रिंट कतार का उत्तर: {note} +@msg the default printer डिफ़ॉल्ट प्रिंटर +@msg raster effects on object {object}: requested {requested} ppi, achieved {achieved} ppi due to the 64 million pixel cap ऑब्जेक्ट {object} पर रास्टर इफ़ेक्ट: {requested} ppi माँगा गया, 64 मिलियन पिक्सेल की सीमा के कारण {achieved} ppi मिला @msg unknown parameter `{key}`; the command takes: {keys} अज्ञात पैरामीटर `{key}`; कमांड लेता है: {keys} @msg the params must be an object, not {got} पैरामीटर एक ऑब्जेक्ट होने चाहिए, {got} नहीं @msg unknown parameter `{path}`; the object takes no keys अज्ञात पैरामीटर `{path}`; ऑब्जेक्ट कोई कुंजी नहीं लेता @@ -9242,6 +9349,10 @@ theme Appearance अपीयरेंस @msg Some islands could not be joined to the area around the art कुछ आइलैंड आर्टवर्क के आसपास के क्षेत्र से नहीं जोड़े जा सके @msg `width` must be from {lo} to {hi} pt `width` {lo} से {hi} pt तक होना चाहिए @msg `angle` must be from -180 to 180 degrees `angle` -180 से 180 डिग्री तक होना चाहिए +@msg `roundness` must be from 0 to 100% `roundness` 0 से 100% तक होना चाहिए +@msg `fidelity` must be from 0.01 to 100 pt `fidelity` 0.01 से 100 pt तक होना चाहिए +@msg style must be "pencil" or "brush" style "pencil" या "brush" होना चाहिए +@msg extend end must be "start" or "end" extend अंत "start" या "end" होना चाहिए @msg `roundness` must be from 1 to 100% `roundness` 1 से 100% तक होना चाहिए @msg `count` must be a whole number from 1 to {MAX_BRIDGES_PER_ISLAND} `count` 1 से {MAX_BRIDGES_PER_ISLAND} तक पूरी संख्या होना चाहिए Weed Box and Lines… वीड बॉक्स और लाइनें… diff --git a/crates/ui-egui/src/i18n/hu.tsv b/crates/ui-egui/src/i18n/hu.tsv index 4be37f06c4..29199f8577 100644 --- a/crates/ui-egui/src/i18n/hu.tsv +++ b/crates/ui-egui/src/i18n/hu.tsv @@ -801,6 +801,7 @@ font-technology Variable Változó Constrain Korlátozás Constrain Angle Korlátozási szög Constrain Width and Height Proportions Szélesség és magasság arányának megtartása + Copy Width to Height Szélesség másolása a magasságba Construction Guides Szerkesztési segédvonalak Contextual Alternates Környezetfüggő változatok Contextual Task Bar Helyzetérzékeny műveletsáv @@ -810,6 +811,8 @@ font-technology Variable Változó Control Vezérlősáv Convert Átalakítás Convert All Spot Colors to Process Minden direktszín átalakítása skálaszínné + Convert {name} to process {name} átalakítása skálaszínné + Keep {name} as spot {name} megtartása direktszínként Convert All Strokes to Outlines Minden körvonal útvonallá alakítása Convert All Text to Outlines Minden szöveg útvonallá alakítása Convert Anchor Point Horgonypont átalakítása @@ -892,6 +895,9 @@ font-technology Variable Változó Create from Selection Létrehozás a kijelölésből Create From: Létrehozás ebből: Create Gradient Mesh… Színátmenetes háló létrehozása… + Flat Sík + To Center A közép felé + To Edge Az él felé Create Graph Diagram létrehozása Create New Fields by Új félképek létrehozása Create New Layer Új réteg létrehozása @@ -3281,6 +3287,18 @@ diagnostics ui felület Preview: Előnézet: Preview All Layers Összes réteg előnézetben Preview in Browser Előnézet böngészőben + Optimize to File Size… Optimalizálás fájlméretre… + Optimize to File Size Optimalizálás fájlméretre + Desired File Size: Kívánt fájlméret: + Start With: Kiindulás: + Use: Használat: + Current Settings Jelenlegi beállítások + Auto Select GIF/JPEG GIF/JPEG automatikus kiválasztása + Total of All Slices Az összes szelet együtt + Each Slice Minden szelet + Current Slice Aktuális szelet + {size}, within {target} {size}, belefér ebbe: {target} + No setting tried fits in {target}; the smallest is {size} Egyik kipróbált beállítás sem fér bele ebbe: {target}; a legkisebb {size} Preview in Browser needs the desktop app (the web downloads files instead) Az Előnézet böngészőben az asztali alkalmazásban érhető el (a webes változat helyette letölti a fájlokat) Preview Mode Előnézeti mód Preview the document as it is now A dokumentum jelenlegi állapotának előnézete @@ -3646,12 +3664,85 @@ mark-style Japanese Japán Responsive Reszponzív Restore Visszaállít Restore every preference to its default (applied on OK) Minden beállítás visszaállítása az alapértékre (az OK gombbal lép életbe) + Shows a bar of commands for the selection or tool on the canvas; it hides while you drag and in Presentation Mode. Parancssávot jelenít meg a vásznon a kijelöléshez vagy az eszközhöz; húzás közben és bemutató módban elrejtőzik. + How far an arrow key moves the selection; with Shift, it moves ten times as far. Ennyivel mozgatja egy nyílbillentyű a kijelölést; a Shift billentyűvel tízszer ennyivel. + The angle of the axes that arrow keys move along and that Shift holds drawing and moving to. Azoknak a tengelyeknek a szöge, amelyek mentén a nyílbillentyűk mozgatnak, és amelyekhez a Shift köti a rajzolást és a mozgatást. + The corner radius the Rounded Rectangle tool draws with; changing the radius while drawing changes this value too. A sarokkerekítés sugara, amellyel a Lekerekített téglalap eszköz rajzol; ha rajzolás közben módosítja a sugarat, ez az érték is módosul. + How far right and down Paste moves the copy when it is given no position, as from a script; Paste in the app centers it in the view. Ennyivel tolja el a Beillesztés a másolatot jobbra és lefelé, ha nincs megadott pozíció, például parancsfájlból; az alkalmazásban a Beillesztés a nézet közepére teszi. + Stops the Pen tool from deleting the anchor you click on a selected path, or adding one where you click its segment. Megakadályozza, hogy a Toll eszköz törölje a kijelölt útvonalon rákattintott horgonypontot, vagy újat adjon hozzá ott, ahol a szakaszára kattint. + Drawing tools show a crosshair pointer instead of their icon; Caps Lock does the same while it is on. A rajzeszközök az ikonjuk helyett célkeresztes mutatót jelenítenek meg; a Caps Lock bekapcsolva ugyanezt teszi. + Shows a tip when the pointer rests on a button or field that has one. Tippet jelenít meg, ha a mutató olyan gombon vagy mezőn áll meg, amelyhez tartozik tipp. + Shows a warning before a script you choose runs. Figyelmeztetést jelenít meg egy kiválasztott parancsfájl futása előtt. + Smooths the edges of artwork on the canvas. Kisimítja a grafika széleit a vásznon. + Select › Same › Fill Color, Stroke Color and Fill & Stroke match only the same tint of a global or spot swatch, not any tint of it. A Kijelölés › Azonos › Kitöltőszín, Körvonalszín és Kitöltés és körvonal csak egy globális vagy direkt színminta azonos árnyalatát találja meg, nem bármely árnyalatát. + Shows the Home screen when no document is open; off, the window stays empty until you click Home. Megjeleníti a kezdőképernyőt, ha nincs megnyitott dokumentum; kikapcsolva az ablak üres marad, amíg a Kezdőképernyő gombra nem kattint. + Measures objects with their strokes and shape-changing effects for size, position and alignment; shadows, glows and blurs are not measured. Az objektumokat körvonalaikkal és alakmódosító effektusaikkal együtt méri a mérethez, a pozícióhoz és az igazításhoz; az árnyékokat, ragyogásokat és elmosásokat nem méri. + At 100% zoom, one inch of the document takes 96 screen points instead of 72. 100%-os nagyításnál a dokumentum egy hüvelyke 72 helyett 96 képernyőpontot foglal el. + Double-clicking a group, path or image with the Selection tool opens it in isolation mode. Ha a Kijelölés eszközzel duplán kattint egy csoportra, útvonalra vagy képre, az elkülönítő módban nyílik meg. + Pattern fills and strokes transform with the art, unless a transform or the Transform panel's menu chooses otherwise. A mintázatos kitöltések és körvonalak a grafikával együtt alakulnak át, hacsak egy átalakítás vagy az Átalakítás panel menüje mást nem választ. + Live corner radii scale with the art, unless the scale chooses otherwise. Az élő sarkok sugara a grafikával együtt méreteződik, hacsak a méretezés mást nem választ. + Stroke weights, dashes and effect distances scale with the art, unless the scale chooses otherwise. A körvonalvastagságok, a szaggatások és az effektustávolságok a grafikával együtt méreteződnek, hacsak a méretezés mást nem választ. + The mouse wheel zooms the canvas instead of scrolling it. Az egérgörgő görgetés helyett nagyítja vagy kicsinyíti a vásznat. + The mouse wheel with Cmd/Ctrl held scrolls the canvas sideways. Az egérgörgő lenyomott Cmd/Ctrl billentyűvel oldalirányban görgeti a vásznat. + Dragging sideways on a numeric field's label changes the field's value. Egy számmező címkéjén oldalirányban húzva módosul a mező értéke. + A two-finger rotate gesture on a trackpad rotates the canvas view. Az érintőpadon végzett kétujjas forgató kézmozdulat elforgatja a vászon nézetét. + Holding a tool's shortcut key chooses the tool until you let go, and then the previous tool is chosen again. Egy eszköz billentyűparancsát lenyomva tartva az eszköz a felengedésig ki van választva, utána ismét az előző eszköz lesz kiválasztva. + Shows the bounding box while you move the selection or draw a shape. Megjeleníti a befoglaló keretet, miközben a kijelölést mozgatja vagy alakzatot rajzol. + Create Trim Marks draws Japanese-style marks instead of Roman ones. A Vágójelek létrehozása római helyett japán stílusú jeleket rajzol. + New art takes only the fill and stroke of the selection; off, it takes the selected object's whole appearance. Az új grafika csak a kijelölés kitöltését és körvonalát veszi át; kikapcsolva a kijelölt objektum teljes megjelenését átveszi. + Changing the width or height in the Transform panel, the Properties panel or the Control bar changes the other in proportion. Ha az Átalakítás panelen, a Tulajdonságok panelen vagy a Vezérlősávon módosítja a szélességet vagy a magasságot, a másik arányosan módosul. + A live rectangle's properties show one Corner Radius field for all four corners; off, each corner has its own field. Egy élő téglalap tulajdonságai egyetlen Sarokkerekítés sugara mezőt mutatnak mind a négy sarokhoz; kikapcsolva minden saroknak saját mezője van. + What edits in the Transform panel transform: the object, its pattern tiles or both; Default follows Transform Pattern Tiles. Mit alakítanak át az Átalakítás panel módosításai: az objektumot, a mintázatcsempéit vagy mindkettőt; az Alapértelmezett a Mintázatcsempék átalakítása beállítást követi. + With one symbol instance selected, the Transform panel uses the symbol's registration point as its reference point. Ha egy szimbólumpéldány van kijelölve, az Átalakítás panel a szimbólum regisztrációs pontját használja referenciapontként. + Darkens the canvas outside the artboards while the Artboard tool is active. Elsötétíti a vásznat a rajztáblákon kívül, amíg a Rajztábla eszköz aktív. + With Fade Region Outside Artboard on, the area outside the artboards stays dark while you drag with the Artboard tool. Ha A rajztáblán kívüli terület elhalványítása be van kapcsolva, a rajztáblákon kívüli terület sötét marad, miközben a Rajztábla eszközzel húz. + How near, in pixels, the pointer must be to an object, anchor or handle for a click to select it. Hány pixelnyire kell a mutatónak egy objektumhoz, horgonyponthoz vagy fogantyúhoz lennie, hogy egy kattintás kijelölje. + Whether the Selection tool's box selects objects it touches or only those fully inside; Drag Direction selects those inside on a drag to the right. E reverses it mid-drag. A Kijelölés eszköz kerete az érintett objektumokat jelöli ki, vagy csak a teljesen benne lévőket; a Húzás iránya jobbra húzáskor a benne lévőket jelöli ki. Az E húzás közben megfordítja a szabályt. + A click selects a filled object only on its path, not inside its fill. Egy kattintás a kitöltött objektumot csak az útvonalán jelöli ki, a kitöltésén belül nem. + How near, in pixels, a point must come to an anchor or ruler guide for Snap to Point to snap it; with Smart Guides on, Smart Guides' Snapping Tolerance applies instead. Hány pixelnyire kell egy pontnak egy horgonyponthoz vagy vonalzó-segédvonalhoz kerülnie, hogy az Illesztés pontra odaillessze; bekapcsolt intelligens segédvonalaknál azok illesztési tűrése érvényes. + With the Selection tool, Cmd/Ctrl-click selects the object under the selected one at the pointer; each further click goes one object deeper. A Kijelölés eszközzel a Cmd/Ctrl+kattintás a mutatónál a kijelölt alatti objektumot jelöli ki; minden további kattintás egy objektummal mélyebbre megy. + Zoom In and Zoom Out bring the center of the selection to the middle of the view. A Nagyítás és a Kicsinyítés a kijelölés közepét a nézet közepére hozza. + Locked and hidden artwork inside an artboard moves, scales and is copied with the artboard, as the other artwork does. A rajztáblán belüli zárolt és rejtett grafika a többi grafikához hasonlóan a rajztáblával együtt mozog, méreteződik és másolódik. + The size of anchor points and direction handle ends on the canvas; larger anchors can also be picked from farther away. A horgonypontok és az irányfogantyúk végeinek mérete a vásznon; a nagyobb horgonypontok távolabbról is megfoghatók. + Draws the ends of direction handles as solid dots, hollow dots or larger solid dots. Az irányfogantyúk végeit teli pöttyökként, üres pöttyökként vagy nagyobb teli pöttyökként rajzolja. + With the Direct Selection tool, the anchor under the pointer is highlighted. A Közvetlen kijelölés eszközzel a mutató alatti horgonypont kiemelve látszik. + Shows direction handles when more than one anchor is selected; off, they show only while a single anchor is selected. Megjeleníti az irányfogantyúkat, ha egynél több horgonypont van kijelölve; kikapcsolva csak egyetlen kijelölt horgonypontnál látszanak. + Corner widgets hide on corners whose angle is greater than this many degrees. A sarokfogantyúk elrejtőznek azokon a sarkokon, amelyek szöge nagyobb ennyi foknál. + The Pen tool previews the next segment from the last anchor to the pointer before you click. A Toll eszköz kattintás előtt mutatja a következő szakaszt az utolsó horgonyponttól a mutatóig. + The Curvature tool previews the curve to the pointer before you place the next point. A Görbület eszköz a következő pont elhelyezése előtt mutatja a görbét a mutatóig. The unit for new documents from built-in sizes other than pixel sizes and for opened files that record no unit; choosing one here and clicking OK also sets the active document's units. A beépített, nem pixelben megadott méretű új dokumentumok és a mértékegységet nem rögzítő megnyitott fájlok mértékegysége; ha itt kiválasztja, és az OK gombra kattint, az aktív dokumentum mértékegysége is ez lesz. Stroke weights, dashes and gaps show in this unit, and numbers typed for them are read in it. A körvonalvastagságok, a vonalak és a hézagok ebben a mértékegységben jelennek meg, és a hozzájuk beírt számokat is ebben értelmezi a program. Type sizes, leading and baseline shift show in this unit, and numbers typed for them are read in it. A betűméretek, a sorköz és az alapvonal-eltolás ebben a mértékegységben jelennek meg, és a hozzájuk beírt számokat is ebben értelmezi a program. The unit for East Asian type measurements, which no field uses yet. A kelet-ázsiai szöveg méreteinek mértékegysége, amelyet egyelőre egyetlen mező sem használ. When on, a number typed without a unit into a field in picas is read in points. Bekapcsolva egy pica mértékegységű mezőbe mértékegység nélkül beírt számot pontként értelmez a program. With XML ID, object names show as XML IDs in the Layers panel, the Variables panel and Layer Options. XML-azonosító esetén az objektumnevek XML-azonosítóként jelennek meg a Rétegek, a Változók és a Rétegbeállítások ablakban. + Snaps drawing, moving and scaling to the grid's subdivisions, even while the grid is hidden; while it is on, Snap to Pixel does not apply. A rajzolást, mozgatást és méretezést a rács osztásaihoz illeszti, akkor is, ha a rács rejtve van; amíg be van kapcsolva, az Illesztés pixelhez nem érvényes. + The color of guides that are not selected; an artboard with a Guide Label draws its own guides in the label's color instead. A nem kijelölt segédvonalak színe; a Segédvonalak címkéjével rendelkező rajztábla a saját segédvonalait a címke színével rajzolja. + Draws guides as solid lines or as dots, including the guides already in the document. A segédvonalakat folytonos vonalként vagy pontokként rajzolja, a dokumentumban már meglévőket is. + With this on, guides are locked when VectorCraft starts; changing this option locks or unlocks them at once, and View › Guides › Lock Guides still changes the lock. Bekapcsolva a segédvonalak a VectorCraft indulásakor zárolva vannak; a beállítás módosítása azonnal zárolja vagy feloldja őket, és a Nézet › Segédvonalak › Segédvonalak zárolása továbbra is módosítja a zárolást. + With this on, holding Cmd/Ctrl as you start dragging from a ruler makes a guide on the active artboard only, or a canvas guide with the Artboard tool. Bekapcsolva a vonalzóból való húzás kezdetén lenyomva tartott Cmd/Ctrl csak az aktív rajztáblán hoz létre segédvonalat, a Rajztábla eszközzel pedig a teljes vászonra kiterjedőt. + The color of the grid; the lines between major gridlines are drawn in a fainter shade of it. A rács színe; a fő rácsvonalak közötti vonalak ennek halványabb árnyalatával jelennek meg. + Draws the grid as lines, or as dots along the major gridlines at each subdivision. A rácsot vonalakként, vagy a fő rácsvonalak mentén minden osztásnál pontokként rajzolja. + The distance between major gridlines, in every open document and in new ones; a VectorCraft document opens with the grid it was saved with. A fő rácsvonalak távolsága minden megnyitott dokumentumban és az újakban; a VectorCraft-dokumentum azzal a ráccsal nyílik meg, amellyel mentették. + How many parts each major grid square is divided into; Snap to Grid snaps to these parts, even when the zoom hides their lines. Hány részre oszlik a rács minden fő négyzete; az Illesztés a rácshoz ezekhez a részekhez illeszt, akkor is, ha a nagyítás elrejti a vonalaikat. + Draws the grid behind the artwork; off, the grid is drawn over it. A rácsot a grafika mögé rajzolja; kikapcsolva a rács a grafika fölé kerül. + In Pixel Preview at 600% zoom or more, the active view shows a line at the edge of every document pixel over the artwork. Pixeles előnézetben 600% vagy nagyobb nagyításnál az aktív nézet a grafika fölött vonalat mutat a dokumentum minden pixelének szélén. + The color of the tile edge and the dashed swatch bounds shown while you edit a pattern. A csempeszél és a szaggatott színmintahatárok színe, amelyek a mintázat szerkesztése közben látszanak. + Snaps drawing, moving and transforming to nearby art and shows guides and labels; Pixel Preview turns them off, and Snap to Grid snaps to the grid instead. A rajzolást, mozgatást és átalakítást a közeli grafikához illeszti, és segédvonalakat és címkéket mutat; a pixeles előnézet kikapcsolja őket, az Illesztés a rácshoz pedig helyettük a rácshoz illeszt. + The color of Smart Guide lines and labels. Az intelligens segédvonalak vonalainak és címkéinek színe. + Shows a line along the edge or center that art lines up with; off, art still lines up without the line, and Snap to Glyph does not apply. Vonalat mutat azon a szélen vagy középen, amelyhez a grafika igazodik; kikapcsolva a grafika vonal nélkül is igazodik, és az Illesztés glifához nem érvényes. + With a selection tool, outlines the unselected object under the pointer in its layer color while you are not dragging. Kijelölőeszközzel a mutató alatti, ki nem jelölt objektumot a rétege színével körvonalazza, amíg nem húz. + Shows the size or angle next to the pointer while you scale, rotate, shear or reflect art. A mutató mellett mutatja a méretet vagy a szöget, miközben a grafikát méretezi, forgatja, nyírja vagy tükrözi. + While you draw, points snap to lines at the chosen Angles through the point the segment or shape starts from. Rajzolás közben a pontok a kiválasztott szögű vonalakhoz illeszkednek, amelyek a szakasz vagy alakzat kezdőpontján haladnak át. + The set of angles the construction guides follow while Construction Guides is on. A szögek készlete, amelyeket a szerkesztési segédvonalak követnek, amíg a Szerkesztési segédvonalak be van kapcsolva. + Names what a point snaps to, such as an anchor, a path or an alignment; off, points snap the same way without the names. Megnevezi, mihez illeszkedik egy pont, például horgonyponthoz, útvonalhoz vagy igazításhoz; kikapcsolva a pontok ugyanúgy illeszkednek, csak a nevek nélkül. + Shows distances, angles and how far art has moved next to the pointer while you draw or move it. A mutató mellett mutatja a távolságokat, a szögeket és a grafika elmozdulását rajzolás vagy mozgatás közben. + Snaps moved or resized art to the same gap as between nearby objects, and marks the equal gaps. A mozgatott vagy átméretezett grafikát a közeli objektumok közötti térközzel azonos térközhöz illeszti, és megjelöli az egyenlő térközöket. + With something selected, holding Alt/Option over another object or an artboard shows the distances between it and the selection. Ha valami ki van jelölve, az Alt/Option nyomva tartása egy másik objektum vagy rajztábla fölött megmutatja a távolságokat közte és a kijelölés között. + A selection dragged back to within the Snapping Tolerance of where the drag began goes back to exactly that place; a copy does not. Az a kijelölés, amelyet a húzás kezdőhelyétől az illesztési tűrésen belülre húznak vissza, pontosan oda tér vissza; a másolat nem. + How near on screen the pointer or a dragged point must come to art for Smart Guides to snap to it; the distance is the same at every zoom. Milyen közel kell a mutatónak vagy egy húzott pontnak a képernyőn a grafikához érnie, hogy az intelligens segédvonalak illesszenek; a távolság minden nagyításnál azonos. + Snaps the end of a line segment, or a circle drawn from its center, so that it touches a nearby curve. Egy szakasz végét vagy a középpontjából rajzolt kört úgy illeszti, hogy érintse a közeli görbét. + Snaps the end of a line segment so that it meets a nearby straight segment at a right angle. Egy szakasz végét úgy illeszti, hogy derékszögben találkozzon egy közeli egyenes szakasszal. Reset all preferences to their defaults? Visszaállítja az összes beállítást az alapértékre? The defaults are applied when you click OK in Preferences. Cancel there keeps your current preferences. Az alapértékek akkor lépnek életbe, amikor a Beállításokban az OK gombra kattint. Az ottani Mégse megtartja a jelenlegi beállításokat. Restore Recovered Documents Helyreállított dokumentumok visszaállítása @@ -5798,6 +5889,11 @@ liquify-list-end {0}, {1} {0} és {1} @msg plug-in parameters: {0} bővítmény paraméterei: {0} @msg plug-in trapped: {0} a bővítmény futása megszakadt: {0} @msg Preview in Browser needs the desktop app (the web downloads files instead) Az Előnézet böngészőben az asztali alkalmazásban érhető el (a webes változat helyette letölti a fájlokat) +@msg give `desiredK`, the desired file size in K (1024 bytes): a number above 0 and at most 1048576 adja meg a `desiredK` értéket, a kívánt fájlméretet K-ban (1024 bájt): 0-nál nagyobb, legfeljebb 1048576 szám +@msg `startWith` is `current` or `auto` a `startWith` értéke `current` vagy `auto` +@msg `use` is `allSlices`, `eachSlice` or `currentSlice` a `use` értéke `allSlices`, `eachSlice` vagy `currentSlice` +@msg `slice` is a slice number from `slice.list`, with `use: currentSlice` a `slice` egy szeletszám a `slice.list` listából, `use: currentSlice` mellett +@msg Optimize to File Size: there is no image to measure Optimalizálás fájlméretre: nincs mérhető kép @msg print settings are not an object a nyomtatási beállítások nem objektumot alkotnak @msg printing isn't available here itt nem lehet nyomtatni @msg range `{s}` is empty a tartomány üres: `{s}` @@ -6287,6 +6383,19 @@ liquify-list-end {0}, {1} {0} és {1} Transform Objects Objektumok transzformálása @msg unknown parameter `{key}`; did you mean `{near}`? ismeretlen paraméter: `{key}`; erre gondolt: `{near}`? @msg unknown parameter `{key}`; the command takes no parameters ismeretlen paraméter: `{key}`; a parancsnak nincs paramétere +@msg unknown parameter `{key}`; `{object}` takes: {keys} ismeretlen paraméter: `{key}`; a(z) `{object}` ezeket fogadja el: {keys} +@msg unknown parameter `{key}`; {why_not} ismeretlen paraméter: `{key}`; {why_not} +@msg no format takes it (see document.formats) egyik formátum sem fogadja el (lásd: document.formats) +@msg no save format takes it (see file.formatOptions) egyik mentési formátum sem fogadja el (lásd: file.formatOptions) +@msg PDF doesn't take it (see document.formats) a PDF nem fogadja el (lásd: document.formats) +@msg EPS doesn't take it (see document.formats) az EPS nem fogadja el (lásd: document.formats) +@msg DXF doesn't take it (see document.formats) a DXF nem fogadja el (lásd: document.formats) +@msg {name} must be {range} (got {v}) a(z) {name} értéke {range} lehet (kapott érték: {v}) +@msg The graphics processor tried first couldn't show the window, so VectorCraft started again on {summary} (Settings › Performance › Graphics Processor › Automatic uses the one that drives your display) Az először kipróbált grafikus processzor nem tudta megjeleníteni az ablakot, ezért a VectorCraft újraindult ezen: {summary} (Beállítások › Teljesítmény › Grafikus processzor › Automatikus: azt használja, amelyik a kijelzőt hajtja) +@msg Sent “{title}” to {to} “{title}” elküldve ide: {to} +@msg Sent “{title}” to {to}. The spooler replied: {note} “{title}” elküldve ide: {to}. A nyomtatási sor válasza: {note} +@msg the default printer alapértelmezett nyomtató +@msg raster effects on object {object}: requested {requested} ppi, achieved {achieved} ppi due to the 64 million pixel cap raszteres effektusok a(z) {object} objektumon: kért felbontás {requested} ppi, elért felbontás {achieved} ppi a 64 millió képpontos korlát miatt @msg unknown parameter `{key}`; the command takes: {keys} ismeretlen paraméter: `{key}`; a parancs ezeket fogadja el: {keys} @msg the params must be an object, not {got} a paramétereknek objektumnak kell lenniük, nem ez: {got} @msg unknown parameter `{path}`; the object takes no keys ismeretlen paraméter: `{path}`; az objektum nem fogad el kulcsokat @@ -7804,6 +7913,11 @@ breakText Glyphs Glifák @msg Some islands could not be joined to the area around the art Egyes szigeteket nem sikerült összekötni a grafikát körülvevő területtel @msg `width` must be from {lo} to {hi} pt A `width` értéke {lo} és {hi} pt között lehet @msg `angle` must be from -180 to 180 degrees Az `angle` értéke -180 és 180 fok között lehet +@msg `roundness` must be from 0 to 100% A `roundness` értéke 0 és 100% között lehet +@msg `fidelity` must be from 0.01 to 100 pt A `fidelity` értéke 0.01 és 100 pt között lehet +@msg style must be "pencil" or "brush" A style értéke "pencil" vagy "brush" lehet +@msg extend end must be "start" or "end" Az extend vége "start" vagy "end" lehet +@msg connect end must be "start" or "end" A connect vége "start" vagy "end" lehet @msg `roundness` must be from 1 to 100% A `roundness` értéke 1 és 100% között lehet @msg `count` must be a whole number from 1 to {MAX_BRIDGES_PER_ISLAND} `count`: 1 és {MAX_BRIDGES_PER_ISLAND} közötti egész szám kell Weed Box and Lines… Gyomláló keret és vonalak… @@ -8327,7 +8441,6 @@ breakText Glyphs Glifák @msg anchor `smooth` must be true or false horgonypont, `smooth`: true vagy false kell @msg anchor `{key}` must be [x, y] horgonypont, `{key}`: [x, y] kell @msg anchor `{key}` must be a number horgonypont, `{key}`: szám kell -@msg angle and roundness must be finite angle és roundness: véges érték kell @msg angles must be a list as long as pins (degrees or null) angles: a pins listával azonos hosszúságú lista kell (fok vagy null) @msg appearance must be flat|center|edge appearance: flat|center|edge kell @msg apply is "fill" or "stroke", not `{other}` apply: "fill" vagy "stroke", ez nem az: `{other}` @@ -9482,8 +9595,6 @@ breakText Glyphs Glifák @msg unknown panel ismeretlen panel @msg unknown panel `{panel}` ismeretlen panel: `{panel}` @msg unknown parameter `{key}` ismeretlen paraméter: `{key}` -@msg unknown parameter `{within}settings.{format}`; {why} ismeretlen paraméter: `{within}settings.{format}`; {why} -@msg unknown parameter `{within}{key}`; {why} ismeretlen paraméter: `{within}{key}`; {why} @msg unknown pieLegend `{v}` (none, standard or wedges) ismeretlen pieLegend: `{v}` (none, standard vagy wedges) @msg unknown piePosition `{v}` (even, ratio or stacked) ismeretlen piePosition: `{v}` (even, ratio vagy stacked) @msg unknown pieSort `{v}` (none, all or first) ismeretlen pieSort: `{v}` (none, all vagy first) @@ -9611,7 +9722,6 @@ breakText Glyphs Glifák @msg {name} `{s}`: {ids} {name} `{s}`: {ids} @msg {name} is built in and can't be deleted {name}: beépített elem, nem törölhető @msg {name} must be a number {name}: szám kell -@msg {name} must be {lo}–{hi}{unit} (got {v}) {name}: {lo}–{hi}{unit} kell (kapott érték: {v}) @msg {name}: CRC or size mismatch {name}: a CRC vagy a méret nem egyezik @msg {name}: only this Affinity file's embedded preview could be read; use File › Open to see it with its warning, or export SVG or PDF from Affinity before placing {name}: ennek az Affinity-fájlnak csak a beágyazott előnézete volt olvasható; a Fájl › Megnyitás paranccsal megnézheted a figyelmeztetésével együtt, vagy az elhelyezés előtt exportálj SVG-t vagy PDF-et az Affinityből @msg {name}: {e} {name}: {e} diff --git a/crates/ui-egui/src/i18n/id.tsv b/crates/ui-egui/src/i18n/id.tsv index 7019562cf8..ee402d333d 100644 --- a/crates/ui-egui/src/i18n/id.tsv +++ b/crates/ui-egui/src/i18n/id.tsv @@ -211,6 +211,9 @@ Mask Masker Rasterize… Rasterisasi… Create Gradient Mesh… Buat mesh gradien… + Flat Datar + To Center Ke tengah + To Edge Ke tepi Create Object Mosaic… Buat mozaik objek… Vector Halftone… Halftone vektor… Create Trim Marks Buat tanda potong @@ -1094,6 +1097,18 @@ lighting Light Cahaya Placement Options… Opsi penempatan… Plug-in… Plug-in… Preview in Browser Pratinjau di browser + Optimize to File Size… Optimalkan ke Ukuran File… + Optimize to File Size Optimalkan ke Ukuran File + Desired File Size: Ukuran File yang Diinginkan: + Start With: Mulai Dengan: + Use: Gunakan: + Current Settings Pengaturan Saat Ini + Auto Select GIF/JPEG Pilih Otomatis GIF/JPEG + Total of All Slices Total Semua Slice + Each Slice Setiap Slice + Current Slice Slice Saat Ini + {size}, within {target} {size}, dalam batas {target} + No setting tried fits in {target}; the smallest is {size} Tidak ada pengaturan yang dicoba yang muat dalam {target}; yang terkecil {size} Printer Setup… Pengaturan printer… Printers Printer Recent File File terbaru @@ -2650,6 +2665,8 @@ digits Malayalam Malayalam Collate Susun Composite colours are converted to it; separations separate with it when it is a CMYK profile. Warna komposit dikonversi ke profil ini; separasi memisah dengannya bila merupakan profil CMYK. Convert All Spot Colors to Process Konversi semua warna spot menjadi proses + Convert {name} to process Konversi {name} menjadi proses + Keep {name} as spot Pertahankan {name} sebagai spot Default Printer Printer default Document Ink Options Opsi tinta dokumen Download: Unduh: @@ -3666,6 +3683,7 @@ theme Appearance Tampilan Command Click to Select Objects Behind Command-klik untuk memilih objek di belakang Constrain Angle Sudut kendala Constrain Width and Height Proportions Kendalikan proporsi lebar dan tinggi + Copy Width to Height Salin lebar ke tinggi Construction Guides Panduan konstruksi Curvature Tool Alat kelengkungan Data Recovery Pemulihan data @@ -4168,12 +4186,85 @@ font-technology Variable Variabel Preferences Preferensi Previous Sebelumnya Restore every preference to its default (applied on OK) Kembalikan semua preferensi ke defaultnya (diterapkan saat OK) + Shows a bar of commands for the selection or tool on the canvas; it hides while you drag and in Presentation Mode. Menampilkan bilah perintah untuk seleksi atau alat di kanvas; bilah ini disembunyikan saat Anda menyeret dan dalam mode presentasi. + How far an arrow key moves the selection; with Shift, it moves ten times as far. Seberapa jauh tombol panah memindahkan seleksi; dengan Shift, tombol itu memindahkannya sepuluh kali lebih jauh. + The angle of the axes that arrow keys move along and that Shift holds drawing and moving to. Sudut sumbu tempat tombol panah memindahkan dan tempat Shift menahan penggambaran dan pemindahan. + The corner radius the Rounded Rectangle tool draws with; changing the radius while drawing changes this value too. Radius sudut yang dipakai alat Persegi panjang bulat untuk menggambar; mengubah radius saat menggambar juga mengubah nilai ini. + How far right and down Paste moves the copy when it is given no position, as from a script; Paste in the app centers it in the view. Seberapa jauh Tempel menggeser salinan ke kanan dan ke bawah saat tidak ada posisi yang diberikan, seperti dari skrip; Tempel di aplikasi menaruhnya di tengah tampilan. + Stops the Pen tool from deleting the anchor you click on a selected path, or adding one where you click its segment. Mencegah alat Pena menghapus titik jangkar yang Anda klik pada jalur terpilih, atau menambahkan titik di tempat Anda mengklik segmennya. + Drawing tools show a crosshair pointer instead of their icon; Caps Lock does the same while it is on. Alat gambar menampilkan penunjuk silang sebagai pengganti ikonnya; Caps Lock melakukan hal yang sama selama aktif. + Shows a tip when the pointer rests on a button or field that has one. Menampilkan tip saat penunjuk berhenti di atas tombol atau bidang yang memilikinya. + Shows a warning before a script you choose runs. Menampilkan peringatan sebelum skrip yang Anda pilih dijalankan. + Smooths the edges of artwork on the canvas. Menghaluskan tepi karya seni di kanvas. + Select › Same › Fill Color, Stroke Color and Fill & Stroke match only the same tint of a global or spot swatch, not any tint of it. Seleksi › Sama › Warna isian, Warna stroke, dan Isian & stroke hanya mencocokkan tint yang sama dari swatch global atau spot, bukan sembarang tint-nya. + Shows the Home screen when no document is open; off, the window stays empty until you click Home. Menampilkan layar Home saat tidak ada dokumen yang terbuka; saat nonaktif, jendela tetap kosong sampai Anda mengklik Home. + Measures objects with their strokes and shape-changing effects for size, position and alignment; shadows, glows and blurs are not measured. Mengukur objek beserta stroke dan efek yang mengubah bentuknya untuk ukuran, posisi, dan perataan; bayangan, cahaya, dan kekaburan tidak diukur. + At 100% zoom, one inch of the document takes 96 screen points instead of 72. Pada zum 100%, satu inci dokumen memakai 96 titik layar, bukan 72. + Double-clicking a group, path or image with the Selection tool opens it in isolation mode. Mengklik ganda grup, jalur, atau gambar dengan alat Seleksi membukanya dalam mode isolasi. + Pattern fills and strokes transform with the art, unless a transform or the Transform panel's menu chooses otherwise. Isian dan stroke pola ikut bertransformasi dengan karya seni, kecuali transformasi atau menu panel Transformasi memilih lain. + Live corner radii scale with the art, unless the scale chooses otherwise. Radius sudut dinamis ikut diskalakan dengan karya seni, kecuali penskalaan memilih lain. + Stroke weights, dashes and effect distances scale with the art, unless the scale chooses otherwise. Ketebalan stroke, garis putus, dan jarak efek ikut diskalakan dengan karya seni, kecuali penskalaan memilih lain. + The mouse wheel zooms the canvas instead of scrolling it. Roda mouse melakukan zum pada kanvas, bukan menggulirnya. + The mouse wheel with Cmd/Ctrl held scrolls the canvas sideways. Roda mouse dengan Cmd/Ctrl ditahan menggulir kanvas ke samping. + Dragging sideways on a numeric field's label changes the field's value. Menyeret ke samping pada label bidang angka mengubah nilai bidang itu. + A two-finger rotate gesture on a trackpad rotates the canvas view. Gerakan putar dua jari pada trackpad memutar tampilan kanvas. + Holding a tool's shortcut key chooses the tool until you let go, and then the previous tool is chosen again. Menahan tombol pintasan alat memilih alat itu sampai Anda melepasnya, lalu alat sebelumnya dipilih lagi. + Shows the bounding box while you move the selection or draw a shape. Menampilkan kotak pembatas saat Anda memindahkan seleksi atau menggambar bentuk. + Create Trim Marks draws Japanese-style marks instead of Roman ones. Buat tanda potong menggambar tanda bergaya Jepang, bukan Romawi. + New art takes only the fill and stroke of the selection; off, it takes the selected object's whole appearance. Karya seni baru hanya mengambil isian dan stroke seleksi; saat nonaktif, karya seni baru mengambil seluruh tampilan objek terpilih. + Changing the width or height in the Transform panel, the Properties panel or the Control bar changes the other in proportion. Mengubah lebar atau tinggi di panel Transformasi, panel Properti, atau bilah Kontrol mengubah yang lain secara proporsional. + A live rectangle's properties show one Corner Radius field for all four corners; off, each corner has its own field. Properti persegi panjang dinamis menampilkan satu bidang Radius sudut untuk keempat sudut; saat nonaktif, setiap sudut punya bidangnya sendiri. + What edits in the Transform panel transform: the object, its pattern tiles or both; Default follows Transform Pattern Tiles. Apa yang ditransformasi oleh pengeditan di panel Transformasi: objek, ubin polanya, atau keduanya; Default mengikuti Transformasi ubin pola. + With one symbol instance selected, the Transform panel uses the symbol's registration point as its reference point. Saat satu instans simbol dipilih, panel Transformasi memakai titik registrasi simbol sebagai titik referensi. + Darkens the canvas outside the artboards while the Artboard tool is active. Menggelapkan kanvas di luar artboard selama alat Artboard aktif. + With Fade Region Outside Artboard on, the area outside the artboards stays dark while you drag with the Artboard tool. Saat Redupkan wilayah di luar artboard aktif, area di luar artboard tetap gelap selama Anda menyeret dengan alat Artboard. + How near, in pixels, the pointer must be to an object, anchor or handle for a click to select it. Seberapa dekat, dalam piksel, penunjuk harus berada dari objek, titik jangkar, atau pegangan agar klik memilihnya. + Whether the Selection tool's box selects objects it touches or only those fully inside; Drag Direction selects those inside on a drag to the right. E reverses it mid-drag. Apakah kotak alat seleksi memilih objek yang disentuhnya atau hanya yang sepenuhnya di dalam; Arah seret memilih yang di dalam saat diseret ke kanan. E membalik aturan saat menyeret. + A click selects a filled object only on its path, not inside its fill. Klik memilih objek berisi hanya pada jalurnya, bukan di dalam isiannya. + How near, in pixels, a point must come to an anchor or ruler guide for Snap to Point to snap it; with Smart Guides on, Smart Guides' Snapping Tolerance applies instead. Seberapa dekat, dalam piksel, sebuah titik harus mendekati titik jangkar atau panduan penggaris agar Snap ke titik menempelkannya; saat panduan cerdas aktif, toleransi kancingnya yang berlaku. + With the Selection tool, Cmd/Ctrl-click selects the object under the selected one at the pointer; each further click goes one object deeper. Dengan alat seleksi, Cmd/Ctrl-klik memilih objek di bawah objek terpilih pada penunjuk; setiap klik berikutnya turun satu objek lebih dalam. + Zoom In and Zoom Out bring the center of the selection to the middle of the view. Perbesar dan Perkecil membawa pusat seleksi ke tengah tampilan. + Locked and hidden artwork inside an artboard moves, scales and is copied with the artboard, as the other artwork does. Karya seni terkunci dan tersembunyi di dalam artboard ikut dipindah, diskalakan, dan disalin bersama artboard seperti karya seni lainnya. + The size of anchor points and direction handle ends on the canvas; larger anchors can also be picked from farther away. Ukuran titik jangkar dan ujung pegangan arah di kanvas; titik jangkar yang lebih besar juga dapat diambil dari jarak lebih jauh. + Draws the ends of direction handles as solid dots, hollow dots or larger solid dots. Menggambar ujung pegangan arah sebagai titik penuh, titik berongga, atau titik penuh yang lebih besar. + With the Direct Selection tool, the anchor under the pointer is highlighted. Dengan alat seleksi langsung, titik jangkar di bawah penunjuk disorot. + Shows direction handles when more than one anchor is selected; off, they show only while a single anchor is selected. Menampilkan pegangan arah saat lebih dari satu titik jangkar dipilih; jika nonaktif, pegangan hanya tampil saat satu titik jangkar dipilih. + Corner widgets hide on corners whose angle is greater than this many degrees. Widget sudut disembunyikan pada sudut yang besarnya melebihi derajat ini. + The Pen tool previews the next segment from the last anchor to the pointer before you click. Alat pena menampilkan pratinjau segmen berikutnya dari titik jangkar terakhir ke penunjuk sebelum Anda mengklik. + The Curvature tool previews the curve to the pointer before you place the next point. Alat kelengkungan menampilkan pratinjau kurva ke penunjuk sebelum Anda menempatkan titik berikutnya. The unit for new documents from built-in sizes other than pixel sizes and for opened files that record no unit; choosing one here and clicking OK also sets the active document's units. Satuan untuk dokumen baru dari ukuran bawaan selain ukuran piksel dan untuk file yang dibuka tanpa satuan tercatat; jika Anda memilihnya di sini lalu mengklik OK, satuan dokumen aktif juga menjadi satuan ini. Stroke weights, dashes and gaps show in this unit, and numbers typed for them are read in it. Ketebalan stroke, putus-putus, dan jarak ditampilkan dalam satuan ini, dan angka yang diketik untuknya dibaca dalam satuan ini. Type sizes, leading and baseline shift show in this unit, and numbers typed for them are read in it. Ukuran teks, leading, dan pergeseran garis dasar ditampilkan dalam satuan ini, dan angka yang diketik untuknya dibaca dalam satuan ini. The unit for East Asian type measurements, which no field uses yet. Satuan untuk ukuran teks Asia Timur, yang belum digunakan bidang mana pun. When on, a number typed without a unit into a field in picas is read in points. Jika aktif, angka yang diketik tanpa satuan di bidang dalam pica dibaca dalam titik. With XML ID, object names show as XML IDs in the Layers panel, the Variables panel and Layer Options. Dengan ID XML, nama objek ditampilkan sebagai ID XML di Lapisan, Variabel, dan Opsi lapisan. + Snaps drawing, moving and scaling to the grid's subdivisions, even while the grid is hidden; while it is on, Snap to Pixel does not apply. Menempelkan penggambaran, pemindahan, dan penskalaan ke subdivisi kisi, bahkan saat kisi disembunyikan; selama opsi ini aktif, Snap ke piksel tidak berlaku. + The color of guides that are not selected; an artboard with a Guide Label draws its own guides in the label's color instead. Warna panduan yang tidak dipilih; artboard yang memiliki Label panduan menggambar panduannya sendiri dengan warna label tersebut. + Draws guides as solid lines or as dots, including the guides already in the document. Menggambar panduan sebagai garis utuh atau sebagai titik, termasuk panduan yang sudah ada di dokumen. + With this on, guides are locked when VectorCraft starts; changing this option locks or unlocks them at once, and View › Guides › Lock Guides still changes the lock. Jika aktif, panduan terkunci saat VectorCraft dimulai; mengubah opsi ini langsung mengunci atau membuka kuncinya, dan Tampilan › Panduan › Kunci panduan tetap dapat mengubah kunci. + With this on, holding Cmd/Ctrl as you start dragging from a ruler makes a guide on the active artboard only, or a canvas guide with the Artboard tool. Jika aktif, menahan Cmd/Ctrl saat mulai menyeret dari penggaris membuat panduan hanya di artboard aktif, atau panduan seluruh kanvas dengan alat artboard. + The color of the grid; the lines between major gridlines are drawn in a fainter shade of it. Warna kisi; garis di antara garis kisi utama digambar dengan nuansa yang lebih pudar dari warna itu. + Draws the grid as lines, or as dots along the major gridlines at each subdivision. Menggambar kisi sebagai garis, atau sebagai titik di sepanjang garis kisi utama pada setiap subdivisi. + The distance between major gridlines, in every open document and in new ones; a VectorCraft document opens with the grid it was saved with. Jarak antara garis kisi utama di setiap dokumen yang terbuka dan di dokumen baru; dokumen VectorCraft dibuka dengan kisi yang disimpan bersamanya. + How many parts each major grid square is divided into; Snap to Grid snaps to these parts, even when the zoom hides their lines. Berapa bagian setiap kotak kisi utama dibagi; Snap ke kisi menempel ke bagian-bagian ini, bahkan saat zoom menyembunyikan garisnya. + Draws the grid behind the artwork; off, the grid is drawn over it. Menggambar kisi di belakang karya seni; jika nonaktif, kisi digambar di atasnya. + In Pixel Preview at 600% zoom or more, the active view shows a line at the edge of every document pixel over the artwork. Di Pratinjau piksel dengan zoom 600% atau lebih, tampilan aktif menunjukkan garis di tepi setiap piksel dokumen di atas karya seni. + The color of the tile edge and the dashed swatch bounds shown while you edit a pattern. Warna tepi ubin dan batas swatch putus-putus yang ditampilkan saat Anda mengedit pola. + Snaps drawing, moving and transforming to nearby art and shows guides and labels; Pixel Preview turns them off, and Snap to Grid snaps to the grid instead. Menjepretkan penggambaran, pemindahan, dan transformasi ke karya di dekatnya serta menampilkan panduan dan label; Pratinjau piksel mematikannya, dan Snap ke kisi menjepretkan ke kisi sebagai gantinya. + The color of Smart Guide lines and labels. Warna garis dan label panduan cerdas. + Shows a line along the edge or center that art lines up with; off, art still lines up without the line, and Snap to Glyph does not apply. Menampilkan garis di sepanjang tepi atau pusat yang sejajar dengan karya; saat mati, karya tetap sejajar tanpa garis, dan Snap ke glif tidak berlaku. + With a selection tool, outlines the unselected object under the pointer in its layer color while you are not dragging. Dengan alat seleksi, menggaris tepi objek yang tidak dipilih di bawah penunjuk dengan warna lapisannya selama Anda tidak menyeret. + Shows the size or angle next to the pointer while you scale, rotate, shear or reflect art. Menampilkan ukuran atau sudut di samping penunjuk saat Anda menskalakan, memutar, memiringkan atau memantulkan karya. + While you draw, points snap to lines at the chosen Angles through the point the segment or shape starts from. Saat Anda menggambar, titik menjepret ke garis pada sudut yang dipilih melalui titik awal segmen atau bentuk. + The set of angles the construction guides follow while Construction Guides is on. Kumpulan sudut yang diikuti panduan konstruksi selama Panduan konstruksi aktif. + Names what a point snaps to, such as an anchor, a path or an alignment; off, points snap the same way without the names. Menamai tempat titik menjepret, misalnya jangkar, jalur, atau perataan; saat mati, titik menjepret dengan cara yang sama tanpa nama. + Shows distances, angles and how far art has moved next to the pointer while you draw or move it. Menampilkan jarak, sudut, dan seberapa jauh karya berpindah di samping penunjuk saat Anda menggambar atau memindahkan. + Snaps moved or resized art to the same gap as between nearby objects, and marks the equal gaps. Menjepretkan karya yang dipindahkan atau diubah ukurannya ke celah yang sama dengan celah antarobjek di dekatnya, dan menandai celah yang sama. + With something selected, holding Alt/Option over another object or an artboard shows the distances between it and the selection. Dengan sesuatu yang dipilih, menahan Alt/Option di atas objek lain atau artboard menampilkan jarak antara objek itu dan seleksi. + A selection dragged back to within the Snapping Tolerance of where the drag began goes back to exactly that place; a copy does not. Seleksi yang diseret kembali hingga dalam toleransi kancing dari tempat seretan dimulai kembali tepat ke tempat itu; salinan tidak. + How near on screen the pointer or a dragged point must come to art for Smart Guides to snap to it; the distance is the same at every zoom. Seberapa dekat penunjuk atau titik yang diseret harus mendekati karya di layar agar panduan cerdas menjepret; jaraknya sama pada setiap zoom. + Snaps the end of a line segment, or a circle drawn from its center, so that it touches a nearby curve. Menjepretkan ujung segmen garis, atau lingkaran yang digambar dari pusatnya, agar menyentuh kurva di dekatnya. + Snaps the end of a line segment so that it meets a nearby straight segment at a right angle. Menjepretkan ujung segmen garis agar bertemu segmen lurus di dekatnya pada sudut siku-siku. Reset all preferences to their defaults? Atur ulang semua preferensi ke defaultnya? The defaults are applied when you click OK in Preferences. Cancel there keeps your current preferences. Nilai default diterapkan saat Anda mengklik OK di Preferensi. Batal di sana mempertahankan preferensi Anda saat ini. Smaller ↔ Larger Lebih kecil ↔ Lebih besar @@ -4462,6 +4553,11 @@ imageTrace Outline Kontur @msg PDF writer error: {0} Kesalahan penulis PDF: {0} @msgplural Packaged {n} file ({note}) in {folder}|Packaged {n} files ({note}) in {folder} Berhasil mengemas {n} file di {folder} ({note}) @msg Preview in Browser needs the desktop app (the web downloads files instead) Pratinjau di Peramban memerlukan aplikasi desktop (versi web mengunduh file sebagai gantinya) +@msg give `desiredK`, the desired file size in K (1024 bytes): a number above 0 and at most 1048576 berikan `desiredK`, ukuran file yang diinginkan dalam K (1024 byte): angka di atas 0 dan paling banyak 1048576 +@msg `startWith` is `current` or `auto` `startWith` adalah `current` atau `auto` +@msg `use` is `allSlices`, `eachSlice` or `currentSlice` `use` adalah `allSlices`, `eachSlice` atau `currentSlice` +@msg `slice` is a slice number from `slice.list`, with `use: currentSlice` `slice` adalah nomor slice dari `slice.list`, dengan `use: currentSlice` +@msg Optimize to File Size: there is no image to measure Optimalkan ke Ukuran File: tidak ada gambar untuk diukur @msg Release Guides: no guides Lepaskan panduan: tidak ada panduan @msg Release: no layer to put the rectangle in Lepaskan: tidak ada lapisan untuk menaruh persegi panjangnya @msg Replace Spine: select a blend and a path Ganti rangka: pilih satu blend dan satu jalur @@ -5529,6 +5625,19 @@ mark-style Japanese Jepang Transform Objects Transformasikan objek @msg unknown parameter `{key}`; did you mean `{near}`? parameter `{key}` tidak dikenal; apakah maksud Anda `{near}`? @msg unknown parameter `{key}`; the command takes no parameters parameter `{key}` tidak dikenal; perintah tidak menerima parameter +@msg unknown parameter `{key}`; `{object}` takes: {keys} parameter `{key}` tidak dikenal; `{object}` menerima: {keys} +@msg unknown parameter `{key}`; {why_not} parameter `{key}` tidak dikenal; {why_not} +@msg no format takes it (see document.formats) tidak ada format yang menerimanya (lihat document.formats) +@msg no save format takes it (see file.formatOptions) tidak ada format penyimpanan yang menerimanya (lihat file.formatOptions) +@msg PDF doesn't take it (see document.formats) PDF tidak menerimanya (lihat document.formats) +@msg EPS doesn't take it (see document.formats) EPS tidak menerimanya (lihat document.formats) +@msg DXF doesn't take it (see document.formats) DXF tidak menerimanya (lihat document.formats) +@msg {name} must be {range} (got {v}) {name} harus {range} (diperoleh {v}) +@msg The graphics processor tried first couldn't show the window, so VectorCraft started again on {summary} (Settings › Performance › Graphics Processor › Automatic uses the one that drives your display) Prosesor grafis yang dicoba pertama kali tidak dapat menampilkan jendela, jadi VectorCraft memulai ulang dengan {summary} (Pengaturan › Kinerja › Prosesor grafis › Otomatis menggunakan prosesor yang menjalankan layar Anda) +@msg Sent “{title}” to {to} “{title}” dikirim ke {to} +@msg Sent “{title}” to {to}. The spooler replied: {note} “{title}” dikirim ke {to}. Balasan antrean cetak: {note} +@msg the default printer printer bawaan +@msg raster effects on object {object}: requested {requested} ppi, achieved {achieved} ppi due to the 64 million pixel cap efek raster pada objek {object}: diminta {requested} ppi, tercapai {achieved} ppi karena batas 64 juta piksel @msg unknown parameter `{key}`; the command takes: {keys} parameter `{key}` tidak dikenal; perintah menerima: {keys} Load EPS into Clipboard Muat EPS ke papan klip @msg an image of {w} × {h} pixels is too large to draw gambar {w} × {h} piksel terlalu besar untuk digambar diff --git a/crates/ui-egui/src/i18n/it.tsv b/crates/ui-egui/src/i18n/it.tsv index 069dc7bd20..ddae18028c 100644 --- a/crates/ui-egui/src/i18n/it.tsv +++ b/crates/ui-egui/src/i18n/it.tsv @@ -205,6 +205,8 @@ antiAlias Sharp Nitido Crisp Definito Strong Forte Anti-aliasing: Anti-aliasing: + Art Optimized Ottimizzato per la grafica + Type Optimized Ottimizzato per il testo Any Kind Qualsiasi tipo Font Technology Tecnologia font font-technology Variable Variabili @@ -607,6 +609,7 @@ font-technology Variable Variabili Consolidate All Windows Consolida tutte le finestre Constrain Angle Vincola angolo Constrain Width and Height Proportions Vincola proporzioni di larghezza e altezza + Copy Width to Height Copia la larghezza nell’altezza Construction Guides Guide di costruzione Contextual Alternates Alternative contestuali Contextual Task Bar Barra attività contestuale @@ -617,6 +620,8 @@ font-technology Variable Variabili Control Controllo Convert Converti Convert All Spot Colors to Process Converti tutti i colori spot in quadricromia + Convert {name} to process Converti {name} in quadricromia + Keep {name} as spot Mantieni {name} come colore spot Convert All Strokes to Outlines Converti tutte le tracce in contorni Convert All Text to Outlines Converti tutto il testo in contorni Convert Anchor Point Converti punto di ancoraggio @@ -692,6 +697,9 @@ font-technology Variable Variabili Create from Selection Crea dalla selezione Create From: Crea da: Create Gradient Mesh… Crea trama sfumatura… + Flat Piatto + To Center Verso il centro + To Edge Verso il bordo Create Graph Crea grafico Create New Layer Crea nuovo livello Create New Sublayer Crea nuovo sottolivello @@ -2758,6 +2766,18 @@ diagnostics ui interfaccia Preview: Anteprima: Preview All Layers Anteprima di tutti i livelli Preview in Browser Anteprima nel browser + Optimize to File Size… Ottimizza in base alle dimensioni del file… + Optimize to File Size Ottimizza in base alle dimensioni del file + Desired File Size: Dimensione file desiderata: + Start With: Inizia con: + Use: Usa: + Current Settings Impostazioni correnti + Auto Select GIF/JPEG Selezione automatica GIF/JPEG + Total of All Slices Totale di tutte le sezioni + Each Slice Ogni sezione + Current Slice Sezione corrente + {size}, within {target} {size}, entro {target} + No setting tried fits in {target}; the smallest is {size} Nessuna impostazione provata rientra in {target}; la più piccola è {size} Preview in Browser needs the desktop app (the web downloads files instead) Anteprima nel browser richiede l'app desktop (la versione web scarica invece i file) Preview Mode Modalità anteprima Preview the document as it is now Visualizza l'anteprima del documento nello stato attuale @@ -3106,12 +3126,85 @@ digits Malayalam Malayalam Responsive Adattivo Restore Ripristina Restore every preference to its default (applied on OK) Ripristina tutte le preferenze ai valori predefiniti (applicato con OK) + Shows a bar of commands for the selection or tool on the canvas; it hides while you drag and in Presentation Mode. Mostra sull'area di lavoro una barra di comandi per la selezione o lo strumento; si nasconde durante il trascinamento e in modalità presentazione. + How far an arrow key moves the selection; with Shift, it moves ten times as far. Di quanto un tasto freccia sposta la selezione; con Maiusc la sposta dieci volte di più. + The angle of the axes that arrow keys move along and that Shift holds drawing and moving to. L'angolo degli assi lungo cui spostano i tasti freccia e a cui Maiusc vincola il disegno e lo spostamento. + The corner radius the Rounded Rectangle tool draws with; changing the radius while drawing changes this value too. Il raggio d'angolo con cui disegna lo strumento Rettangolo arrotondato; cambiare il raggio durante il disegno cambia anche questo valore. + How far right and down Paste moves the copy when it is given no position, as from a script; Paste in the app centers it in the view. Di quanto Incolla sposta la copia a destra e in basso quando non riceve una posizione, come da uno script; Incolla nell'app la centra nella vista. + Stops the Pen tool from deleting the anchor you click on a selected path, or adding one where you click its segment. Impedisce allo strumento Penna di eliminare il punto di ancoraggio su cui fai clic in un tracciato selezionato o di aggiungerne uno dove fai clic sul suo segmento. + Drawing tools show a crosshair pointer instead of their icon; Caps Lock does the same while it is on. Gli strumenti di disegno mostrano un puntatore a croce invece della loro icona; Bloc Maiusc fa lo stesso finché è attivo. + Shows a tip when the pointer rests on a button or field that has one. Mostra un suggerimento quando il puntatore si ferma su un pulsante o un campo che ne ha uno. + Shows a warning before a script you choose runs. Mostra un avviso prima che venga eseguito uno script che scegli. + Smooths the edges of artwork on the canvas. Smussa i bordi della grafica nell'area di lavoro. + Select › Same › Fill Color, Stroke Color and Fill & Stroke match only the same tint of a global or spot swatch, not any tint of it. Selezione › Uguale › Colore riempimento, Colore traccia e Riempimento e traccia trovano solo la stessa tinta di un campione globale o di un colore spot, non qualsiasi sua tinta. + Shows the Home screen when no document is open; off, the window stays empty until you click Home. Mostra la schermata Home quando nessun documento è aperto; se disattivata, la finestra resta vuota finché non fai clic su Home. + Measures objects with their strokes and shape-changing effects for size, position and alignment; shadows, glows and blurs are not measured. Misura gli oggetti con le tracce e gli effetti che ne cambiano la forma per dimensioni, posizione e allineamento; ombre, bagliori e sfocature non vengono misurati. + At 100% zoom, one inch of the document takes 96 screen points instead of 72. Allo zoom del 100%, un pollice del documento occupa 96 punti dello schermo invece di 72. + Double-clicking a group, path or image with the Selection tool opens it in isolation mode. Un doppio clic su un gruppo, un tracciato o un'immagine con lo strumento Selezione lo apre in modalità isolamento. + Pattern fills and strokes transform with the art, unless a transform or the Transform panel's menu chooses otherwise. I riempimenti e le tracce con motivo si trasformano con la grafica, a meno che una trasformazione o il menu del pannello Trasforma scelga diversamente. + Live corner radii scale with the art, unless the scale chooses otherwise. I raggi degli angoli dinamici si ridimensionano con la grafica, a meno che il ridimensionamento scelga diversamente. + Stroke weights, dashes and effect distances scale with the art, unless the scale chooses otherwise. Spessori delle tracce, trattini e distanze degli effetti si ridimensionano con la grafica, a meno che il ridimensionamento scelga diversamente. + The mouse wheel zooms the canvas instead of scrolling it. La rotellina del mouse esegue lo zoom dell'area di lavoro invece di scorrerla. + The mouse wheel with Cmd/Ctrl held scrolls the canvas sideways. La rotellina del mouse con Cmd/Ctrl premuto scorre l'area di lavoro in orizzontale. + Dragging sideways on a numeric field's label changes the field's value. Trascinare in orizzontale sull'etichetta di un campo numerico ne cambia il valore. + A two-finger rotate gesture on a trackpad rotates the canvas view. Un gesto di rotazione con due dita sul trackpad ruota la vista dell'area di lavoro. + Holding a tool's shortcut key chooses the tool until you let go, and then the previous tool is chosen again. Tenere premuta la scorciatoia di uno strumento lo sceglie finché non la rilasci, poi viene scelto di nuovo lo strumento precedente. + Shows the bounding box while you move the selection or draw a shape. Mostra il riquadro di delimitazione mentre sposti la selezione o disegni una forma. + Create Trim Marks draws Japanese-style marks instead of Roman ones. Crea segni di taglio disegna segni in stile giapponese invece di quelli romani. + New art takes only the fill and stroke of the selection; off, it takes the selected object's whole appearance. La nuova grafica prende solo il riempimento e la traccia della selezione; se disattivata, prende l'intero aspetto dell'oggetto selezionato. + Changing the width or height in the Transform panel, the Properties panel or the Control bar changes the other in proportion. Cambiare larghezza o altezza nel pannello Trasforma, nel pannello Proprietà o nel pannello Controllo cambia l'altra in proporzione. + A live rectangle's properties show one Corner Radius field for all four corners; off, each corner has its own field. Le proprietà di un rettangolo dinamico mostrano un solo campo Raggio angolo per tutti e quattro gli angoli; se disattivata, ogni angolo ha il proprio campo. + What edits in the Transform panel transform: the object, its pattern tiles or both; Default follows Transform Pattern Tiles. Cosa trasformano le modifiche nel pannello Trasforma: l'oggetto, i suoi tasselli motivo o entrambi; Predefinito segue Trasforma tasselli motivo. + With one symbol instance selected, the Transform panel uses the symbol's registration point as its reference point. Con un'istanza di simbolo selezionata, il pannello Trasforma usa il punto di registrazione del simbolo come punto di riferimento. + Darkens the canvas outside the artboards while the Artboard tool is active. Scurisce l'area di lavoro fuori dalle tavole da disegno mentre lo strumento Tavola da disegno è attivo. + With Fade Region Outside Artboard on, the area outside the artboards stays dark while you drag with the Artboard tool. Con Attenua area esterna alla tavola da disegno attivo, l'area fuori dalle tavole da disegno resta scura mentre trascini con lo strumento Tavola da disegno. + How near, in pixels, the pointer must be to an object, anchor or handle for a click to select it. Quanto vicino, in pixel, deve trovarsi il puntatore a un oggetto, punto di ancoraggio o maniglia perché un clic lo selezioni. + Whether the Selection tool's box selects objects it touches or only those fully inside; Drag Direction selects those inside on a drag to the right. E reverses it mid-drag. Se il riquadro dello strumento Selezione seleziona gli oggetti che tocca o solo quelli interamente all'interno; Direzione di trascinamento seleziona quelli interni trascinando verso destra. E inverte la regola durante il trascinamento. + A click selects a filled object only on its path, not inside its fill. Un clic seleziona un oggetto con riempimento solo sul suo tracciato, non all'interno del riempimento. + How near, in pixels, a point must come to an anchor or ruler guide for Snap to Point to snap it; with Smart Guides on, Smart Guides' Snapping Tolerance applies instead. Quanto vicino, in pixel, un punto deve arrivare a un punto di ancoraggio o a una guida del righello perché Aggancia al punto lo agganci; con le guide sensibili attive vale invece la loro tolleranza di aggancio. + With the Selection tool, Cmd/Ctrl-click selects the object under the selected one at the pointer; each further click goes one object deeper. Con lo strumento Selezione, Cmd/Ctrl+clic seleziona l'oggetto sotto quello selezionato nel punto del puntatore; ogni clic successivo scende di un oggetto. + Zoom In and Zoom Out bring the center of the selection to the middle of the view. Ingrandisci e Riduci portano il centro della selezione al centro della vista. + Locked and hidden artwork inside an artboard moves, scales and is copied with the artboard, as the other artwork does. La grafica bloccata e nascosta all'interno di una tavola da disegno viene spostata, ridimensionata e copiata con essa, come il resto della grafica. + The size of anchor points and direction handle ends on the canvas; larger anchors can also be picked from farther away. La dimensione dei punti di ancoraggio e delle estremità delle maniglie di direzione sull'area di lavoro; i punti di ancoraggio più grandi si possono afferrare anche da più lontano. + Draws the ends of direction handles as solid dots, hollow dots or larger solid dots. Disegna le estremità delle maniglie di direzione come punti pieni, punti vuoti o punti pieni più grandi. + With the Direct Selection tool, the anchor under the pointer is highlighted. Con lo strumento Selezione diretta, il punto di ancoraggio sotto il puntatore viene evidenziato. + Shows direction handles when more than one anchor is selected; off, they show only while a single anchor is selected. Mostra le maniglie di direzione quando è selezionato più di un punto di ancoraggio; se disattivato, compaiono solo con un singolo punto di ancoraggio selezionato. + Corner widgets hide on corners whose angle is greater than this many degrees. I widget angolo si nascondono sugli angoli la cui ampiezza supera questo numero di gradi. + The Pen tool previews the next segment from the last anchor to the pointer before you click. Lo strumento Penna mostra l'anteprima del segmento successivo dall'ultimo punto di ancoraggio al puntatore prima del clic. + The Curvature tool previews the curve to the pointer before you place the next point. Lo strumento Curvatura mostra l'anteprima della curva fino al puntatore prima di posizionare il punto successivo. The unit for new documents from built-in sizes other than pixel sizes and for opened files that record no unit; choosing one here and clicking OK also sets the active document's units. L'unità dei nuovi documenti nelle dimensioni predefinite, tranne quelle in pixel, e dei file aperti che non registrano alcuna unità; sceglierla qui e fare clic su OK la imposta anche per il documento attivo. Stroke weights, dashes and gaps show in this unit, and numbers typed for them are read in it. Gli spessori della traccia, i trattini e gli spazi sono mostrati in questa unità, e i numeri digitati per essi sono letti in questa unità. Type sizes, leading and baseline shift show in this unit, and numbers typed for them are read in it. Dimensioni del testo, interlinea e spostamento della linea di base sono mostrati in questa unità, e i numeri digitati per essi sono letti in questa unità. The unit for East Asian type measurements, which no field uses yet. L'unità per le misure del testo dell'Asia orientale, che nessun campo usa ancora. When on, a number typed without a unit into a field in picas is read in points. Se attiva, un numero digitato senza unità in un campo in pica viene letto in punti. With XML ID, object names show as XML IDs in the Layers panel, the Variables panel and Layer Options. Con ID XML, i nomi degli oggetti sono mostrati come ID XML in Livelli, Variabili e Opzioni livello. + Snaps drawing, moving and scaling to the grid's subdivisions, even while the grid is hidden; while it is on, Snap to Pixel does not apply. Aggancia il disegno, lo spostamento e il ridimensionamento alle suddivisioni della griglia, anche quando la griglia è nascosta; finché è attivo, Aggancia ai pixel non si applica. + The color of guides that are not selected; an artboard with a Guide Label draws its own guides in the label's color instead. Il colore delle guide non selezionate; una tavola da disegno con un'Etichetta delle guide disegna le proprie guide nel colore dell'etichetta. + Draws guides as solid lines or as dots, including the guides already in the document. Disegna le guide come linee continue o come punti, comprese le guide già presenti nel documento. + With this on, guides are locked when VectorCraft starts; changing this option locks or unlocks them at once, and View › Guides › Lock Guides still changes the lock. Se attivo, le guide sono bloccate all'avvio di VectorCraft; cambiare l'opzione le blocca o sblocca subito, e Visualizza › Guide › Blocca guide continua a cambiare il blocco. + With this on, holding Cmd/Ctrl as you start dragging from a ruler makes a guide on the active artboard only, or a canvas guide with the Artboard tool. Se attivo, tenere premuto Cmd/Ctrl all'inizio di un trascinamento da un righello crea una guida solo sulla tavola da disegno attiva, oppure una guida su tutta l'area di lavoro con lo strumento Tavola da disegno. + The color of the grid; the lines between major gridlines are drawn in a fainter shade of it. Il colore della griglia; le linee tra le linee principali sono disegnate in una tonalità più tenue di quel colore. + Draws the grid as lines, or as dots along the major gridlines at each subdivision. Disegna la griglia come linee, oppure come punti lungo le linee principali a ogni suddivisione. + The distance between major gridlines, in every open document and in new ones; a VectorCraft document opens with the grid it was saved with. La distanza tra le linee principali della griglia, in ogni documento aperto e in quelli nuovi; un documento VectorCraft si apre con la griglia con cui è stato salvato. + How many parts each major grid square is divided into; Snap to Grid snaps to these parts, even when the zoom hides their lines. In quante parti è diviso ogni quadrato principale della griglia; Aggancia alla griglia aggancia a queste parti, anche quando lo zoom ne nasconde le linee. + Draws the grid behind the artwork; off, the grid is drawn over it. Disegna la griglia dietro la grafica; se disattivato, la griglia è disegnata sopra. + In Pixel Preview at 600% zoom or more, the active view shows a line at the edge of every document pixel over the artwork. In Anteprima pixel con zoom del 600% o più, la vista attiva mostra sopra la grafica una linea sul bordo di ogni pixel del documento. + The color of the tile edge and the dashed swatch bounds shown while you edit a pattern. Il colore del bordo del tassello e dei limiti tratteggiati del campione mostrati mentre modifichi un motivo. + Snaps drawing, moving and transforming to nearby art and shows guides and labels; Pixel Preview turns them off, and Snap to Grid snaps to the grid instead. Aggancia disegno, spostamento e trasformazione alla grafica vicina e mostra guide ed etichette; l’anteprima pixel le disattiva, e Aggancia alla griglia aggancia invece alla griglia. + The color of Smart Guide lines and labels. Il colore delle linee e delle etichette delle guide sensibili. + Shows a line along the edge or center that art lines up with; off, art still lines up without the line, and Snap to Glyph does not apply. Mostra una linea lungo il bordo o il centro con cui la grafica si allinea; se disattivata, la grafica si allinea comunque senza la linea, e Aggancia a glifo non si applica. + With a selection tool, outlines the unselected object under the pointer in its layer color while you are not dragging. Con uno strumento di selezione, contorna l’oggetto non selezionato sotto il puntatore con il colore del suo livello finché non trascini. + Shows the size or angle next to the pointer while you scale, rotate, shear or reflect art. Mostra la dimensione o l’angolo accanto al puntatore mentre ridimensioni, ruoti, inclini o rifletti la grafica. + While you draw, points snap to lines at the chosen Angles through the point the segment or shape starts from. Mentre disegni, i punti si agganciano a linee con gli angoli scelti che passano per il punto da cui parte il segmento o la forma. + The set of angles the construction guides follow while Construction Guides is on. L’insieme di angoli che seguono le guide di costruzione mentre Guide di costruzione è attivo. + Names what a point snaps to, such as an anchor, a path or an alignment; off, points snap the same way without the names. Indica a cosa si aggancia un punto, come un punto di ancoraggio, un tracciato o un allineamento; se disattivato, i punti si agganciano allo stesso modo, senza i nomi. + Shows distances, angles and how far art has moved next to the pointer while you draw or move it. Mostra accanto al puntatore distanze, angoli e di quanto si è spostata la grafica mentre disegni o sposti. + Snaps moved or resized art to the same gap as between nearby objects, and marks the equal gaps. Aggancia la grafica spostata o ridimensionata alla stessa distanza che separa gli oggetti vicini e segna le distanze uguali. + With something selected, holding Alt/Option over another object or an artboard shows the distances between it and the selection. Con qualcosa di selezionato, tenere premuto Alt/Option su un altro oggetto o una tavola da disegno mostra le distanze tra questo e la selezione. + A selection dragged back to within the Snapping Tolerance of where the drag began goes back to exactly that place; a copy does not. Una selezione trascinata indietro entro la tolleranza di aggancio dal punto in cui è iniziato il trascinamento torna esattamente lì; una copia no. + How near on screen the pointer or a dragged point must come to art for Smart Guides to snap to it; the distance is the same at every zoom. Quanto vicino sullo schermo il puntatore o un punto trascinato deve arrivare alla grafica perché le guide sensibili vi si aggancino; la distanza è la stessa a ogni zoom. + Snaps the end of a line segment, or a circle drawn from its center, so that it touches a nearby curve. Aggancia l’estremità di un segmento di linea, o un cerchio disegnato dal centro, in modo che tocchi una curva vicina. + Snaps the end of a line segment so that it meets a nearby straight segment at a right angle. Aggancia l’estremità di un segmento di linea in modo che incontri un segmento rettilineo vicino ad angolo retto. Reset all preferences to their defaults? Ripristinare tutte le preferenze ai valori predefiniti? The defaults are applied when you click OK in Preferences. Cancel there keeps your current preferences. I valori predefiniti vengono applicati quando fai clic su OK in Preferenze. Annulla lì mantiene le preferenze attuali. Restore Recovered Documents Ripristina documenti recuperati @@ -4707,6 +4800,11 @@ liquify-list-end {0}, {1} {0} e {1} @msg PDF writer error: {0} Errore del generatore PDF: {0} @msgplural Packaged {n} file ({note}) in {folder}|Packaged {n} files ({note}) in {folder} Pacchetto creato con {n} file in {folder} ({note}) @msg Preview in Browser needs the desktop app (the web downloads files instead) Anteprima nel browser richiede l'app desktop (sul web i file vengono invece scaricati) +@msg give `desiredK`, the desired file size in K (1024 bytes): a number above 0 and at most 1048576 indica `desiredK`, la dimensione del file desiderata in K (1024 byte): un numero maggiore di 0 e al massimo 1048576 +@msg `startWith` is `current` or `auto` `startWith` è `current` o `auto` +@msg `use` is `allSlices`, `eachSlice` or `currentSlice` `use` è `allSlices`, `eachSlice` o `currentSlice` +@msg `slice` is a slice number from `slice.list`, with `use: currentSlice` `slice` è un numero di sezione da `slice.list`, con `use: currentSlice` +@msg Optimize to File Size: there is no image to measure Ottimizza in base alle dimensioni del file: non c'è nessuna immagine da misurare @msg Release Guides: no guides Rilascia guide: nessuna guida @msg Release: no layer to put the rectangle in Rilascia: nessun livello in cui inserire il rettangolo @msg Replace Spine: select a blend and a path Sostituisci dorsale: seleziona una fusione e un tracciato @@ -5918,6 +6016,19 @@ lighting Light Luce Transform Objects Trasforma oggetti @msg unknown parameter `{key}`; did you mean `{near}`? parametro sconosciuto `{key}`; forse intendevate `{near}`? @msg unknown parameter `{key}`; the command takes no parameters parametro sconosciuto `{key}`; il comando non ha parametri +@msg unknown parameter `{key}`; `{object}` takes: {keys} parametro sconosciuto `{key}`; `{object}` accetta: {keys} +@msg unknown parameter `{key}`; {why_not} parametro sconosciuto `{key}`; {why_not} +@msg no format takes it (see document.formats) nessun formato lo accetta (vedere document.formats) +@msg no save format takes it (see file.formatOptions) nessun formato di salvataggio lo accetta (vedere file.formatOptions) +@msg PDF doesn't take it (see document.formats) PDF non lo accetta (vedere document.formats) +@msg EPS doesn't take it (see document.formats) EPS non lo accetta (vedere document.formats) +@msg DXF doesn't take it (see document.formats) DXF non lo accetta (vedere document.formats) +@msg {name} must be {range} (got {v}) {name} deve essere {range} (ricevuto {v}) +@msg The graphics processor tried first couldn't show the window, so VectorCraft started again on {summary} (Settings › Performance › Graphics Processor › Automatic uses the one that drives your display) Il processore grafico provato per primo non è riuscito a mostrare la finestra, quindi VectorCraft è stato riavviato con {summary} (Impostazioni › Prestazioni › Processore grafico › Automatico usa quello che gestisce lo schermo) +@msg Sent “{title}” to {to} “{title}” inviato a: {to} +@msg Sent “{title}” to {to}. The spooler replied: {note} “{title}” inviato a: {to}. Risposta della coda di stampa: {note} +@msg the default printer stampante predefinita +@msg raster effects on object {object}: requested {requested} ppi, achieved {achieved} ppi due to the 64 million pixel cap effetti raster sull'oggetto {object}: richiesti {requested} ppi, ottenuti {achieved} ppi a causa del limite di 64 milioni di pixel @msg unknown parameter `{key}`; the command takes: {keys} parametro sconosciuto `{key}`; il comando accetta: {keys} @msg the params must be an object, not {got} i parametri devono essere un oggetto, non {got} @msg unknown parameter `{path}`; the object takes no keys parametro sconosciuto `{path}`; l'oggetto non accetta chiavi @@ -7446,6 +7557,10 @@ breakText Glyphs Glifi @msg Some islands could not be joined to the area around the art Non è stato possibile collegare alcune isole all’area intorno alla grafica @msg `width` must be from {lo} to {hi} pt `width` deve essere compreso tra {lo} e {hi} pt @msg `angle` must be from -180 to 180 degrees `angle` deve essere compreso tra -180 e 180 gradi +@msg `roundness` must be from 0 to 100% `roundness` deve essere compreso tra 0 e 100% +@msg `fidelity` must be from 0.01 to 100 pt `fidelity` deve essere compreso tra 0.01 e 100 pt +@msg style must be "pencil" or "brush" style deve essere "pencil" o "brush" +@msg extend end must be "start" or "end" l’estremità di extend deve essere "start" o "end" @msg `roundness` must be from 1 to 100% `roundness` deve essere compreso tra 1 e 100% @msg `count` must be a whole number from 1 to {MAX_BRIDGES_PER_ISLAND} `count` deve essere un numero intero compreso tra 1 e {MAX_BRIDGES_PER_ISLAND} Weed Box and Lines… Riquadro e linee di spellicolatura… @@ -7830,7 +7945,6 @@ breakText Glyphs Glifi @msg unknown dither `{d}` (diffusion, pattern, noise or none) dithering sconosciuto `{d}` (diffusion, pattern, noise o none) @msg unknown panel `{panel}` pannello sconosciuto `{panel}` @msg unknown parameter `{key}` parametro sconosciuto `{key}` -@msg unknown parameter `{within}settings.{format}`; {why} parametro sconosciuto `{within}settings.{format}`; {why} @msg unknown reduction `{reduction}` (selective, perceptual, adaptive, web, gray, blackWhite, uniform or document) riduzione sconosciuta `{reduction}` (selective, perceptual, adaptive, web, gray, blackWhite, uniform o document) @msg unmatched ')' ')' senza corrispondenza @msg unterminated character class classe di caratteri non terminata @@ -8200,7 +8314,6 @@ breakText Glyphs Glifi @msg anchor `smooth` must be true or false `smooth` del punto di ancoraggio deve essere true o false @msg anchor `{key}` must be [x, y] `{key}` del punto di ancoraggio deve essere [x, y] @msg anchor `{key}` must be a number `{key}` del punto di ancoraggio deve essere un numero -@msg angle and roundness must be finite angle e roundness devono essere finiti @msg angles must be a list as long as pins (degrees or null) angles deve essere un elenco lungo quanto pins (gradi o null) @msg appearance must be flat|center|edge appearance deve essere flat|center|edge @msg apply is "fill" or "stroke", not `{other}` apply è "fill" o "stroke", non `{other}` @@ -9390,9 +9503,7 @@ breakText Glyphs Glifi @msg the spacing makes more than {MAX_GROMMETS} grommets la spaziatura produce più di {MAX_GROMMETS} occhielli @msg there is no banner to mark non c'è nessuno striscione da contrassegnare @msg turn on at least one side attiva almeno un lato -@msg unknown parameter `{within}{key}`; {why} parametro sconosciuto `{within}{key}`; {why} @msg with no hem and no grommets there is nothing to mark senza orlo e senza occhielli non c'è nulla da contrassegnare -@msg {name} must be {lo}–{hi}{unit} (got {v}) {name} deve essere {lo}–{hi}{unit} (ricevuto {v}) @msg {saving} failed: {e} {saving} non riuscito: {e} Banner Hems and Grommets… Orli e occhielli per striscioni… Banner Hems and Grommets Orli e occhielli per striscioni diff --git a/crates/ui-egui/src/i18n/ja.tsv b/crates/ui-egui/src/i18n/ja.tsv index 27fd69e567..6b46cb5a91 100644 --- a/crates/ui-egui/src/i18n/ja.tsv +++ b/crates/ui-egui/src/i18n/ja.tsv @@ -268,6 +268,9 @@ digits Malayalam マラヤーラム数字 Mask マスク Rasterize… ラスタライズ… Create Gradient Mesh… グラデーションメッシュを作成… + Flat フラット + To Center 中心へ + To Edge エッジへ Create Object Mosaic… モザイクオブジェクトを作成… Vector Halftone… ベクターハーフトーン… Create Trim Marks トリムマークを作成 @@ -1120,6 +1123,8 @@ antiAlias Sharp シャープ Crisp くっきり Strong 太め Anti-aliasing: アンチエイリアス: + Art Optimized アートに最適化 + Type Optimized 文字に最適化 Appearance Item アピアランス項目 Appearance Panel アピアランスパネル Appearance of Black ブラックのアピアランス @@ -1369,10 +1374,13 @@ antiAlias Sharp シャープ Conflict {n} of {count} 競合 {n} / {count} Constrain Angle 角度を制限 Constrain Width and Height Proportions 幅と高さの縦横比を固定 + Copy Width to Height 幅を高さにコピー Construction Guides 作図ガイド Contextual Alternates 前後関係に依存する字形 Convert 変換 Convert All Spot Colors to Process すべての特色をプロセスカラーに変換 + Convert {name} to process {name} をプロセスカラーに変換 + Keep {name} as spot {name} を特色のままにする Convert All Strokes to Outlines すべての線をアウトラインに変換 Convert All Text to Outlines すべてのテキストをアウトラインに変換 Convert Anchor Point アンカーポイントの切り替え @@ -2832,6 +2840,18 @@ diagnostics ui UI Preview All Layers すべてのレイヤーをプレビュー Preview Mode プレビューモード Preview in Browser ブラウザーでプレビュー + Optimize to File Size… ファイルサイズに合わせて最適化… + Optimize to File Size ファイルサイズに合わせて最適化 + Desired File Size: 目標ファイルサイズ: + Start With: 開始設定: + Use: 対象: + Current Settings 現在の設定 + Auto Select GIF/JPEG GIF/JPEG を自動選択 + Total of All Slices すべてのスライスの合計 + Each Slice 各スライス + Current Slice 現在のスライス + {size}, within {target} {size} ({target} 以内) + No setting tried fits in {target}; the smallest is {size} 試したどの設定も {target} に収まりません。最小は {size} Preview the document as it is now 現在のドキュメントをプレビュー Previous 前へ Previous Library 前のライブラリ @@ -3083,12 +3103,85 @@ mark-style Japanese 日本式 Restore 復元 Restore Recovered Documents 復帰したドキュメントを復元 Restore every preference to its default (applied on OK) すべての環境設定を初期値に戻す (OK で適用) + Shows a bar of commands for the selection or tool on the canvas; it hides while you drag and in Presentation Mode. 選択範囲やツールに応じたコマンドのバーをカンバスに表示します。ドラッグ中とプレゼンテーションモードでは隠れます。 + How far an arrow key moves the selection; with Shift, it moves ten times as far. 矢印キーで選択範囲を移動する距離です。Shift キーを押すと 10 倍移動します。 + The angle of the axes that arrow keys move along and that Shift holds drawing and moving to. 矢印キーで移動する軸と、Shift キーで描画や移動を固定する軸の角度です。 + The corner radius the Rounded Rectangle tool draws with; changing the radius while drawing changes this value too. 角丸長方形ツールで描くときの角丸の半径です。描画中に半径を変えるとこの値も変わります。 + How far right and down Paste moves the copy when it is given no position, as from a script; Paste in the app centers it in the view. スクリプトからなど位置の指定がないときに、ペーストでコピーを右と下へずらす距離です。アプリでのペーストはコピーを表示の中央に置きます。 + Stops the Pen tool from deleting the anchor you click on a selected path, or adding one where you click its segment. 選択したパスでクリックしたアンカーポイントをペンツールが削除したり、セグメントをクリックした位置に追加したりしないようにします。 + Drawing tools show a crosshair pointer instead of their icon; Caps Lock does the same while it is on. 描画ツールのポインターをアイコンではなく十字にします。Caps Lock がオンの間も同じになります。 + Shows a tip when the pointer rests on a button or field that has one. ヒントのあるボタンやフィールドにポインターを置くとヒントを表示します。 + Shows a warning before a script you choose runs. 選んだスクリプトを実行する前に警告を表示します。 + Smooths the edges of artwork on the canvas. カンバス上のアートワークの縁を滑らかにします。 + Select › Same › Fill Color, Stroke Color and Fill & Stroke match only the same tint of a global or spot swatch, not any tint of it. 選択 › 共通 › カラー (塗り)、カラー (線)、塗りと線は、グローバルスウォッチまたは特色スウォッチの同じ濃度だけを選び、ほかの濃度は選びません。 + Shows the Home screen when no document is open; off, the window stays empty until you click Home. ドキュメントが開いていないときにホーム画面を表示します。オフのときは、ホームをクリックするまでウィンドウは空のままです。 + Measures objects with their strokes and shape-changing effects for size, position and alignment; shadows, glows and blurs are not measured. サイズ、位置、整列のために、線と形を変える効果を含めてオブジェクトを測ります。ドロップシャドウ、光彩、ぼかしは含めません。 + At 100% zoom, one inch of the document takes 96 screen points instead of 72. 100% 表示のとき、ドキュメントの 1 インチを 72 ではなく 96 スクリーンポイントで表示します。 + Double-clicking a group, path or image with the Selection tool opens it in isolation mode. 選択ツールでグループ、パス、画像をダブルクリックすると、編集モードで開きます。 + Pattern fills and strokes transform with the art, unless a transform or the Transform panel's menu chooses otherwise. 変形コマンドや変形パネルのメニューで別の指定をしない限り、パターンの塗りと線をアートワークと一緒に変形します。 + Live corner radii scale with the art, unless the scale chooses otherwise. 拡大・縮小で別の指定をしない限り、ライブコーナーの半径をアートワークと一緒に拡大・縮小します。 + Stroke weights, dashes and effect distances scale with the art, unless the scale chooses otherwise. 拡大・縮小で別の指定をしない限り、線幅、破線、効果の距離をアートワークと一緒に拡大・縮小します。 + The mouse wheel zooms the canvas instead of scrolling it. マウスホイールでカンバスをスクロールせずにズームします。 + The mouse wheel with Cmd/Ctrl held scrolls the canvas sideways. Cmd/Ctrl キーを押しながらマウスホイールを回すとカンバスを横にスクロールします。 + Dragging sideways on a numeric field's label changes the field's value. 数値フィールドのラベルを横にドラッグすると、フィールドの値が変わります。 + A two-finger rotate gesture on a trackpad rotates the canvas view. トラックパッドで 2 本指の回転ジェスチャーをすると、カンバスの表示が回転します。 + Holding a tool's shortcut key chooses the tool until you let go, and then the previous tool is chosen again. ツールのショートカットキーを押している間はそのツールを選び、離すと前のツールに戻ります。 + Shows the bounding box while you move the selection or draw a shape. 選択範囲の移動中や図形の描画中にバウンディングボックスを表示します。 + Create Trim Marks draws Japanese-style marks instead of Roman ones. トリムマークを作成で、西洋式ではなく日本式のトンボを描きます。 + New art takes only the fill and stroke of the selection; off, it takes the selected object's whole appearance. 新規オブジェクトに選択範囲の塗りと線だけを適用します。オフのときは、選択したオブジェクトのアピアランス全体を適用します。 + Changing the width or height in the Transform panel, the Properties panel or the Control bar changes the other in proportion. 変形パネル、プロパティパネル、コントロールパネルで幅または高さを変えると、もう一方も比率を保って変わります。 + A live rectangle's properties show one Corner Radius field for all four corners; off, each corner has its own field. ライブ長方形のプロパティで、4 つの角に共通の角丸の半径フィールドを 1 つ表示します。オフのときは角ごとにフィールドを表示します。 + What edits in the Transform panel transform: the object, its pattern tiles or both; Default follows Transform Pattern Tiles. 変形パネルでの編集が変形する対象で、オブジェクト、パターンタイル、またはその両方です。デフォルトはパターンタイルを変形に従います。 + With one symbol instance selected, the Transform panel uses the symbol's registration point as its reference point. シンボルインスタンスを 1 つ選択したとき、変形パネルはシンボルの基準点を基準点として使います。 + Darkens the canvas outside the artboards while the Artboard tool is active. アートボードツールを使っている間、アートボードの外側のカンバスを暗く表示します。 + With Fade Region Outside Artboard on, the area outside the artboards stays dark while you drag with the Artboard tool. アートボードの外側を暗く表示がオンのとき、アートボードツールでドラッグしている間もアートボードの外側を暗いままにします。 + How near, in pixels, the pointer must be to an object, anchor or handle for a click to select it. クリックでオブジェクト、アンカーポイント、ハンドルを選択できる、ポインターからの距離(ピクセル)です。 + Whether the Selection tool's box selects objects it touches or only those fully inside; Drag Direction selects those inside on a drag to the right. E reverses it mid-drag. 選択ツールのボックスが、触れたオブジェクトを選択するか、完全に内側のものだけを選択するかです。ドラッグ方向では右へドラッグすると内側のものを選択します。ドラッグ中に E を押すとルールが反転します。 + A click selects a filled object only on its path, not inside its fill. 塗りのあるオブジェクトを、塗りの内側ではなくパス上のクリックでのみ選択します。 + How near, in pixels, a point must come to an anchor or ruler guide for Snap to Point to snap it; with Smart Guides on, Smart Guides' Snapping Tolerance applies instead. ポイントにスナップでポイントがスナップされる、アンカーポイントや定規ガイドまでの距離(ピクセル)です。スマートガイドがオンのときは、代わりにスマートガイドのスナップ許容値を使います。 + With the Selection tool, Cmd/Ctrl-click selects the object under the selected one at the pointer; each further click goes one object deeper. 選択ツールで Cmd/Ctrl キーを押しながらクリックすると、ポインター位置で選択中のオブジェクトの下にあるオブジェクトを選択します。クリックするたびに 1 つ下へ進みます。 + Zoom In and Zoom Out bring the center of the selection to the middle of the view. ズームインとズームアウトで、選択範囲の中心をビューの中央に移動します。 + Locked and hidden artwork inside an artboard moves, scales and is copied with the artboard, as the other artwork does. アートボード内のロックされたアートワークと非表示のアートワークも、ほかのアートワークと同じくアートボードと一緒に移動、拡大・縮小、複製されます。 + The size of anchor points and direction handle ends on the canvas; larger anchors can also be picked from farther away. カンバス上のアンカーポイントと方向ハンドルの先端のサイズです。大きいアンカーポイントは、より離れた位置からもつかめます。 + Draws the ends of direction handles as solid dots, hollow dots or larger solid dots. 方向ハンドルの先端を、塗りつぶしの点、中空の点、大きい塗りつぶしの点のいずれかで描きます。 + With the Direct Selection tool, the anchor under the pointer is highlighted. ダイレクト選択ツールで、ポインターの下にあるアンカーポイントを強調表示します。 + Shows direction handles when more than one anchor is selected; off, they show only while a single anchor is selected. 複数のアンカーポイントを選択したときに方向ハンドルを表示します。オフのときは、アンカーポイントを 1 つだけ選択したときにのみ表示します。 + Corner widgets hide on corners whose angle is greater than this many degrees. 角度がこの値(度)より大きいコーナーでは、コーナーウィジェットを隠します。 + The Pen tool previews the next segment from the last anchor to the pointer before you click. クリックする前に、ペンツールで最後のアンカーポイントからポインターまでの次のセグメントをプレビューします。 + The Curvature tool previews the curve to the pointer before you place the next point. 次のポイントを置く前に、カーブツールでポインターまでのカーブをプレビューします。 The unit for new documents from built-in sizes other than pixel sizes and for opened files that record no unit; choosing one here and clicking OK also sets the active document's units. ピクセル以外の組み込みサイズの新規ドキュメントと、単位を記録していない開いたファイルに使う単位で、ここで選んで OK をクリックすると作業中のドキュメントの単位も変わります。 Stroke weights, dashes and gaps show in this unit, and numbers typed for them are read in it. 線幅、線分、間隔はこの単位で表示され、入力した数値もこの単位で読み取られます。 Type sizes, leading and baseline shift show in this unit, and numbers typed for them are read in it. フォントサイズ、行送り、ベースラインシフトはこの単位で表示され、入力した数値もこの単位で読み取られます。 The unit for East Asian type measurements, which no field uses yet. 東アジア言語の文字の測定に使う単位で、まだどのフィールドも使っていません。 When on, a number typed without a unit into a field in picas is read in points. オンのとき、パイカのフィールドに単位なしで入力した数値はポイントとして読み取られます。 With XML ID, object names show as XML IDs in the Layers panel, the Variables panel and Layer Options. XML ID を選ぶと、レイヤー、変数、レイヤーオプションでオブジェクト名が XML ID として表示されます。 + Snaps drawing, moving and scaling to the grid's subdivisions, even while the grid is hidden; while it is on, Snap to Pixel does not apply. グリッドが非表示でも、描画、移動、拡大・縮小をグリッドの分割位置にスナップします。オンの間は「ピクセルにスナップ」は働きません。 + The color of guides that are not selected; an artboard with a Guide Label draws its own guides in the label's color instead. 選択されていないガイドの色です。ガイドのラベルを設定したアートボードは、自身のガイドをラベルの色で描きます。 + Draws guides as solid lines or as dots, including the guides already in the document. ドキュメントにすでにあるガイドも含め、ガイドを実線または点線で描きます。 + With this on, guides are locked when VectorCraft starts; changing this option locks or unlocks them at once, and View › Guides › Lock Guides still changes the lock. オンにすると、VectorCraft の起動時にガイドがロックされます。このオプションを変更するとすぐにロックまたはロック解除され、表示 › ガイド › ガイドをロックでも引き続きロックを切り替えられます。 + With this on, holding Cmd/Ctrl as you start dragging from a ruler makes a guide on the active artboard only, or a canvas guide with the Artboard tool. オンにすると、定規からドラッグを始めるときに Cmd/Ctrl を押していると、アクティブなアートボードだけのガイドを作成し、アートボードツールではカンバス全体のガイドを作成します。 + The color of the grid; the lines between major gridlines are drawn in a fainter shade of it. グリッドの色です。主グリッド線の間の線は、この色の薄い色合いで描かれます。 + Draws the grid as lines, or as dots along the major gridlines at each subdivision. グリッドを線で描くか、主グリッド線に沿って各分割位置に点で描きます。 + The distance between major gridlines, in every open document and in new ones; a VectorCraft document opens with the grid it was saved with. 開いているすべてのドキュメントと新規ドキュメントでの主グリッド線の間隔です。VectorCraft ドキュメントは保存時のグリッドで開きます。 + How many parts each major grid square is divided into; Snap to Grid snaps to these parts, even when the zoom hides their lines. 主グリッドの各マスを分割する数です。ズームで線が隠れていても、「グリッドにスナップ」はこの分割位置にスナップします。 + Draws the grid behind the artwork; off, the grid is drawn over it. グリッドをアートワークの背面に描きます。オフのときは前面に描きます。 + In Pixel Preview at 600% zoom or more, the active view shows a line at the edge of every document pixel over the artwork. ピクセルプレビューで 600% 以上にズームすると、アクティブな表示でアートワークの上に、ドキュメントの各ピクセルの境界に線が表示されます。 + The color of the tile edge and the dashed swatch bounds shown while you edit a pattern. パターンの編集中に表示されるタイルの境界線と、破線のスウォッチの境界の色です。 + Snaps drawing, moving and transforming to nearby art and shows guides and labels; Pixel Preview turns them off, and Snap to Grid snaps to the grid instead. 描画、移動、変形を近くのアートにスナップし、ガイドとラベルを表示します。ピクセルプレビューではオフになり、グリッドにスナップがオンのときは代わりにグリッドにスナップします。 + The color of Smart Guide lines and labels. スマートガイドの線とラベルの色です。 + Shows a line along the edge or center that art lines up with; off, art still lines up without the line, and Snap to Glyph does not apply. アートが揃う端または中心に沿って線を表示します。オフでも線なしで揃い、グリフにスナップは適用されません。 + With a selection tool, outlines the unselected object under the pointer in its layer color while you are not dragging. 選択ツールでドラッグしていないとき、ポインターの下にある未選択のオブジェクトをレイヤーの色で囲みます。 + Shows the size or angle next to the pointer while you scale, rotate, shear or reflect art. アートを拡大・縮小、回転、シアー、またはリフレクトしている間、ポインターの横にサイズまたは角度を表示します。 + While you draw, points snap to lines at the chosen Angles through the point the segment or shape starts from. 描画中、セグメントまたはシェイプの始点を通る、選択した角度の線にポイントがスナップします。 + The set of angles the construction guides follow while Construction Guides is on. 作図ガイドがオンのときに作図ガイドが従う角度のセットです。 + Names what a point snaps to, such as an anchor, a path or an alignment; off, points snap the same way without the names. アンカー、パス、整列など、ポイントのスナップ先の名前を表示します。オフでも名前なしで同じようにスナップします。 + Shows distances, angles and how far art has moved next to the pointer while you draw or move it. 描画中または移動中に、距離、角度、アートの移動量をポインターの横に表示します。 + Snaps moved or resized art to the same gap as between nearby objects, and marks the equal gaps. 移動またはサイズ変更したアートを近くのオブジェクト間と同じ間隔にスナップし、等しい間隔を示します。 + With something selected, holding Alt/Option over another object or an artboard shows the distances between it and the selection. 何かを選択した状態で、別のオブジェクトまたはアートボードの上で Alt/Option キーを押し続けると、それと選択範囲の間の距離を表示します。 + A selection dragged back to within the Snapping Tolerance of where the drag began goes back to exactly that place; a copy does not. ドラッグの開始位置からスナップ許容値の範囲内までドラッグして戻した選択範囲は、正確にその位置に戻ります。コピーは戻りません。 + How near on screen the pointer or a dragged point must come to art for Smart Guides to snap to it; the distance is the same at every zoom. スマートガイドがスナップするために、ポインターやドラッグしたポイントが画面上でアートにどこまで近づく必要があるかです。この距離はどのズームでも同じです。 + Snaps the end of a line segment, or a circle drawn from its center, so that it touches a nearby curve. 直線セグメントの端、または中心から描いた円を、近くの曲線に接するようにスナップします。 + Snaps the end of a line segment so that it meets a nearby straight segment at a right angle. 直線セグメントの端を、近くの直線セグメントと直角に交わるようにスナップします。 Reset all preferences to their defaults? すべての環境設定を初期値に戻しますか? The defaults are applied when you click OK in Preferences. Cancel there keeps your current preferences. 初期値は環境設定で OK をクリックすると適用されます。そこでキャンセルすると現在の環境設定が保たれます。 Restored documents open unsaved: save them to keep them. 復元したドキュメントは未保存の状態で開きます。保存して残してください。 @@ -5148,6 +5241,11 @@ swatch Bright Violet ビビッドバイオレット @msg 1 hidden object 非表示のオブジェクト 1 個 @msg {n} hidden objects 非表示のオブジェクト {n} 個 @msg Preview in Browser needs the desktop app (the web downloads files instead) 「ブラウザーでプレビュー」にはデスクトップアプリが必要です (Web 版では代わりにファイルをダウンロードします) +@msg give `desiredK`, the desired file size in K (1024 bytes): a number above 0 and at most 1048576 `desiredK` に目標ファイルサイズを K (1024 バイト) 単位で指定してください: 0 より大きく 1048576 以下の数値 +@msg `startWith` is `current` or `auto` `startWith` は `current` または `auto` です +@msg `use` is `allSlices`, `eachSlice` or `currentSlice` `use` は `allSlices`、`eachSlice` または `currentSlice` です +@msg `slice` is a slice number from `slice.list`, with `use: currentSlice` `slice` は `slice.list` のスライス番号で、`use: currentSlice` と一緒に使います +@msg Optimize to File Size: there is no image to measure ファイルサイズに合わせて最適化: 測定する画像がありません @msg no file system here この環境にはファイルシステムがありません @msg nothing to preview プレビューするものがありません @msg Saved {n} files beside {path} {path} と同じ場所にファイルを {n} 個保存しました @@ -5962,6 +6060,19 @@ lighting Light ライト Transform Objects オブジェクトの変形 @msg unknown parameter `{key}`; did you mean `{near}`? `{key}` は不明なパラメーターです。`{near}` のことですか? @msg unknown parameter `{key}`; the command takes no parameters `{key}` は不明なパラメーターです。このコマンドにパラメーターはありません +@msg unknown parameter `{key}`; `{object}` takes: {keys} `{key}` は不明なパラメーターです。`{object}` で使えるキー: {keys} +@msg unknown parameter `{key}`; {why_not} `{key}` は不明なパラメーターです。{why_not} +@msg no format takes it (see document.formats) このオプションを使う形式はありません (document.formats を参照) +@msg no save format takes it (see file.formatOptions) このオプションを使う保存形式はありません (file.formatOptions を参照) +@msg PDF doesn't take it (see document.formats) PDF では使えません (document.formats を参照) +@msg EPS doesn't take it (see document.formats) EPS では使えません (document.formats を参照) +@msg DXF doesn't take it (see document.formats) DXF では使えません (document.formats を参照) +@msg {name} must be {range} (got {v}) {name} は {range} にしてください (指定値: {v}) +@msg The graphics processor tried first couldn't show the window, so VectorCraft started again on {summary} (Settings › Performance › Graphics Processor › Automatic uses the one that drives your display) 最初に試したグラフィックスプロセッサーではウィンドウを表示できなかったため、{summary} で VectorCraft を再起動しました (環境設定 › パフォーマンス › グラフィックプロセッサー › 自動 では、ディスプレイを駆動しているプロセッサーを使います) +@msg Sent “{title}” to {to} “{title}” を {to} に送信しました +@msg Sent “{title}” to {to}. The spooler replied: {note} “{title}” を {to} に送信しました。印刷キューの応答: {note} +@msg the default printer デフォルトのプリンター +@msg raster effects on object {object}: requested {requested} ppi, achieved {achieved} ppi due to the 64 million pixel cap オブジェクト {object} のラスター効果: 要求は {requested} ppi ですが、6400 万ピクセルの上限により {achieved} ppi になりました @msg unknown parameter `{key}`; the command takes: {keys} `{key}` は不明なパラメーターです。このコマンドで使えるパラメーター: {keys} @msg the params must be an object, not {got} パラメーターはオブジェクトにしてください ({got} は使えません) @msg unknown parameter `{path}`; the object takes no keys `{path}` は不明なパラメーターです。このオブジェクトにはキーを指定できません @@ -6988,8 +7099,6 @@ axis Y Axis Y 軸 @msg unknown dither `{d}` (diffusion, pattern, noise or none) `{d}` は不明なディザの指定です (diffusion、pattern、noise、none のいずれか) @msg unknown panel `{panel}` `{panel}` は不明なパネルです @msg unknown parameter `{key}` `{key}` は不明なパラメーターです -@msg unknown parameter `{within}settings.{format}`; {why} `{within}settings.{format}` は不明なパラメーターです。{why} -@msg unknown parameter `{within}{key}`; {why} `{within}{key}` は不明なパラメーターです。{why} @msg unknown reduction `{reduction}` (selective, perceptual, adaptive, web, gray, blackWhite, uniform or document) `{reduction}` は不明な減色の指定です (selective、perceptual、adaptive、web、gray、blackWhite、uniform、document のいずれか) @msg unmatched ')' 対応していない ')' があります @msg unterminated character class 文字クラスが閉じられていません @@ -7359,7 +7468,6 @@ axis Y Axis Y 軸 @msg anchor `smooth` must be true or false アンカーの `smooth` には true または false を指定してください @msg anchor `{key}` must be [x, y] アンカーの `{key}` には [x, y] を指定してください @msg anchor `{key}` must be a number アンカーの `{key}` には数値を指定してください -@msg angle and roundness must be finite angle と roundness には有限の値を指定してください @msg angles must be a list as long as pins (degrees or null) angles には pins と同じ長さのリスト (度数または null) を指定してください @msg appearance must be flat|center|edge appearance には flat|center|edge のいずれかを指定してください @msg apply is "fill" or "stroke", not `{other}` apply には "fill" または "stroke" を指定してください (`{other}` は指定できません) @@ -8411,7 +8519,6 @@ axis Y Axis Y 軸 @msg {label} must be a number from 1 to 10000 {label} には 1 から 10000 までの数値を指定してください @msg {name} `{s}`: {ids} {name} `{s}`: {ids} @msg {name} is built in and can't be deleted {name} は組み込みのため、削除できません -@msg {name} must be {lo}–{hi}{unit} (got {v}) {name} には {lo}–{hi}{unit} を指定してください (指定値: {v}) @msg {name}: CRC or size mismatch {name}: CRC またはサイズが一致しません @msg {name}: only this Affinity file's embedded preview could be read; use File › Open to see it with its warning, or export SVG or PDF from Affinity before placing {name}: この Affinity ファイルは埋め込みプレビューしか読み込めませんでした。「ファイル › 開く」で警告とともに表示するか、配置する前に Affinity から SVG または PDF を書き出してください @msg {name}: {e} {name}: {e} @@ -9325,6 +9432,10 @@ breakText Glyphs 字形 @msg Some islands could not be joined to the area around the art 一部のアイランドをアートワークの周囲の領域につなげられませんでした @msg `width` must be from {lo} to {hi} pt `width` は {lo}~{hi} pt の範囲で指定してください @msg `angle` must be from -180 to 180 degrees `angle` は -180~180 度の範囲で指定してください +@msg `roundness` must be from 0 to 100% `roundness` は 0~100% の範囲で指定してください +@msg `fidelity` must be from 0.01 to 100 pt `fidelity` は 0.01~100 pt の範囲で指定してください +@msg style must be "pencil" or "brush" style は "pencil" または "brush" を指定してください +@msg extend end must be "start" or "end" extend の端は "start" または "end" を指定してください @msg `roundness` must be from 1 to 100% `roundness` は 1~100% の範囲で指定してください @msg `count` must be a whole number from 1 to {MAX_BRIDGES_PER_ISLAND} `count` には 1 から {MAX_BRIDGES_PER_ISLAND} の整数を指定してください Weed Box and Lines… カス取り枠とライン… diff --git a/crates/ui-egui/src/i18n/ka.tsv b/crates/ui-egui/src/i18n/ka.tsv index ad18ef54d7..d7b0629c63 100644 --- a/crates/ui-egui/src/i18n/ka.tsv +++ b/crates/ui-egui/src/i18n/ka.tsv @@ -1807,8 +1807,6 @@ @msg unknown panel უცნობი პანელი @msg unknown panel `{panel}` უცნობი პანელი `{panel}` @msg unknown parameter `{key}` უცნობი პარამეტრი `{key}` -@msg unknown parameter `{within}settings.{format}`; {why} უცნობი პარამეტრი `{within}settings.{format}`; {why} -@msg unknown parameter `{within}{key}`; {why} უცნობი პარამეტრი `{within}{key}`; {why} @msg unknown pieLegend `{v}` (none, standard or wedges) უცნობი pieLegend `{v}` (none, standard ან wedges) @msg unknown piePosition `{v}` (even, ratio or stacked) უცნობი piePosition `{v}` (even, ratio ან stacked) @msg unknown pieSort `{v}` (none, all or first) უცნობი pieSort `{v}` (none, all ან first) @@ -1941,7 +1939,6 @@ @msg {name} is not a CMYK profile {name} CMYK პროფილი არ არის @msg {name} is not an RGB profile {name} RGB პროფილი არ არის @msg {name} must be a number {name} რიცხვი უნდა იყოს -@msg {name} must be {lo}–{hi}{unit} (got {v}) {name} უნდა იყოს {lo}–{hi}{unit} (მიღებულია {v}) @msg {name}: CRC or size mismatch {name}: CRC ან ზომა არ ემთხვევა @msg {name}: only this Affinity file's embedded preview could be read; use File › Open to see it with its warning, or export SVG or PDF from Affinity before placing {name}: Affinity-ის ამ ფაილიდან მხოლოდ ჩაშენებული წინასწარი ხედის წაკითხვა მოხერხდა; გაფრთხილებასთან ერთად მის სანახავად გამოიყენეთ ფაილი › გახსნა, ან განთავსებამდე Affinity-დან გააკეთეთ SVG-ის ან PDF-ის ექსპორტი @msg {name}: {e} {name}: {e} @@ -2383,6 +2380,9 @@ Mask ნიღაბი Rasterize… რასტრირება… Create Gradient Mesh… გრადიენტული ბადის შექმნა… + Flat ბრტყელი + To Center ცენტრისკენ + To Edge კიდისკენ Create Object Mosaic… ობიექტების მოზაიკის შექმნა… Vector Halftone… ვექტორული ნახევარტონი… Create Trim Marks ჭრის ნიშნების შექმნა @@ -3259,6 +3259,18 @@ lighting Light სინათლე Placement Options… განთავსების პარამეტრები… Plug-in… პლაგინი… Preview in Browser ბრაუზერში ნახვა + Optimize to File Size… ფაილის ზომაზე ოპტიმიზაცია… + Optimize to File Size ფაილის ზომაზე ოპტიმიზაცია + Desired File Size: სასურველი ფაილის ზომა: + Start With: დაწყება: + Use: გამოყენება: + Current Settings მიმდინარე პარამეტრები + Auto Select GIF/JPEG GIF/JPEG-ის ავტომატური არჩევა + Total of All Slices ყველა ნაჭრის ჯამი + Each Slice თითოეული ნაჭერი + Current Slice მიმდინარე ნაჭერი + {size}, within {target} {size}, {target}-ის ფარგლებში + No setting tried fits in {target}; the smallest is {size} არცერთი ნაცადი პარამეტრი არ ეტევა {target}-ში; უმცირესია {size} Printer Setup… პრინტერის დაყენება… Printers პრინტერები Recent File ბოლოს გახსნილი ფაილი @@ -4822,6 +4834,8 @@ digits Malayalam მალაიალამური Collate დაკომპლექტება Composite colours are converted to it; separations separate with it when it is a CMYK profile. შედგენილი ფერები მასში გარდაიქმნება; სეპარაცია მისით ხდება, როცა ის CMYK პროფილია. Convert All Spot Colors to Process ყველა სპოტ-ფერის პროცესულად გარდაქმნა + Convert {name} to process {name}-ის პროცესულად გარდაქმნა + Keep {name} as spot {name}-ის სპოტ-ფერად დატოვება Default Printer ნაგულისხმევი პრინტერი Document Ink Options დოკუმენტის საღებავების პარამეტრები Download: ჩამოტვირთვა: @@ -5760,6 +5774,7 @@ theme Appearance იერსახე Command Click to Select Objects Behind Command-დაწკაპუნებით უკან მდებარე ობიექტების მონიშვნა Constrain Angle კუთხის შეზღუდვა Constrain Width and Height Proportions სიგანისა და სიმაღლის პროპორციების შენარჩუნება + Copy Width to Height სიგანის კოპირება სიმაღლეში Construction Guides სამშენებლო დამხმარე ხაზები Curvature Tool მრუდის ხელსაწყო Data Recovery მონაცემების აღდგენა @@ -6236,12 +6251,86 @@ font-technology Variable ცვლადი Preferences პარამეტრები Previous წინა Restore every preference to its default (applied on OK) ყველა პარამეტრის ნაგულისხმევ მნიშვნელობაზე დაბრუნება (გამოიყენება OK-ზე დაჭერისას) + Shows a bar of commands for the selection or tool on the canvas; it hides while you drag and in Presentation Mode. ტილოზე აჩვენებს ბრძანებების ზოლს მონიშნულისთვის ან ხელსაწყოსთვის; გადათრევისას და პრეზენტაციის რეჟიმში იმალება. + How far an arrow key moves the selection; with Shift, it moves ten times as far. რამდენად შორს გადაადგილებს ისრის კლავიში მონიშნულს; Shift-ით ათჯერ უფრო შორს გადაადგილებს. + The angle of the axes that arrow keys move along and that Shift holds drawing and moving to. იმ ღერძების კუთხე, რომელთა გასწვრივაც ისრის კლავიშები გადაადგილებენ და რომლებზეც Shift ზღუდავს ხატვას და გადაადგილებას. + The corner radius the Rounded Rectangle tool draws with; changing the radius while drawing changes this value too. კუთხის რადიუსი, რომლითაც მომრგვალებული მართკუთხედის ხელსაწყო ხატავს; ხატვისას რადიუსის შეცვლა ამ მნიშვნელობასაც ცვლის. + How far right and down Paste moves the copy when it is given no position, as from a script; Paste in the app centers it in the view. რამდენად გადაწევს ჩასმა ასლს მარჯვნივ და ქვემოთ, როცა პოზიცია მითითებული არ არის, მაგალითად სკრიპტიდან; აპში ჩასმა ასლს ხედის ცენტრში სვამს. + Stops the Pen tool from deleting the anchor you click on a selected path, or adding one where you click its segment. კალმის ხელსაწყოს უკრძალავს მონიშნულ კონტურზე დაწკაპუნებული საყრდენი წერტილის წაშლას ან ახლის დამატებას იქ, სადაც მის სეგმენტზე დააწკაპუნებთ. + Drawing tools show a crosshair pointer instead of their icon; Caps Lock does the same while it is on. სახატავი ხელსაწყოები ხატულის ნაცვლად ჯვრისებრ მაჩვენებელს აჩვენებენ; Caps Lock იგივეს აკეთებს, სანამ ჩართულია. + Shows a tip when the pointer rests on a button or field that has one. აჩვენებს მინიშნებას, როცა მაჩვენებელი ჩერდება ღილაკზე ან ველზე, რომელსაც ის აქვს. + Shows a warning before a script you choose runs. აჩვენებს გაფრთხილებას თქვენ მიერ არჩეული სკრიპტის გაშვებამდე. + Smooths the edges of artwork on the canvas. ტილოზე ნახატის კიდეებს აგლუვებს. + Select › Same › Fill Color, Stroke Color and Fill & Stroke match only the same tint of a global or spot swatch, not any tint of it. მონიშვნა › იგივე › შევსების ფერი, კონტურის ფერი და შევსება და კონტური პოულობს მხოლოდ გლობალური ან სპოტ ნიმუშის იმავე ტონს და არა მის ნებისმიერ ტონს. + Shows the Home screen when no document is open; off, the window stays empty until you click Home. აჩვენებს საწყის ეკრანს, როცა არცერთი დოკუმენტი არ არის გახსნილი; გამორთვისას ფანჯარა ცარიელი რჩება, სანამ საწყის ეკრანზე არ დააწკაპუნებთ. + Measures objects with their strokes and shape-changing effects for size, position and alignment; shadows, glows and blurs are not measured. ზომის, პოზიციისა და სწორების დროს ობიექტებს ზომავს კონტურებითა და ფორმის შემცვლელი ეფექტებით; ჩრდილები, ნათება და გაბუნდოვნება არ იზომება. + At 100% zoom, one inch of the document takes 96 screen points instead of 72. 100%-იან მასშტაბზე დოკუმენტის ერთი დიუმი 72-ის ნაცვლად 96 ეკრანის პუნქტს იკავებს. + Double-clicking a group, path or image with the Selection tool opens it in isolation mode. მონიშვნის ხელსაწყოთი ჯგუფზე, კონტურზე ან გამოსახულებაზე ორჯერ დაწკაპუნება მას იზოლაციის რეჟიმში ხსნის. + Pattern fills and strokes transform with the art, unless a transform or the Transform panel's menu chooses otherwise. პატერნის შევსებები და კონტურები ნახატთან ერთად გარდაიქმნება, თუ გარდაქმნა ან გარდაქმნის პანელის მენიუ სხვას არ აირჩევს. + Live corner radii scale with the art, unless the scale chooses otherwise. დინამიკური კუთხეების რადიუსები ნახატთან ერთად მასშტაბირდება, თუ მასშტაბირება სხვას არ აირჩევს. + Stroke weights, dashes and effect distances scale with the art, unless the scale chooses otherwise. კონტურის სისქე, შტრიხები და ეფექტების მანძილები ნახატთან ერთად მასშტაბირდება, თუ მასშტაბირება სხვას არ აირჩევს. + The mouse wheel zooms the canvas instead of scrolling it. მაუსის ბორბალი ტილოს გადახვევის ნაცვლად მასშტაბს ცვლის. + While Zoom with Mouse Wheel is off, the mouse wheel with Cmd/Ctrl held scrolls the canvas sideways. სანამ მაუსის ბორბლით მასშტაბირება გამორთულია, დაჭერილი Cmd/Ctrl-ით მაუსის ბორბალი ტილოს გვერდულად გადაახვევს. + The mouse wheel with Cmd/Ctrl held scrolls the canvas sideways. დაჭერილი Cmd/Ctrl-ით მაუსის ბორბალი ტილოს გვერდულად გადაახვევს. + Dragging sideways on a numeric field's label changes the field's value. რიცხვითი ველის წარწერაზე გვერდულად გადათრევა ველის მნიშვნელობას ცვლის. + A two-finger rotate gesture on a trackpad rotates the canvas view. ტრეკპადზე ორი თითით მობრუნების ჟესტი ტილოს ხედს აბრუნებს. + Holding a tool's shortcut key chooses the tool until you let go, and then the previous tool is chosen again. ხელსაწყოს მალსახმობი კლავიშის დაჭერით ხელსაწყო არჩეულია მის აშვებამდე, შემდეგ კი ისევ წინა ხელსაწყო აირჩევა. + Shows the bounding box while you move the selection or draw a shape. აჩვენებს შემომსაზღვრელ ჩარჩოს, სანამ მონიშნულს გადაადგილებთ ან ფიგურას ხატავთ. + Create Trim Marks draws Japanese-style marks instead of Roman ones. ჭრის ნიშნების შექმნა რომაულის ნაცვლად იაპონური სტილის ნიშნებს ხატავს. + New art takes only the fill and stroke of the selection; off, it takes the selected object's whole appearance. ახალი ნახატი მონიშნულიდან მხოლოდ შევსებასა და კონტურს იღებს; გამორთვისას იღებს მონიშნული ობიექტის მთელ იერსახეს. + Changing the width or height in the Transform panel, the Properties panel or the Control bar changes the other in proportion. სიგანის ან სიმაღლის შეცვლა გარდაქმნის პანელში, თვისებების პანელში ან მართვის ზოლში მეორესაც პროპორციულად ცვლის. + A live rectangle's properties show one Corner Radius field for all four corners; off, each corner has its own field. დინამიკური მართკუთხედის თვისებები ოთხივე კუთხისთვის კუთხის რადიუსის ერთ ველს აჩვენებს; გამორთვისას თითოეულ კუთხეს თავისი ველი აქვს. + What edits in the Transform panel transform: the object, its pattern tiles or both; Default follows Transform Pattern Tiles. რას გარდაქმნის ცვლილებები გარდაქმნის პანელში: ობიექტს, მისი პატერნის ფილებს ან ორივეს; ნაგულისხმევი მისდევს პატერნის ფილების გარდაქმნას. + With one symbol instance selected, the Transform panel uses the symbol's registration point as its reference point. როცა სიმბოლოს ერთი ეგზემპლარია მონიშნული, გარდაქმნის პანელი სიმბოლოს რეგისტრაციის წერტილს საყრდენ წერტილად იყენებს. + Darkens the canvas outside the artboards while the Artboard tool is active. სანამ სამუშაო დაფის ხელსაწყო აქტიურია, სამუშაო დაფების გარეთ ტილოს აბნელებს. + With Fade Region Outside Artboard on, the area outside the artboards stays dark while you drag with the Artboard tool. როცა სამუშაო დაფის გარეთ არის დაბნელება ჩართულია, სამუშაო დაფის ხელსაწყოთი გადათრევისას სამუშაო დაფების გარეთ არე ბნელი რჩება. + How near, in pixels, the pointer must be to an object, anchor or handle for a click to select it. რამდენად ახლოს, პიქსელებში, უნდა იყოს მაჩვენებელი ობიექტთან, საყრდენ წერტილთან ან სახელურთან, რომ დაწკაპუნებამ ის მონიშნოს. + Whether the Selection tool's box selects objects it touches or only those fully inside; Drag Direction selects those inside on a drag to the right. E reverses it mid-drag. მონიშვნის ხელსაწყოს ჩარჩო მონიშნავს შეხებულ ობიექტებს თუ მხოლოდ სრულად შიგნით მყოფებს; გადათრევის მიმართულება მარჯვნივ გადათრევისას შიგნით მყოფებს მონიშნავს. E გადათრევისას წესს აბრუნებს. + A click selects a filled object only on its path, not inside its fill. დაწკაპუნება შევსებულ ობიექტს მხოლოდ მის კონტურზე მონიშნავს და არა შევსების შიგნით. + How near, in pixels, a point must come to an anchor or ruler guide for Snap to Point to snap it; with Smart Guides on, Smart Guides' Snapping Tolerance applies instead. რამდენად ახლოს, პიქსელებში, უნდა მივიდეს წერტილი საყრდენ წერტილთან ან სახაზავის დამხმარე ხაზთან, რომ წერტილზე მიბმამ ის მიაბას; ჩართული ჭკვიანი დამხმარე ხაზებისას მათი მიბმის დაშვება მოქმედებს. + With the Selection tool, Cmd/Ctrl-click selects the object under the selected one at the pointer; each further click goes one object deeper. მონიშვნის ხელსაწყოთი Cmd/Ctrl-დაწკაპუნება მაჩვენებელთან მონიშნული ობიექტის ქვეშ მყოფ ობიექტს მონიშნავს; ყოველი შემდეგი დაწკაპუნება ერთი ობიექტით ღრმად ჩადის. + Zoom In and Zoom Out bring the center of the selection to the middle of the view. გადიდება და დაპატარავება მონიშვნის ცენტრს ხედის შუაში გადაიტანს. + Locked and hidden artwork inside an artboard moves, scales and is copied with the artboard, as the other artwork does. სამუშაო დაფის შიგნით არსებული დაბლოკილი და დამალული ნამუშევარი სხვა ნამუშევრის მსგავსად სამუშაო დაფასთან ერთად გადაადგილდება, მასშტაბირდება და კოპირდება. + The size of anchor points and direction handle ends on the canvas; larger anchors can also be picked from farther away. საყრდენი წერტილებისა და მიმართულების სახელურების ბოლოების ზომა ტილოზე; უფრო დიდი საყრდენი წერტილების აღება უფრო შორიდანაც შეიძლება. + Draws the ends of direction handles as solid dots, hollow dots or larger solid dots. მიმართულების სახელურების ბოლოებს ხატავს სავსე წერტილებად, ღრუ წერტილებად ან უფრო დიდ სავსე წერტილებად. + With the Direct Selection tool, the anchor under the pointer is highlighted. პირდაპირი მონიშვნის ხელსაწყოთი მაჩვენებლის ქვეშ მყოფი საყრდენი წერტილი გამოიკვეთება. + Shows direction handles when more than one anchor is selected; off, they show only while a single anchor is selected. აჩვენებს მიმართულების სახელურებს, როცა ერთზე მეტი საყრდენი წერტილია მონიშნული; გამორთულისას ისინი მხოლოდ ერთი მონიშნული საყრდენი წერტილისას ჩანს. + Corner widgets hide on corners whose angle is greater than this many degrees. კუთხის ვიჯეტები იმალება იმ კუთხეებზე, რომელთა კუთხე ამდენ გრადუსზე მეტია. + The Pen tool previews the next segment from the last anchor to the pointer before you click. კალმის ხელსაწყო დაწკაპუნებამდე აჩვენებს შემდეგ სეგმენტს ბოლო საყრდენი წერტილიდან მაჩვენებლამდე. + The Curvature tool previews the curve to the pointer before you place the next point. მრუდის ხელსაწყო შემდეგი წერტილის დასმამდე აჩვენებს მრუდს მაჩვენებლამდე. The unit for new documents from built-in sizes other than pixel sizes and for opened files that record no unit; choosing one here and clicking OK also sets the active document's units. ერთეული ახალი დოკუმენტებისთვის (ჩაშენებული ზომებით, პიქსელურის გარდა) და იმ გახსნილი ფაილებისთვის, რომლებშიც ერთეული არ წერია; OK-ზე დაწკაპებისას აქტიური დოკუმენტიც ამ ერთეულს მიიღებს. Stroke weights, dashes and gaps show in this unit, and numbers typed for them are read in it. კონტურის სისქე, ტირეები და შუალედები ამ ერთეულში ჩანს, და მათთვის აკრეფილი რიცხვები ამ ერთეულში იკითხება. Type sizes, leading and baseline shift show in this unit, and numbers typed for them are read in it. ტექსტის ზომა, სტრიქონთა დაშორება და საბაზისო ხაზის წანაცვლება ამ ერთეულში ჩანს, და მათთვის აკრეფილი რიცხვები ამ ერთეულში იკითხება. The unit for East Asian type measurements, which no field uses yet. აღმოსავლეთაზიური ტექსტის ზომების ერთეული, რომელსაც ჯერჯერობით არცერთი ველი არ იყენებს. When on, a number typed without a unit into a field in picas is read in points. ჩართვისას პიკებში მოცემულ ველში ერთეულის გარეშე აკრეფილი რიცხვი პუნქტებში იკითხება. With XML ID, object names show as XML IDs in the Layers panel, the Variables panel and Layer Options. XML ID-ის არჩევისას ობიექტების სახელები შრეების პანელში, ცვლადების პანელსა და შრის პარამეტრებში XML ID-ებად ჩანს. + Snaps drawing, moving and scaling to the grid's subdivisions, even while the grid is hidden; while it is on, Snap to Pixel does not apply. ხატვას, გადაადგილებასა და მასშტაბირებას ბადის დაყოფებზე მიაბამს, მაშინაც კი, როცა ბადე დამალულია; სანამ ჩართულია, პიქსელზე მიბმა არ მოქმედებს. + The color of guides that are not selected; an artboard with a Guide Label draws its own guides in the label's color instead. არჩეული არ მყოფი დამხმარე ხაზების ფერი; იარლიყიანი სამუშაო დაფა საკუთარ დამხმარე ხაზებს იარლიყის ფერით ხატავს. + Draws guides as solid lines or as dots, including the guides already in the document. დამხმარე ხაზებს უწყვეტი ხაზებით ან წერტილებით ხატავს, დოკუმენტში უკვე არსებულების ჩათვლით. + With this on, guides are locked when VectorCraft starts; changing this option locks or unlocks them at once, and View › Guides › Lock Guides still changes the lock. ჩართვისას დამხმარე ხაზები VectorCraft-ის გაშვებისას ჩაკეტილია; პარამეტრის შეცვლა მათ მაშინვე კეტავს ან ხსნის, ხოლო ხედი › დამხმარე ხაზები › დამხმარე ხაზების ჩაკეტვა კვლავ ცვლის ჩაკეტვას. + With this on, holding Cmd/Ctrl as you start dragging from a ruler makes a guide on the active artboard only, or a canvas guide with the Artboard tool. ჩართვისას სახაზავიდან გადათრევის დაწყებისას დაჭერილი Cmd/Ctrl დამხმარე ხაზს მხოლოდ აქტიურ სამუშაო დაფაზე ქმნის, სამუშაო დაფის ხელსაწყოთი კი მთელი ტილოს ხაზს. + The color of the grid; the lines between major gridlines are drawn in a fainter shade of it. ბადის ფერი; მთავარ ხაზებს შორის ხაზები მისი უფრო მკრთალი ელფერით იხატება. + Draws the grid as lines, or as dots along the major gridlines at each subdivision. ბადეს ხაზებით ხატავს, ან წერტილებით მთავარი ხაზების გასწვრივ ყოველ დაყოფაზე. + The distance between major gridlines, in every open document and in new ones; a VectorCraft document opens with the grid it was saved with. მთავარ ხაზებს შორის მანძილი ყველა ღია და ახალ დოკუმენტში; VectorCraft-ის დოკუმენტი იმ ბადით იხსნება, რომლითაც შეინახა. + How many parts each major grid square is divided into; Snap to Grid snaps to these parts, even when the zoom hides their lines. რამდენ ნაწილად იყოფა ბადის თითოეული მთავარი კვადრატი; ბადეზე მიბმა ამ ნაწილებზე მიაბამს, მაშინაც კი, როცა მასშტაბი მათ ხაზებს მალავს. + Draws the grid behind the artwork; off, the grid is drawn over it. ბადეს ნამუშევრის უკან ხატავს; გამორთვისას ბადე მის ზემოთ იხატება. + In Pixel Preview at 600% zoom or more, the active view shows a line at the edge of every document pixel over the artwork. პიქსელების წინასწარ ნახვაში 600%-იან ან მეტ მასშტაბზე აქტიური ხედი ნამუშევრის ზემოთ დოკუმენტის თითოეული პიქსელის კიდეზე ხაზს აჩვენებს. + The color of the tile edge and the dashed swatch bounds shown while you edit a pattern. ფილის კიდისა და ფერის ნიმუშის წყვეტილი საზღვრების ფერი, რომლებიც პატერნის რედაქტირებისას ჩანს. + Snaps drawing, moving and transforming to nearby art and shows guides and labels; Pixel Preview turns them off, and Snap to Grid snaps to the grid instead. ხატვას, გადატანასა და გარდაქმნას ახლომდებარე გრაფიკაზე აბამს და აჩვენებს დამხმარე ხაზებსა და წარწერებს; პიქსელების წინასწარი ნახვა მათ თიშავს, ბადეზე მიბმა კი მათ ნაცვლად ბადეზე აბამს. + The color of Smart Guide lines and labels. ჭკვიანი დამხმარე ხაზების ხაზებისა და წარწერების ფერი. + Shows a line along the edge or center that art lines up with; off, art still lines up without the line, and Snap to Glyph does not apply. აჩვენებს ხაზს იმ კიდის ან ცენტრის გასწვრივ, რომელსაც გრაფიკა უსწორდება; გამორთვისას გრაფიკა მაინც სწორდება ხაზის გარეშე, გლიფზე მიბმა კი არ მოქმედებს. + With a selection tool, outlines the unselected object under the pointer in its layer color while you are not dragging. მონიშვნის ხელსაწყოთი, სანამ არ ათრევთ, მაჩვენებლის ქვეშ მყოფ მოუნიშნავ ობიექტს მისი შრის ფერით შემოხაზავს. + Shows the size or angle next to the pointer while you scale, rotate, shear or reflect art. გრაფიკის მასშტაბირების, მობრუნების, დახრის ან არეკვლისას მაჩვენებლის გვერდით აჩვენებს ზომას ან კუთხეს. + While you draw, points snap to lines at the chosen Angles through the point the segment or shape starts from. ხატვისას წერტილები ებმის არჩეული კუთხის ხაზებს, რომლებიც სეგმენტის ან ფიგურის საწყის წერტილზე გადის. + The set of angles the construction guides follow while Construction Guides is on. კუთხეების ნაკრები, რომელსაც სამშენებლო დამხმარე ხაზები მიჰყვება, სანამ სამშენებლო დამხმარე ხაზები ჩართულია. + Names what a point snaps to, such as an anchor, a path or an alignment; off, points snap the same way without the names. ასახელებს, რას ებმის წერტილი, მაგალითად, საყრდენ წერტილს, ტრაექტორიას ან გასწორებას; გამორთვისას წერტილები ისევე ებმის, სახელების გარეშე. + Shows distances, angles and how far art has moved next to the pointer while you draw or move it. ხატვის ან გადატანისას მაჩვენებლის გვერდით აჩვენებს მანძილებს, კუთხეებს და რამდენით გადაადგილდა გრაფიკა. + Snaps moved or resized art to the same gap as between nearby objects, and marks the equal gaps. გადატანილ ან ზომაშეცვლილ გრაფიკას აბამს იმავე შუალედზე, რაც ახლომდებარე ობიექტებს შორისაა, და ნიშნავს თანაბარ შუალედებს. + With something selected, holding Alt/Option over another object or an artboard shows the distances between it and the selection. როცა რაიმე მონიშნულია, Alt/Option-ის დაჭერა სხვა ობიექტზე ან სამუშაო დაფაზე აჩვენებს მანძილებს მასა და მონიშნულს შორის. + A selection dragged back to within the Snapping Tolerance of where the drag began goes back to exactly that place; a copy does not. მონიშნული, რომელიც თრევის დაწყების ადგილიდან მიბმის დაშვების ფარგლებში დააბრუნეთ, ზუსტად იმ ადგილზე ბრუნდება; ასლი არა. + How near on screen the pointer or a dragged point must come to art for Smart Guides to snap to it; the distance is the same at every zoom. რამდენად ახლოს უნდა მივიდეს ეკრანზე მაჩვენებელი ან გადათრეული წერტილი გრაფიკასთან, რომ ჭკვიანმა დამხმარე ხაზებმა მიაბან; მანძილი ყველა მასშტაბზე ერთნაირია. + Snaps the end of a line segment, or a circle drawn from its center, so that it touches a nearby curve. ხაზის სეგმენტის ბოლოს, ან ცენტრიდან დახატულ წრეწირს, ისე აბამს, რომ ახლომდებარე მრუდს შეეხოს. + Snaps the end of a line segment so that it meets a nearby straight segment at a right angle. ხაზის სეგმენტის ბოლოს ისე აბამს, რომ ახლომდებარე სწორ სეგმენტს მართი კუთხით შეხვდეს. Reset all preferences to their defaults? დავაბრუნოთ ყველა პარამეტრი ნაგულისხმევ მნიშვნელობებზე? The defaults are applied when you click OK in Preferences. Cancel there keeps your current preferences. ნაგულისხმევი მნიშვნელობები გამოიყენება, როცა პარამეტრებში OK-ს დააჭერთ. იქ გაუქმება ინარჩუნებს თქვენს მიმდინარე პარამეტრებს. Smaller ↔ Larger უფრო პატარა ↔ უფრო დიდი @@ -6513,6 +6602,11 @@ font-technology Variable ცვლადი @msg PDF writer error: {0} PDF-ის ჩამწერის შეცდომა: {0} @msgplural Packaged {n} file ({note}) in {folder}|Packaged {n} files ({note}) in {folder} შეფუთულია ფაილი ({n}) საქაღალდეში {folder} ({note}) @msg Preview in Browser needs the desktop app (the web downloads files instead) ბრაუზერში წინასწარ ნახვას დესკტოპის აპი სჭირდება (ვებში ფაილები ჩამოიტვირთება) +@msg give `desiredK`, the desired file size in K (1024 bytes): a number above 0 and at most 1048576 მიუთითეთ `desiredK`, სასურველი ფაილის ზომა K-ში (1024 ბაიტი): 0-ზე მეტი და არაუმეტეს 1048576 რიცხვი +@msg `startWith` is `current` or `auto` `startWith` არის `current` ან `auto` +@msg `use` is `allSlices`, `eachSlice` or `currentSlice` `use` არის `allSlices`, `eachSlice` ან `currentSlice` +@msg `slice` is a slice number from `slice.list`, with `use: currentSlice` `slice` არის ნაჭრის ნომერი `slice.list`-დან, `use: currentSlice`-თან ერთად +@msg Optimize to File Size: there is no image to measure ფაილის ზომაზე ოპტიმიზაცია: გასაზომი გამოსახულება არ არის @msg Release Guides: no guides დამხმარე ხაზების მოხსნა: დამხმარე ხაზები არ არის @msg Release: no layer to put the rectangle in მოხსნა: მართკუთხედის ჩასასმელი შრე არ არის @msg Replace Spine: select a blend and a path ხერხემლის ჩანაცვლება: მონიშნეთ გადასვლა და ტრაექტორია @@ -7717,6 +7811,19 @@ font-technology Variable ცვლადი Transform Objects ობიექტების გარდაქმნა @msg unknown parameter `{key}`; did you mean `{near}`? უცნობი პარამეტრი `{key}`; იქნებ `{near}` იგულისხმეთ? @msg unknown parameter `{key}`; the command takes no parameters უცნობი პარამეტრი `{key}`; ბრძანება პარამეტრებს არ იღებს +@msg unknown parameter `{key}`; `{object}` takes: {keys} უცნობი პარამეტრი `{key}`; `{object}` იღებს: {keys} +@msg unknown parameter `{key}`; {why_not} უცნობი პარამეტრი `{key}`; {why_not} +@msg no format takes it (see document.formats) არცერთი ფორმატი არ იღებს მას (იხილეთ document.formats) +@msg no save format takes it (see file.formatOptions) არცერთი შენახვის ფორმატი არ იღებს მას (იხილეთ file.formatOptions) +@msg PDF doesn't take it (see document.formats) PDF არ იღებს მას (იხილეთ document.formats) +@msg EPS doesn't take it (see document.formats) EPS არ იღებს მას (იხილეთ document.formats) +@msg DXF doesn't take it (see document.formats) DXF არ იღებს მას (იხილეთ document.formats) +@msg {name} must be {range} (got {v}) {name} უნდა იყოს {range} (მიღებულია {v}) +@msg The graphics processor tried first couldn't show the window, so VectorCraft started again on {summary} (Settings › Performance › Graphics Processor › Automatic uses the one that drives your display) პირველად ნაცდმა გრაფიკულმა პროცესორმა ფანჯარა ვერ აჩვენა, ამიტომ VectorCraft ხელახლა გაეშვა: {summary} (პარამეტრები › წარმადობა › გრაფიკული პროცესორი › ავტომატური იყენებს იმას, რომელიც თქვენს ეკრანს მართავს) +@msg Sent “{title}” to {to} “{title}” გაგზავნილია: {to} +@msg Sent “{title}” to {to}. The spooler replied: {note} “{title}” გაგზავნილია: {to}. ბეჭდვის რიგის პასუხი: {note} +@msg the default printer ნაგულისხმევი პრინტერი +@msg raster effects on object {object}: requested {requested} ppi, achieved {achieved} ppi due to the 64 million pixel cap რასტრული ეფექტები ობიექტზე {object}: მოთხოვნილია {requested} ppi, მიღწეულია {achieved} ppi 64 მილიონი პიქსელის ლიმიტის გამო @msg unknown parameter `{key}`; the command takes: {keys} უცნობი პარამეტრი `{key}`; ბრძანება იღებს: {keys} @msg the params must be an object, not {got} პარამეტრები უნდა იყოს ობიექტი და არა {got} @msg unknown parameter `{path}`; the object takes no keys უცნობი პარამეტრი `{path}`; ობიექტი გასაღებებს არ იღებს @@ -10121,6 +10228,10 @@ font-script Japanese იაპონური @msg Some islands could not be joined to the area around the art ზოგიერთი კუნძული ვერ დაუკავშირდა ნახატის გარშემო არეს @msg `width` must be from {lo} to {hi} pt `width` უნდა იყოს {lo}-დან {hi} pt-მდე @msg `angle` must be from -180 to 180 degrees `angle` უნდა იყოს -180-დან 180 გრადუსამდე +@msg `roundness` must be from 0 to 100% `roundness` უნდა იყოს 0-დან 100%-მდე +@msg `fidelity` must be from 0.01 to 100 pt `fidelity` უნდა იყოს 0.01-დან 100 pt-მდე +@msg style must be "pencil" or "brush" style უნდა იყოს "pencil" ან "brush" +@msg extend end must be "start" or "end" extend-ის ბოლო უნდა იყოს "start" ან "end" @msg `roundness` must be from 1 to 100% `roundness` უნდა იყოს 1-დან 100%-მდე @msg `count` must be a whole number from 1 to {MAX_BRIDGES_PER_ISLAND} `count` უნდა იყოს მთელი რიცხვი 1-დან {MAX_BRIDGES_PER_ISLAND}-მდე Weed Box and Lines… ნარჩენის მოსაცილებელი ჩარჩო და ხაზები… diff --git a/crates/ui-egui/src/i18n/ko.tsv b/crates/ui-egui/src/i18n/ko.tsv index 1003c788eb..3bb94245d4 100644 --- a/crates/ui-egui/src/i18n/ko.tsv +++ b/crates/ui-egui/src/i18n/ko.tsv @@ -261,6 +261,9 @@ digits Malayalam 말라얄람어 Mask 마스크 Rasterize… 래스터화… Create Gradient Mesh… 그레이디언트 메시 만들기… + Flat 평면 + To Center 가운데로 + To Edge 가장자리로 Create Object Mosaic… 개체 모자이크 만들기… Vector Halftone… 벡터 하프톤… Create Trim Marks 트림 마크 만들기 @@ -1110,6 +1113,8 @@ antiAlias Sharp 날카롭게 Crisp 또렷하게 Strong 강하게 Anti-aliasing: 안티 앨리어싱: + Art Optimized 아트에 최적화 + Type Optimized 문자에 최적화 Appearance Item 모양새 항목 Appearance Panel 모양새 패널 Appearance of Black 검정 표시 방식 @@ -1359,10 +1364,13 @@ antiAlias Sharp 날카롭게 Conflict {n} of {count} 충돌 {n}/{count} Constrain Angle 각도 제한 Constrain Width and Height Proportions 너비와 높이 비율 고정 + Copy Width to Height 너비를 높이로 복사 Construction Guides 작도 안내선 Contextual Alternates 문맥 대체 글자 Convert 변환 Convert All Spot Colors to Process 모든 별색을 프로세스 색상으로 변환 + Convert {name} to process {name}을(를) 프로세스 색상으로 변환 + Keep {name} as spot {name}을(를) 별색으로 유지 Convert All Strokes to Outlines 모든 선을 윤곽선으로 변환 Convert All Text to Outlines 모든 문자를 윤곽선으로 변환 Convert Anchor Point 앵커 포인트 변환 @@ -2822,6 +2830,18 @@ diagnostics ui UI Preview All Layers 모든 레이어 미리 보기 Preview Mode 미리 보기 모드 Preview in Browser 브라우저에서 미리 보기 + Optimize to File Size… 파일 크기에 맞게 최적화… + Optimize to File Size 파일 크기에 맞게 최적화 + Desired File Size: 원하는 파일 크기: + Start With: 시작 설정: + Use: 사용: + Current Settings 현재 설정 + Auto Select GIF/JPEG GIF/JPEG 자동 선택 + Total of All Slices 모든 분할 합계 + Each Slice 각 분할 + Current Slice 현재 분할 + {size}, within {target} {size}, {target} 이내 + No setting tried fits in {target}; the smallest is {size} 시도한 설정 중 {target}에 맞는 것이 없습니다. 가장 작은 크기는 {size} Preview the document as it is now 문서를 현재 상태로 미리 보기 Previous 이전 Previous Library 이전 라이브러리 @@ -3072,12 +3092,85 @@ mark-style Japanese 일본식 Restore 복원 Restore Recovered Documents 복구된 문서 복원 Restore every preference to its default (applied on OK) 모든 환경 설정을 기본값으로 복원(확인 시 적용) + Shows a bar of commands for the selection or tool on the canvas; it hides while you drag and in Presentation Mode. 캔버스에 선택 영역이나 도구에 맞는 명령 막대를 표시합니다. 드래그하는 동안과 프레젠테이션 모드에서는 숨겨집니다. + How far an arrow key moves the selection; with Shift, it moves ten times as far. 화살표 키로 선택 영역을 이동하는 거리입니다. Shift 키를 누르면 10배 멀리 이동합니다. + The angle of the axes that arrow keys move along and that Shift holds drawing and moving to. 화살표 키로 이동하는 축과 Shift 키로 그리기와 이동을 고정하는 축의 각도입니다. + The corner radius the Rounded Rectangle tool draws with; changing the radius while drawing changes this value too. 둥근 사각형 도구로 그릴 때 쓰는 모퉁이 반지름입니다. 그리는 동안 반지름을 바꾸면 이 값도 바뀝니다. + How far right and down Paste moves the copy when it is given no position, as from a script; Paste in the app centers it in the view. 스크립트에서처럼 위치가 지정되지 않았을 때 붙여넣기가 사본을 오른쪽과 아래로 옮기는 거리입니다. 앱에서 붙여넣기를 하면 사본이 보기의 가운데에 놓입니다. + Stops the Pen tool from deleting the anchor you click on a selected path, or adding one where you click its segment. 펜 도구가 선택한 패스에서 클릭한 고정점을 삭제하거나 세그먼트를 클릭한 위치에 고정점을 추가하지 않게 합니다. + Drawing tools show a crosshair pointer instead of their icon; Caps Lock does the same while it is on. 그리기 도구의 포인터를 아이콘 대신 십자선으로 표시합니다. Caps Lock이 켜져 있는 동안에도 같습니다. + Shows a tip when the pointer rests on a button or field that has one. 도움말이 있는 버튼이나 필드에 포인터를 올려 두면 도움말을 표시합니다. + Shows a warning before a script you choose runs. 선택한 스크립트를 실행하기 전에 경고를 표시합니다. + Smooths the edges of artwork on the canvas. 캔버스에 있는 아트웍의 가장자리를 매끄럽게 표시합니다. + Select › Same › Fill Color, Stroke Color and Fill & Stroke match only the same tint of a global or spot swatch, not any tint of it. 선택 › 동일 › 칠 색상, 선 색상, 칠 및 선은 전역 또는 별색 견본의 같은 색조만 찾고, 다른 색조는 찾지 않습니다. + Shows the Home screen when no document is open; off, the window stays empty until you click Home. 열린 문서가 없을 때 홈 화면을 표시합니다. 끄면 홈을 클릭할 때까지 창이 비어 있습니다. + Measures objects with their strokes and shape-changing effects for size, position and alignment; shadows, glows and blurs are not measured. 크기, 위치, 정렬을 위해 선과 모양을 바꾸는 효과를 포함하여 개체를 측정합니다. 그림자, 광선, 흐림 효과는 측정하지 않습니다. + At 100% zoom, one inch of the document takes 96 screen points instead of 72. 100% 확대/축소에서 문서의 1인치가 72가 아닌 96 화면 포인트를 차지합니다. + Double-clicking a group, path or image with the Selection tool opens it in isolation mode. 선택 도구로 그룹, 패스 또는 이미지를 두 번 클릭하면 격리 모드로 엽니다. + Pattern fills and strokes transform with the art, unless a transform or the Transform panel's menu chooses otherwise. 변형 명령이나 변형 패널의 메뉴에서 달리 선택하지 않는 한, 패턴 칠과 선이 아트웍과 함께 변형됩니다. + Live corner radii scale with the art, unless the scale chooses otherwise. 크기 조정에서 달리 선택하지 않는 한, 라이브 모퉁이 반지름이 아트웍과 함께 크기 조정됩니다. + Stroke weights, dashes and effect distances scale with the art, unless the scale chooses otherwise. 크기 조정에서 달리 선택하지 않는 한, 선 두께, 대시, 효과 거리가 아트웍과 함께 크기 조정됩니다. + The mouse wheel zooms the canvas instead of scrolling it. 마우스 휠로 캔버스를 스크롤하지 않고 확대/축소합니다. + The mouse wheel with Cmd/Ctrl held scrolls the canvas sideways. Cmd/Ctrl 키를 누른 채 마우스 휠을 돌리면 캔버스가 가로로 스크롤됩니다. + Dragging sideways on a numeric field's label changes the field's value. 숫자 필드의 레이블을 옆으로 드래그하면 필드 값이 바뀝니다. + A two-finger rotate gesture on a trackpad rotates the canvas view. 트랙패드에서 두 손가락으로 회전하는 동작을 하면 캔버스 보기가 회전합니다. + Holding a tool's shortcut key chooses the tool until you let go, and then the previous tool is chosen again. 도구의 바로 가기 키를 누르고 있는 동안 그 도구가 선택되고, 키를 놓으면 이전 도구가 다시 선택됩니다. + Shows the bounding box while you move the selection or draw a shape. 선택 영역을 이동하거나 모양을 그리는 동안 테두리 상자를 표시합니다. + Create Trim Marks draws Japanese-style marks instead of Roman ones. 트림 마크 만들기에서 서양식 대신 일본식 표시를 그립니다. + New art takes only the fill and stroke of the selection; off, it takes the selected object's whole appearance. 새 아트웍이 선택 영역의 칠과 선만 가져옵니다. 끄면 선택한 개체의 모양 전체를 가져옵니다. + Changing the width or height in the Transform panel, the Properties panel or the Control bar changes the other in proportion. 변형 패널, 속성 패널 또는 컨트롤 패널에서 폭이나 높이를 바꾸면 다른 값도 비율에 맞게 바뀝니다. + A live rectangle's properties show one Corner Radius field for all four corners; off, each corner has its own field. 라이브 사각형의 속성에 네 모퉁이 모두에 쓰는 모퉁이 반지름 필드 하나를 표시합니다. 끄면 모퉁이마다 필드가 따로 있습니다. + What edits in the Transform panel transform: the object, its pattern tiles or both; Default follows Transform Pattern Tiles. 변형 패널에서 편집할 때 변형되는 대상으로, 개체, 패턴 타일 또는 둘 다입니다. 기본값은 패턴 타일 변형을 따릅니다. + With one symbol instance selected, the Transform panel uses the symbol's registration point as its reference point. 심볼 인스턴스 하나를 선택하면 변형 패널은 심볼의 등록 지점을 참조점으로 사용합니다. + Darkens the canvas outside the artboards while the Artboard tool is active. 아트보드 도구를 사용하는 동안 아트보드 바깥의 캔버스를 어둡게 표시합니다. + With Fade Region Outside Artboard on, the area outside the artboards stays dark while you drag with the Artboard tool. 아트보드 외부 영역 어둡게 표시가 켜져 있으면 아트보드 도구로 드래그하는 동안에도 아트보드 바깥 영역이 어둡게 유지됩니다. + How near, in pixels, the pointer must be to an object, anchor or handle for a click to select it. 클릭으로 개체, 고정점 또는 핸들을 선택하려면 포인터가 얼마나 가까이(픽셀) 있어야 하는지입니다. + Whether the Selection tool's box selects objects it touches or only those fully inside; Drag Direction selects those inside on a drag to the right. E reverses it mid-drag. 선택 도구의 상자가 닿은 개체를 선택할지, 완전히 안에 있는 개체만 선택할지입니다. 드래그 방향은 오른쪽으로 드래그하면 안쪽 개체를 선택합니다. 드래그 중 E를 누르면 규칙이 반대로 바뀝니다. + A click selects a filled object only on its path, not inside its fill. 칠이 있는 개체를 칠 안쪽이 아니라 패스를 클릭할 때만 선택합니다. + How near, in pixels, a point must come to an anchor or ruler guide for Snap to Point to snap it; with Smart Guides on, Smart Guides' Snapping Tolerance applies instead. 포인트에 스냅이 점을 스냅하려면 점이 고정점이나 눈금자 안내선에 얼마나 가까이(픽셀) 와야 하는지입니다. 스마트 안내선이 켜져 있으면 대신 스마트 안내선의 스냅 허용 오차를 씁니다. + With the Selection tool, Cmd/Ctrl-click selects the object under the selected one at the pointer; each further click goes one object deeper. 선택 도구에서 Cmd/Ctrl-클릭하면 포인터 위치에서 선택한 개체 아래의 개체를 선택하며, 클릭할 때마다 한 개체씩 더 아래로 내려갑니다. + Zoom In and Zoom Out bring the center of the selection to the middle of the view. 확대와 축소가 선택 영역의 중심을 보기의 가운데로 가져옵니다. + Locked and hidden artwork inside an artboard moves, scales and is copied with the artboard, as the other artwork does. 아트보드 안의 잠긴 아트워크와 숨겨진 아트워크도 다른 아트워크처럼 아트보드와 함께 이동, 크기 조정, 복사됩니다. + The size of anchor points and direction handle ends on the canvas; larger anchors can also be picked from farther away. 캔버스에 표시되는 고정점과 방향 핸들 끝의 크기입니다. 고정점이 클수록 더 먼 곳에서도 잡을 수 있습니다. + Draws the ends of direction handles as solid dots, hollow dots or larger solid dots. 방향 핸들 끝을 채워진 점, 속이 빈 점 또는 더 큰 채워진 점으로 그립니다. + With the Direct Selection tool, the anchor under the pointer is highlighted. 직접 선택 도구에서 포인터 아래의 고정점을 강조 표시합니다. + Shows direction handles when more than one anchor is selected; off, they show only while a single anchor is selected. 고정점을 둘 이상 선택했을 때 방향 핸들을 표시합니다. 끄면 고정점을 하나만 선택했을 때만 표시됩니다. + Corner widgets hide on corners whose angle is greater than this many degrees. 각도가 이 값(도)보다 큰 모퉁이에서는 모퉁이 위젯을 숨깁니다. + The Pen tool previews the next segment from the last anchor to the pointer before you click. 펜 도구가 클릭하기 전에 마지막 고정점에서 포인터까지 다음 세그먼트를 미리 보여 줍니다. + The Curvature tool previews the curve to the pointer before you place the next point. 곡률 도구가 다음 점을 놓기 전에 포인터까지 곡선을 미리 보여 줍니다. The unit for new documents from built-in sizes other than pixel sizes and for opened files that record no unit; choosing one here and clicking OK also sets the active document's units. 픽셀 크기가 아닌 기본 제공 크기의 새 문서와 단위가 기록되지 않은 열린 파일에 쓰는 단위이며, 여기서 고르고 확인을 누르면 활성 문서의 단위도 바뀝니다. Stroke weights, dashes and gaps show in this unit, and numbers typed for them are read in it. 선 두께, 대시, 간격이 이 단위로 표시되며, 입력한 숫자도 이 단위로 읽습니다. Type sizes, leading and baseline shift show in this unit, and numbers typed for them are read in it. 글자 크기, 행간, 기준선 이동이 이 단위로 표시되며, 입력한 숫자도 이 단위로 읽습니다. The unit for East Asian type measurements, which no field uses yet. 동아시아 문자 측정에 쓰는 단위로, 아직 이 단위를 쓰는 필드는 없습니다. When on, a number typed without a unit into a field in picas is read in points. 켜면 파이카 필드에 단위 없이 입력한 숫자를 포인트로 읽습니다. With XML ID, object names show as XML IDs in the Layers panel, the Variables panel and Layer Options. XML ID를 고르면 레이어, 변수, 레이어 옵션에서 개체 이름이 XML ID로 표시됩니다. + Snaps drawing, moving and scaling to the grid's subdivisions, even while the grid is hidden; while it is on, Snap to Pixel does not apply. 격자가 숨겨져 있어도 그리기, 이동, 크기 조절을 격자의 세분 위치에 스냅합니다. 켜져 있는 동안에는 픽셀에 스냅이 적용되지 않습니다. + The color of guides that are not selected; an artboard with a Guide Label draws its own guides in the label's color instead. 선택되지 않은 안내선의 색상입니다. 안내선 레이블이 있는 아트보드는 자신의 안내선을 레이블 색상으로 그립니다. + Draws guides as solid lines or as dots, including the guides already in the document. 문서에 이미 있는 안내선을 포함해 안내선을 실선 또는 점으로 그립니다. + With this on, guides are locked when VectorCraft starts; changing this option locks or unlocks them at once, and View › Guides › Lock Guides still changes the lock. 켜면 VectorCraft가 시작될 때 안내선이 잠깁니다. 이 옵션을 바꾸면 즉시 잠기거나 잠금이 풀리며, 보기 › 안내선 › 안내선 잠그기로도 계속 잠금을 바꿀 수 있습니다. + With this on, holding Cmd/Ctrl as you start dragging from a ruler makes a guide on the active artboard only, or a canvas guide with the Artboard tool. 켜면 눈금자에서 드래그를 시작할 때 Cmd/Ctrl을 누르고 있으면 활성 아트보드에만 안내선을 만들고, 아트보드 도구에서는 캔버스 전체의 안내선을 만듭니다. + The color of the grid; the lines between major gridlines are drawn in a fainter shade of it. 격자의 색상입니다. 주 격자선 사이의 선은 이 색상의 더 옅은 색조로 그려집니다. + Draws the grid as lines, or as dots along the major gridlines at each subdivision. 격자를 선으로, 또는 주 격자선을 따라 각 세분 위치에 점으로 그립니다. + The distance between major gridlines, in every open document and in new ones; a VectorCraft document opens with the grid it was saved with. 열려 있는 모든 문서와 새 문서의 주 격자선 간격입니다. VectorCraft 문서는 저장할 때의 격자로 열립니다. + How many parts each major grid square is divided into; Snap to Grid snaps to these parts, even when the zoom hides their lines. 각 주 격자 칸을 나누는 수입니다. 확대/축소로 선이 숨겨져도 격자에 스냅은 이 위치에 스냅합니다. + Draws the grid behind the artwork; off, the grid is drawn over it. 격자를 아트워크 뒤에 그립니다. 끄면 격자를 아트워크 위에 그립니다. + In Pixel Preview at 600% zoom or more, the active view shows a line at the edge of every document pixel over the artwork. 픽셀 미리 보기에서 600% 이상으로 확대하면 활성 보기에서 아트워크 위에 문서의 각 픽셀 경계마다 선이 표시됩니다. + The color of the tile edge and the dashed swatch bounds shown while you edit a pattern. 패턴을 편집하는 동안 표시되는 타일 가장자리와 점선 견본 경계의 색상입니다. + Snaps drawing, moving and transforming to nearby art and shows guides and labels; Pixel Preview turns them off, and Snap to Grid snaps to the grid instead. 그리기, 이동, 변형을 가까운 아트에 스냅하고 안내선과 레이블을 표시합니다. 픽셀 미리 보기에서는 꺼지며, 격자에 스냅이 켜져 있으면 대신 격자에 스냅합니다. + The color of Smart Guide lines and labels. 스마트 안내선의 선과 레이블 색상입니다. + Shows a line along the edge or center that art lines up with; off, art still lines up without the line, and Snap to Glyph does not apply. 아트가 맞춰지는 가장자리나 중심을 따라 선을 표시합니다. 끄면 선 없이도 맞춰지며, 글리프에 스냅은 적용되지 않습니다. + With a selection tool, outlines the unselected object under the pointer in its layer color while you are not dragging. 선택 도구로 드래그하지 않는 동안 포인터 아래의 선택되지 않은 개체 윤곽을 레이어 색상으로 표시합니다. + Shows the size or angle next to the pointer while you scale, rotate, shear or reflect art. 아트의 크기를 조절하거나 회전하거나 기울이거나 반사하는 동안 포인터 옆에 크기나 각도를 표시합니다. + While you draw, points snap to lines at the chosen Angles through the point the segment or shape starts from. 그리는 동안 점이 세그먼트나 모양의 시작점을 지나는 선택한 각도의 선에 스냅됩니다. + The set of angles the construction guides follow while Construction Guides is on. 작도 안내선이 켜져 있을 때 작도 안내선이 따르는 각도 세트입니다. + Names what a point snaps to, such as an anchor, a path or an alignment; off, points snap the same way without the names. 앵커, 패스, 정렬처럼 점이 스냅되는 대상의 이름을 표시합니다. 끄면 이름 없이 같은 방식으로 스냅됩니다. + Shows distances, angles and how far art has moved next to the pointer while you draw or move it. 그리거나 이동하는 동안 포인터 옆에 거리, 각도, 아트가 이동한 거리를 표시합니다. + Snaps moved or resized art to the same gap as between nearby objects, and marks the equal gaps. 이동하거나 크기를 조절한 아트를 가까운 개체 사이와 같은 간격에 스냅하고 같은 간격을 표시합니다. + With something selected, holding Alt/Option over another object or an artboard shows the distances between it and the selection. 무언가를 선택한 상태에서 다른 개체나 아트보드 위에서 Alt/Option 키를 누르고 있으면 그것과 선택 영역 사이의 거리를 표시합니다. + A selection dragged back to within the Snapping Tolerance of where the drag began goes back to exactly that place; a copy does not. 드래그를 시작한 위치에서 스냅 허용 오차 이내로 다시 드래그한 선택 영역은 정확히 그 위치로 돌아갑니다. 복사본은 돌아가지 않습니다. + How near on screen the pointer or a dragged point must come to art for Smart Guides to snap to it; the distance is the same at every zoom. 스마트 안내선이 스냅하려면 포인터나 드래그한 점이 화면에서 아트에 얼마나 가까이 와야 하는지입니다. 이 거리는 모든 확대/축소에서 같습니다. + Snaps the end of a line segment, or a circle drawn from its center, so that it touches a nearby curve. 선 세그먼트의 끝이나 중심에서 그린 원을 가까운 곡선에 닿도록 스냅합니다. + Snaps the end of a line segment so that it meets a nearby straight segment at a right angle. 선 세그먼트의 끝을 가까운 직선 세그먼트와 직각으로 만나도록 스냅합니다. Reset all preferences to their defaults? 모든 환경 설정을 기본값으로 재설정하시겠습니까? The defaults are applied when you click OK in Preferences. Cancel there keeps your current preferences. 기본값은 환경 설정에서 확인을 클릭하면 적용됩니다. 그곳에서 취소를 누르면 현재 환경 설정이 유지됩니다. Restored documents open unsaved: save them to keep them. 복원된 문서는 저장되지 않은 상태로 열립니다. 보존하려면 저장하세요. @@ -5075,6 +5168,11 @@ theme Appearance 외관 @msg 1 hidden object 숨겨진 개체 1개 @msg {n} hidden objects 숨겨진 개체 {n}개 @msg Preview in Browser needs the desktop app (the web downloads files instead) 브라우저에서 미리 보기는 데스크톱 앱이 필요합니다(웹에서는 파일을 다운로드합니다) +@msg give `desiredK`, the desired file size in K (1024 bytes): a number above 0 and at most 1048576 `desiredK`에 원하는 파일 크기를 K(1024바이트) 단위로 지정하세요: 0보다 크고 1048576 이하인 숫자 +@msg `startWith` is `current` or `auto` `startWith`는 `current` 또는 `auto`입니다 +@msg `use` is `allSlices`, `eachSlice` or `currentSlice` `use`는 `allSlices`, `eachSlice` 또는 `currentSlice`입니다 +@msg `slice` is a slice number from `slice.list`, with `use: currentSlice` `slice`는 `slice.list`의 분할 번호이며 `use: currentSlice`와 함께 씁니다 +@msg Optimize to File Size: there is no image to measure 파일 크기에 맞게 최적화: 측정할 이미지가 없습니다 @msg no file system here 여기에는 파일 시스템이 없습니다 @msg nothing to preview 미리 볼 항목이 없습니다 @msg Saved {n} files beside {path} {path} 옆에 파일 {n}개를 저장했습니다 @@ -5880,6 +5978,19 @@ lighting Light 광원 Transform Objects 개체 변형 @msg unknown parameter `{key}`; did you mean `{near}`? 알 수 없는 매개변수 `{key}`: `{near}`을(를) 의미하셨습니까? @msg unknown parameter `{key}`; the command takes no parameters 알 수 없는 매개변수 `{key}`: 이 명령에는 매개변수가 없습니다 +@msg unknown parameter `{key}`; `{object}` takes: {keys} 알 수 없는 매개변수 `{key}`: `{object}`이(가) 받는 키: {keys} +@msg unknown parameter `{key}`; {why_not} 알 수 없는 매개변수 `{key}`: {why_not} +@msg no format takes it (see document.formats) 이 옵션을 받는 형식이 없습니다(document.formats 참조) +@msg no save format takes it (see file.formatOptions) 이 옵션을 받는 저장 형식이 없습니다(file.formatOptions 참조) +@msg PDF doesn't take it (see document.formats) PDF는 이 옵션을 받지 않습니다(document.formats 참조) +@msg EPS doesn't take it (see document.formats) EPS는 이 옵션을 받지 않습니다(document.formats 참조) +@msg DXF doesn't take it (see document.formats) DXF는 이 옵션을 받지 않습니다(document.formats 참조) +@msg {name} must be {range} (got {v}) {name}은(는) {range}이어야 합니다({v} 입력됨) +@msg The graphics processor tried first couldn't show the window, so VectorCraft started again on {summary} (Settings › Performance › Graphics Processor › Automatic uses the one that drives your display) 처음 시도한 그래픽 프로세서가 창을 표시하지 못해 {summary}에서 VectorCraft를 다시 시작했습니다(설정 › 성능 › 그래픽 프로세서 › 자동은 디스플레이를 구동하는 프로세서를 사용합니다) +@msg Sent “{title}” to {to} “{title}”을(를) {to}(으)로 보냈습니다 +@msg Sent “{title}” to {to}. The spooler replied: {note} “{title}”을(를) {to}(으)로 보냈습니다. 인쇄 대기열 응답: {note} +@msg the default printer 기본 프린터 +@msg raster effects on object {object}: requested {requested} ppi, achieved {achieved} ppi due to the 64 million pixel cap 개체 {object}의 래스터 효과: {requested} ppi를 요청했지만 6,400만 픽셀 한도 때문에 {achieved} ppi가 되었습니다 @msg unknown parameter `{key}`; the command takes: {keys} 알 수 없는 매개변수 `{key}`: 이 명령이 받는 매개변수: {keys} @msg the params must be an object, not {got} 매개변수는 객체여야 합니다({got} 사용 불가) @msg unknown parameter `{path}`; the object takes no keys 알 수 없는 매개변수 `{path}`: 이 객체는 키를 받지 않습니다 @@ -7410,6 +7521,11 @@ breakText Glyphs 글리프 @msg Some islands could not be joined to the area around the art 일부 섬을 아트워크 주변 영역에 연결할 수 없습니다 @msg `width` must be from {lo} to {hi} pt `width`는 {lo}에서 {hi}pt 사이여야 합니다 @msg `angle` must be from -180 to 180 degrees `angle`는 -180도에서 180도 사이여야 합니다 +@msg `roundness` must be from 0 to 100% `roundness`는 0%에서 100% 사이여야 합니다 +@msg `fidelity` must be from 0.01 to 100 pt `fidelity`는 0.01에서 100pt 사이여야 합니다 +@msg style must be "pencil" or "brush" style은 "pencil" 또는 "brush"여야 합니다 +@msg extend end must be "start" or "end" extend 끝은 "start" 또는 "end"여야 합니다 +@msg connect end must be "start" or "end" connect 끝은 "start" 또는 "end"여야 합니다 @msg `roundness` must be from 1 to 100% `roundness`는 1%에서 100% 사이여야 합니다 @msg `count` must be a whole number from 1 to {MAX_BRIDGES_PER_ISLAND} `count`는 1에서 {MAX_BRIDGES_PER_ISLAND} 사이의 정수여야 합니다 Weed Box and Lines… 위딩 상자 및 선… @@ -8053,7 +8169,6 @@ breakText Glyphs 글리프 @msg anchor `smooth` must be true or false 앵커의 `smooth`은(는) true 또는 false여야 합니다 @msg anchor `{key}` must be [x, y] 앵커의 `{key}`은(는) [x, y]여야 합니다 @msg anchor `{key}` must be a number 앵커의 `{key}`은(는) 숫자여야 합니다 -@msg angle and roundness must be finite 각도와 원형률은 유한해야 합니다 @msg angles must be a list as long as pins (degrees or null) angles는 pins와 길이가 같은 목록이어야 합니다(도 또는 null) @msg appearance must be flat|center|edge appearance는 flat|center|edge여야 합니다 @msg apply is "fill" or "stroke", not `{other}` apply는 "fill" 또는 "stroke"입니다: `{other}` @@ -9215,8 +9330,6 @@ breakText Glyphs 글리프 @msg unknown panel 알 수 없는 패널 @msg unknown panel `{panel}` 알 수 없는 패널 `{panel}` @msg unknown parameter `{key}` 알 수 없는 매개변수 `{key}` -@msg unknown parameter `{within}settings.{format}`; {why} 알 수 없는 매개변수 `{within}settings.{format}`: {why} -@msg unknown parameter `{within}{key}`; {why} 알 수 없는 매개변수 `{within}{key}`: {why} @msg unknown pieLegend `{v}` (none, standard or wedges) 알 수 없는 pieLegend `{v}`(none, standard 또는 wedges) @msg unknown piePosition `{v}` (even, ratio or stacked) 알 수 없는 piePosition `{v}`(even, ratio 또는 stacked) @msg unknown pieSort `{v}` (none, all or first) 알 수 없는 pieSort `{v}`(none, all 또는 first) @@ -9345,7 +9458,6 @@ breakText Glyphs 글리프 @msg {name} `{s}`: {ids} {name} `{s}`: {ids} @msg {name} is built in and can't be deleted {name}은(는) 기본 제공 항목이라 삭제할 수 없습니다 @msg {name} must be a number {name}은(는) 숫자여야 합니다 -@msg {name} must be {lo}–{hi}{unit} (got {v}) {name}은(는) {lo}–{hi}{unit}여야 합니다({v} 입력됨) @msg {name}: CRC or size mismatch {name}: CRC 또는 크기가 일치하지 않습니다 @msg {name}: only this Affinity file's embedded preview could be read; use File › Open to see it with its warning, or export SVG or PDF from Affinity before placing {name}: 이 Affinity 파일은 포함된 미리 보기만 읽을 수 있었습니다. 경고와 함께 보려면 파일 › 열기를 사용하거나, 가져오기 전에 Affinity에서 SVG 또는 PDF로 내보내세요 @msg {name}: {e} {name}: {e} diff --git a/crates/ui-egui/src/i18n/nl.tsv b/crates/ui-egui/src/i18n/nl.tsv index 6a57fbc622..9d2c6df035 100644 --- a/crates/ui-egui/src/i18n/nl.tsv +++ b/crates/ui-egui/src/i18n/nl.tsv @@ -576,6 +576,11 @@ liquify-list-end {0}, {1} {0} en {1} @msg Some islands could not be joined to the area around the art Sommige eilanden konden niet worden verbonden met het gebied rond de illustratie @msg `width` must be from {lo} to {hi} pt `width` moet van {lo} tot {hi} pt zijn @msg `angle` must be from -180 to 180 degrees `angle` moet van -180 tot 180 graden zijn +@msg `roundness` must be from 0 to 100% `roundness` moet van 0 tot 100% zijn +@msg `fidelity` must be from 0.01 to 100 pt `fidelity` moet van 0.01 tot 100 pt zijn +@msg style must be "pencil" or "brush" style moet "pencil" of "brush" zijn +@msg extend end must be "start" or "end" het einde van extend moet "start" of "end" zijn +@msg connect end must be "start" or "end" het einde van connect moet "start" of "end" zijn @msg `roundness` must be from 1 to 100% `roundness` moet van 1 tot 100% zijn @msg `count` must be a whole number from 1 to {MAX_BRIDGES_PER_ISLAND} `count` moet een geheel getal van 1 tot {MAX_BRIDGES_PER_ISLAND} zijn @@ -779,6 +784,9 @@ liquify-list-end {0}, {1} {0} en {1} Mask Masker Rasterize… Rasteriseren… Create Gradient Mesh… Verloopmesh maken… + Flat Vlak + To Center Naar het midden + To Edge Naar de rand Create Object Mosaic… Objectmozaïek maken… Vector Halftone… Vectorhalftoon… Create Trim Marks Afsnijtekens maken @@ -1662,6 +1670,18 @@ lighting Light Licht Placement Options… Plaatsingsopties… Plug-in… Plug-in… Preview in Browser Voorbeeld in browser + Optimize to File Size… Optimaliseren naar bestandsgrootte… + Optimize to File Size Optimaliseren naar bestandsgrootte + Desired File Size: Gewenste bestandsgrootte: + Start With: Beginnen met: + Use: Gebruiken: + Current Settings Huidige instellingen + Auto Select GIF/JPEG GIF/JPEG automatisch kiezen + Total of All Slices Totaal van alle slices + Each Slice Elke slice + Current Slice Huidige slice + {size}, within {target} {size}, binnen {target} + No setting tried fits in {target}; the smallest is {size} Geen geprobeerde instelling past in {target}; de kleinste is {size} Printer Setup… Printerinstellingen… Printers Printers Recent File Recent bestand @@ -3267,6 +3287,8 @@ digits Malayalam Malayalam Collate Sorteren Composite colours are converted to it; separations separate with it when it is a CMYK profile. Composietkleuren worden ernaar geconverteerd; separaties worden ermee gescheiden als het een CMYK-profiel is. Convert All Spot Colors to Process Alle spotkleuren omzetten naar proceskleuren + Convert {name} to process {name} omzetten naar proceskleur + Keep {name} as spot {name} als spotkleur behouden Default Printer Standaardprinter Document Ink Options Inktopties voor document Download: Downloaden: @@ -4283,6 +4305,7 @@ theme Appearance Vormgeving Command Click to Select Objects Behind Command-klik om objecten erachter te selecteren Constrain Angle Vastleghoek Constrain Width and Height Proportions Breedte- en hoogteverhouding vastleggen + Copy Width to Height Breedte naar hoogte kopiëren Construction Guides Bouwhulplijnen Curvature Tool Krommingsgereedschap Data Recovery Gegevensherstel @@ -4785,12 +4808,85 @@ font-technology Variable Variabel Preferences Voorkeuren Previous Vorige Restore every preference to its default (applied on OK) Elke voorkeur terugzetten naar de standaard (toegepast bij OK) + Shows a bar of commands for the selection or tool on the canvas; it hides while you drag and in Presentation Mode. Toont op het canvas een balk met opdrachten voor de selectie of het gereedschap; die verdwijnt tijdens het slepen en in de presentatiemodus. + How far an arrow key moves the selection; with Shift, it moves ten times as far. Hoe ver een pijltoets de selectie verplaatst; met Shift verplaatst die tien keer zo ver. + The angle of the axes that arrow keys move along and that Shift holds drawing and moving to. De hoek van de assen waarlangs pijltoetsen verplaatsen en waaraan Shift tekenen en verplaatsen bindt. + The corner radius the Rounded Rectangle tool draws with; changing the radius while drawing changes this value too. De hoekradius waarmee het gereedschap Afgeronde rechthoek tekent; als u de radius tijdens het tekenen wijzigt, wijzigt deze waarde ook. + How far right and down Paste moves the copy when it is given no position, as from a script; Paste in the app centers it in the view. Hoe ver Plakken de kopie naar rechts en omlaag verschuift als er geen positie is opgegeven, zoals vanuit een script; Plakken in de app plaatst die in het midden van de weergave. + Stops the Pen tool from deleting the anchor you click on a selected path, or adding one where you click its segment. Voorkomt dat het gereedschap Pen het ankerpunt verwijdert waarop u klikt op een geselecteerd pad, of er een toevoegt waar u op het segment ervan klikt. + Drawing tools show a crosshair pointer instead of their icon; Caps Lock does the same while it is on. Tekengereedschappen tonen een kruisdraadaanwijzer in plaats van hun pictogram; Caps Lock doet hetzelfde zolang die aan staat. + Shows a tip when the pointer rests on a button or field that has one. Toont een tip wanneer de aanwijzer stilstaat op een knop of veld dat er een heeft. + Shows a warning before a script you choose runs. Toont een waarschuwing voordat een script dat u kiest wordt uitgevoerd. + Smooths the edges of artwork on the canvas. Maakt de randen van illustraties op het canvas vloeiend. + Select › Same › Fill Color, Stroke Color and Fill & Stroke match only the same tint of a global or spot swatch, not any tint of it. Selecteren › Zelfde › Vulkleur, Contourkleur en Vulling en contour vinden alleen dezelfde tint van een globaal of steunkleurstaal, niet elke tint ervan. + Shows the Home screen when no document is open; off, the window stays empty until you click Home. Toont het startscherm wanneer er geen document open is; uitgeschakeld blijft het venster leeg totdat u op Home klikt. + Measures objects with their strokes and shape-changing effects for size, position and alignment; shadows, glows and blurs are not measured. Meet objecten met hun contouren en vormveranderende effecten voor grootte, positie en uitlijning; schaduwen, gloed en vervagingen worden niet gemeten. + At 100% zoom, one inch of the document takes 96 screen points instead of 72. Bij 100% zoom neemt één inch van het document 96 schermpunten in beslag in plaats van 72. + Double-clicking a group, path or image with the Selection tool opens it in isolation mode. Dubbelklikken op een groep, pad of afbeelding met het gereedschap Selectie opent die in de isolatiemodus. + Pattern fills and strokes transform with the art, unless a transform or the Transform panel's menu chooses otherwise. Patroonvullingen en -contouren transformeren mee met de illustratie, tenzij een transformatie of het menu van het deelvenster Transformeren anders kiest. + Live corner radii scale with the art, unless the scale chooses otherwise. Dynamische hoekradii schalen mee met de illustratie, tenzij het schalen anders kiest. + Stroke weights, dashes and effect distances scale with the art, unless the scale chooses otherwise. Contourdiktes, streepjes en effectafstanden schalen mee met de illustratie, tenzij het schalen anders kiest. + The mouse wheel zooms the canvas instead of scrolling it. Het muiswiel zoomt het canvas in plaats van het te schuiven. + The mouse wheel with Cmd/Ctrl held scrolls the canvas sideways. Het muiswiel met Cmd/Ctrl ingedrukt schuift het canvas zijwaarts. + Dragging sideways on a numeric field's label changes the field's value. Zijwaarts slepen over het label van een numeriek veld wijzigt de waarde van het veld. + A two-finger rotate gesture on a trackpad rotates the canvas view. Een draaigebaar met twee vingers op een trackpad draait de weergave van het canvas. + Holding a tool's shortcut key chooses the tool until you let go, and then the previous tool is chosen again. Als u de sneltoets van een gereedschap ingedrukt houdt, is dat gereedschap gekozen tot u loslaat, en daarna wordt het vorige gereedschap weer gekozen. + Shows the bounding box while you move the selection or draw a shape. Toont het begrenzingskader terwijl u de selectie verplaatst of een vorm tekent. + Create Trim Marks draws Japanese-style marks instead of Roman ones. Afsnijtekens maken tekent tekens in Japanse stijl in plaats van Romeinse. + New art takes only the fill and stroke of the selection; off, it takes the selected object's whole appearance. Nieuwe illustraties krijgen alleen de vulling en contour van de selectie; uitgeschakeld krijgen ze de hele vormgeving van het geselecteerde object. + Changing the width or height in the Transform panel, the Properties panel or the Control bar changes the other in proportion. Als u de breedte of hoogte wijzigt in het deelvenster Transformeren, het deelvenster Eigenschappen of de balk Bediening, wijzigt de andere naar verhouding. + A live rectangle's properties show one Corner Radius field for all four corners; off, each corner has its own field. De eigenschappen van een dynamische rechthoek tonen één veld Hoekradius voor alle vier hoeken; uitgeschakeld heeft elke hoek een eigen veld. + What edits in the Transform panel transform: the object, its pattern tiles or both; Default follows Transform Pattern Tiles. Wat bewerkingen in het deelvenster Transformeren transformeren: het object, de patroontegels ervan of beide; Standaard volgt Patroontegels transformeren. + With one symbol instance selected, the Transform panel uses the symbol's registration point as its reference point. Met één symboolinstantie geselecteerd gebruikt het deelvenster Transformeren het registratiepunt van het symbool als referentiepunt. + Darkens the canvas outside the artboards while the Artboard tool is active. Maakt het canvas buiten de tekenborden donkerder zolang het gereedschap Tekenbord actief is. + With Fade Region Outside Artboard on, the area outside the artboards stays dark while you drag with the Artboard tool. Met Gebied buiten tekenbord dimmen aan blijft het gebied buiten de tekenborden donker terwijl u sleept met het gereedschap Tekenbord. + How near, in pixels, the pointer must be to an object, anchor or handle for a click to select it. Hoe dicht, in pixels, de aanwijzer bij een object, ankerpunt of greep moet zijn om het met een klik te selecteren. + Whether the Selection tool's box selects objects it touches or only those fully inside; Drag Direction selects those inside on a drag to the right. E reverses it mid-drag. Of het kader van het Selectie-gereedschap objecten selecteert die het raakt of alleen die volledig erbinnen; Sleeprichting selecteert die erbinnen bij slepen naar rechts. E keert de regel om tijdens het slepen. + A click selects a filled object only on its path, not inside its fill. Een klik selecteert een gevuld object alleen op zijn pad, niet binnen de vulling. + How near, in pixels, a point must come to an anchor or ruler guide for Snap to Point to snap it; with Smart Guides on, Smart Guides' Snapping Tolerance applies instead. Hoe dicht, in pixels, een punt bij een ankerpunt of linealhulplijn moet komen om er met Uitlijnen op punt op te snappen; met slimme hulplijnen aan geldt in plaats daarvan hun snapping-tolerantie. + With the Selection tool, Cmd/Ctrl-click selects the object under the selected one at the pointer; each further click goes one object deeper. Met het Selectie-gereedschap selecteert Cmd/Ctrl-klikken het object onder het geselecteerde bij de aanwijzer; elke volgende klik gaat één object dieper. + Zoom In and Zoom Out bring the center of the selection to the middle of the view. Inzoomen en Uitzoomen brengen het midden van de selectie naar het midden van de weergave. + Locked and hidden artwork inside an artboard moves, scales and is copied with the artboard, as the other artwork does. Vergrendelde en verborgen illustraties binnen een tekenbord worden net als de andere illustraties met het tekenbord verplaatst, geschaald en gekopieerd. + The size of anchor points and direction handle ends on the canvas; larger anchors can also be picked from farther away. De grootte van ankerpunten en de uiteinden van richtingsgrepen op het canvas; grotere ankerpunten zijn ook van verder weg te pakken. + Draws the ends of direction handles as solid dots, hollow dots or larger solid dots. Tekent de uiteinden van richtingsgrepen als volle stippen, holle stippen of grotere volle stippen. + With the Direct Selection tool, the anchor under the pointer is highlighted. Met het Direct selecteren-gereedschap wordt het ankerpunt onder de aanwijzer gemarkeerd. + Shows direction handles when more than one anchor is selected; off, they show only while a single anchor is selected. Toont richtingsgrepen wanneer meer dan één ankerpunt is geselecteerd; staat dit uit, dan verschijnen ze alleen bij één geselecteerd ankerpunt. + Corner widgets hide on corners whose angle is greater than this many degrees. Hoekwidgets worden verborgen op hoeken met een hoek groter dan dit aantal graden. + The Pen tool previews the next segment from the last anchor to the pointer before you click. Het Pen-gereedschap toont het volgende segment van het laatste ankerpunt naar de aanwijzer voordat u klikt. + The Curvature tool previews the curve to the pointer before you place the next point. Het Krommingsgereedschap toont de curve naar de aanwijzer voordat u het volgende punt plaatst. The unit for new documents from built-in sizes other than pixel sizes and for opened files that record no unit; choosing one here and clicking OK also sets the active document's units. De eenheid voor nieuwe documenten in de ingebouwde formaten, behalve formaten in pixels, en voor geopende bestanden die geen eenheid vastleggen; kiest u die hier en klikt u op OK, dan krijgt ook het actieve document deze eenheid. Stroke weights, dashes and gaps show in this unit, and numbers typed for them are read in it. Contourdiktes, streepjes en tussenruimtes worden in deze eenheid getoond, en getallen die ervoor worden getypt, worden erin gelezen. Type sizes, leading and baseline shift show in this unit, and numbers typed for them are read in it. Tekstgroottes, regelafstand en basislijnverschuiving worden in deze eenheid getoond, en getallen die ervoor worden getypt, worden erin gelezen. The unit for East Asian type measurements, which no field uses yet. De eenheid voor maten van Oost-Aziatische tekst, die nog geen enkel veld gebruikt. When on, a number typed without a unit into a field in picas is read in points. Wanneer dit aan staat, wordt een getal dat zonder eenheid in een veld in pica's wordt getypt, in punten gelezen. With XML ID, object names show as XML IDs in the Layers panel, the Variables panel and Layer Options. Met XML-id worden objectnamen als XML-id's getoond in Lagen, Variabelen en Laagopties. + Snaps drawing, moving and scaling to the grid's subdivisions, even while the grid is hidden; while it is on, Snap to Pixel does not apply. Lijnt tekenen, verplaatsen en schalen uit op de onderverdelingen van het raster, ook als het raster verborgen is; zolang dit aan staat, geldt Uitlijnen op pixel niet. + The color of guides that are not selected; an artboard with a Guide Label draws its own guides in the label's color instead. De kleur van hulplijnen die niet geselecteerd zijn; een tekenbord met een hulplijnlabel tekent zijn eigen hulplijnen in de kleur van het label. + Draws guides as solid lines or as dots, including the guides already in the document. Tekent hulplijnen als doorgetrokken lijnen of als stippen, ook de hulplijnen die al in het document staan. + With this on, guides are locked when VectorCraft starts; changing this option locks or unlocks them at once, and View › Guides › Lock Guides still changes the lock. Als dit aan staat, zijn hulplijnen vergrendeld wanneer VectorCraft start; het wijzigen van deze optie vergrendelt of ontgrendelt ze meteen, en Beeld › Hulplijnen › Hulplijnen vergrendelen wijzigt de vergrendeling nog steeds. + With this on, holding Cmd/Ctrl as you start dragging from a ruler makes a guide on the active artboard only, or a canvas guide with the Artboard tool. Als dit aan staat, maakt Cmd/Ctrl ingedrukt aan het begin van een sleep vanuit een liniaal een hulplijn op alleen het actieve tekenbord, of met het tekengebied-gereedschap een hulplijn over het hele canvas. + The color of the grid; the lines between major gridlines are drawn in a fainter shade of it. De kleur van het raster; de lijnen tussen de hoofdrasterlijnen worden in een vagere tint ervan getekend. + Draws the grid as lines, or as dots along the major gridlines at each subdivision. Tekent het raster als lijnen, of als stippen langs de hoofdrasterlijnen bij elke onderverdeling. + The distance between major gridlines, in every open document and in new ones; a VectorCraft document opens with the grid it was saved with. De afstand tussen hoofdrasterlijnen in elk open document en in nieuwe; een VectorCraft-document opent met het raster waarmee het is opgeslagen. + How many parts each major grid square is divided into; Snap to Grid snaps to these parts, even when the zoom hides their lines. In hoeveel delen elk hoofdrastervak wordt verdeeld; Uitlijnen op raster lijnt uit op deze delen, ook als de zoom hun lijnen verbergt. + Draws the grid behind the artwork; off, the grid is drawn over it. Tekent het raster achter de illustratie; uit wordt het raster eroverheen getekend. + In Pixel Preview at 600% zoom or more, the active view shows a line at the edge of every document pixel over the artwork. In Pixelvoorbeeld bij 600% zoom of meer toont de actieve weergave over de illustratie een lijn langs de rand van elke documentpixel. + The color of the tile edge and the dashed swatch bounds shown while you edit a pattern. De kleur van de tegelrand en de gestippelde staalgrenzen die worden getoond terwijl u een patroon bewerkt. + Snaps drawing, moving and transforming to nearby art and shows guides and labels; Pixel Preview turns them off, and Snap to Grid snaps to the grid instead. Lijnt tekenen, verplaatsen en transformeren uit op illustraties in de buurt en toont hulplijnen en labels; Pixelvoorbeeld zet ze uit, en Uitlijnen op raster lijnt in plaats daarvan uit op het raster. + The color of Smart Guide lines and labels. De kleur van de lijnen en labels van slimme hulplijnen. + Shows a line along the edge or center that art lines up with; off, art still lines up without the line, and Snap to Glyph does not apply. Toont een lijn langs de rand of het midden waarmee de illustratie uitlijnt; uit lijnt de illustratie nog steeds uit zonder de lijn, en Uitlijnen op glyph geldt niet. + With a selection tool, outlines the unselected object under the pointer in its layer color while you are not dragging. Met een selectiegereedschap krijgt het niet-geselecteerde object onder de aanwijzer een omtrek in de kleur van zijn laag, zolang u niet sleept. + Shows the size or angle next to the pointer while you scale, rotate, shear or reflect art. Toont de grootte of hoek naast de aanwijzer terwijl u een illustratie schaalt, draait, schuintrekt of spiegelt. + While you draw, points snap to lines at the chosen Angles through the point the segment or shape starts from. Tijdens het tekenen worden punten uitgelijnd op lijnen in de gekozen hoeken door het punt waar het segment of de vorm begint. + The set of angles the construction guides follow while Construction Guides is on. De set hoeken die de bouwhulplijnen volgen terwijl Bouwhulplijnen aan staat. + Names what a point snaps to, such as an anchor, a path or an alignment; off, points snap the same way without the names. Noemt waarop een punt uitlijnt, zoals een ankerpunt, een pad of een uitlijning; uit worden punten op dezelfde manier uitgelijnd, zonder de namen. + Shows distances, angles and how far art has moved next to the pointer while you draw or move it. Toont naast de aanwijzer afstanden, hoeken en hoe ver de illustratie is verplaatst terwijl u tekent of verplaatst. + Snaps moved or resized art to the same gap as between nearby objects, and marks the equal gaps. Lijnt verplaatste of vergrote of verkleinde illustraties uit op dezelfde tussenruimte als tussen objecten in de buurt en markeert de gelijke tussenruimten. + With something selected, holding Alt/Option over another object or an artboard shows the distances between it and the selection. Met iets geselecteerd toont Alt/Option ingedrukt boven een ander object of een tekenbord de afstanden tussen dat object en de selectie. + A selection dragged back to within the Snapping Tolerance of where the drag began goes back to exactly that place; a copy does not. Een selectie die tot binnen de snapping-tolerantie van het beginpunt van het slepen wordt teruggesleept, keert precies naar die plek terug; een kopie niet. + How near on screen the pointer or a dragged point must come to art for Smart Guides to snap to it; the distance is the same at every zoom. Hoe dicht de aanwijzer of een gesleept punt op het scherm bij een illustratie moet komen voordat slimme hulplijnen erop uitlijnen; de afstand is bij elke zoom gelijk. + Snaps the end of a line segment, or a circle drawn from its center, so that it touches a nearby curve. Lijnt het einde van een lijnsegment, of een cirkel getekend vanuit het middelpunt, zo uit dat het een curve in de buurt raakt. + Snaps the end of a line segment so that it meets a nearby straight segment at a right angle. Lijnt het einde van een lijnsegment zo uit dat het een recht segment in de buurt onder een rechte hoek raakt. Reset all preferences to their defaults? Alle voorkeuren terugzetten naar de standaardwaarden? The defaults are applied when you click OK in Preferences. Cancel there keeps your current preferences. De standaardwaarden worden toegepast wanneer u in Voorkeuren op OK klikt. Annuleren daar behoudt uw huidige voorkeuren. Smaller ↔ Larger Kleiner ↔ Groter @@ -5081,6 +5177,11 @@ imageTrace Outline Contour @msg PDF writer error: {0} PDF-schrijffout: {0} @msgplural Packaged {n} file ({note}) in {folder}|Packaged {n} files ({note}) in {folder} {n} bestand verpakt in {folder} ({note})|{n} bestanden verpakt in {folder} ({note}) @msg Preview in Browser needs the desktop app (the web downloads files instead) Voorvertoning in browser heeft de desktop-app nodig (het web downloadt in plaats daarvan bestanden) +@msg give `desiredK`, the desired file size in K (1024 bytes): a number above 0 and at most 1048576 geef `desiredK`, de gewenste bestandsgrootte in K (1024 bytes): een getal boven 0 en hoogstens 1048576 +@msg `startWith` is `current` or `auto` `startWith` is `current` of `auto` +@msg `use` is `allSlices`, `eachSlice` or `currentSlice` `use` is `allSlices`, `eachSlice` of `currentSlice` +@msg `slice` is a slice number from `slice.list`, with `use: currentSlice` `slice` is een slicenummer uit `slice.list`, met `use: currentSlice` +@msg Optimize to File Size: there is no image to measure Optimaliseren naar bestandsgrootte: er is geen afbeelding om te meten @msg Release Guides: no guides Hulplijnen vrijgeven: geen hulplijnen @msg Release: no layer to put the rectangle in Vrijgeven: geen laag om de rechthoek in te plaatsen @msg Replace Spine: select a blend and a path Ruggengraat vervangen: selecteer een mengsel en een pad @@ -6314,7 +6415,6 @@ imageTrace Outline Contour @msg anchor `smooth` must be true or false `smooth` van het anker moet true of false zijn @msg anchor `{key}` must be [x, y] `{key}` van het anker moet [x, y] zijn @msg anchor `{key}` must be a number `{key}` van het anker moet een getal zijn -@msg angle and roundness must be finite hoek en ronding moeten eindig zijn @msg angles must be a list as long as pins (degrees or null) angles moet een lijst zijn die even lang is als pins (graden of null) @msg appearance must be flat|center|edge appearance moet flat|center|edge zijn @msg apply is "fill" or "stroke", not `{other}` apply is "fill" of "stroke", niet `{other}` @@ -8061,6 +8161,19 @@ mark-style Japanese Japans Transform Objects Objecten transformeren @msg unknown parameter `{key}`; did you mean `{near}`? onbekende parameter `{key}`; bedoelde je `{near}`? @msg unknown parameter `{key}`; the command takes no parameters onbekende parameter `{key}`; de opdracht accepteert geen parameters +@msg unknown parameter `{key}`; `{object}` takes: {keys} onbekende parameter `{key}`; `{object}` accepteert: {keys} +@msg unknown parameter `{key}`; {why_not} onbekende parameter `{key}`; {why_not} +@msg no format takes it (see document.formats) geen enkele indeling accepteert deze (zie document.formats) +@msg no save format takes it (see file.formatOptions) geen enkele opslagindeling accepteert deze (zie file.formatOptions) +@msg PDF doesn't take it (see document.formats) PDF accepteert deze niet (zie document.formats) +@msg EPS doesn't take it (see document.formats) EPS accepteert deze niet (zie document.formats) +@msg DXF doesn't take it (see document.formats) DXF accepteert deze niet (zie document.formats) +@msg {name} must be {range} (got {v}) {name} moet {range} zijn (kreeg {v}) +@msg The graphics processor tried first couldn't show the window, so VectorCraft started again on {summary} (Settings › Performance › Graphics Processor › Automatic uses the one that drives your display) De grafische processor die eerst werd geprobeerd, kon het venster niet weergeven, dus VectorCraft is opnieuw gestart met {summary} (Instellingen › Prestaties › Grafische processor › Automatisch gebruikt de processor die je beeldscherm aanstuurt) +@msg Sent “{title}” to {to} “{title}” verzonden naar {to} +@msg Sent “{title}” to {to}. The spooler replied: {note} “{title}” verzonden naar {to}. Antwoord van de afdrukwachtrij: {note} +@msg the default printer de standaardprinter +@msg raster effects on object {object}: requested {requested} ppi, achieved {achieved} ppi due to the 64 million pixel cap rastereffecten op object {object}: {requested} ppi gevraagd, {achieved} ppi bereikt vanwege de limiet van 64 miljoen pixels @msg unknown parameter `{key}`; the command takes: {keys} onbekende parameter `{key}`; de opdracht accepteert: {keys} Load EPS into Clipboard EPS in het klembord laden @msg an image of {w} × {h} pixels is too large to draw een afbeelding van {w} × {h} pixels is te groot om te tekenen diff --git a/crates/ui-egui/src/i18n/pl.tsv b/crates/ui-egui/src/i18n/pl.tsv index 3c3b666821..0ea11d0eee 100644 --- a/crates/ui-egui/src/i18n/pl.tsv +++ b/crates/ui-egui/src/i18n/pl.tsv @@ -188,6 +188,9 @@ Mask Maska Rasterize… Rasteryzuj… Create Gradient Mesh… Utwórz siatkę gradientową… + Flat Płaski + To Center Do środka + To Edge Do krawędzi Create Object Mosaic… Utwórz mozaikę obiektów… Vector Halftone… Półton wektorowy… Create Trim Marks Utwórz znaczniki przycięcia @@ -1127,6 +1130,18 @@ lighting Light Światło Placement Options… Opcje umieszczania… Plug-in… Wtyczka… Preview in Browser Podgląd w przeglądarce + Optimize to File Size… Optymalizuj do rozmiaru pliku… + Optimize to File Size Optymalizuj do rozmiaru pliku + Desired File Size: Żądany rozmiar pliku: + Start With: Zacznij od: + Use: Użyj: + Current Settings Bieżące ustawienia + Auto Select GIF/JPEG Automatyczny wybór GIF/JPEG + Total of All Slices Suma wszystkich plasterków + Each Slice Każdy plasterek + Current Slice Bieżący plasterek + {size}, within {target} {size}, w granicach {target} + No setting tried fits in {target}; the smallest is {size} Żadne wypróbowane ustawienie nie mieści się w {target}; najmniejsze ma {size} Printer Setup… Ustawienia drukarki… Printers Drukarki Recent File Ostatni plik @@ -2838,6 +2853,8 @@ digits Malayalam Malajalam Collate Sortuj Composite colours are converted to it; separations separate with it when it is a CMYK profile. Kolory kompozytowe są do niego konwertowane; rozbarwienia korzystają z niego, gdy jest profilem CMYK. Convert All Spot Colors to Process Konwertuj wszystkie kolory dodatkowe na triadowe + Convert {name} to process Konwertuj {name} na kolor triadowy + Keep {name} as spot Zachowaj {name} jako kolor dodatkowy Default Printer Drukarka domyślna Document Ink Options Opcje farb dokumentu Download: Pobieranie: @@ -3869,6 +3886,7 @@ theme Appearance Wygląd Command Click to Select Objects Behind Kliknięcie z Command zaznacza obiekty pod spodem Constrain Angle Kąt ograniczenia Constrain Width and Height Proportions Zachowaj proporcje szerokości i wysokości + Copy Width to Height Kopiuj szerokość do wysokości Construction Guides Linie konstrukcyjne Curvature Tool Narzędzie Krzywizna Data Recovery Odzyskiwanie danych @@ -4358,12 +4376,85 @@ font-technology Variable Zmienne Preferences Preferencje Previous Wstecz Restore every preference to its default (applied on OK) Przywróć domyślne wartości wszystkich preferencji (zastosowane po OK) + Shows a bar of commands for the selection or tool on the canvas; it hides while you drag and in Presentation Mode. Pokazuje na obszarze roboczym pasek poleceń dla zaznaczenia lub narzędzia; ukrywa się podczas przeciągania i w trybie prezentacji. + How far an arrow key moves the selection; with Shift, it moves ten times as far. Jak daleko klawisz strzałki przesuwa zaznaczenie; z klawiszem Shift przesuwa je dziesięć razy dalej. + The angle of the axes that arrow keys move along and that Shift holds drawing and moving to. Kąt osi, wzdłuż których przesuwają klawisze strzałek i do których Shift ogranicza rysowanie i przesuwanie. + The corner radius the Rounded Rectangle tool draws with; changing the radius while drawing changes this value too. Promień narożnika, z jakim rysuje narzędzie Zaokrąglony prostokąt; zmiana promienia podczas rysowania zmienia też tę wartość. + How far right and down Paste moves the copy when it is given no position, as from a script; Paste in the app centers it in the view. Jak daleko w prawo i w dół Wklej przesuwa kopię, gdy nie podano położenia, na przykład w skrypcie; Wklej w aplikacji umieszcza ją na środku widoku. + Stops the Pen tool from deleting the anchor you click on a selected path, or adding one where you click its segment. Nie pozwala narzędziu Pióro usuwać punktu kontrolnego klikniętego na zaznaczonej ścieżce ani dodawać punktu w miejscu kliknięcia jej segmentu. + Drawing tools show a crosshair pointer instead of their icon; Caps Lock does the same while it is on. Narzędzia do rysowania pokazują wskaźnik w kształcie krzyżyka zamiast swojej ikony; Caps Lock działa tak samo, dopóki jest włączony. + Shows a tip when the pointer rests on a button or field that has one. Pokazuje wskazówkę, gdy wskaźnik zatrzyma się na przycisku lub polu, które ją ma. + Shows a warning before a script you choose runs. Pokazuje ostrzeżenie przed uruchomieniem wybranego skryptu. + Smooths the edges of artwork on the canvas. Wygładza krawędzie grafiki na obszarze roboczym. + Select › Same › Fill Color, Stroke Color and Fill & Stroke match only the same tint of a global or spot swatch, not any tint of it. Zaznacz › Taki sam › Kolor wypełnienia, Kolor obrysu oraz Wypełnienie i obrys dopasowują tylko ten sam odcień globalnej lub dodatkowej próbki, a nie dowolny jej odcień. + Shows the Home screen when no document is open; off, the window stays empty until you click Home. Pokazuje stronę startową, gdy nie jest otwarty żaden dokument; po wyłączeniu okno pozostaje puste, dopóki nie klikniesz Strona startowa. + Measures objects with their strokes and shape-changing effects for size, position and alignment; shadows, glows and blurs are not measured. Mierzy obiekty razem z obrysami i efektami zmieniającymi kształt na potrzeby rozmiaru, położenia i wyrównania; cienie, poświaty i rozmycia nie są mierzone. + At 100% zoom, one inch of the document takes 96 screen points instead of 72. Przy powiększeniu 100% jeden cal dokumentu zajmuje 96 punktów ekranu zamiast 72. + Double-clicking a group, path or image with the Selection tool opens it in isolation mode. Dwukrotne kliknięcie grupy, ścieżki lub obrazu narzędziem Zaznaczanie otwiera je w trybie izolacji. + Pattern fills and strokes transform with the art, unless a transform or the Transform panel's menu chooses otherwise. Wypełnienia i obrysy wzorkiem przekształcają się razem z grafiką, chyba że przekształcenie lub menu panelu Przekształć wybierze inaczej. + Live corner radii scale with the art, unless the scale chooses otherwise. Promienie narożników dynamicznych skalują się razem z grafiką, chyba że skalowanie wybierze inaczej. + Stroke weights, dashes and effect distances scale with the art, unless the scale chooses otherwise. Grubości obrysów, kreski i odległości efektów skalują się razem z grafiką, chyba że skalowanie wybierze inaczej. + The mouse wheel zooms the canvas instead of scrolling it. Kółko myszy powiększa obszar roboczy zamiast go przewijać. + The mouse wheel with Cmd/Ctrl held scrolls the canvas sideways. Kółko myszy z wciśniętym Cmd/Ctrl przewija obszar roboczy w poziomie. + Dragging sideways on a numeric field's label changes the field's value. Przeciąganie w bok po etykiecie pola liczbowego zmienia wartość pola. + A two-finger rotate gesture on a trackpad rotates the canvas view. Gest obrotu dwoma palcami na gładziku obraca widok obszaru roboczego. + Holding a tool's shortcut key chooses the tool until you let go, and then the previous tool is chosen again. Przytrzymanie skrótu narzędzia wybiera je do momentu puszczenia klawisza, a potem ponownie wybierane jest poprzednie narzędzie. + Shows the bounding box while you move the selection or draw a shape. Pokazuje obwiednię podczas przesuwania zaznaczenia lub rysowania kształtu. + Create Trim Marks draws Japanese-style marks instead of Roman ones. Utwórz znaczniki przycięcia rysuje znaczniki w stylu japońskim zamiast rzymskich. + New art takes only the fill and stroke of the selection; off, it takes the selected object's whole appearance. Nowa grafika przejmuje tylko wypełnienie i obrys zaznaczenia; po wyłączeniu przejmuje cały wygląd zaznaczonego obiektu. + Changing the width or height in the Transform panel, the Properties panel or the Control bar changes the other in proportion. Zmiana szerokości lub wysokości w panelu Przekształć, panelu Właściwości lub panelu Sterowanie proporcjonalnie zmienia drugi wymiar. + A live rectangle's properties show one Corner Radius field for all four corners; off, each corner has its own field. Właściwości dynamicznego prostokąta pokazują jedno pole Promień narożnika dla wszystkich czterech narożników; po wyłączeniu każdy narożnik ma własne pole. + What edits in the Transform panel transform: the object, its pattern tiles or both; Default follows Transform Pattern Tiles. Co przekształcają zmiany w panelu Przekształć: obiekt, kafelki jego wzorka lub oba; Domyślne podąża za opcją Przekształcaj kafelki wzorków. + With one symbol instance selected, the Transform panel uses the symbol's registration point as its reference point. Gdy zaznaczone jest jedno wystąpienie symbolu, panel Przekształć używa punktu rejestracji symbolu jako punktu odniesienia. + Darkens the canvas outside the artboards while the Artboard tool is active. Przyciemnia obszar roboczy poza obszarami kompozycji, gdy aktywne jest narzędzie Obszar kompozycji. + With Fade Region Outside Artboard on, the area outside the artboards stays dark while you drag with the Artboard tool. Gdy włączone jest Przyciemnij obszar poza obszarem kompozycji, obszar poza obszarami kompozycji pozostaje ciemny podczas przeciągania narzędziem Obszar kompozycji. + How near, in pixels, the pointer must be to an object, anchor or handle for a click to select it. Jak blisko, w pikselach, wskaźnik musi być od obiektu, punktu kontrolnego lub uchwytu, aby kliknięcie go zaznaczyło. + Whether the Selection tool's box selects objects it touches or only those fully inside; Drag Direction selects those inside on a drag to the right. E reverses it mid-drag. Czy ramka narzędzia Zaznaczanie zaznacza dotknięte obiekty, czy tylko te całkowicie wewnątrz; Kierunek przeciągania zaznacza te wewnątrz przy przeciąganiu w prawo. E odwraca regułę podczas przeciągania. + A click selects a filled object only on its path, not inside its fill. Kliknięcie zaznacza wypełniony obiekt tylko na jego ścieżce, nie wewnątrz wypełnienia. + How near, in pixels, a point must come to an anchor or ruler guide for Snap to Point to snap it; with Smart Guides on, Smart Guides' Snapping Tolerance applies instead. Jak blisko, w pikselach, punkt musi podejść do punktu kontrolnego lub linii pomocniczej linijki, aby Przyciągaj do punktów go przyciągnęło; przy włączonych inteligentnych liniach pomocniczych obowiązuje ich tolerancja przyciągania. + With the Selection tool, Cmd/Ctrl-click selects the object under the selected one at the pointer; each further click goes one object deeper. Z narzędziem Zaznaczanie Cmd/Ctrl+kliknięcie zaznacza obiekt pod zaznaczonym w miejscu wskaźnika; każde kolejne kliknięcie schodzi o jeden obiekt głębiej. + Zoom In and Zoom Out bring the center of the selection to the middle of the view. Powiększ i Pomniejsz przenoszą środek zaznaczenia na środek widoku. + Locked and hidden artwork inside an artboard moves, scales and is copied with the artboard, as the other artwork does. Zablokowana i ukryta grafika wewnątrz obszaru kompozycji jest przesuwana, skalowana i kopiowana razem z nim, tak jak pozostała grafika. + The size of anchor points and direction handle ends on the canvas; larger anchors can also be picked from farther away. Rozmiar punktów kontrolnych i końców uchwytów kierunkowych na obszarze roboczym; większe punkty kontrolne można chwycić także z większej odległości. + Draws the ends of direction handles as solid dots, hollow dots or larger solid dots. Rysuje końce uchwytów kierunkowych jako pełne kropki, puste kropki lub większe pełne kropki. + With the Direct Selection tool, the anchor under the pointer is highlighted. Z narzędziem Zaznaczanie bezpośrednie punkt kontrolny pod wskaźnikiem jest wyróżniany. + Shows direction handles when more than one anchor is selected; off, they show only while a single anchor is selected. Pokazuje uchwyty kierunkowe, gdy zaznaczono więcej niż jeden punkt kontrolny; po wyłączeniu są widoczne tylko przy jednym zaznaczonym punkcie. + Corner widgets hide on corners whose angle is greater than this many degrees. Widżety narożników są ukrywane na narożnikach o kącie większym niż ta liczba stopni. + The Pen tool previews the next segment from the last anchor to the pointer before you click. Narzędzie Pióro pokazuje podgląd następnego segmentu od ostatniego punktu kontrolnego do wskaźnika przed kliknięciem. + The Curvature tool previews the curve to the pointer before you place the next point. Narzędzie Krzywizna pokazuje podgląd krzywej do wskaźnika przed umieszczeniem następnego punktu. The unit for new documents from built-in sizes other than pixel sizes and for opened files that record no unit; choosing one here and clicking OK also sets the active document's units. Jednostka nowych dokumentów o wbudowanych rozmiarach, z wyjątkiem rozmiarów w pikselach, oraz otwartych plików bez zapisanej jednostki; wybranie jej tutaj i kliknięcie OK ustawia ją też w aktywnym dokumencie. Stroke weights, dashes and gaps show in this unit, and numbers typed for them are read in it. Grubości obrysu, kreski i odstępy są wyświetlane w tej jednostce, a liczby wpisane dla nich są w niej odczytywane. Type sizes, leading and baseline shift show in this unit, and numbers typed for them are read in it. Rozmiary tekstu, interlinia i przesunięcie linii bazowej są wyświetlane w tej jednostce, a liczby wpisane dla nich są w niej odczytywane. The unit for East Asian type measurements, which no field uses yet. Jednostka miar tekstu wschodnioazjatyckiego, której żadne pole jeszcze nie używa. When on, a number typed without a unit into a field in picas is read in points. Gdy opcja jest włączona, liczba wpisana bez jednostki w polu w pica jest odczytywana w punktach. With XML ID, object names show as XML IDs in the Layers panel, the Variables panel and Layer Options. Przy ID XML nazwy obiektów są wyświetlane jako ID XML w Warstwach, Zmiennych i Opcjach warstwy. + Snaps drawing, moving and scaling to the grid's subdivisions, even while the grid is hidden; while it is on, Snap to Pixel does not apply. Przyciąga rysowanie, przesuwanie i skalowanie do podpodziałów siatki, nawet gdy siatka jest ukryta; dopóki jest włączone, Przyciągaj do pikseli nie działa. + The color of guides that are not selected; an artboard with a Guide Label draws its own guides in the label's color instead. Kolor niezaznaczonych linii pomocniczych; obszar kompozycji z Etykietą linii pomocniczych rysuje własne linie pomocnicze w kolorze etykiety. + Draws guides as solid lines or as dots, including the guides already in the document. Rysuje linie pomocnicze jako linie ciągłe lub kropki, także te, które już są w dokumencie. + With this on, guides are locked when VectorCraft starts; changing this option locks or unlocks them at once, and View › Guides › Lock Guides still changes the lock. Po włączeniu linie pomocnicze są zablokowane przy uruchomieniu VectorCraft; zmiana tej opcji od razu je blokuje lub odblokowuje, a Widok › Linie pomocnicze › Zablokuj linie pomocnicze nadal zmienia blokadę. + With this on, holding Cmd/Ctrl as you start dragging from a ruler makes a guide on the active artboard only, or a canvas guide with the Artboard tool. Po włączeniu przytrzymanie Cmd/Ctrl na początku przeciągania z linijki tworzy linię pomocniczą tylko na aktywnym obszarze kompozycji, a z narzędziem Obszar kompozycji linię na całym płótnie. + The color of the grid; the lines between major gridlines are drawn in a fainter shade of it. Kolor siatki; linie między głównymi liniami siatki są rysowane w jaśniejszym odcieniu tego koloru. + Draws the grid as lines, or as dots along the major gridlines at each subdivision. Rysuje siatkę jako linie albo jako kropki wzdłuż głównych linii siatki przy każdym podpodziale. + The distance between major gridlines, in every open document and in new ones; a VectorCraft document opens with the grid it was saved with. Odstęp między głównymi liniami siatki w każdym otwartym dokumencie i w nowych; dokument VectorCraft otwiera się z siatką, z którą został zapisany. + How many parts each major grid square is divided into; Snap to Grid snaps to these parts, even when the zoom hides their lines. Na ile części dzieli się każdy główny kwadrat siatki; Przyciągaj do siatki przyciąga do tych części, nawet gdy powiększenie ukrywa ich linie. + Draws the grid behind the artwork; off, the grid is drawn over it. Rysuje siatkę za grafiką; po wyłączeniu siatka jest rysowana na niej. + In Pixel Preview at 600% zoom or more, the active view shows a line at the edge of every document pixel over the artwork. W Podglądzie pikseli przy powiększeniu 600% lub większym aktywny widok pokazuje nad grafiką linię na krawędzi każdego piksela dokumentu. + The color of the tile edge and the dashed swatch bounds shown while you edit a pattern. Kolor krawędzi kafelka i przerywanych granic próbki widocznych podczas edycji wzorka. + Snaps drawing, moving and transforming to nearby art and shows guides and labels; Pixel Preview turns them off, and Snap to Grid snaps to the grid instead. Przyciąga rysowanie, przesuwanie i przekształcanie do pobliskiej grafiki oraz pokazuje linie pomocnicze i etykiety; Podgląd pikseli je wyłącza, a Przyciągaj do siatki przyciąga zamiast nich do siatki. + The color of Smart Guide lines and labels. Kolor linii i etykiet inteligentnych linii pomocniczych. + Shows a line along the edge or center that art lines up with; off, art still lines up without the line, and Snap to Glyph does not apply. Pokazuje linię wzdłuż krawędzi lub środka, do których wyrównuje się grafika; po wyłączeniu grafika nadal się wyrównuje bez linii, a Przyciągaj do glifów nie działa. + With a selection tool, outlines the unselected object under the pointer in its layer color while you are not dragging. Przy narzędziu zaznaczania obrysowuje niezaznaczony obiekt pod wskaźnikiem kolorem jego warstwy, dopóki nie przeciągasz. + Shows the size or angle next to the pointer while you scale, rotate, shear or reflect art. Pokazuje rozmiar lub kąt obok wskaźnika podczas skalowania, obracania, pochylania lub odbijania grafiki. + While you draw, points snap to lines at the chosen Angles through the point the segment or shape starts from. Podczas rysowania punkty przyciągają się do linii pod wybranymi kątami przechodzących przez punkt, od którego zaczyna się segment lub kształt. + The set of angles the construction guides follow while Construction Guides is on. Zestaw kątów, wzdłuż których biegną linie konstrukcyjne, gdy Linie konstrukcyjne są włączone. + Names what a point snaps to, such as an anchor, a path or an alignment; off, points snap the same way without the names. Nazywa to, do czego przyciąga się punkt, np. punkt kontrolny, ścieżkę lub wyrównanie; po wyłączeniu punkty przyciągają się tak samo, bez nazw. + Shows distances, angles and how far art has moved next to the pointer while you draw or move it. Pokazuje obok wskaźnika odległości, kąty i to, o ile przesunęła się grafika, podczas rysowania lub przesuwania. + Snaps moved or resized art to the same gap as between nearby objects, and marks the equal gaps. Przyciąga przesuniętą grafikę lub grafikę o zmienionym rozmiarze do takiego samego odstępu jak między pobliskimi obiektami i zaznacza równe odstępy. + With something selected, holding Alt/Option over another object or an artboard shows the distances between it and the selection. Gdy coś jest zaznaczone, przytrzymanie Alt/Option nad innym obiektem lub obszarem kompozycji pokazuje odległości między nim a zaznaczeniem. + A selection dragged back to within the Snapping Tolerance of where the drag began goes back to exactly that place; a copy does not. Zaznaczenie przeciągnięte z powrotem na odległość tolerancji przyciągania od miejsca, w którym zaczęło się przeciąganie, wraca dokładnie w to miejsce; kopia nie. + How near on screen the pointer or a dragged point must come to art for Smart Guides to snap to it; the distance is the same at every zoom. Jak blisko na ekranie wskaźnik lub przeciągany punkt musi znaleźć się przy grafice, aby inteligentne linie pomocnicze go przyciągnęły; odległość jest taka sama przy każdym powiększeniu. + Snaps the end of a line segment, or a circle drawn from its center, so that it touches a nearby curve. Przyciąga koniec odcinka lub okrąg rysowany od środka tak, aby dotykał pobliskiej krzywej. + Snaps the end of a line segment so that it meets a nearby straight segment at a right angle. Przyciąga koniec odcinka tak, aby spotykał pobliski prosty segment pod kątem prostym. Reset all preferences to their defaults? Przywrócić domyślne wartości wszystkich preferencji? The defaults are applied when you click OK in Preferences. Cancel there keeps your current preferences. Wartości domyślne zostaną zastosowane po kliknięciu OK w Preferencjach. Anuluj w tym oknie zachowuje bieżące preferencje. Smaller ↔ Larger Mniejszy ↔ większy @@ -4798,6 +4889,11 @@ liquify-list-end {0}, {1} {0} i {1} @msg PDF writer error: {0} Błąd zapisu PDF: {0} @msgplural Packaged {n} file ({note}) in {folder}|Packaged {n} files ({note}) in {folder} Spakowane pliki: {n} w {folder} ({note}) @msg Preview in Browser needs the desktop app (the web downloads files instead) Podgląd w przeglądarce wymaga aplikacji desktopowej (wersja webowa zamiast tego pobiera pliki) +@msg give `desiredK`, the desired file size in K (1024 bytes): a number above 0 and at most 1048576 podaj `desiredK`, żądany rozmiar pliku w K (1024 bajty): liczbę większą od 0 i najwyżej 1048576 +@msg `startWith` is `current` or `auto` `startWith` to `current` lub `auto` +@msg `use` is `allSlices`, `eachSlice` or `currentSlice` `use` to `allSlices`, `eachSlice` lub `currentSlice` +@msg `slice` is a slice number from `slice.list`, with `use: currentSlice` `slice` to numer plasterka z `slice.list`, z `use: currentSlice` +@msg Optimize to File Size: there is no image to measure Optymalizuj do rozmiaru pliku: brak obrazu do zmierzenia @msg Release Guides: no guides Uwolnij linie pomocnicze: brak linii pomocniczych @msg Release: no layer to put the rectangle in Uwolnij: brak warstwy, na której można umieścić prostokąt @msg Replace Spine: select a blend and a path Zastąp grzbiet: zaznacz przejście i ścieżkę @@ -6142,6 +6238,19 @@ mark-style Japanese Japońskie Transform Objects Przekształć obiekty @msg unknown parameter `{key}`; did you mean `{near}`? nieznany parametr `{key}`; czy chodziło o `{near}`? @msg unknown parameter `{key}`; the command takes no parameters nieznany parametr `{key}`; polecenie nie przyjmuje parametrów +@msg unknown parameter `{key}`; `{object}` takes: {keys} nieznany parametr `{key}`; `{object}` przyjmuje: {keys} +@msg unknown parameter `{key}`; {why_not} nieznany parametr `{key}`; {why_not} +@msg no format takes it (see document.formats) żaden format go nie przyjmuje (zobacz document.formats) +@msg no save format takes it (see file.formatOptions) żaden format zapisu go nie przyjmuje (zobacz file.formatOptions) +@msg PDF doesn't take it (see document.formats) PDF go nie przyjmuje (zobacz document.formats) +@msg EPS doesn't take it (see document.formats) EPS go nie przyjmuje (zobacz document.formats) +@msg DXF doesn't take it (see document.formats) DXF go nie przyjmuje (zobacz document.formats) +@msg {name} must be {range} (got {v}) {name} musi wynosić {range} (podano {v}) +@msg The graphics processor tried first couldn't show the window, so VectorCraft started again on {summary} (Settings › Performance › Graphics Processor › Automatic uses the one that drives your display) Pierwszy wypróbowany procesor graficzny nie mógł wyświetlić okna, więc VectorCraft uruchomił się ponownie na {summary} (Ustawienia › Wydajność › Procesor graficzny › Automatycznie używa tego, który obsługuje ekran) +@msg Sent “{title}” to {to} Wysłano “{title}” do: {to} +@msg Sent “{title}” to {to}. The spooler replied: {note} Wysłano “{title}” do: {to}. Odpowiedź kolejki wydruku: {note} +@msg the default printer drukarka domyślna +@msg raster effects on object {object}: requested {requested} ppi, achieved {achieved} ppi due to the 64 million pixel cap efekty rastrowe na obiekcie {object}: żądano {requested} ppi, uzyskano {achieved} ppi z powodu limitu 64 milionów pikseli @msg unknown parameter `{key}`; the command takes: {keys} nieznany parametr `{key}`; polecenie przyjmuje: {keys} @msg the params must be an object, not {got} parametry muszą być obiektem, a nie {got} @msg unknown parameter `{path}`; the object takes no keys nieznany parametr `{path}`; obiekt nie przyjmuje kluczy @@ -7675,6 +7784,11 @@ breakText Glyphs Glify @msg Some islands could not be joined to the area around the art Niektórych wysp nie udało się połączyć z obszarem wokół grafiki @msg `width` must be from {lo} to {hi} pt `width` musi mieścić się w zakresie od {lo} do {hi} pt @msg `angle` must be from -180 to 180 degrees `angle` musi mieścić się w zakresie od -180 do 180 stopni +@msg `roundness` must be from 0 to 100% `roundness` musi mieścić się w zakresie od 0 do 100% +@msg `fidelity` must be from 0.01 to 100 pt `fidelity` musi mieścić się w zakresie od 0.01 do 100 pt +@msg style must be "pencil" or "brush" style musi mieć wartość "pencil" lub "brush" +@msg extend end must be "start" or "end" koniec extend musi mieć wartość "start" lub "end" +@msg connect end must be "start" or "end" koniec connect musi mieć wartość "start" lub "end" @msg `roundness` must be from 1 to 100% `roundness` musi mieścić się w zakresie od 1 do 100% @msg `count` must be a whole number from 1 to {MAX_BRIDGES_PER_ISLAND} `count` musi być liczbą całkowitą od 1 do {MAX_BRIDGES_PER_ISLAND} Weed Box and Lines… Ramka i linie do wybierania… @@ -8073,8 +8187,6 @@ breakText Glyphs Glify @msg unknown dither `{d}` (diffusion, pattern, noise or none) nieznane rozpraszanie `{d}` (diffusion, pattern, noise lub none) @msg unknown panel `{panel}` nieznany panel `{panel}` @msg unknown parameter `{key}` nieznany parametr `{key}` -@msg unknown parameter `{within}settings.{format}`; {why} nieznany parametr `{within}settings.{format}`; {why} -@msg unknown parameter `{within}{key}`; {why} nieznany parametr `{within}{key}`; {why} @msg unknown reduction `{reduction}` (selective, perceptual, adaptive, web, gray, blackWhite, uniform or document) nieznana redukcja `{reduction}` (selective, perceptual, adaptive, web, gray, blackWhite, uniform lub document) @msg unmatched ')' niesparowany znak ')' @msg unterminated character class niezakończona klasa znaków @@ -8441,7 +8553,6 @@ breakText Glyphs Glify @msg anchor `smooth` must be true or false `smooth` punktu kontrolnego musi mieć wartość true lub false @msg anchor `{key}` must be [x, y] `{key}` punktu kontrolnego musi mieć postać [x, y] @msg anchor `{key}` must be a number `{key}` punktu kontrolnego musi być liczbą -@msg angle and roundness must be finite kąt i okrągłość muszą być skończone @msg angles must be a list as long as pins (degrees or null) angles musi być listą tej samej długości co pins (stopnie lub null) @msg appearance must be flat|center|edge appearance musi mieć wartość flat|center|edge @msg apply is "fill" or "stroke", not `{other}` apply ma wartość "fill" lub "stroke", a nie `{other}` @@ -9491,7 +9602,6 @@ breakText Glyphs Glify @msg {label} must be a number from 1 to 10000 {label} musi być liczbą od 1 do 10000 @msg {name} `{s}`: {ids} {name} `{s}`: {ids} @msg {name} is built in and can't be deleted {name} jest wbudowane i nie można go usunąć -@msg {name} must be {lo}–{hi}{unit} (got {v}) {name} musi wynosić {lo}–{hi}{unit} (podano {v}) @msg {name}: CRC or size mismatch {name}: niezgodność CRC lub rozmiaru @msg {name}: only this Affinity file's embedded preview could be read; use File › Open to see it with its warning, or export SVG or PDF from Affinity before placing {name}: udało się odczytać tylko osadzony podgląd tego pliku Affinity; użyj polecenia Plik › Otwórz, aby zobaczyć go wraz z ostrzeżeniem, albo przed umieszczeniem wyeksportuj SVG lub PDF z programu Affinity @msg {name}: {e} {name}: {e} diff --git a/crates/ui-egui/src/i18n/pt-br.tsv b/crates/ui-egui/src/i18n/pt-br.tsv index 9e9856767d..b98f70fc14 100644 --- a/crates/ui-egui/src/i18n/pt-br.tsv +++ b/crates/ui-egui/src/i18n/pt-br.tsv @@ -552,6 +552,7 @@ antiAlias Sharp Nítido Consolidate All Windows Consolidar Todas as Janelas Constrain Angle Ângulo de Restrição Constrain Width and Height Proportions Restringir Proporções de Largura e Altura + Copy Width to Height Copiar Largura para Altura Construction Guides Guias de Construção Contextual Alternates Variantes Contextuais Contextual Task Bar Barra de Tarefas Contextual @@ -561,6 +562,8 @@ antiAlias Sharp Nítido Control Controle Convert Converter Convert All Spot Colors to Process Converter Todas as Cores Spot em Processo + Convert {name} to process Converter {name} em Processo + Keep {name} as spot Manter {name} como Spot Convert All Strokes to Outlines Converter Todos os Traçados em Contornos Convert All Text to Outlines Converter Todo o Texto em Contornos Convert Anchor Point Converter Ponto de Ancoragem @@ -615,6 +618,9 @@ antiAlias Sharp Nítido Create Clipping Mask Criar Máscara de Recorte Create From: Criar De: Create Gradient Mesh… Criar Malha de Gradiente… + Flat Plano + To Center Para o Centro + To Edge Para a Borda Create Graph Criar Gráfico Create New Layer Criar Nova Camada Create New Sublayer Criar Nova Subcamada @@ -2249,6 +2255,18 @@ antiAlias Sharp Nítido Preview: Visualização: Preview Mode Modo de Visualização Preview in Browser Visualizar no Navegador + Optimize to File Size… Otimizar para tamanho de arquivo… + Optimize to File Size Otimizar para tamanho de arquivo + Desired File Size: Tamanho de arquivo desejado: + Start With: Começar com: + Use: Usar: + Current Settings Configurações atuais + Auto Select GIF/JPEG Seleção automática GIF/JPEG + Total of All Slices Total de todas as fatias + Each Slice Cada fatia + Current Slice Fatia atual + {size}, within {target} {size}, dentro de {target} + No setting tried fits in {target}; the smallest is {size} Nenhuma configuração testada cabe em {target}; a menor tem {size} Preview the document as it is now Visualizar o documento como está agora Previous Anterior Previous Library Biblioteca Anterior @@ -2557,12 +2575,85 @@ digits Malayalam Malaiala Restore Restaurar Restore Recovered Documents Restaurar Documentos Recuperados Restore every preference to its default (applied on OK) Restaurar toda preferência ao padrão (aplicado em OK) + Shows a bar of commands for the selection or tool on the canvas; it hides while you drag and in Presentation Mode. Mostra na tela uma barra de comandos para a seleção ou a ferramenta; ela se oculta enquanto você arrasta e no Modo de Apresentação. + How far an arrow key moves the selection; with Shift, it moves ten times as far. Quanto uma tecla de seta move a seleção; com Shift, ela move dez vezes mais. + The angle of the axes that arrow keys move along and that Shift holds drawing and moving to. O ângulo dos eixos ao longo dos quais as teclas de seta movem e aos quais o Shift restringe o desenho e o movimento. + The corner radius the Rounded Rectangle tool draws with; changing the radius while drawing changes this value too. O raio de canto com que a ferramenta Retângulo Arredondado desenha; mudar o raio durante o desenho também muda este valor. + How far right and down Paste moves the copy when it is given no position, as from a script; Paste in the app centers it in the view. Quanto Colar desloca a cópia para a direita e para baixo quando nenhuma posição é dada, como a partir de um script; Colar no aplicativo a centraliza na visualização. + Stops the Pen tool from deleting the anchor you click on a selected path, or adding one where you click its segment. Impede que a ferramenta Caneta exclua a âncora clicada em um demarcador selecionado ou adicione uma onde você clica no segmento dele. + Drawing tools show a crosshair pointer instead of their icon; Caps Lock does the same while it is on. As ferramentas de desenho mostram um ponteiro em cruz em vez do ícone; o Caps Lock faz o mesmo enquanto está ativado. + Shows a tip when the pointer rests on a button or field that has one. Mostra uma dica quando o ponteiro para sobre um botão ou campo que tem uma. + Shows a warning before a script you choose runs. Mostra um aviso antes de executar um script que você escolher. + Smooths the edges of artwork on the canvas. Suaviza as bordas da arte na tela. + Select › Same › Fill Color, Stroke Color and Fill & Stroke match only the same tint of a global or spot swatch, not any tint of it. Seleção › Igual › Cor de Preenchimento, Cor do Traçado e Preenchimento e Traçado encontram apenas o mesmo tom de uma amostra global ou de cor especial, não qualquer tom dela. + Shows the Home screen when no document is open; off, the window stays empty until you click Home. Mostra a tela Início quando nenhum documento está aberto; desativada, a janela fica vazia até você clicar em Início. + Measures objects with their strokes and shape-changing effects for size, position and alignment; shadows, glows and blurs are not measured. Mede os objetos com seus traçados e efeitos que mudam a forma para tamanho, posição e alinhamento; sombras, brilhos e desfoques não são medidos. + At 100% zoom, one inch of the document takes 96 screen points instead of 72. Com zoom de 100%, uma polegada do documento ocupa 96 pontos de tela em vez de 72. + Double-clicking a group, path or image with the Selection tool opens it in isolation mode. Clicar duas vezes em um grupo, demarcador ou imagem com a ferramenta Seleção o abre no modo de isolamento. + Pattern fills and strokes transform with the art, unless a transform or the Transform panel's menu chooses otherwise. Preenchimentos e traçados de padrão se transformam com a arte, a menos que uma transformação ou o menu do painel Transformar escolha outra coisa. + Live corner radii scale with the art, unless the scale chooses otherwise. Os raios de canto dinâmicos mudam de escala com a arte, a menos que a escala escolha outra coisa. + Stroke weights, dashes and effect distances scale with the art, unless the scale chooses otherwise. Espessuras de traçado, traços e distâncias de efeitos mudam de escala com a arte, a menos que a escala escolha outra coisa. + The mouse wheel zooms the canvas instead of scrolling it. A roda do mouse aplica zoom na tela em vez de rolá-la. + The mouse wheel with Cmd/Ctrl held scrolls the canvas sideways. A roda do mouse com Cmd/Ctrl pressionado rola a tela para os lados. + Dragging sideways on a numeric field's label changes the field's value. Arrastar para os lados sobre o rótulo de um campo numérico muda o valor do campo. + A two-finger rotate gesture on a trackpad rotates the canvas view. Um gesto de rotação com dois dedos no trackpad gira a visualização da tela. + Holding a tool's shortcut key chooses the tool until you let go, and then the previous tool is chosen again. Manter pressionado o atalho de uma ferramenta a escolhe até você soltar, e então a ferramenta anterior é escolhida de novo. + Shows the bounding box while you move the selection or draw a shape. Mostra a caixa delimitadora enquanto você move a seleção ou desenha uma forma. + Create Trim Marks draws Japanese-style marks instead of Roman ones. Criar Marcas de Corte desenha marcas no estilo japonês em vez de romanas. + New art takes only the fill and stroke of the selection; off, it takes the selected object's whole appearance. A nova arte recebe só o preenchimento e o traçado da seleção; desativada, recebe toda a aparência do objeto selecionado. + Changing the width or height in the Transform panel, the Properties panel or the Control bar changes the other in proportion. Mudar a largura ou a altura no painel Transformar, no painel Propriedades ou no painel Controle muda a outra na mesma proporção. + A live rectangle's properties show one Corner Radius field for all four corners; off, each corner has its own field. As propriedades de um retângulo dinâmico mostram um só campo Raio do Canto para os quatro cantos; desativada, cada canto tem seu próprio campo. + What edits in the Transform panel transform: the object, its pattern tiles or both; Default follows Transform Pattern Tiles. O que as edições no painel Transformar transformam: o objeto, seus blocos de padrão ou ambos; Padrão segue Transformar Blocos de Padrão. + With one symbol instance selected, the Transform panel uses the symbol's registration point as its reference point. Com uma instância de símbolo selecionada, o painel Transformar usa o ponto de registro do símbolo como ponto de referência. + Darkens the canvas outside the artboards while the Artboard tool is active. Escurece a tela fora das pranchetas enquanto a ferramenta Prancheta está ativa. + With Fade Region Outside Artboard on, the area outside the artboards stays dark while you drag with the Artboard tool. Com Escurecer Região Fora da Prancheta ativado, a área fora das pranchetas continua escura enquanto você arrasta com a ferramenta Prancheta. + How near, in pixels, the pointer must be to an object, anchor or handle for a click to select it. Quão perto, em pixels, o ponteiro precisa estar de um objeto, ponto de ancoragem ou alça para que um clique o selecione. + Whether the Selection tool's box selects objects it touches or only those fully inside; Drag Direction selects those inside on a drag to the right. E reverses it mid-drag. Se a caixa da ferramenta Seleção seleciona os objetos que toca ou só os totalmente dentro; Direção do arrasto seleciona os de dentro ao arrastar para a direita. E inverte a regra durante o arrasto. + A click selects a filled object only on its path, not inside its fill. Um clique seleciona um objeto preenchido só no demarcador, não dentro do preenchimento. + How near, in pixels, a point must come to an anchor or ruler guide for Snap to Point to snap it; with Smart Guides on, Smart Guides' Snapping Tolerance applies instead. Quão perto, em pixels, um ponto precisa chegar de um ponto de ancoragem ou guia de régua para que Ajustar ao Ponto o ajuste; com as Guias Inteligentes ativadas, vale a Tolerância de Ajuste delas. + With the Selection tool, Cmd/Ctrl-click selects the object under the selected one at the pointer; each further click goes one object deeper. Com a ferramenta Seleção, Cmd/Ctrl+clique seleciona o objeto abaixo do selecionado no ponteiro; cada clique seguinte desce mais um objeto. + Zoom In and Zoom Out bring the center of the selection to the middle of the view. Ampliar e Reduzir levam o centro da seleção ao meio da visualização. + Locked and hidden artwork inside an artboard moves, scales and is copied with the artboard, as the other artwork does. A arte bloqueada e oculta dentro de uma prancheta é movida, dimensionada e copiada com ela, como o restante da arte. + The size of anchor points and direction handle ends on the canvas; larger anchors can also be picked from farther away. O tamanho dos pontos de ancoragem e das pontas das alças de direção na tela; pontos de ancoragem maiores também podem ser pegos de mais longe. + Draws the ends of direction handles as solid dots, hollow dots or larger solid dots. Desenha as pontas das alças de direção como pontos cheios, pontos vazados ou pontos cheios maiores. + With the Direct Selection tool, the anchor under the pointer is highlighted. Com a ferramenta Seleção Direta, o ponto de ancoragem sob o ponteiro é realçado. + Shows direction handles when more than one anchor is selected; off, they show only while a single anchor is selected. Mostra as alças de direção quando mais de um ponto de ancoragem está selecionado; desativado, elas só aparecem com um único ponto de ancoragem selecionado. + Corner widgets hide on corners whose angle is greater than this many degrees. Os widgets de canto se ocultam em cantos cujo ângulo é maior que estes graus. + The Pen tool previews the next segment from the last anchor to the pointer before you click. A ferramenta Caneta mostra uma prévia do próximo segmento, do último ponto de ancoragem até o ponteiro, antes do clique. + The Curvature tool previews the curve to the pointer before you place the next point. A ferramenta Curvatura mostra uma prévia da curva até o ponteiro antes de você posicionar o próximo ponto. The unit for new documents from built-in sizes other than pixel sizes and for opened files that record no unit; choosing one here and clicking OK also sets the active document's units. A unidade dos novos documentos de tamanhos predefinidos, exceto os tamanhos em pixels, e dos arquivos abertos que não registram nenhuma unidade; escolhê-la aqui e clicar em OK também a define no documento ativo. Stroke weights, dashes and gaps show in this unit, and numbers typed for them are read in it. As espessuras de traçado, os traços e as lacunas aparecem nesta unidade, e os números digitados para eles são lidos nela. Type sizes, leading and baseline shift show in this unit, and numbers typed for them are read in it. Tamanhos de texto, entrelinhamento e deslocamento da linha de base aparecem nesta unidade, e os números digitados para eles são lidos nela. The unit for East Asian type measurements, which no field uses yet. A unidade das medidas de texto do Leste Asiático, que nenhum campo usa ainda. When on, a number typed without a unit into a field in picas is read in points. Quando ativado, um número digitado sem unidade em um campo em picas é lido em pontos. With XML ID, object names show as XML IDs in the Layers panel, the Variables panel and Layer Options. Com ID XML, os nomes dos objetos aparecem como IDs XML em Camadas, Variáveis e Opções de Camada. + Snaps drawing, moving and scaling to the grid's subdivisions, even while the grid is hidden; while it is on, Snap to Pixel does not apply. Ajusta o desenho, o movimento e a escala às subdivisões da grade, mesmo com a grade oculta; enquanto está ativado, Ajustar ao Pixel não se aplica. + The color of guides that are not selected; an artboard with a Guide Label draws its own guides in the label's color instead. A cor das guias não selecionadas; uma prancheta com Rótulo das Guias desenha as próprias guias na cor do rótulo. + Draws guides as solid lines or as dots, including the guides already in the document. Desenha as guias como linhas contínuas ou como pontos, inclusive as guias que já estão no documento. + With this on, guides are locked when VectorCraft starts; changing this option locks or unlocks them at once, and View › Guides › Lock Guides still changes the lock. Com esta opção ativada, as guias ficam bloqueadas quando o VectorCraft inicia; mudar a opção as bloqueia ou desbloqueia na hora, e Exibir › Guias › Bloquear Guias continua mudando o bloqueio. + With this on, holding Cmd/Ctrl as you start dragging from a ruler makes a guide on the active artboard only, or a canvas guide with the Artboard tool. Com esta opção ativada, manter Cmd/Ctrl pressionado ao começar a arrastar de uma régua cria uma guia só na prancheta ativa, ou uma guia de toda a tela de pintura com a ferramenta Mesa de Trabalho. + The color of the grid; the lines between major gridlines are drawn in a fainter shade of it. A cor da grade; as linhas entre as linhas principais são desenhadas em um tom mais claro dessa cor. + Draws the grid as lines, or as dots along the major gridlines at each subdivision. Desenha a grade como linhas, ou como pontos ao longo das linhas principais em cada subdivisão. + The distance between major gridlines, in every open document and in new ones; a VectorCraft document opens with the grid it was saved with. A distância entre as linhas principais da grade, em todos os documentos abertos e nos novos; um documento do VectorCraft abre com a grade com que foi salvo. + How many parts each major grid square is divided into; Snap to Grid snaps to these parts, even when the zoom hides their lines. Em quantas partes cada quadrado principal da grade é dividido; Ajustar à Grade ajusta a essas partes, mesmo quando o zoom esconde as linhas delas. + Draws the grid behind the artwork; off, the grid is drawn over it. Desenha a grade atrás da arte; desativada, a grade é desenhada sobre ela. + In Pixel Preview at 600% zoom or more, the active view shows a line at the edge of every document pixel over the artwork. Na Visualização de Pixels com zoom de 600% ou mais, a exibição ativa mostra sobre a arte uma linha na borda de cada pixel do documento. + The color of the tile edge and the dashed swatch bounds shown while you edit a pattern. A cor da borda do bloco e dos limites tracejados da amostra mostrados enquanto você edita um padrão. + Snaps drawing, moving and transforming to nearby art and shows guides and labels; Pixel Preview turns them off, and Snap to Grid snaps to the grid instead. Ajusta o desenho, a movimentação e a transformação à arte próxima e mostra guias e rótulos; a Visualização de Pixels os desativa, e Ajustar à Grade ajusta à grade no lugar deles. + The color of Smart Guide lines and labels. A cor das linhas e dos rótulos das guias inteligentes. + Shows a line along the edge or center that art lines up with; off, art still lines up without the line, and Snap to Glyph does not apply. Mostra uma linha ao longo da borda ou do centro com que a arte se alinha; desativada, a arte continua se alinhando sem a linha, e Ajustar ao Glifo não se aplica. + With a selection tool, outlines the unselected object under the pointer in its layer color while you are not dragging. Com uma ferramenta de seleção, contorna o objeto não selecionado sob o ponteiro com a cor da camada dele enquanto você não arrasta. + Shows the size or angle next to the pointer while you scale, rotate, shear or reflect art. Mostra o tamanho ou o ângulo ao lado do ponteiro enquanto você dimensiona, gira, cisalha ou espelha a arte. + While you draw, points snap to lines at the chosen Angles through the point the segment or shape starts from. Enquanto você desenha, os pontos se ajustam a linhas nos ângulos escolhidos que passam pelo ponto onde o segmento ou a forma começa. + The set of angles the construction guides follow while Construction Guides is on. O conjunto de ângulos que as guias de construção seguem enquanto Guias de Construção está ativado. + Names what a point snaps to, such as an anchor, a path or an alignment; off, points snap the same way without the names. Nomeia aquilo a que um ponto se ajusta, como uma âncora, um caminho ou um alinhamento; desativado, os pontos se ajustam da mesma forma, sem os nomes. + Shows distances, angles and how far art has moved next to the pointer while you draw or move it. Mostra ao lado do ponteiro distâncias, ângulos e quanto a arte se moveu enquanto você desenha ou move. + Snaps moved or resized art to the same gap as between nearby objects, and marks the equal gaps. Ajusta a arte movida ou redimensionada ao mesmo espaço que há entre objetos próximos e marca os espaços iguais. + With something selected, holding Alt/Option over another object or an artboard shows the distances between it and the selection. Com algo selecionado, manter Alt/Option pressionado sobre outro objeto ou uma prancheta mostra as distâncias entre ele e a seleção. + A selection dragged back to within the Snapping Tolerance of where the drag began goes back to exactly that place; a copy does not. Uma seleção arrastada de volta até a tolerância de ajuste do lugar onde o arrasto começou volta exatamente para aquele lugar; uma cópia não. + How near on screen the pointer or a dragged point must come to art for Smart Guides to snap to it; the distance is the same at every zoom. Quão perto na tela o ponteiro ou um ponto arrastado precisa chegar da arte para que as guias inteligentes se ajustem a ela; a distância é a mesma em qualquer zoom. + Snaps the end of a line segment, or a circle drawn from its center, so that it touches a nearby curve. Ajusta a extremidade de um segmento de linha, ou um círculo desenhado a partir do centro, para que toque uma curva próxima. + Snaps the end of a line segment so that it meets a nearby straight segment at a right angle. Ajusta a extremidade de um segmento de linha para que encontre um segmento reto próximo em ângulo reto. Reset all preferences to their defaults? Redefinir todas as preferências para o padrão? The defaults are applied when you click OK in Preferences. Cancel there keeps your current preferences. Os padrões são aplicados quando você clica em OK em Preferências. Cancelar ali mantém suas preferências atuais. Restored documents open unsaved: save them to keep them. Os documentos restaurados abrem sem salvar: salve-os para mantê-los. @@ -3994,6 +4085,11 @@ axis Both Ambos @msg PDF writer error: {0} Erro do gravador de PDF: {0} @msgplural Packaged {n} file ({note}) in {folder}|Packaged {n} files ({note}) in {folder} {n} arquivo empacotado em {folder} ({note})|{n} arquivos empacotados em {folder} ({note}) @msg Preview in Browser needs the desktop app (the web downloads files instead) Visualizar no navegador exige o aplicativo para desktop (na web, os arquivos são baixados) +@msg give `desiredK`, the desired file size in K (1024 bytes): a number above 0 and at most 1048576 informe `desiredK`, o tamanho de arquivo desejado em K (1024 bytes): um número acima de 0 e no máximo 1048576 +@msg `startWith` is `current` or `auto` `startWith` é `current` ou `auto` +@msg `use` is `allSlices`, `eachSlice` or `currentSlice` `use` é `allSlices`, `eachSlice` ou `currentSlice` +@msg `slice` is a slice number from `slice.list`, with `use: currentSlice` `slice` é um número de fatia de `slice.list`, com `use: currentSlice` +@msg Optimize to File Size: there is no image to measure Otimizar para tamanho de arquivo: não há imagem para medir @msg Release Guides: no guides Liberar guias: não há guias @msg Release: no layer to put the rectangle in Liberar: não há camada para colocar o retângulo @msg Replace Spine: select a blend and a path Substituir coluna: selecione uma mesclagem e um traçado @@ -4871,6 +4967,19 @@ axis Both Ambos Transform Objects Transformar objetos @msg unknown parameter `{key}`; did you mean `{near}`? parâmetro desconhecido `{key}`; você quis dizer `{near}`? @msg unknown parameter `{key}`; the command takes no parameters parâmetro desconhecido `{key}`; o comando não tem parâmetros +@msg unknown parameter `{key}`; `{object}` takes: {keys} parâmetro desconhecido `{key}`; `{object}` aceita: {keys} +@msg unknown parameter `{key}`; {why_not} parâmetro desconhecido `{key}`; {why_not} +@msg no format takes it (see document.formats) nenhum formato o aceita (consulte document.formats) +@msg no save format takes it (see file.formatOptions) nenhum formato de salvamento o aceita (consulte file.formatOptions) +@msg PDF doesn't take it (see document.formats) PDF não o aceita (consulte document.formats) +@msg EPS doesn't take it (see document.formats) EPS não o aceita (consulte document.formats) +@msg DXF doesn't take it (see document.formats) DXF não o aceita (consulte document.formats) +@msg {name} must be {range} (got {v}) {name} deve ser {range} (recebido {v}) +@msg The graphics processor tried first couldn't show the window, so VectorCraft started again on {summary} (Settings › Performance › Graphics Processor › Automatic uses the one that drives your display) O processador gráfico tentado primeiro não conseguiu exibir a janela, então o VectorCraft reiniciou em {summary} (Configurações › Desempenho › Processador Gráfico › Automático usa o que controla sua tela) +@msg Sent “{title}” to {to} “{title}” enviado para {to} +@msg Sent “{title}” to {to}. The spooler replied: {note} “{title}” enviado para {to}. Resposta da fila de impressão: {note} +@msg the default printer a impressora padrão +@msg raster effects on object {object}: requested {requested} ppi, achieved {achieved} ppi due to the 64 million pixel cap efeitos de rasterização no objeto {object}: solicitados {requested} ppi, obtidos {achieved} ppi devido ao limite de 64 milhões de pixels @msg unknown parameter `{key}`; the command takes: {keys} parâmetro desconhecido `{key}`; o comando aceita: {keys} @msg the params must be an object, not {got} os parâmetros devem ser um objeto, não {got} @msg unknown parameter `{path}`; the object takes no keys parâmetro desconhecido `{path}`; o objeto não aceita chaves @@ -8006,6 +8115,11 @@ swatch Yellow Green Verde-amarelado @msg Some islands could not be joined to the area around the art Algumas ilhas não puderam ser unidas à área ao redor da arte @msg `width` must be from {lo} to {hi} pt `width` deve estar entre {lo} e {hi} pt @msg `angle` must be from -180 to 180 degrees `angle` deve estar entre -180 e 180 graus +@msg `roundness` must be from 0 to 100% `roundness` deve estar entre 0 e 100% +@msg `fidelity` must be from 0.01 to 100 pt `fidelity` deve estar entre 0.01 e 100 pt +@msg style must be "pencil" or "brush" style deve ser "pencil" ou "brush" +@msg extend end must be "start" or "end" a extremidade de extend deve ser "start" ou "end" +@msg connect end must be "start" or "end" a extremidade de connect deve ser "start" ou "end" @msg `roundness` must be from 1 to 100% `roundness` deve estar entre 1 e 100% @msg `count` must be a whole number from 1 to {MAX_BRIDGES_PER_ISLAND} `count` deve ser um número inteiro de 1 a {MAX_BRIDGES_PER_ISLAND} Weed Box and Lines… Caixa e Linhas de Descasque… @@ -8519,7 +8633,6 @@ swatch Yellow Green Verde-amarelado @msg anchor `smooth` must be true or false `smooth` do ponto de ancoragem deve ser true ou false @msg anchor `{key}` must be [x, y] `{key}` do ponto de ancoragem deve ser [x, y] @msg anchor `{key}` must be a number `{key}` do ponto de ancoragem deve ser um número -@msg angle and roundness must be finite angle e roundness devem ser finitos @msg angles must be a list as long as pins (degrees or null) angles deve ser uma lista do mesmo tamanho que pins (graus ou null) @msg appearance must be flat|center|edge appearance deve ser flat|center|edge @msg apply is "fill" or "stroke", not `{other}` apply é "fill" ou "stroke", não `{other}` @@ -9673,8 +9786,6 @@ swatch Yellow Green Verde-amarelado @msg unknown panel painel desconhecido @msg unknown panel `{panel}` painel desconhecido `{panel}` @msg unknown parameter `{key}` parâmetro desconhecido `{key}` -@msg unknown parameter `{within}settings.{format}`; {why} parâmetro desconhecido `{within}settings.{format}`; {why} -@msg unknown parameter `{within}{key}`; {why} parâmetro desconhecido `{within}{key}`; {why} @msg unknown pieLegend `{v}` (none, standard or wedges) pieLegend desconhecido `{v}` (none, standard ou wedges) @msg unknown piePosition `{v}` (even, ratio or stacked) piePosition desconhecido `{v}` (even, ratio ou stacked) @msg unknown pieSort `{v}` (none, all or first) pieSort desconhecido `{v}` (none, all ou first) @@ -9803,7 +9914,6 @@ swatch Yellow Green Verde-amarelado @msg {name} `{s}`: {ids} {name} `{s}`: {ids} @msg {name} is built in and can't be deleted {name} é integrado e não pode ser excluído @msg {name} must be a number {name} deve ser um número -@msg {name} must be {lo}–{hi}{unit} (got {v}) {name} deve ser {lo}–{hi}{unit} (recebido {v}) @msg {name}: CRC or size mismatch {name}: CRC ou tamanho não confere @msg {name}: only this Affinity file's embedded preview could be read; use File › Open to see it with its warning, or export SVG or PDF from Affinity before placing {name}: só foi possível ler a prévia incorporada deste arquivo do Affinity; use Arquivo › Abrir para vê-la com o aviso, ou exporte SVG ou PDF pelo Affinity antes de colocar @msg {name}: {e} {name}: {e} diff --git a/crates/ui-egui/src/i18n/ru.tsv b/crates/ui-egui/src/i18n/ru.tsv index 4226c60bc2..071ba50afb 100644 --- a/crates/ui-egui/src/i18n/ru.tsv +++ b/crates/ui-egui/src/i18n/ru.tsv @@ -605,6 +605,7 @@ font-technology Variable Вариативные Consolidate All Windows Объединить все окна Constrain Angle Ограничить угол Constrain Width and Height Proportions Сохранять пропорции ширины и высоты + Copy Width to Height Копировать ширину в высоту Construction Guides Направляющие построения Contextual Alternates Контекстные альтернативы Contextual Task Bar Контекстная панель задач @@ -615,6 +616,8 @@ font-technology Variable Вариативные Control Control Convert Преобразовать Convert All Spot Colors to Process Преобразовать все плашечные цвета в составные + Convert {name} to process Преобразовать {name} в составной цвет + Keep {name} as spot Оставить {name} плашечным цветом Convert All Strokes to Outlines Преобразовать все обводки в контуры Convert All Text to Outlines Преобразовать весь текст в контуры Convert Anchor Point Преобразовать опорную точку @@ -690,6 +693,9 @@ font-technology Variable Вариативные Create from Selection Создать из выделения Create From: Создать из: Create Gradient Mesh… Создать градиентную сетку… + Flat Плоский + To Center К центру + To Edge К краю Create Graph Создать диаграмму Create New Layer Создать новый слой Create New Sublayer Создать новый подслой @@ -2747,6 +2753,18 @@ diagnostics ui интерфейс Preview: Просмотр: Preview All Layers Просмотреть все слои Preview in Browser Просмотреть в браузере + Optimize to File Size… Оптимизировать по размеру файла… + Optimize to File Size Оптимизировать по размеру файла + Desired File Size: Желаемый размер файла: + Start With: Начать с: + Use: Использовать: + Current Settings Текущие настройки + Auto Select GIF/JPEG Автовыбор GIF/JPEG + Total of All Slices Сумма всех фрагментов + Each Slice Каждый фрагмент + Current Slice Текущий фрагмент + {size}, within {target} {size}, в пределах {target} + No setting tried fits in {target}; the smallest is {size} Ни одна опробованная настройка не укладывается в {target}; наименьший размер {size} Preview in Browser needs the desktop app (the web downloads files instead) Просмотр в браузере требует настольного приложения (web-версия скачивает файлы) Preview Mode Режим просмотра Preview the document as it is now Просмотреть документ в текущем виде @@ -3095,12 +3113,85 @@ digits Malayalam Малаялам Responsive Адаптивный Restore Восстановить Restore every preference to its default (applied on OK) Восстановить все настройки по умолчанию (применяется при нажатии ОК) + Shows a bar of commands for the selection or tool on the canvas; it hides while you drag and in Presentation Mode. Показывает на холсте панель команд для выделения или инструмента; она скрывается во время перетаскивания и в режиме презентации. + How far an arrow key moves the selection; with Shift, it moves ten times as far. Насколько клавиша со стрелкой сдвигает выделение; с Shift она сдвигает его в десять раз дальше. + The angle of the axes that arrow keys move along and that Shift holds drawing and moving to. Угол осей, вдоль которых сдвигают клавиши со стрелками и к которым Shift привязывает рисование и перемещение. + The corner radius the Rounded Rectangle tool draws with; changing the radius while drawing changes this value too. Радиус угла, с которым рисует инструмент «Скруглённый прямоугольник»; изменение радиуса во время рисования меняет и это значение. + How far right and down Paste moves the copy when it is given no position, as from a script; Paste in the app centers it in the view. Насколько «Вставить» сдвигает копию вправо и вниз, когда положение не задано, например из скрипта; «Вставить» в приложении помещает её в центр вида. + Stops the Pen tool from deleting the anchor you click on a selected path, or adding one where you click its segment. Не даёт инструменту «Перо» удалять опорную точку, по которой вы щёлкаете на выделенном контуре, или добавлять точку там, где вы щёлкаете по его сегменту. + Drawing tools show a crosshair pointer instead of their icon; Caps Lock does the same while it is on. Инструменты рисования показывают указатель-перекрестие вместо своего значка; Caps Lock делает то же самое, пока он включён. + Shows a tip when the pointer rests on a button or field that has one. Показывает подсказку, когда указатель задерживается на кнопке или поле, у которых она есть. + Shows a warning before a script you choose runs. Показывает предупреждение перед запуском выбранного вами скрипта. + Smooths the edges of artwork on the canvas. Сглаживает края графики на холсте. + Select › Same › Fill Color, Stroke Color and Fill & Stroke match only the same tint of a global or spot swatch, not any tint of it. «Выделение › То же › Цвет заливки», «Цвет обводки» и «Заливка и обводка» находят только тот же оттенок глобального или плашечного образца, а не любой его оттенок. + Shows the Home screen when no document is open; off, the window stays empty until you click Home. Показывает начальный экран, когда нет открытых документов; если выключено, окно остаётся пустым, пока вы не нажмёте «Домой». + Measures objects with their strokes and shape-changing effects for size, position and alignment; shadows, glows and blurs are not measured. Измеряет объекты с обводками и эффектами, меняющими форму, для размера, положения и выравнивания; тени, свечения и размытия не учитываются. + At 100% zoom, one inch of the document takes 96 screen points instead of 72. При масштабе 100 % один дюйм документа занимает 96 экранных пунктов вместо 72. + Double-clicking a group, path or image with the Selection tool opens it in isolation mode. Двойной щелчок по группе, контуру или изображению инструментом «Выделение» открывает их в режиме изоляции. + Pattern fills and strokes transform with the art, unless a transform or the Transform panel's menu chooses otherwise. Заливки и обводки узором трансформируются вместе с графикой, если трансформирование или меню панели «Трансформировать» не задаёт иное. + Live corner radii scale with the art, unless the scale chooses otherwise. Радиусы динамических углов масштабируются вместе с графикой, если масштабирование не задаёт иное. + Stroke weights, dashes and effect distances scale with the art, unless the scale chooses otherwise. Толщина обводок, штрихи и расстояния эффектов масштабируются вместе с графикой, если масштабирование не задаёт иное. + The mouse wheel zooms the canvas instead of scrolling it. Колесо мыши масштабирует холст, а не прокручивает его. + The mouse wheel with Cmd/Ctrl held scrolls the canvas sideways. Колесо мыши с нажатой Cmd/Ctrl прокручивает холст по горизонтали. + Dragging sideways on a numeric field's label changes the field's value. Перетаскивание по подписи числового поля в сторону меняет значение поля. + A two-finger rotate gesture on a trackpad rotates the canvas view. Жест поворота двумя пальцами на трекпаде поворачивает вид холста. + Holding a tool's shortcut key chooses the tool until you let go, and then the previous tool is chosen again. Пока вы удерживаете клавишу инструмента, он остаётся выбранным, а после отпускания снова выбирается предыдущий инструмент. + Shows the bounding box while you move the selection or draw a shape. Показывает ограничивающую рамку, пока вы перемещаете выделение или рисуете фигуру. + Create Trim Marks draws Japanese-style marks instead of Roman ones. «Создать метки подрезки» рисует метки в японском стиле вместо западных. + New art takes only the fill and stroke of the selection; off, it takes the selected object's whole appearance. Новые объекты получают только заливку и обводку выделения; если выключено, они получают всё оформление выделенного объекта. + Changing the width or height in the Transform panel, the Properties panel or the Control bar changes the other in proportion. Изменение ширины или высоты на панели «Трансформировать», панели «Свойства» или панели управления пропорционально меняет другой размер. + A live rectangle's properties show one Corner Radius field for all four corners; off, each corner has its own field. Свойства динамического прямоугольника показывают одно поле «Радиус угла» для всех четырёх углов; если выключено, у каждого угла своё поле. + What edits in the Transform panel transform: the object, its pattern tiles or both; Default follows Transform Pattern Tiles. Что трансформируют изменения на панели «Трансформировать»: объект, плитки его узора или и то и другое; «По умолчанию» следует «Трансформировать плитки узора». + With one symbol instance selected, the Transform panel uses the symbol's registration point as its reference point. Когда выделен один экземпляр символа, панель «Трансформировать» использует точку регистрации символа как опорную точку. + Darkens the canvas outside the artboards while the Artboard tool is active. Затемняет холст вне монтажных областей, пока активен инструмент «Монтажная область». + With Fade Region Outside Artboard on, the area outside the artboards stays dark while you drag with the Artboard tool. Когда включено «Затемнять область вне монтажной области», область вне монтажных областей остаётся тёмной, пока вы перетаскиваете инструментом «Монтажная область». + How near, in pixels, the pointer must be to an object, anchor or handle for a click to select it. Насколько близко, в пикселях, указатель должен быть к объекту, опорной точке или маркеру, чтобы щелчок выделил его. + Whether the Selection tool's box selects objects it touches or only those fully inside; Drag Direction selects those inside on a drag to the right. E reverses it mid-drag. Выделяет ли рамка инструмента «Выделение» затронутые объекты или только целиком попавшие внутрь; «Направление перетаскивания» выделяет попавшие внутрь при перетаскивании вправо. E меняет правило во время перетаскивания. + A click selects a filled object only on its path, not inside its fill. Щелчок выделяет объект с заливкой только по его контуру, а не внутри заливки. + How near, in pixels, a point must come to an anchor or ruler guide for Snap to Point to snap it; with Smart Guides on, Smart Guides' Snapping Tolerance applies instead. Насколько близко, в пикселях, точка должна подойти к опорной точке или направляющей линейки, чтобы «Привязать к точке» привязало её; при включённых умных направляющих действует их допуск привязки. + With the Selection tool, Cmd/Ctrl-click selects the object under the selected one at the pointer; each further click goes one object deeper. С инструментом «Выделение» Cmd/Ctrl+щелчок выделяет объект под выделенным в точке указателя; каждый следующий щелчок уходит на один объект глубже. + Zoom In and Zoom Out bring the center of the selection to the middle of the view. «Увеличить» и «Уменьшить» переносят центр выделения в середину вида. + Locked and hidden artwork inside an artboard moves, scales and is copied with the artboard, as the other artwork does. Заблокированные и скрытые объекты внутри монтажной области перемещаются, масштабируются и копируются вместе с ней, как и остальные объекты. + The size of anchor points and direction handle ends on the canvas; larger anchors can also be picked from farther away. Размер опорных точек и концов маркеров направления на холсте; более крупные опорные точки можно захватить и с большего расстояния. + Draws the ends of direction handles as solid dots, hollow dots or larger solid dots. Рисует концы маркеров направления сплошными точками, полыми точками или более крупными сплошными точками. + With the Direct Selection tool, the anchor under the pointer is highlighted. С инструментом «Прямое выделение» опорная точка под указателем подсвечивается. + Shows direction handles when more than one anchor is selected; off, they show only while a single anchor is selected. Показывает маркеры направления, когда выделено больше одной опорной точки; если выключено, они видны только при одной выделенной опорной точке. + Corner widgets hide on corners whose angle is greater than this many degrees. Угловые виджеты скрываются на углах больше этого числа градусов. + The Pen tool previews the next segment from the last anchor to the pointer before you click. Инструмент «Перо» показывает, прежде чем вы щёлкнете, следующий сегмент от последней опорной точки до указателя. + The Curvature tool previews the curve to the pointer before you place the next point. Инструмент «Кривизна» показывает кривую до указателя, прежде чем вы поставите следующую точку. The unit for new documents from built-in sizes other than pixel sizes and for opened files that record no unit; choosing one here and clicking OK also sets the active document's units. Единица новых документов встроенных размеров, кроме размеров в пикселях, и открытых файлов без записанной единицы; если выбрать её здесь и нажать ОК, она станет и единицей активного документа. Stroke weights, dashes and gaps show in this unit, and numbers typed for them are read in it. Толщина обводки, штрихи и зазоры показываются в этой единице, и введённые для них числа читаются в ней. Type sizes, leading and baseline shift show in this unit, and numbers typed for them are read in it. Размеры текста, интерлиньяж и смещение базовой линии показываются в этой единице, и введённые для них числа читаются в ней. The unit for East Asian type measurements, which no field uses yet. Единица для размеров восточноазиатского текста, которую пока не использует ни одно поле. When on, a number typed without a unit into a field in picas is read in points. Если включено, число, введённое без единицы в поле в пиках, читается в пунктах. With XML ID, object names show as XML IDs in the Layers panel, the Variables panel and Layer Options. При XML ID имена объектов показываются как XML ID в «Слоях», «Переменных» и «Параметрах слоя». + Snaps drawing, moving and scaling to the grid's subdivisions, even while the grid is hidden; while it is on, Snap to Pixel does not apply. Привязывает рисование, перемещение и масштабирование к делениям сетки, даже когда сетка скрыта; пока параметр включен, «Привязать к пикселю» не действует. + The color of guides that are not selected; an artboard with a Guide Label draws its own guides in the label's color instead. Цвет невыделенных направляющих; монтажная область с «Меткой направляющих» рисует свои направляющие цветом метки. + Draws guides as solid lines or as dots, including the guides already in the document. Рисует направляющие сплошными линиями или точками, включая направляющие, которые уже есть в документе. + With this on, guides are locked when VectorCraft starts; changing this option locks or unlocks them at once, and View › Guides › Lock Guides still changes the lock. Если параметр включен, направляющие заблокированы при запуске VectorCraft; изменение параметра сразу блокирует или разблокирует их, а «Просмотр › Направляющие › Заблокировать направляющие» по-прежнему меняет блокировку. + With this on, holding Cmd/Ctrl as you start dragging from a ruler makes a guide on the active artboard only, or a canvas guide with the Artboard tool. Если параметр включен, Cmd/Ctrl, удерживаемая в начале перетаскивания с линейки, создает направляющую только на активной монтажной области, а с инструментом «Монтажная область» направляющую на весь холст. + The color of the grid; the lines between major gridlines are drawn in a fainter shade of it. Цвет сетки; линии между основными линиями сетки рисуются более бледным оттенком этого цвета. + Draws the grid as lines, or as dots along the major gridlines at each subdivision. Рисует сетку линиями или точками вдоль основных линий сетки на каждом делении. + The distance between major gridlines, in every open document and in new ones; a VectorCraft document opens with the grid it was saved with. Расстояние между основными линиями сетки во всех открытых документах и в новых; документ VectorCraft открывается с сеткой, с которой он был сохранен. + How many parts each major grid square is divided into; Snap to Grid snaps to these parts, even when the zoom hides their lines. На сколько частей делится каждый основной квадрат сетки; «Привязать к сетке» привязывает к этим частям, даже когда масштаб скрывает их линии. + Draws the grid behind the artwork; off, the grid is drawn over it. Рисует сетку за графикой; если параметр выключен, сетка рисуется поверх нее. + In Pixel Preview at 600% zoom or more, the active view shows a line at the edge of every document pixel over the artwork. В «Просмотре пикселей» при масштабе 600 % и больше активный вид показывает поверх графики линию по краю каждого пикселя документа. + The color of the tile edge and the dashed swatch bounds shown while you edit a pattern. Цвет края плитки и пунктирных границ образца, которые видны во время редактирования узора. + Snaps drawing, moving and transforming to nearby art and shows guides and labels; Pixel Preview turns them off, and Snap to Grid snaps to the grid instead. Привязывает рисование, перемещение и трансформирование к ближайшим объектам и показывает направляющие и метки; просмотр пикселей их отключает, а «Привязать к сетке» вместо них привязывает к сетке. + The color of Smart Guide lines and labels. Цвет линий и меток умных направляющих. + Shows a line along the edge or center that art lines up with; off, art still lines up without the line, and Snap to Glyph does not apply. Показывает линию вдоль края или центра, с которым выравниваются объекты; когда параметр выключен, они выравниваются без линии, а «Привязать к глифу» не действует. + With a selection tool, outlines the unselected object under the pointer in its layer color while you are not dragging. При инструменте выделения обводит невыделенный объект под указателем цветом его слоя, пока вы не перетаскиваете. + Shows the size or angle next to the pointer while you scale, rotate, shear or reflect art. Показывает размер или угол рядом с указателем, пока вы масштабируете, поворачиваете, наклоняете или отражаете объекты. + While you draw, points snap to lines at the chosen Angles through the point the segment or shape starts from. Во время рисования точки привязываются к линиям под выбранными углами, проходящим через точку начала сегмента или фигуры. + The set of angles the construction guides follow while Construction Guides is on. Набор углов, по которым идут направляющие построения, пока включены «Направляющие построения». + Names what a point snaps to, such as an anchor, a path or an alignment; off, points snap the same way without the names. Называет то, к чему привязывается точка: опорную точку, контур или выравнивание; когда параметр выключен, точки привязываются так же, но без названий. + Shows distances, angles and how far art has moved next to the pointer while you draw or move it. Показывает рядом с указателем расстояния, углы и смещение объектов во время рисования или перемещения. + Snaps moved or resized art to the same gap as between nearby objects, and marks the equal gaps. Привязывает перемещённые или изменённые в размере объекты к такому же промежутку, как между ближайшими объектами, и отмечает равные промежутки. + With something selected, holding Alt/Option over another object or an artboard shows the distances between it and the selection. Когда что-то выделено, удержание Alt/Option над другим объектом или монтажной областью показывает расстояния между ним и выделением. + A selection dragged back to within the Snapping Tolerance of where the drag began goes back to exactly that place; a copy does not. Выделение, перетащенное обратно в пределы допуска привязки от места начала перетаскивания, возвращается точно туда; копия не возвращается. + How near on screen the pointer or a dragged point must come to art for Smart Guides to snap to it; the distance is the same at every zoom. Насколько близко на экране указатель или перетаскиваемая точка должны подойти к объекту, чтобы умные направляющие привязали их; расстояние одинаково при любом масштабе. + Snaps the end of a line segment, or a circle drawn from its center, so that it touches a nearby curve. Привязывает конец отрезка или окружность, нарисованную от центра, так, чтобы она касалась ближайшей кривой. + Snaps the end of a line segment so that it meets a nearby straight segment at a right angle. Привязывает конец отрезка так, чтобы он встречал ближайший прямой сегмент под прямым углом. Reset all preferences to their defaults? Сбросить все настройки до значений по умолчанию? The defaults are applied when you click OK in Preferences. Cancel there keeps your current preferences. Значения по умолчанию применяются, когда вы нажимаете ОК в окне «Настройки». Отмена там сохраняет текущие настройки. Restore Recovered Documents Восстановить восстановленные документы @@ -4703,6 +4794,11 @@ liquify-list-end {0}, {1} {0} и {1} @msg PDF writer error: {0} ошибка записи PDF: {0} @msgplural Packaged {n} file ({note}) in {folder}|Packaged {n} files ({note}) in {folder} Упаковано файлов: {n} в {folder} ({note}) @msg Preview in Browser needs the desktop app (the web downloads files instead) Просмотр в браузере требует настольного приложения (web-версия скачивает файлы) +@msg give `desiredK`, the desired file size in K (1024 bytes): a number above 0 and at most 1048576 укажите `desiredK`, желаемый размер файла в K (1024 байта): число больше 0 и не больше 1048576 +@msg `startWith` is `current` or `auto` `startWith` принимает значения `current` или `auto` +@msg `use` is `allSlices`, `eachSlice` or `currentSlice` `use` принимает значения `allSlices`, `eachSlice` или `currentSlice` +@msg `slice` is a slice number from `slice.list`, with `use: currentSlice` `slice` задаёт номер фрагмента из `slice.list`, вместе с `use: currentSlice` +@msg Optimize to File Size: there is no image to measure Оптимизировать по размеру файла: нет изображения для измерения @msg Release Guides: no guides Освобождение направляющих: нет направляющих @msg Release: no layer to put the rectangle in Освобождение: нет слоя для помещения прямоугольника @msg Replace Spine: select a blend and a path Замена остова: выделите переход и контур @@ -5916,6 +6012,19 @@ lighting Light Свет Transform Objects Трансформировать объекты @msg unknown parameter `{key}`; did you mean `{near}`? неизвестный параметр `{key}`; возможно, имелся в виду `{near}`? @msg unknown parameter `{key}`; the command takes no parameters неизвестный параметр `{key}`; у команды нет параметров +@msg unknown parameter `{key}`; `{object}` takes: {keys} неизвестный параметр `{key}`; `{object}` принимает: {keys} +@msg unknown parameter `{key}`; {why_not} неизвестный параметр `{key}`; {why_not} +@msg no format takes it (see document.formats) ни один формат его не принимает (см. document.formats) +@msg no save format takes it (see file.formatOptions) ни один формат сохранения его не принимает (см. file.formatOptions) +@msg PDF doesn't take it (see document.formats) PDF его не принимает (см. document.formats) +@msg EPS doesn't take it (see document.formats) EPS его не принимает (см. document.formats) +@msg DXF doesn't take it (see document.formats) DXF его не принимает (см. document.formats) +@msg {name} must be {range} (got {v}) {name} должен быть {range} (получено {v}) +@msg The graphics processor tried first couldn't show the window, so VectorCraft started again on {summary} (Settings › Performance › Graphics Processor › Automatic uses the one that drives your display) Графический процессор, выбранный первым, не смог показать окно, поэтому VectorCraft запустился снова на {summary} (Настройки › Производительность › Графический процессор › Автоматически использует тот, к которому подключён дисплей) +@msg Sent “{title}” to {to} “{title}” отправлено: {to} +@msg Sent “{title}” to {to}. The spooler replied: {note} “{title}” отправлено: {to}. Ответ очереди печати: {note} +@msg the default printer принтер по умолчанию +@msg raster effects on object {object}: requested {requested} ppi, achieved {achieved} ppi due to the 64 million pixel cap растровые эффекты объекта {object}: запрошено {requested} ppi, получено {achieved} ppi из-за ограничения в 64 миллиона пикселей @msg unknown parameter `{key}`; the command takes: {keys} неизвестный параметр `{key}`; команда принимает: {keys} @msg the params must be an object, not {got} параметры должны быть объектом, а не {got} @msg unknown parameter `{path}`; the object takes no keys неизвестный параметр `{path}`; объект не принимает ключей @@ -7921,6 +8030,10 @@ shape Open Открытый @msg Some islands could not be joined to the area around the art Некоторые островки не удалось соединить с областью вокруг графики @msg `width` must be from {lo} to {hi} pt `width` должно быть от {lo} до {hi} pt @msg `angle` must be from -180 to 180 degrees `angle` должно быть от -180 до 180 градусов +@msg `roundness` must be from 0 to 100% `roundness` должно быть от 0 до 100% +@msg `fidelity` must be from 0.01 to 100 pt `fidelity` должно быть от 0.01 до 100 pt +@msg style must be "pencil" or "brush" style должен быть "pencil" или "brush" +@msg extend end must be "start" or "end" конец extend должен быть "start" или "end" @msg `roundness` must be from 1 to 100% `roundness` должно быть от 1 до 100% @msg `count` must be a whole number from 1 to {MAX_BRIDGES_PER_ISLAND} `count` должно быть целым числом от 1 до {MAX_BRIDGES_PER_ISLAND} Weed Box and Lines… Рамка и линии выборки… @@ -9595,8 +9708,6 @@ shape Open Открытый @msg unknown panel неизвестная панель @msg unknown panel `{panel}` неизвестная панель `{panel}` @msg unknown parameter `{key}` неизвестный параметр `{key}` -@msg unknown parameter `{within}settings.{format}`; {why} неизвестный параметр `{within}settings.{format}`; {why} -@msg unknown parameter `{within}{key}`; {why} неизвестный параметр `{within}{key}`; {why} @msg unknown pieLegend `{v}` (none, standard or wedges) неизвестное значение pieLegend `{v}` (none, standard или wedges) @msg unknown piePosition `{v}` (even, ratio or stacked) неизвестное значение piePosition `{v}` (even, ratio или stacked) @msg unknown pieSort `{v}` (none, all or first) неизвестное значение pieSort `{v}` (none, all или first) @@ -9726,7 +9837,6 @@ shape Open Открытый @msg {name} `{s}`: {ids} {name} `{s}`: {ids} @msg {name} is built in and can't be deleted {name} встроен, его нельзя удалить @msg {name} must be a number {name} должно быть числом -@msg {name} must be {lo}–{hi}{unit} (got {v}) {name} должно быть {lo}–{hi}{unit} (получено {v}) @msg {name}: CRC or size mismatch {name}: несовпадение CRC или размера @msg {name}: only this Affinity file's embedded preview could be read; use File › Open to see it with its warning, or export SVG or PDF from Affinity before placing {name}: удалось прочитать только встроенный предпросмотр этого файла Affinity; используйте «Файл › Открыть», чтобы увидеть его с предупреждением, или перед помещением экспортируйте SVG или PDF из Affinity @msg {name}: {e} {name}: {e} diff --git a/crates/ui-egui/src/i18n/sv.tsv b/crates/ui-egui/src/i18n/sv.tsv index 58f33f6698..5cda0aa97f 100644 --- a/crates/ui-egui/src/i18n/sv.tsv +++ b/crates/ui-egui/src/i18n/sv.tsv @@ -594,6 +594,7 @@ font-technology Variable Variabla Consolidate All Windows Samla alla fönster Constrain Angle Begränsa vinkel Constrain Width and Height Proportions Behåll proportioner för bredd och höjd + Copy Width to Height Kopiera bredd till höjd Construction Guides Konstruktionsstödlinjer Contextual Alternates Kontextuella alternativ Contextual Task Bar Kontextuellt aktivitetsfält @@ -604,6 +605,8 @@ font-technology Variable Variabla Control Kontroll Convert Konvertera Convert All Spot Colors to Process Konvertera alla dekorfärger till process + Convert {name} to process Konvertera {name} till process + Keep {name} as spot Behåll {name} som dekorfärg Convert All Strokes to Outlines Konvertera alla konturer till konturbanor Convert All Text to Outlines Konvertera all text till konturbanor Convert Anchor Point Konvertera ankarpunkt @@ -679,6 +682,9 @@ font-technology Variable Variabla Create from Selection Skapa från markering Create From: Skapa från: Create Gradient Mesh… Skapa gradientnät… + Flat Platt + To Center Mot mitten + To Edge Mot kanten Create Graph Skapa diagram Create New Layer Skapa nytt lager Create New Sublayer Skapa nytt underlager @@ -2651,6 +2657,18 @@ font-technology Variable Variabla Preview: Förhandsgranskning: Preview All Layers Förhandsgranska alla lager Preview in Browser Förhandsgranska i webbläsare + Optimize to File Size… Optimera till filstorlek… + Optimize to File Size Optimera till filstorlek + Desired File Size: Önskad filstorlek: + Start With: Börja med: + Use: Använd: + Current Settings Aktuella inställningar + Auto Select GIF/JPEG Välj GIF/JPEG automatiskt + Total of All Slices Alla skivor totalt + Each Slice Varje skiva + Current Slice Aktuell skiva + {size}, within {target} {size}, inom {target} + No setting tried fits in {target}; the smallest is {size} Ingen provad inställning ryms i {target}; den minsta är {size} Preview in Browser needs the desktop app (the web downloads files instead) Förhandsgranska i webbläsare kräver skrivbordsappen (webbversionen hämtar filerna i stället) Preview Mode Förhandsgranskningsläge Preview the document as it is now Förhandsgranska dokumentet som det ser ut nu @@ -2995,12 +3013,85 @@ digits Malayalam Malayalam Responsive Responsiv Restore Återställ Restore every preference to its default (applied on OK) Återställ alla inställningar till standard (verkställs vid OK) + Shows a bar of commands for the selection or tool on the canvas; it hides while you drag and in Presentation Mode. Visar ett fält med kommandon för markeringen eller verktyget på arbetsytan; det döljs medan du drar och i presentationsläge. + How far an arrow key moves the selection; with Shift, it moves ten times as far. Hur långt en piltangent flyttar markeringen; med Skift flyttar den tio gånger så långt. + The angle of the axes that arrow keys move along and that Shift holds drawing and moving to. Vinkeln på de axlar som piltangenterna flyttar längs och som Skift låser ritande och flyttande till. + The corner radius the Rounded Rectangle tool draws with; changing the radius while drawing changes this value too. Hörnradien som verktyget Rundad rektangel ritar med; ändrar du radien medan du ritar ändras även det här värdet. + How far right and down Paste moves the copy when it is given no position, as from a script; Paste in the app centers it in the view. Hur långt åt höger och nedåt Klistra in flyttar kopian när ingen position anges, som från ett skript; Klistra in i appen placerar den mitt i vyn. + Stops the Pen tool from deleting the anchor you click on a selected path, or adding one where you click its segment. Hindrar verktyget Penna från att ta bort ankarpunkten du klickar på i en markerad bana, eller lägga till en där du klickar på dess segment. + Drawing tools show a crosshair pointer instead of their icon; Caps Lock does the same while it is on. Ritverktyg visar en hårkorspekare i stället för sin ikon; Caps Lock gör samma sak medan den är på. + Shows a tip when the pointer rests on a button or field that has one. Visar ett tips när pekaren vilar på en knapp eller ett fält som har ett. + Shows a warning before a script you choose runs. Visar en varning innan ett skript som du väljer körs. + Smooths the edges of artwork on the canvas. Jämnar ut kanterna på grafiken på arbetsytan. + Select › Same › Fill Color, Stroke Color and Fill & Stroke match only the same tint of a global or spot swatch, not any tint of it. Markera › Samma › Fyllnadsfärg, Konturfärg och Fyllning och kontur hittar bara samma nyans av ett globalt färgprov eller en dekorfärg, inte vilken nyans som helst av det. + Shows the Home screen when no document is open; off, the window stays empty until you click Home. Visar startskärmen när inget dokument är öppet; när det är av förblir fönstret tomt tills du klickar på Start. + Measures objects with their strokes and shape-changing effects for size, position and alignment; shadows, glows and blurs are not measured. Mäter objekt med deras konturer och formändrande effekter för storlek, position och justering; skuggor, glöd och oskärpa mäts inte. + At 100% zoom, one inch of the document takes 96 screen points instead of 72. Vid 100 % zoom tar en tum av dokumentet upp 96 skärmpunkter i stället för 72. + Double-clicking a group, path or image with the Selection tool opens it in isolation mode. Dubbelklick på en grupp, en bana eller en bild med verktyget Markering öppnar den i isoleringsläge. + Pattern fills and strokes transform with the art, unless a transform or the Transform panel's menu chooses otherwise. Mönsterfyllningar och -konturer transformeras med grafiken, om inte en transformering eller menyn i panelen Transformera väljer annat. + Live corner radii scale with the art, unless the scale chooses otherwise. Dynamiska hörnradier skalas med grafiken, om inte skalningen väljer annat. + Stroke weights, dashes and effect distances scale with the art, unless the scale chooses otherwise. Konturtjocklekar, streck och effektavstånd skalas med grafiken, om inte skalningen väljer annat. + The mouse wheel zooms the canvas instead of scrolling it. Mushjulet zoomar arbetsytan i stället för att rulla den. + The mouse wheel with Cmd/Ctrl held scrolls the canvas sideways. Mushjulet med Cmd/Ctrl nedtryckt rullar arbetsytan i sidled. + Dragging sideways on a numeric field's label changes the field's value. Att dra i sidled på ett sifferfälts etikett ändrar fältets värde. + A two-finger rotate gesture on a trackpad rotates the canvas view. En rotationsgest med två fingrar på en styrplatta roterar arbetsytans vy. + Holding a tool's shortcut key chooses the tool until you let go, and then the previous tool is chosen again. När du håller ned ett verktygs kortkommando är verktyget valt tills du släpper, och sedan väljs det föregående verktyget igen. + Shows the bounding box while you move the selection or draw a shape. Visar avgränsningsramen medan du flyttar markeringen eller ritar en form. + Create Trim Marks draws Japanese-style marks instead of Roman ones. Skapa skärmärken ritar märken i japansk stil i stället för romerska. + New art takes only the fill and stroke of the selection; off, it takes the selected object's whole appearance. Ny grafik får bara markeringens fyllning och kontur; när det är av får den hela utseendet hos det markerade objektet. + Changing the width or height in the Transform panel, the Properties panel or the Control bar changes the other in proportion. När du ändrar bredden eller höjden i panelen Transformera, panelen Egenskaper eller kontrollfältet ändras den andra i proportion. + A live rectangle's properties show one Corner Radius field for all four corners; off, each corner has its own field. Egenskaperna för en dynamisk rektangel visar ett fält Hörnradie för alla fyra hörn; när det är av har varje hörn ett eget fält. + What edits in the Transform panel transform: the object, its pattern tiles or both; Default follows Transform Pattern Tiles. Vad ändringar i panelen Transformera transformerar: objektet, dess mönsterrutor eller båda; Standard följer Transformera mönsterrutor. + With one symbol instance selected, the Transform panel uses the symbol's registration point as its reference point. När en symbolinstans är markerad använder panelen Transformera symbolens registreringspunkt som referenspunkt. + Darkens the canvas outside the artboards while the Artboard tool is active. Gör arbetsytan utanför ritytorna mörkare medan verktyget Rityta är aktivt. + With Fade Region Outside Artboard on, the area outside the artboards stays dark while you drag with the Artboard tool. När Tona ned området utanför ritytan är på förblir området utanför ritytorna mörkt medan du drar med verktyget Rityta. + How near, in pixels, the pointer must be to an object, anchor or handle for a click to select it. Hur nära, i pixlar, pekaren måste vara ett objekt, en ankarpunkt eller ett handtag för att ett klick ska markera det. + Whether the Selection tool's box selects objects it touches or only those fully inside; Drag Direction selects those inside on a drag to the right. E reverses it mid-drag. Om markeringsverktygets ram markerar objekt den rör vid eller bara de som ligger helt inuti; Dragriktning markerar de inuti när du drar åt höger. E vänder regeln medan du drar. + A click selects a filled object only on its path, not inside its fill. Ett klick markerar ett fyllt objekt bara på dess bana, inte inuti fyllningen. + How near, in pixels, a point must come to an anchor or ruler guide for Snap to Point to snap it; with Smart Guides on, Smart Guides' Snapping Tolerance applies instead. Hur nära, i pixlar, en punkt måste komma en ankarpunkt eller en linjalstödlinje för att Fäst mot punkt ska fästa den; med smarta stödlinjer på gäller deras fästtolerans i stället. + With the Selection tool, Cmd/Ctrl-click selects the object under the selected one at the pointer; each further click goes one object deeper. Med markeringsverktyget markerar Cmd/Ctrl-klick objektet under det markerade vid pekaren; varje nytt klick går ett objekt djupare. + Zoom In and Zoom Out bring the center of the selection to the middle of the view. Zooma in och Zooma ut flyttar markeringens mitt till mitten av vyn. + Locked and hidden artwork inside an artboard moves, scales and is copied with the artboard, as the other artwork does. Låst och dold grafik inuti en rityta flyttas, skalas och kopieras med ritytan, precis som övrig grafik. + The size of anchor points and direction handle ends on the canvas; larger anchors can also be picked from farther away. Storleken på ankarpunkter och riktningshandtagens ändar på arbetsytan; större ankarpunkter kan också fångas längre ifrån. + Draws the ends of direction handles as solid dots, hollow dots or larger solid dots. Ritar riktningshandtagens ändar som fyllda prickar, ihåliga prickar eller större fyllda prickar. + With the Direct Selection tool, the anchor under the pointer is highlighted. Med direktmarkeringsverktyget framhävs ankarpunkten under pekaren. + Shows direction handles when more than one anchor is selected; off, they show only while a single anchor is selected. Visar riktningshandtag när mer än en ankarpunkt är markerad; avstängt visas de bara när en enda ankarpunkt är markerad. + Corner widgets hide on corners whose angle is greater than this many degrees. Hörnwidgetar döljs på hörn vars vinkel är större än så här många grader. + The Pen tool previews the next segment from the last anchor to the pointer before you click. Pennverktyget förhandsvisar nästa segment från den sista ankarpunkten till pekaren innan du klickar. + The Curvature tool previews the curve to the pointer before you place the next point. Krökningsverktyget förhandsvisar kurvan till pekaren innan du placerar nästa punkt. The unit for new documents from built-in sizes other than pixel sizes and for opened files that record no unit; choosing one here and clicking OK also sets the active document's units. Enheten för nya dokument i de inbyggda storlekarna, utom storlekar i pixlar, och för öppnade filer som inte anger någon enhet; om du väljer den här och klickar på OK får även det aktiva dokumentet den enheten. Stroke weights, dashes and gaps show in this unit, and numbers typed for them are read in it. Konturtjocklekar, streck och mellanrum visas i den här enheten, och tal som skrivs för dem läses i den. Type sizes, leading and baseline shift show in this unit, and numbers typed for them are read in it. Teckenstorlekar, radavstånd och baslinjeförskjutning visas i den här enheten, och tal som skrivs för dem läses i den. The unit for East Asian type measurements, which no field uses yet. Enheten för mått i östasiatisk text, som inget fält använder ännu. When on, a number typed without a unit into a field in picas is read in points. När det är på läses ett tal som skrivs utan enhet i ett fält i pica i punkter. With XML ID, object names show as XML IDs in the Layers panel, the Variables panel and Layer Options. Med XML-id visas objektnamn som XML-id:n i Lager, Variabler och Lageralternativ. + Snaps drawing, moving and scaling to the grid's subdivisions, even while the grid is hidden; while it is on, Snap to Pixel does not apply. Fäster ritande, flyttning och skalning mot rutnätets underindelningar, även när rutnätet är dolt; medan det är på gäller inte Fäst mot pixel. + The color of guides that are not selected; an artboard with a Guide Label draws its own guides in the label's color instead. Färgen på stödlinjer som inte är markerade; en rityta med en stödlinjeetikett ritar sina egna stödlinjer i etikettens färg. + Draws guides as solid lines or as dots, including the guides already in the document. Ritar stödlinjer som heldragna linjer eller som punkter, även stödlinjer som redan finns i dokumentet. + With this on, guides are locked when VectorCraft starts; changing this option locks or unlocks them at once, and View › Guides › Lock Guides still changes the lock. När det är på är stödlinjerna låsta när VectorCraft startar; att ändra alternativet låser eller låser upp dem direkt, och Visa › Stödlinjer › Lås stödlinjer ändrar fortfarande låsningen. + With this on, holding Cmd/Ctrl as you start dragging from a ruler makes a guide on the active artboard only, or a canvas guide with the Artboard tool. När det är på skapar Cmd/Ctrl, nedtryckt i början av en dragning från en linjal, en stödlinje bara på den aktiva ritytan, eller med ritytsverktyget en stödlinje över hela arbetsytan. + The color of the grid; the lines between major gridlines are drawn in a fainter shade of it. Rutnätets färg; linjerna mellan huvudlinjerna ritas i en blekare nyans av den. + Draws the grid as lines, or as dots along the major gridlines at each subdivision. Ritar rutnätet som linjer, eller som punkter längs huvudlinjerna vid varje underindelning. + The distance between major gridlines, in every open document and in new ones; a VectorCraft document opens with the grid it was saved with. Avståndet mellan rutnätets huvudlinjer i varje öppet dokument och i nya; ett VectorCraft-dokument öppnas med det rutnät det sparades med. + How many parts each major grid square is divided into; Snap to Grid snaps to these parts, even when the zoom hides their lines. Hur många delar varje huvudruta i rutnätet delas i; Fäst mot rutnät fäster mot dessa delar, även när zoomen döljer deras linjer. + Draws the grid behind the artwork; off, the grid is drawn over it. Ritar rutnätet bakom grafiken; av ritas rutnätet ovanpå den. + In Pixel Preview at 600% zoom or more, the active view shows a line at the edge of every document pixel over the artwork. I pixelförhandsgranskning vid 600 % zoom eller mer visar den aktiva vyn en linje vid kanten av varje dokumentpixel ovanpå grafiken. + The color of the tile edge and the dashed swatch bounds shown while you edit a pattern. Färgen på rutkanten och de streckade provrutegränserna som visas medan du redigerar ett mönster. + Snaps drawing, moving and transforming to nearby art and shows guides and labels; Pixel Preview turns them off, and Snap to Grid snaps to the grid instead. Fäster ritande, flyttning och transformering mot närliggande teckningar och visar stödlinjer och etiketter; Pixelförhandsgranskning stänger av dem, och Fäst mot rutnät fäster mot rutnätet i stället. + The color of Smart Guide lines and labels. Färgen på de smarta stödlinjernas linjer och etiketter. + Shows a line along the edge or center that art lines up with; off, art still lines up without the line, and Snap to Glyph does not apply. Visar en linje längs den kant eller mitt som teckningen linjerar med; avstängd linjerar teckningen ändå utan linjen, och Fäst mot glyf gäller inte. + With a selection tool, outlines the unselected object under the pointer in its layer color while you are not dragging. Med ett markeringsverktyg får det omarkerade objektet under pekaren en kontur i lagrets färg medan du inte drar. + Shows the size or angle next to the pointer while you scale, rotate, shear or reflect art. Visar storleken eller vinkeln bredvid pekaren medan du skalar, roterar, skjuvar eller speglar teckningar. + While you draw, points snap to lines at the chosen Angles through the point the segment or shape starts from. Medan du ritar fästs punkter mot linjer i de valda vinklarna genom punkten där segmentet eller formen börjar. + The set of angles the construction guides follow while Construction Guides is on. Uppsättningen vinklar som konstruktionsstödlinjerna följer medan Konstruktionsstödlinjer är på. + Names what a point snaps to, such as an anchor, a path or an alignment; off, points snap the same way without the names. Namnger det som en punkt fäster mot, till exempel en ankarpunkt, en bana eller en justering; avstängd fäster punkterna på samma sätt utan namnen. + Shows distances, angles and how far art has moved next to the pointer while you draw or move it. Visar avstånd, vinklar och hur långt teckningen har flyttats bredvid pekaren medan du ritar eller flyttar. + Snaps moved or resized art to the same gap as between nearby objects, and marks the equal gaps. Fäster flyttade teckningar eller teckningar med ändrad storlek mot samma mellanrum som mellan närliggande objekt och markerar de lika mellanrummen. + With something selected, holding Alt/Option over another object or an artboard shows the distances between it and the selection. När något är markerat visar Alt/Option nedhållen över ett annat objekt eller en rityta avstånden mellan det och markeringen. + A selection dragged back to within the Snapping Tolerance of where the drag began goes back to exactly that place; a copy does not. En markering som dras tillbaka till inom fästtoleransen från där dragningen började återgår exakt dit; en kopia gör det inte. + How near on screen the pointer or a dragged point must come to art for Smart Guides to snap to it; the distance is the same at every zoom. Hur nära på skärmen pekaren eller en dragen punkt måste komma teckningen för att de smarta stödlinjerna ska fästa mot den; avståndet är detsamma vid alla zoomnivåer. + Snaps the end of a line segment, or a circle drawn from its center, so that it touches a nearby curve. Fäster änden av ett linjesegment, eller en cirkel ritad från sin mitt, så att den rör en närliggande kurva. + Snaps the end of a line segment so that it meets a nearby straight segment at a right angle. Fäster änden av ett linjesegment så att det möter ett närliggande rakt segment i rät vinkel. Reset all preferences to their defaults? Återställa alla inställningar till standard? The defaults are applied when you click OK in Preferences. Cancel there keeps your current preferences. Standardvärdena verkställs när du klickar på OK i Inställningar. Avbryt där behåller dina nuvarande inställningar. Restore Recovered Documents Återställ återskapade dokument @@ -4585,6 +4676,11 @@ liquify-list-end {0}, {1} {0} och {1} @msg PDF writer error: {0} fel i PDF-skrivaren: {0} @msgplural Packaged {n} file ({note}) in {folder}|Packaged {n} files ({note}) in {folder} Paketerade {n} fil i {folder} ({note})|Paketerade {n} filer i {folder} ({note}) @msg Preview in Browser needs the desktop app (the web downloads files instead) Förhandsgranska i webbläsare kräver skrivbordsappen (webbversionen hämtar filer i stället) +@msg give `desiredK`, the desired file size in K (1024 bytes): a number above 0 and at most 1048576 ange `desiredK`, önskad filstorlek i K (1024 byte): ett tal över 0 och högst 1048576 +@msg `startWith` is `current` or `auto` `startWith` är `current` eller `auto` +@msg `use` is `allSlices`, `eachSlice` or `currentSlice` `use` är `allSlices`, `eachSlice` eller `currentSlice` +@msg `slice` is a slice number from `slice.list`, with `use: currentSlice` `slice` är ett skivnummer från `slice.list`, med `use: currentSlice` +@msg Optimize to File Size: there is no image to measure Optimera till filstorlek: det finns ingen bild att mäta @msg Release Guides: no guides Släpp stödlinjer: inga stödlinjer @msg Release: no layer to put the rectangle in Släpp: inget lager att placera rektangeln i @msg Replace Spine: select a blend and a path Ersätt ryggrad: markera en blandning och en bana @@ -5793,6 +5889,18 @@ lighting Light Ljus Transform Objects Transformera objekt @msg unknown parameter `{key}`; did you mean `{near}`? okänd parameter `{key}`; menade du `{near}`? @msg unknown parameter `{key}`; the command takes no parameters okänd parameter `{key}`; kommandot tar inga parametrar +@msg unknown parameter `{key}`; `{object}` takes: {keys} okänd parameter `{key}`; `{object}` tar: {keys} +@msg unknown parameter `{key}`; {why_not} okänd parameter `{key}`; {why_not} +@msg no format takes it (see document.formats) inget format tar den (se document.formats) +@msg no save format takes it (see file.formatOptions) inget sparformat tar den (se file.formatOptions) +@msg PDF doesn't take it (see document.formats) PDF tar den inte (se document.formats) +@msg EPS doesn't take it (see document.formats) EPS tar den inte (se document.formats) +@msg DXF doesn't take it (see document.formats) DXF tar den inte (se document.formats) +@msg The graphics processor tried first couldn't show the window, so VectorCraft started again on {summary} (Settings › Performance › Graphics Processor › Automatic uses the one that drives your display) Grafikprocessorn som prövades först kunde inte visa fönstret, så VectorCraft startade om med {summary} (Inställningar › Prestanda › Grafikprocessor › Automatisk använder den som driver din skärm) +@msg Sent “{title}” to {to} Skickade “{title}” till {to} +@msg Sent “{title}” to {to}. The spooler replied: {note} Skickade “{title}” till {to}. Svar från utskriftskön: {note} +@msg the default printer standardskrivaren +@msg raster effects on object {object}: requested {requested} ppi, achieved {achieved} ppi due to the 64 million pixel cap rastereffekter på objekt {object}: begärde {requested} ppi, uppnådde {achieved} ppi på grund av gränsen på 64 miljoner pixlar @msg unknown parameter `{key}`; the command takes: {keys} okänd parameter `{key}`; kommandot tar: {keys} @msg the params must be an object, not {got} parametrarna måste vara ett objekt, inte {got} @msg unknown parameter `{path}`; the object takes no keys okänd parameter `{path}`; objektet tar inga nycklar @@ -7810,7 +7918,7 @@ digits Hindi Hindi @msg {LABEL} produced an empty result {LABEL} gav ett tomt resultat @msg {name} `{s}`: {ids} {name} `{s}`: {ids} @msg {name} is built in and can't be deleted {name} är inbyggd och kan inte tas bort -@msg {name} must be {lo}–{hi}{unit} (got {v}) {name} måste vara {lo}–{hi}{unit} (fick {v}) +@msg {name} must be {range} (got {v}) {name} måste vara {range} (fick {v}) @msg {name}: {e} {name}: {e} @msg {name}: CRC or size mismatch {name}: CRC eller storlek stämmer inte @msg {name}: only this Affinity file's embedded preview could be read; use File › Open to see it with its warning, or export SVG or PDF from Affinity before placing {name}: endast den inbäddade förhandsgranskningen i den här Affinity-filen kunde läsas; använd Arkiv › Öppna för att se den med dess varning, eller exportera SVG eller PDF från Affinity innan du placerar den @@ -8118,7 +8226,6 @@ digits Hindi Hindi @msg anchor `{key}` must be [x, y] ankarpunktens `{key}` måste vara [x, y] @msg anchor `{key}` must be a number ankarpunktens `{key}` måste vara ett tal @msg anchor `smooth` must be true or false ankarpunktens `smooth` måste vara true eller false -@msg angle and roundness must be finite vinkel och rundhet måste vara ändliga @msg angles must be a list as long as pins (degrees or null) angles måste vara en lista lika lång som pins (grader eller null) @msg appearance must be flat|center|edge appearance måste vara flat|center|edge @msg apply is "fill" or "stroke", not `{other}` apply är "fill" eller "stroke", inte `{other}` @@ -9284,6 +9391,10 @@ digits Hindi Hindi @msg Some islands could not be joined to the area around the art Vissa öar kunde inte förbindas med området runt teckningen @msg `width` must be from {lo} to {hi} pt `width` måste vara från {lo} till {hi} pt @msg `angle` must be from -180 to 180 degrees `angle` måste vara från -180 till 180 grader +@msg `roundness` must be from 0 to 100% `roundness` måste vara från 0 till 100 % +@msg `fidelity` must be from 0.01 to 100 pt `fidelity` måste vara från 0.01 till 100 pt +@msg style must be "pencil" or "brush" style måste vara "pencil" eller "brush" +@msg extend end must be "start" or "end" extend end måste vara "start" eller "end" @msg `roundness` must be from 1 to 100% `roundness` måste vara från 1 till 100 % @msg `count` must be a whole number from 1 to {MAX_BRIDGES_PER_ISLAND} `count` måste vara ett heltal från 1 till {MAX_BRIDGES_PER_ISLAND} Weed Box and Lines… Rensningsram och rensningslinjer… diff --git a/crates/ui-egui/src/i18n/tests.rs b/crates/ui-egui/src/i18n/tests.rs index 81cb542145..f81ae48ce9 100644 --- a/crates/ui-egui/src/i18n/tests.rs +++ b/crates/ui-egui/src/i18n/tests.rs @@ -1,4 +1,4 @@ -use super::catalog::{Catalog, parse_entries, placeholders}; +use super::catalog::{Catalog, matchable, parse_entries, placeholders, unmatchable_rows}; use super::*; const ZH: fn() -> Lang = || Lang::from_code("zh-hant").expect("zh-hant registered"); @@ -1959,8 +1959,7 @@ fn untranslated_report() { for code in COMPLETE_MESSAGES { let lang = Lang::from_code(code).expect("registered"); - let (entries, _) = parse_entries(lang.0.source); - let rows: BTreeSet<&str> = entries.iter().filter(|(ctx, _, _)| ctx == "@msg").map(|(_, src, _)| src.as_str()).collect(); + let rows = message_rows(lang.0.source); add(code, "messages", messages.iter().filter(|m| !rows.contains(m.as_str())).cloned().collect::<BTreeSet<_>>()); let meanings = vectorcraft_eps::POSTSCRIPT_ERRORS.iter().filter(|(_, m)| message(lang, m) == *m).map(|(_, m)| m.to_string()); add(code, "PostScript error meanings", meanings.collect()); @@ -2667,6 +2666,145 @@ fn package_status_message_templates_parse() { assert!(Catalog::parse("@msg\tPackaged {n} file(s) in {folder}{note}\tbad\n").message("Packaged 1 file(s) in /a b").is_none()); } +/// The sources of the `@msg` rows of the catalog file `text` that its catalog shows. A row the +/// catalog leaves out ([`unmatchable_rows`]) is not one: its messages are shown in English. +fn message_rows(text: &str) -> std::collections::BTreeSet<String> { + let left_out = unmatchable_rows(text); + let (entries, _) = parse_entries(text); + entries.into_iter().filter(|(ctx, src, _)| ctx == "@msg" && !left_out.contains(src)).map(|(_, src, _)| src).collect() +} + +/// [`untranslated_report`] lists a message as missing when the catalog leaves its row out. +#[test] +fn a_row_the_catalog_leaves_out_does_not_count_as_translated() { + let text = concat!( + "@msg\t{name} must be {lo}–{hi}{unit} (got {v})\t{name}: {lo}–{hi}{unit}, {v}\n", + "@msg\t{name} must be {range} (got {v})\t{name}: {range}, {v}\n", + "@msg\t{e}\t{e}\n", + "@msg\tnothing selected\tnada seleccionado\n", + "@msgplural\t{n}{what} left|{n} {what} left\t{n} {what}|{n} {what}\n", + ); + assert_eq!(unmatchable_rows(text), ["{name} must be {lo}–{hi}{unit} (got {v})", "{e}", "{n}{what} left|{n} {what} left"]); + assert_eq!(message_rows(text).into_iter().collect::<Vec<_>>(), ["nothing selected", "{name} must be {range} (got {v})"]); +} + +/// Every `@msg` and `@msgplural` row of the bundled catalogs has a source that messages can be +/// matched against: text, and no two placeholders in a row. +#[test] +fn bundled_catalogs_have_no_message_row_they_leave_out() { + for l in &LANGUAGES { + let left_out = unmatchable_rows(l.source); + assert!(left_out.is_empty(), "{}: no message matches these rows (two placeholders in a row, or no text): {left_out:?}", l.code); + } +} + +/// The status messages the desktop app makes (`apps/vectorcraft/src`, test modules aside), read as +/// [`message_literals`] reads the crates'. [`untranslated_report`] does not list them. +fn desktop_app_messages() -> std::collections::BTreeSet<String> { + let mut out = std::collections::BTreeSet::new(); + let mut stack = vec![std::path::Path::new(env!("CARGO_MANIFEST_DIR")).join("../../apps/vectorcraft/src")]; + while let Some(d) = stack.pop() { + for entry in std::fs::read_dir(&d).into_iter().flatten().flatten() { + let path = entry.path(); + let name = path.file_name().and_then(|n| n.to_str()).unwrap_or(""); + if path.is_dir() { + if name != "tests" { + stack.push(path); + } + } else if name.ends_with(".rs") && !name.starts_with("tests") && !name.ends_with("_tests.rs") { + let text = std::fs::read_to_string(&path).unwrap_or_default(); + out.extend(source_messages(without_test_module(&text), &[], &std::collections::BTreeMap::new())); + } + } + } + out +} + +/// Every status and error message is made with text between its placeholders, so a catalog row +/// can match it: values that stand side by side (a key and the object it is in, a range and its +/// unit) are joined into one value before the message is made. +#[test] +fn message_templates_have_text_between_their_placeholders() { + let app = desktop_app_messages(); + assert!(app.iter().any(|m| m.starts_with("The graphics processor tried first")), "the desktop app scan found {} messages", app.len()); + let mut messages = message_literals(); + messages.extend(app); + // A message that is one value alone (`{e}`) passes another message on. + let passes_on = |m: &str| m.starts_with('{') && m.ends_with('}') && m.matches('{').count() == 1; + let unmatchable: Vec<&String> = messages.iter().filter(|m| m.contains('{') && !passes_on(m) && !matchable(m)).collect(); + assert!(unmatchable.is_empty(), "no catalog row can match these messages; join the values that stand side by side first: {unmatchable:#?}"); +} + +/// Messages whose side-by-side values are joined before the message is made (a key with the +/// objects it is in, a range with its unit, an object's id with its name) are translated whole in +/// every complete-message language, the reason a key is refused for included. +#[test] +fn messages_with_joined_values_translate_whole() { + use serde_json::json; + let refusal = |id: &str, params: serde_json::Value| vectorcraft_engine::cmd::params::check_params(id, ¶ms).expect_err("refused").to_string(); + let setting = |checked: Result<(), vectorcraft_pdf::PdfError>| checked.expect_err("refused").to_string(); + let mut marks = vectorcraft_pdf::PdfSettings::default(); + marks.marks.weight = 9.0; + let gpu = "The graphics processor tried first couldn't show the window, so VectorCraft started again on Fast GPU"; + // Each message with the values it keeps and English words its translations do not. + let messages: Vec<(String, Vec<&str>, Vec<&str>)> = vec![ + (refusal("document.exportPdf", json!({"marks": {"ofset": 1}})), vec!["`marks.ofset`", "`marks.offset`"], vec!["unknown", "mean"]), + (refusal("document.exportPdf", json!({"marks": {"zz": 1}})), vec!["`marks.zz`", "`marks`", "weight"], vec!["unknown", "takes"]), + (refusal("document.exportForScreens", json!({"settings": {"zz": {}}})), vec!["`settings.zz`", "`settings`"], vec!["unknown", "takes"]), + (refusal("document.export", json!({"noSuchOption": 1})), vec!["`noSuchOption`", "document.formats"], vec!["unknown", "takes"]), + ( + refusal("document.save", json!({"path": "a.pdf", "options": {"noSuchOption": 1}})), + vec!["`options.noSuchOption`", "file.formatOptions"], + vec!["unknown", "takes"], + ), + ( + refusal("document.exportPdf", json!({"noSuchOption": 1})), + vec!["`noSuchOption`", "PDF", "document.formats"], + vec!["unknown", "doesn", "take"], + ), + ( + refusal("document.exportEps", json!({"noSuchOption": 1})), + vec!["`noSuchOption`", "EPS", "document.formats"], + vec!["unknown", "doesn", "take"], + ), + ( + refusal("document.exportDxf", json!({"noSuchOption": 1})), + vec!["`noSuchOption`", "DXF", "document.formats"], + vec!["unknown", "doesn", "take"], + ), + (setting(vectorcraft_pdf::PrintSettings { copies: 0, ..Default::default() }.check()), vec!["copies", "1–999", "0"], vec!["must", "got"]), + (setting(marks.check_values()), vec!["marks.weight", "0.05–2 pt", "9"], vec!["must", "got"]), + (gpu.to_string(), vec!["Fast GPU"], vec!["tried", "started"]), + ( + format!("{gpu} (Settings › Performance › Graphics Processor › Automatic uses the one that drives your display)"), + vec!["Fast GPU"], + vec!["tried", "started", "uses", "drives"], + ), + ("Sent “Poster” to the default printer".to_string(), vec!["“Poster”"], vec!["Sent", "default"]), + ("Sent “Poster” to Office Laser".to_string(), vec!["“Poster”", "Office Laser"], vec!["Sent"]), + ( + "Sent “Poster” to Office Laser (Floor 2). The spooler replied: job 12".to_string(), + vec!["“Poster”", "Office Laser (Floor 2)", "job 12"], + vec!["Sent", "spooler", "replied"], + ), + ("`canceled` is not an available name".to_string(), vec!["`canceled`"], vec![]), + ("a graphic style named `canceled` already exists".to_string(), vec!["`canceled`"], vec![]), + ( + "raster effects on object 7 (Logo): requested 300.0 ppi, achieved 72.0 ppi due to the 64 million pixel cap".to_string(), + vec!["7", "Logo", "300.0", "72.0"], + vec!["requested", "achieved"], + ), + ]; + for code in COMPLETE_MESSAGES { + let lang = Lang::from_code(code).expect("registered"); + for (english, kept, words) in &messages { + let shown = message(lang, english); + assert!(kept.iter().all(|value| shown.contains(value)), "{code}: {english} -> {shown}"); + assert!(shown.split(|c: char| !c.is_alphabetic()).all(|w| !words.contains(&w)), "{code}: {english} -> {shown}"); + } + } +} + /// A placeholder that occurs twice in a template matches the same text both times, so a template /// that ends with the name it starts with does not swallow a line that wraps its message. #[test] @@ -3105,6 +3243,67 @@ fn three_d_refusals_translate_with_their_values() { assert_eq!(message(de(), &errors[1].0), "ungültige Parameter für `effect.apply`: Licht: intensity muss eine Zahl von 0 bis 100 sein"); } +/// The Blob Brush's range refusals (`path.blob` `angle`, `roundness` and `fidelity`) show in every +/// complete-message language with the key and the range numbers as given; the error the command +/// returns stays English. +#[test] +fn blob_brush_range_refusals_translate_with_their_values() { + use serde_json::json; + let mut s = vectorcraft_engine::Session::new(); + s.execute("file.new", &json!({"width": 100, "height": 100})).unwrap(); + let refusals = [ + (json!({"angle": 200}), "`angle`", ["-180", "180"]), + (json!({"roundness": 101}), "`roundness`", ["0", "100"]), + (json!({"fidelity": 0}), "`fidelity`", ["0.01", "100"]), + ]; + for (extra, key, numbers) in &refusals { + let mut p = json!({"points": [[10, 10], [60, 10]]}); + p.as_object_mut().unwrap().extend(extra.as_object().unwrap().clone()); + let e = s.execute("path.blob", &p).unwrap_err().to_string(); + assert!(e.starts_with("invalid parameters for `path.blob`: ") && e.contains(key) && e.contains(" must be from "), "{e}"); + assert_eq!(message(Lang::EN, &e), e); + for code in COMPLETE_MESSAGES { + let shown = message(Lang::from_code(code).expect("registered"), &e); + assert!(!shown.contains(" must be from ") && shown.contains("`path.blob`") && shown.contains(key), "{code}: {e} -> {shown}"); + assert!(numbers.iter().all(|n| shown.contains(n)), "{code}: {e} -> {shown}"); + } + } + assert_eq!( + message(de(), &s.execute("path.blob", &json!({"points": [[10, 10], [60, 10]], "angle": -181})).unwrap_err().to_string()), + "ungültige Parameter für `path.blob`: `angle` muss zwischen -180 und 180 Grad liegen" + ); +} + +/// `path.freehand`'s refusals of an unknown `style`, `extend` end or `connect` end show in every +/// complete-message language with the accepted values as given. +#[test] +fn freehand_choice_refusals_translate_with_their_values() { + use serde_json::json; + let mut s = vectorcraft_engine::Session::new(); + s.execute("file.new", &json!({"width": 100, "height": 100})).unwrap(); + let a = s.execute("path.create", &json!({"d": "M10 10 L20 10"})).unwrap()["id"].clone(); + let b = s.execute("path.create", &json!({"d": "M10 50 L20 50"})).unwrap()["id"].clone(); + let points = json!([[20, 10], [30, 30], [20, 50]]); + let refusals = [ + (json!({"points": points, "style": "ink"}), ["pencil", "brush"]), + (json!({"points": points, "extend": {"id": a, "end": "middle"}}), ["start", "end"]), + (json!({"points": points, "extend": {"id": a}, "connect": {"id": b, "end": "middle"}}), ["start", "end"]), + ]; + // A catalog may translate the parameter's name (Hindi कनेक्ट) and put the accepted values in its + // own quotation marks (German „start“); the values themselves stay as written. + let quotes = [("\"", "\""), ("„", "“"), ("“", "”"), ("«", "»"), ("« ", " »"), ("「", "」"), ("‘", "’")]; + for (p, values) in &refusals { + let e = s.execute("path.freehand", p).unwrap_err().to_string(); + assert!(e.starts_with("invalid parameters for `path.freehand`: ") && e.contains(" must be "), "{e}"); + for code in COMPLETE_MESSAGES { + let shown = message(Lang::from_code(code).expect("registered"), &e); + assert!(!shown.contains(" must be ") && shown.contains("`path.freehand`"), "{code}: {e} -> {shown}"); + let quoted = |v: &str| quotes.iter().any(|(open, close)| shown.contains(&format!("{open}{v}{close}"))); + assert!(values.iter().all(|v| quoted(v)), "{code}: {e} -> {shown}"); + } + } +} + /// The values SVG filter refusals put in `{what}` that are messages of their own: the attributes /// over their limit, named with their element. `kernelUnitLength` is an attribute's name as written. const SVG_FILTER_PARTS: &[&str] = &["feConvolveMatrix's order", "feMorphology's radius", "a blur's stdDeviation"]; diff --git a/crates/ui-egui/src/i18n/tr.tsv b/crates/ui-egui/src/i18n/tr.tsv index afda820317..ba2ae9118f 100644 --- a/crates/ui-egui/src/i18n/tr.tsv +++ b/crates/ui-egui/src/i18n/tr.tsv @@ -587,6 +587,7 @@ font-technology Variable Değişken Consolidate All Windows Tüm Pencereleri Birleştir Constrain Angle Açıyı Sınırla Constrain Width and Height Proportions Genişlik ve Yükseklik Oranlarını Sınırla + Copy Width to Height Genişliği Yüksekliğe Kopyala Construction Guides İnşaat Kılavuzları Contextual Alternates Bağlamsal Alternatifler Contextual Task Bar Bağlamsal Görev Çubuğu @@ -596,6 +597,8 @@ font-technology Variable Değişken Control Kontrol Convert Dönüştür Convert All Spot Colors to Process Tüm Spot Renkleri Proses Renklere Dönüştür + Convert {name} to process {name} Rengini Prosese Dönüştür + Keep {name} as spot {name} Rengini Spot Olarak Koru Convert All Strokes to Outlines Tüm Konturları Anahatlara Dönüştür Convert All Text to Outlines Tüm Metni Ana Hatlara Dönüştür Convert Anchor Point Bağlantı Noktasını Dönüştür @@ -671,6 +674,9 @@ font-technology Variable Değişken Create from Selection Seçimden Oluştur Create From: Şuradan Oluştur: Create Gradient Mesh… Degrade Kafes Oluştur… + Flat Düz + To Center Merkeze Doğru + To Edge Kenara Doğru Create Graph Grafik Oluştur Create New Layer Yeni Katman Oluştur Create New Sublayer Yeni Alt Katman Oluştur @@ -2492,6 +2498,18 @@ shape Open Açık Preview: Önizleme: Preview All Layers Tüm Katmanları Önizle Preview in Browser Tarayıcıda Önizleme + Optimize to File Size… Dosya Boyutuna Göre Optimize Et… + Optimize to File Size Dosya Boyutuna Göre Optimize Et + Desired File Size: İstenen Dosya Boyutu: + Start With: Başlangıç: + Use: Kullan: + Current Settings Geçerli Ayarlar + Auto Select GIF/JPEG GIF/JPEG Otomatik Seç + Total of All Slices Tüm Dilimlerin Toplamı + Each Slice Her Dilim + Current Slice Geçerli Dilim + {size}, within {target} {size}, {target} sınırında + No setting tried fits in {target}; the smallest is {size} Denenen hiçbir ayar {target} içine sığmıyor; en küçüğü {size} Preview in Browser needs the desktop app (the web downloads files instead) Tarayıcıdaki önizleme için masaüstü uygulaması gerekir (bunun yerine web, dosyaları indirir) Preview Mode Önizleme Modu Preview the document as it is now Belgeyi şu anki haliyle önizleyin @@ -2832,12 +2850,85 @@ digits Malayalam Malayalam Responsive duyarlı Restore Geri yükle Restore every preference to its default (applied on OK) Her tercihi varsayılana geri yükleyin (Tamam'a uygulanır) + Shows a bar of commands for the selection or tool on the canvas; it hides while you drag and in Presentation Mode. Tuvalde seçim veya araç için bir komut çubuğu gösterir; sürüklerken ve Sunum Modu'nda gizlenir. + How far an arrow key moves the selection; with Shift, it moves ten times as far. Bir ok tuşunun seçimi ne kadar taşıdığı; Shift ile on kat daha uzağa taşır. + The angle of the axes that arrow keys move along and that Shift holds drawing and moving to. Ok tuşlarının boyunca taşıdığı ve Shift'in çizmeyi ve taşımayı sınırladığı eksenlerin açısı. + The corner radius the Rounded Rectangle tool draws with; changing the radius while drawing changes this value too. Yuvarlatılmış Dikdörtgen aracının çizdiği köşe yarıçapı; çizerken yarıçapı değiştirmek bu değeri de değiştirir. + How far right and down Paste moves the copy when it is given no position, as from a script; Paste in the app centers it in the view. Bir komut dosyasından olduğu gibi konum verilmediğinde Yapıştır'ın kopyayı sağa ve aşağı ne kadar kaydırdığı; uygulamada Yapıştır kopyayı görünümün ortasına koyar. + Stops the Pen tool from deleting the anchor you click on a selected path, or adding one where you click its segment. Kalem aracının seçili bir yolda tıkladığınız bağlantı noktasını silmesini veya yolun bir parçasına tıkladığınız yere nokta eklemesini engeller. + Drawing tools show a crosshair pointer instead of their icon; Caps Lock does the same while it is on. Çizim araçları simgeleri yerine artı işaretli bir imleç gösterir; Caps Lock açıkken aynısını yapar. + Shows a tip when the pointer rests on a button or field that has one. İmleç ipucu olan bir düğme veya alan üzerinde durduğunda ipucunu gösterir. + Shows a warning before a script you choose runs. Seçtiğiniz bir komut dosyası çalışmadan önce uyarı gösterir. + Smooths the edges of artwork on the canvas. Tuvaldeki resmin kenarlarını yumuşatır. + Select › Same › Fill Color, Stroke Color and Fill & Stroke match only the same tint of a global or spot swatch, not any tint of it. Seçim › Aynı › Dolgu Rengi, Kontur Rengi ve Doldur ve Konturla yalnızca genel veya spot renk örneğinin aynı tonunu bulur, herhangi bir tonunu değil. + Shows the Home screen when no document is open; off, the window stays empty until you click Home. Hiçbir belge açık değilken Ana Sayfa ekranını gösterir; kapalıyken siz Ana Sayfa'ya tıklayana kadar pencere boş kalır. + Measures objects with their strokes and shape-changing effects for size, position and alignment; shadows, glows and blurs are not measured. Nesneleri boyut, konum ve hizalama için konturları ve şekil değiştiren efektleriyle birlikte ölçer; gölgeler, parlamalar ve bulanıklaştırmalar ölçülmez. + At 100% zoom, one inch of the document takes 96 screen points instead of 72. %100 yakınlaştırmada belgenin bir inçi 72 yerine 96 ekran noktası kaplar. + Double-clicking a group, path or image with the Selection tool opens it in isolation mode. Seçim aracıyla bir gruba, yola veya görüntüye çift tıklamak onu yalıtım modunda açar. + Pattern fills and strokes transform with the art, unless a transform or the Transform panel's menu chooses otherwise. Desen dolguları ve konturları, bir dönüşüm veya Dönüştür panelinin menüsü başka bir seçim yapmadıkça resimle birlikte dönüşür. + Live corner radii scale with the art, unless the scale chooses otherwise. Canlı köşe yarıçapları, ölçekleme başka bir seçim yapmadıkça resimle birlikte ölçeklenir. + Stroke weights, dashes and effect distances scale with the art, unless the scale chooses otherwise. Kontur kalınlıkları, kesik çizgiler ve efekt mesafeleri, ölçekleme başka bir seçim yapmadıkça resimle birlikte ölçeklenir. + The mouse wheel zooms the canvas instead of scrolling it. Fare tekerleği tuvali kaydırmak yerine yakınlaştırır. + The mouse wheel with Cmd/Ctrl held scrolls the canvas sideways. Cmd/Ctrl basılıyken fare tekerleği tuvali yana kaydırır. + Dragging sideways on a numeric field's label changes the field's value. Sayısal bir alanın etiketi üzerinde yana sürüklemek alanın değerini değiştirir. + A two-finger rotate gesture on a trackpad rotates the canvas view. İzleme dörtgeninde iki parmakla döndürme hareketi tuvalin görünümünü döndürür. + Holding a tool's shortcut key chooses the tool until you let go, and then the previous tool is chosen again. Bir aracın kısayol tuşunu basılı tutmak, tuşu bırakana kadar o aracı seçer, ardından önceki araç yeniden seçilir. + Shows the bounding box while you move the selection or draw a shape. Seçimi taşırken veya bir şekil çizerken sınırlayıcı kutuyu gösterir. + Create Trim Marks draws Japanese-style marks instead of Roman ones. Kesim İşaretleri Oluşturun, Roma tarzı yerine Japon tarzı işaretler çizer. + New art takes only the fill and stroke of the selection; off, it takes the selected object's whole appearance. Yeni resim yalnızca seçimin dolgusunu ve konturunu alır; kapalıyken seçili nesnenin tüm görünümünü alır. + Changing the width or height in the Transform panel, the Properties panel or the Control bar changes the other in proportion. Dönüştür panelinde, Özellikler panelinde veya Kontrol çubuğunda genişliği ya da yüksekliği değiştirmek diğerini orantılı olarak değiştirir. + A live rectangle's properties show one Corner Radius field for all four corners; off, each corner has its own field. Canlı bir dikdörtgenin özellikleri dört köşenin tümü için tek bir Köşe Yarıçapı alanı gösterir; kapalıyken her köşenin kendi alanı olur. + What edits in the Transform panel transform: the object, its pattern tiles or both; Default follows Transform Pattern Tiles. Dönüştür panelindeki düzenlemelerin neyi dönüştürdüğü: nesneyi, desen döşemelerini veya ikisini; Varsayılan, Desen Döşemelerini Dönüştür'ü izler. + With one symbol instance selected, the Transform panel uses the symbol's registration point as its reference point. Bir sembol örneği seçiliyken Dönüştür paneli, sembolün kayıt noktasını referans noktası olarak kullanır. + Darkens the canvas outside the artboards while the Artboard tool is active. Çalışma Yüzeyi aracı etkinken çalışma yüzeylerinin dışındaki tuvali karartır. + With Fade Region Outside Artboard on, the area outside the artboards stays dark while you drag with the Artboard tool. Çalışma Yüzeyi Dışındaki Bölgeyi Karart açıkken, Çalışma Yüzeyi aracıyla sürüklerken çalışma yüzeylerinin dışındaki alan karanlık kalır. + How near, in pixels, the pointer must be to an object, anchor or handle for a click to select it. Bir tıklamanın nesneyi, bağlantı noktasını veya tutamacı seçmesi için işaretçinin ona piksel cinsinden ne kadar yakın olması gerektiği. + Whether the Selection tool's box selects objects it touches or only those fully inside; Drag Direction selects those inside on a drag to the right. E reverses it mid-drag. Seçim Aracı kutusunun dokunduğu nesneleri mi yoksa yalnızca tamamen içindekileri mi seçtiği; Sürükleme yönü sağa sürüklerken içindekileri seçer. Sürüklerken E kuralı tersine çevirir. + A click selects a filled object only on its path, not inside its fill. Tıklama, dolgulu bir nesneyi dolgusunun içinden değil, yalnızca yolundan seçer. + How near, in pixels, a point must come to an anchor or ruler guide for Snap to Point to snap it; with Smart Guides on, Smart Guides' Snapping Tolerance applies instead. Noktaya Yasla'nın bir noktayı yaslaması için noktanın bir bağlantı noktasına veya cetvel kılavuzuna piksel cinsinden ne kadar yaklaşması gerektiği; Akıllı Kılavuzlar açıkken onların Yapışma Toleransı geçerlidir. + With the Selection tool, Cmd/Ctrl-click selects the object under the selected one at the pointer; each further click goes one object deeper. Seçim Aracı ile Cmd/Ctrl-tıklama, işaretçideki seçili nesnenin altındaki nesneyi seçer; sonraki her tıklama bir nesne daha derine iner. + Zoom In and Zoom Out bring the center of the selection to the middle of the view. Yakınlaştır ve Uzaklaştır, seçimin merkezini görünümün ortasına getirir. + Locked and hidden artwork inside an artboard moves, scales and is copied with the artboard, as the other artwork does. Bir çalışma yüzeyinin içindeki kilitli ve gizli resimler, diğer resimler gibi çalışma yüzeyiyle birlikte taşınır, ölçeklenir ve kopyalanır. + The size of anchor points and direction handle ends on the canvas; larger anchors can also be picked from farther away. Tuvaldeki bağlantı noktalarının ve yön tutamacı uçlarının boyutu; daha büyük bağlantı noktaları daha uzaktan da tutulabilir. + Draws the ends of direction handles as solid dots, hollow dots or larger solid dots. Yön tutamaçlarının uçlarını dolu noktalar, içi boş noktalar veya daha büyük dolu noktalar olarak çizer. + With the Direct Selection tool, the anchor under the pointer is highlighted. Doğrudan Seçim Aracı ile işaretçinin altındaki bağlantı noktası vurgulanır. + Shows direction handles when more than one anchor is selected; off, they show only while a single anchor is selected. Birden fazla bağlantı noktası seçildiğinde yön tutamaçlarını gösterir; kapalıyken yalnızca tek bir bağlantı noktası seçiliyken görünürler. + Corner widgets hide on corners whose angle is greater than this many degrees. Açısı bu dereceden büyük olan köşelerde köşe widget'ları gizlenir. + The Pen tool previews the next segment from the last anchor to the pointer before you click. Kalem Aracı, tıklamadan önce son bağlantı noktasından işaretçiye kadar sonraki parçanın önizlemesini gösterir. + The Curvature tool previews the curve to the pointer before you place the next point. Kavis Aracı, sonraki noktayı yerleştirmeden önce işaretçiye kadar eğrinin önizlemesini gösterir. The unit for new documents from built-in sizes other than pixel sizes and for opened files that record no unit; choosing one here and clicking OK also sets the active document's units. Piksel boyutları dışındaki yerleşik boyutlardaki yeni belgelerin ve birim kaydetmeyen açılan dosyaların birimi; burada seçip Tamam'a tıkladığınızda etkin belgenin birimi de bu olur. Stroke weights, dashes and gaps show in this unit, and numbers typed for them are read in it. Kontur kalınlıkları, kısa çizgiler ve boşluklar bu birimde gösterilir ve bunlar için yazılan sayılar bu birimde okunur. Type sizes, leading and baseline shift show in this unit, and numbers typed for them are read in it. Yazı boyutları, satır aralığı ve taban çizgisi kayması bu birimde gösterilir ve bunlar için yazılan sayılar bu birimde okunur. The unit for East Asian type measurements, which no field uses yet. Doğu Asya metni ölçüleri için henüz hiçbir alanın kullanmadığı birim. When on, a number typed without a unit into a field in picas is read in points. Açıkken, pika cinsinden bir alana birimsiz yazılan sayı punto olarak okunur. With XML ID, object names show as XML IDs in the Layers panel, the Variables panel and Layer Options. XML kimliği seçiliyken nesne adları Katmanlar, Değişkenler ve Katman Seçenekleri'nde XML kimliği olarak gösterilir. + Snaps drawing, moving and scaling to the grid's subdivisions, even while the grid is hidden; while it is on, Snap to Pixel does not apply. Izgara gizliyken bile çizmeyi, taşımayı ve ölçeklemeyi ızgaranın alt bölümlerine yaslar; açık olduğu sürece Piksel'e Yapış uygulanmaz. + The color of guides that are not selected; an artboard with a Guide Label draws its own guides in the label's color instead. Seçili olmayan kılavuzların rengi; Kılavuz Etiketi olan bir çalışma yüzeyi kendi kılavuzlarını etiketin renginde çizer. + Draws guides as solid lines or as dots, including the guides already in the document. Belgede zaten bulunan kılavuzlar da dahil olmak üzere kılavuzları düz çizgi ya da nokta olarak çizer. + With this on, guides are locked when VectorCraft starts; changing this option locks or unlocks them at once, and View › Guides › Lock Guides still changes the lock. Açıkken VectorCraft başladığında kılavuzlar kilitlidir; bu seçeneği değiştirmek onları hemen kilitler ya da kilidini açar, Görünüm › Kılavuzlar › Kilit Kılavuzları ise kilidi değiştirmeye devam eder. + With this on, holding Cmd/Ctrl as you start dragging from a ruler makes a guide on the active artboard only, or a canvas guide with the Artboard tool. Açıkken bir cetvelden sürüklemeye başlarken Cmd/Ctrl basılı tutulursa yalnızca etkin çalışma yüzeyinde bir kılavuz, Çalışma Yüzeyi Aracı ile ise tüm tuvali kaplayan bir kılavuz oluşturulur. + The color of the grid; the lines between major gridlines are drawn in a fainter shade of it. Izgaranın rengi; ana ızgara çizgileri arasındaki çizgiler bu rengin daha soluk bir tonuyla çizilir. + Draws the grid as lines, or as dots along the major gridlines at each subdivision. Izgarayı çizgi olarak ya da her alt bölümde ana ızgara çizgileri boyunca nokta olarak çizer. + The distance between major gridlines, in every open document and in new ones; a VectorCraft document opens with the grid it was saved with. Her açık belgede ve yeni belgelerde ana ızgara çizgileri arasındaki uzaklık; bir VectorCraft belgesi kaydedildiği ızgarayla açılır. + How many parts each major grid square is divided into; Snap to Grid snaps to these parts, even when the zoom hides their lines. Her ana ızgara karesinin kaç parçaya bölündüğü; Izgaraya Yasla, yakınlaştırma çizgilerini gizlese bile bu parçalara yaslar. + Draws the grid behind the artwork; off, the grid is drawn over it. Izgarayı resmin arkasına çizer; kapalıyken ızgara resmin üstüne çizilir. + In Pixel Preview at 600% zoom or more, the active view shows a line at the edge of every document pixel over the artwork. Piksel Önizlemesi'nde %600 veya daha fazla yakınlaştırmada etkin görünüm, resmin üstünde belgenin her pikselinin kenarında bir çizgi gösterir. + The color of the tile edge and the dashed swatch bounds shown while you edit a pattern. Bir deseni düzenlerken gösterilen döşeme kenarının ve kesik çizgili renk örneği sınırlarının rengi. + Snaps drawing, moving and transforming to nearby art and shows guides and labels; Pixel Preview turns them off, and Snap to Grid snaps to the grid instead. Çizmeyi, taşımayı ve dönüştürmeyi yakındaki çizime yaslar, kılavuzları ve etiketleri gösterir; Piksel Önizlemesi bunları kapatır, Izgaraya Yasla ise onların yerine ızgaraya yaslar. + The color of Smart Guide lines and labels. Akıllı Kılavuz çizgilerinin ve etiketlerinin rengi. + Shows a line along the edge or center that art lines up with; off, art still lines up without the line, and Snap to Glyph does not apply. Çizimin hizalandığı kenar veya merkez boyunca bir çizgi gösterir; kapalıyken çizim çizgi olmadan da hizalanır ve Glif'e Yapış uygulanmaz. + With a selection tool, outlines the unselected object under the pointer in its layer color while you are not dragging. Bir seçim aracıyla, siz sürüklemezken işaretçinin altındaki seçili olmayan nesnenin çevresini katmanının rengiyle çizer. + Shows the size or angle next to the pointer while you scale, rotate, shear or reflect art. Çizimi ölçeklerken, döndürürken, eğerken veya yansıtırken işaretçinin yanında boyutu veya açıyı gösterir. + While you draw, points snap to lines at the chosen Angles through the point the segment or shape starts from. Siz çizerken noktalar, parçanın veya şeklin başladığı noktadan geçen seçili açılardaki çizgilere yaslanır. + The set of angles the construction guides follow while Construction Guides is on. İnşaat Kılavuzları açıkken inşaat kılavuzlarının izlediği açı kümesi. + Names what a point snaps to, such as an anchor, a path or an alignment; off, points snap the same way without the names. Bir noktanın neye yaslandığını adlandırır, örneğin bir bağlantı noktası, bir yol veya bir hizalama; kapalıyken noktalar adlar olmadan aynı şekilde yaslanır. + Shows distances, angles and how far art has moved next to the pointer while you draw or move it. Siz çizerken veya taşırken işaretçinin yanında mesafeleri, açıları ve çizimin ne kadar taşındığını gösterir. + Snaps moved or resized art to the same gap as between nearby objects, and marks the equal gaps. Taşınan veya yeniden boyutlandırılan çizimi yakındaki nesneler arasındakiyle aynı boşluğa yaslar ve eşit boşlukları işaretler. + With something selected, holding Alt/Option over another object or an artboard shows the distances between it and the selection. Bir şey seçiliyken, başka bir nesnenin veya çalışma yüzeyinin üzerinde Alt/Option tuşunu basılı tutmak onunla seçim arasındaki mesafeleri gösterir. + A selection dragged back to within the Snapping Tolerance of where the drag began goes back to exactly that place; a copy does not. Sürüklemenin başladığı yere yapışma toleransı içinde geri sürüklenen seçim tam olarak o yere döner; kopya dönmez. + How near on screen the pointer or a dragged point must come to art for Smart Guides to snap to it; the distance is the same at every zoom. Akıllı Kılavuzların yaslaması için işaretçinin veya sürüklenen noktanın ekranda çizime ne kadar yaklaşması gerektiği; mesafe her yakınlaştırmada aynıdır. + Snaps the end of a line segment, or a circle drawn from its center, so that it touches a nearby curve. Bir çizgi parçasının ucunu veya merkezinden çizilen bir daireyi yakındaki bir eğriye değecek şekilde yaslar. + Snaps the end of a line segment so that it meets a nearby straight segment at a right angle. Bir çizgi parçasının ucunu yakındaki düz bir parçayla dik açıyla buluşacak şekilde yaslar. Reset all preferences to their defaults? Tüm tercihler varsayılanlarına sıfırlansın mı? The defaults are applied when you click OK in Preferences. Cancel there keeps your current preferences. Varsayılanlar, Tercihler'de Tamam'a tıkladığınızda uygulanır. Oradaki İptal, mevcut tercihlerinizi korur. Restore Recovered Documents Kurtarılan Belgeleri Geri Yükle @@ -4418,6 +4509,11 @@ liquify-list-end {0}, {1} {0} ve {1} @msg PDF writer error: {0} PDF yazıcı hatası: {0} @msgplural Packaged {n} file ({note}) in {folder}|Packaged {n} files ({note}) in {folder} {n} dosya {folder} klasörüne paketlendi ({note}) @msg Preview in Browser needs the desktop app (the web downloads files instead) Tarayıcıdaki önizleme için masaüstü uygulaması gerekir (bunun yerine web, dosyaları indirir) +@msg give `desiredK`, the desired file size in K (1024 bytes): a number above 0 and at most 1048576 `desiredK` değerini verin, K cinsinden istenen dosya boyutu (1024 bayt): 0'dan büyük ve en çok 1048576 olan bir sayı +@msg `startWith` is `current` or `auto` `startWith` değeri `current` veya `auto` olmalıdır +@msg `use` is `allSlices`, `eachSlice` or `currentSlice` `use` değeri `allSlices`, `eachSlice` veya `currentSlice` olmalıdır +@msg `slice` is a slice number from `slice.list`, with `use: currentSlice` `slice`, `slice.list` içindeki bir dilim numarasıdır ve `use: currentSlice` ile kullanılır +@msg Optimize to File Size: there is no image to measure Dosya Boyutuna Göre Optimize Et: ölçülecek görüntü yok @msg Release Guides: no guides Sürüm Kılavuzları: kılavuz yok @msg Release: no layer to put the rectangle in Serbest bırakma: dikdörtgeni yerleştirecek katman yok @msg Replace Spine: select a blend and a path Omurgayı Değiştir: bir karışım ve yol seçin @@ -5649,6 +5745,19 @@ lighting Light Işık Transform Objects Nesneleri Dönüştür @msg unknown parameter `{key}`; did you mean `{near}`? bilinmeyen parametre `{key}`; `{near}` mi demek istediniz? @msg unknown parameter `{key}`; the command takes no parameters bilinmeyen parametre `{key}`; komut hiçbir parametre almaz +@msg unknown parameter `{key}`; `{object}` takes: {keys} bilinmeyen parametre `{key}`; `{object}` şunları alır: {keys} +@msg unknown parameter `{key}`; {why_not} bilinmeyen parametre `{key}`; {why_not} +@msg no format takes it (see document.formats) hiçbir biçim bunu almaz (bkz. document.formats) +@msg no save format takes it (see file.formatOptions) hiçbir kaydetme biçimi bunu almaz (bkz. file.formatOptions) +@msg PDF doesn't take it (see document.formats) PDF bunu almaz (bkz. document.formats) +@msg EPS doesn't take it (see document.formats) EPS bunu almaz (bkz. document.formats) +@msg DXF doesn't take it (see document.formats) DXF bunu almaz (bkz. document.formats) +@msg {name} must be {range} (got {v}) {name} {range} olmalıdır ({v} verildi) +@msg The graphics processor tried first couldn't show the window, so VectorCraft started again on {summary} (Settings › Performance › Graphics Processor › Automatic uses the one that drives your display) İlk önce denenen grafik işlemcisi pencereyi gösteremedi, bu yüzden VectorCraft {summary} üzerinde yeniden başladı (Ayarlar › Performans › Grafik İşlemcisi › Otomatik, ekranınızı süren işlemciyi kullanır) +@msg Sent “{title}” to {to} “{title}” şuraya gönderildi: {to} +@msg Sent “{title}” to {to}. The spooler replied: {note} “{title}” şuraya gönderildi: {to}. Yazdırma kuyruğunun yanıtı: {note} +@msg the default printer varsayılan yazıcı +@msg raster effects on object {object}: requested {requested} ppi, achieved {achieved} ppi due to the 64 million pixel cap {object} nesnesindeki raster efektleri: {requested} ppi istendi, 64 milyon piksel sınırı nedeniyle {achieved} ppi elde edildi @msg unknown parameter `{key}`; the command takes: {keys} bilinmeyen parametre `{key}`; komut şunları alır: {keys} @msg the params must be an object, not {got} parametreler bir nesne olmalıdır, {got} değil @msg unknown parameter `{path}`; the object takes no keys bilinmeyen parametre `{path}`; nesne anahtar almaz @@ -9700,6 +9809,11 @@ breakText Glyphs Glifler @msg Some islands could not be joined to the area around the art Bazı adalar çizimin çevresindeki alana bağlanamadı @msg `width` must be from {lo} to {hi} pt `width` {lo} ile {hi} pt arasında olmalıdır @msg `angle` must be from -180 to 180 degrees `angle` -180 ile 180 derece arasında olmalıdır +@msg `roundness` must be from 0 to 100% `roundness` %0 ile %100 arasında olmalıdır +@msg `fidelity` must be from 0.01 to 100 pt `fidelity` 0.01 ile 100 pt arasında olmalıdır +@msg style must be "pencil" or "brush" style "pencil" veya "brush" olmalıdır +@msg extend end must be "start" or "end" extend ucu "start" veya "end" olmalıdır +@msg connect end must be "start" or "end" connect ucu "start" veya "end" olmalıdır @msg `roundness` must be from 1 to 100% `roundness` %1 ile %100 arasında olmalıdır @msg `count` must be a whole number from 1 to {MAX_BRIDGES_PER_ISLAND} `count` 1 ile {MAX_BRIDGES_PER_ISLAND} arasında bir tam sayı olmalıdır Weed Box and Lines… Ayıklama Kutusu ve Çizgileri… diff --git a/crates/ui-egui/src/i18n/uk.tsv b/crates/ui-egui/src/i18n/uk.tsv index e156283bbf..db30d98464 100644 --- a/crates/ui-egui/src/i18n/uk.tsv +++ b/crates/ui-egui/src/i18n/uk.tsv @@ -199,6 +199,8 @@ antiAlias Sharp Різке Crisp Чітке Strong Сильне Anti-aliasing: Згладжування: + Art Optimized Оптимізовано для графіки + Type Optimized Оптимізовано для тексту Any Kind Будь-який тип Font Technology Технологія шрифту font-technology Variable Варіативні @@ -601,6 +603,7 @@ font-technology Variable Варіативні Consolidate All Windows Об’єднати всі вікна Constrain Angle Обмежити кут Constrain Width and Height Proportions Зберігати пропорції ширини та висоти + Copy Width to Height Копіювати ширину у висоту Construction Guides Напрямні побудови Contextual Alternates Контекстні альтернативи Contextual Task Bar Контекстна панель завдань @@ -611,6 +614,8 @@ font-technology Variable Варіативні Control Панель керування Convert Перетворити Convert All Spot Colors to Process Перетворити всі плашкові кольори на складові + Convert {name} to process Перетворити {name} на складовий колір + Keep {name} as spot Залишити {name} плашковим кольором Convert All Strokes to Outlines Перетворити всі обведення на контури Convert All Text to Outlines Перетворити весь текст на контури Convert Anchor Point Перетворити опорну точку @@ -686,6 +691,9 @@ font-technology Variable Варіативні Create from Selection Створити із виділення Create From: Створити з: Create Gradient Mesh… Створити градієнтну сітку… + Flat Плаский + To Center До центру + To Edge До краю Create Graph Створити діаграму Create New Layer Створити новий шар Create New Sublayer Створити новий підшар @@ -2750,6 +2758,18 @@ diagnostics ui інтерфейс Preview: Перегляд: Preview All Layers Переглянути всі шари Preview in Browser Переглянути у браузері + Optimize to File Size… Оптимізувати за розміром файлу… + Optimize to File Size Оптимізувати за розміром файлу + Desired File Size: Бажаний розмір файлу: + Start With: Почати з: + Use: Використати: + Current Settings Поточні налаштування + Auto Select GIF/JPEG Автовибір GIF/JPEG + Total of All Slices Сума всіх фрагментів + Each Slice Кожен фрагмент + Current Slice Поточний фрагмент + {size}, within {target} {size}, у межах {target} + No setting tried fits in {target}; the smallest is {size} Жодне випробуване налаштування не вміщується в {target}; найменший розмір {size} Preview in Browser needs the desktop app (the web downloads files instead) Перегляд у браузері вимагає настільної програми (web-версія завантажує файли) Preview Mode Режим перегляду Preview the document as it is now Переглянути документ у поточному вигляді @@ -3098,12 +3118,85 @@ digits Malayalam Малаялам Responsive Адаптивний Restore Відновити Restore every preference to its default (applied on OK) Відновити всі параметри за промовчанням (застосовується при натисканні ОК) + Shows a bar of commands for the selection or tool on the canvas; it hides while you drag and in Presentation Mode. Показує на полотні панель команд для виділення або інструмента; вона ховається під час перетягування та в режимі презентації. + How far an arrow key moves the selection; with Shift, it moves ten times as far. Наскільки клавіша зі стрілкою зсуває виділення; із Shift вона зсуває його вдесятеро далі. + The angle of the axes that arrow keys move along and that Shift holds drawing and moving to. Кут осей, уздовж яких зсувають клавіші зі стрілками і до яких Shift прив’язує малювання та переміщення. + The corner radius the Rounded Rectangle tool draws with; changing the radius while drawing changes this value too. Радіус кута, з яким малює інструмент «Округлений прямокутник»; зміна радіуса під час малювання змінює й це значення. + How far right and down Paste moves the copy when it is given no position, as from a script; Paste in the app centers it in the view. Наскільки «Вставити» зсуває копію праворуч і вниз, коли положення не задано, наприклад зі скрипту; «Вставити» в застосунку розміщує її в центрі вигляду. + Stops the Pen tool from deleting the anchor you click on a selected path, or adding one where you click its segment. Не дає інструменту «Перо» видаляти опорну точку, на яку ви клацаєте на виділеному контурі, або додавати точку там, де ви клацаєте на його сегменті. + Drawing tools show a crosshair pointer instead of their icon; Caps Lock does the same while it is on. Інструменти малювання показують вказівник-перехрестя замість свого значка; Caps Lock робить те саме, поки він увімкнений. + Shows a tip when the pointer rests on a button or field that has one. Показує підказку, коли вказівник зупиняється на кнопці або полі, що її мають. + Shows a warning before a script you choose runs. Показує попередження перед запуском вибраного вами скрипту. + Smooths the edges of artwork on the canvas. Згладжує краї графіки на полотні. + Select › Same › Fill Color, Stroke Color and Fill & Stroke match only the same tint of a global or spot swatch, not any tint of it. «Виділення › Те саме › Колір заливки», «Колір обведення» та «Заливка та обведення» знаходять лише той самий відтінок глобального або плашкового зразка, а не будь-який його відтінок. + Shows the Home screen when no document is open; off, the window stays empty until you click Home. Показує початковий екран, коли немає відкритих документів; якщо вимкнено, вікно лишається порожнім, доки ви не натиснете «Додому». + Measures objects with their strokes and shape-changing effects for size, position and alignment; shadows, glows and blurs are not measured. Вимірює об’єкти з обведеннями та ефектами, що змінюють форму, для розміру, положення й вирівнювання; тіні, світіння та розмиття не враховуються. + At 100% zoom, one inch of the document takes 96 screen points instead of 72. За масштабу 100 % один дюйм документа займає 96 екранних пунктів замість 72. + Double-clicking a group, path or image with the Selection tool opens it in isolation mode. Подвійне клацання на групі, контурі або зображенні інструментом «Виділення» відкриває їх у режимі ізоляції. + Pattern fills and strokes transform with the art, unless a transform or the Transform panel's menu chooses otherwise. Заливки й обведення візерунком трансформуються разом із графікою, якщо трансформування або меню панелі «Трансформувати» не задає іншого. + Live corner radii scale with the art, unless the scale chooses otherwise. Радіуси динамічних кутів масштабуються разом із графікою, якщо масштабування не задає іншого. + Stroke weights, dashes and effect distances scale with the art, unless the scale chooses otherwise. Товщина обведень, штрихи та відстані ефектів масштабуються разом із графікою, якщо масштабування не задає іншого. + The mouse wheel zooms the canvas instead of scrolling it. Колесо миші масштабує полотно, а не прокручує його. + The mouse wheel with Cmd/Ctrl held scrolls the canvas sideways. Колесо миші з натиснутою Cmd/Ctrl прокручує полотно по горизонталі. + Dragging sideways on a numeric field's label changes the field's value. Перетягування вбік по підпису числового поля змінює значення поля. + A two-finger rotate gesture on a trackpad rotates the canvas view. Жест обертання двома пальцями на трекпаді обертає вигляд полотна. + Holding a tool's shortcut key chooses the tool until you let go, and then the previous tool is chosen again. Поки ви утримуєте клавішу інструмента, його вибрано, а після відпускання знову вибирається попередній інструмент. + Shows the bounding box while you move the selection or draw a shape. Показує обмежувальну рамку, поки ви переміщуєте виділення або малюєте фігуру. + Create Trim Marks draws Japanese-style marks instead of Roman ones. «Створити мітки підрізування» малює мітки в японському стилі замість західних. + New art takes only the fill and stroke of the selection; off, it takes the selected object's whole appearance. Нові об’єкти отримують лише заливку та обведення виділення; якщо вимкнено, вони отримують усе оформлення виділеного об’єкта. + Changing the width or height in the Transform panel, the Properties panel or the Control bar changes the other in proportion. Зміна ширини або висоти на панелі «Трансформувати», панелі «Властивості» або панелі керування пропорційно змінює інший розмір. + A live rectangle's properties show one Corner Radius field for all four corners; off, each corner has its own field. Властивості динамічного прямокутника показують одне поле «Радіус кута» для всіх чотирьох кутів; якщо вимкнено, кожен кут має власне поле. + What edits in the Transform panel transform: the object, its pattern tiles or both; Default follows Transform Pattern Tiles. Що трансформують зміни на панелі «Трансформувати»: об’єкт, плитки його візерунка або обидва; «За замовчуванням» слідує «Трансформувати плитки візерунка». + With one symbol instance selected, the Transform panel uses the symbol's registration point as its reference point. Коли виділено один екземпляр символу, панель «Трансформувати» використовує точку реєстрації символу як опорну точку. + Darkens the canvas outside the artboards while the Artboard tool is active. Затемнює полотно поза монтажними областями, поки активний інструмент «Монтажна область». + With Fade Region Outside Artboard on, the area outside the artboards stays dark while you drag with the Artboard tool. Коли ввімкнено «Затемнювати ділянку поза монтажною областю», ділянка поза монтажними областями лишається темною, поки ви перетягуєте інструментом «Монтажна область». + How near, in pixels, the pointer must be to an object, anchor or handle for a click to select it. Наскільки близько, у пікселях, вказівник має бути до об’єкта, опорної точки або маркера, щоб клацання виділило його. + Whether the Selection tool's box selects objects it touches or only those fully inside; Drag Direction selects those inside on a drag to the right. E reverses it mid-drag. Чи виділяє рамка інструмента «Виділення» зачеплені об’єкти, чи лише ті, що цілком усередині; «Напрямок перетягування» виділяє ті, що всередині, під час перетягування праворуч. E змінює правило під час перетягування. + A click selects a filled object only on its path, not inside its fill. Клацання виділяє об’єкт із заливкою лише на його контурі, а не всередині заливки. + How near, in pixels, a point must come to an anchor or ruler guide for Snap to Point to snap it; with Smart Guides on, Smart Guides' Snapping Tolerance applies instead. Наскільки близько, у пікселях, точка має підійти до опорної точки або напрямної лінійки, щоб «Прив’язати до точки» прив’язало її; з увімкненими розумними напрямними діє їхній допуск прив’язки. + With the Selection tool, Cmd/Ctrl-click selects the object under the selected one at the pointer; each further click goes one object deeper. З інструментом «Виділення» Cmd/Ctrl+клацання виділяє об’єкт під виділеним у місці вказівника; кожне наступне клацання йде на один об’єкт глибше. + Zoom In and Zoom Out bring the center of the selection to the middle of the view. «Збільшити» і «Зменшити» переносять центр виділення в середину вигляду. + Locked and hidden artwork inside an artboard moves, scales and is copied with the artboard, as the other artwork does. Заблоковані й приховані об’єкти всередині монтажної області переміщуються, масштабуються й копіюються разом із нею, як і решта об’єктів. + The size of anchor points and direction handle ends on the canvas; larger anchors can also be picked from farther away. Розмір опорних точок і кінців маркерів напрямку на полотні; більші опорні точки можна захопити й з більшої відстані. + Draws the ends of direction handles as solid dots, hollow dots or larger solid dots. Малює кінці маркерів напрямку суцільними точками, порожнистими точками або більшими суцільними точками. + With the Direct Selection tool, the anchor under the pointer is highlighted. З інструментом «Пряме виділення» опорна точка під вказівником підсвічується. + Shows direction handles when more than one anchor is selected; off, they show only while a single anchor is selected. Показує маркери напрямку, коли виділено більше однієї опорної точки; якщо вимкнено, вони видні лише при одній виділеній опорній точці. + Corner widgets hide on corners whose angle is greater than this many degrees. Кутові віджети приховуються на кутах, більших за це число градусів. + The Pen tool previews the next segment from the last anchor to the pointer before you click. Інструмент «Перо» показує, перш ніж ви клацнете, наступний сегмент від останньої опорної точки до вказівника. + The Curvature tool previews the curve to the pointer before you place the next point. Інструмент «Кривизна» показує криву до вказівника, перш ніж ви поставите наступну точку. The unit for new documents from built-in sizes other than pixel sizes and for opened files that record no unit; choosing one here and clicking OK also sets the active document's units. Одиниця нових документів вбудованих розмірів, крім розмірів у пікселях, і відкритих файлів без записаної одиниці; якщо вибрати її тут і натиснути ОК, вона стане й одиницею активного документа. Stroke weights, dashes and gaps show in this unit, and numbers typed for them are read in it. Товщина обведення, штрихи й зазори показуються в цій одиниці, і введені для них числа читаються в ній. Type sizes, leading and baseline shift show in this unit, and numbers typed for them are read in it. Розміри тексту, інтерліньяж і зміщення базової лінії показуються в цій одиниці, і введені для них числа читаються в ній. The unit for East Asian type measurements, which no field uses yet. Одиниця для розмірів східноазіатського тексту, якої поки не використовує жодне поле. When on, a number typed without a unit into a field in picas is read in points. Якщо ввімкнено, число, введене без одиниці в поле в піках, читається в пунктах. With XML ID, object names show as XML IDs in the Layers panel, the Variables panel and Layer Options. З XML ID назви об’єктів показуються як XML ID у «Шарах», «Змінних» і «Параметрах шару». + Snaps drawing, moving and scaling to the grid's subdivisions, even while the grid is hidden; while it is on, Snap to Pixel does not apply. Прив’язує малювання, переміщення й масштабування до поділок сітки, навіть коли сітку приховано; поки параметр увімкнено, «Прив’язати до пікселя» не діє. + The color of guides that are not selected; an artboard with a Guide Label draws its own guides in the label's color instead. Колір невиділених напрямних; монтажна область із «Міткою напрямних» малює свої напрямні кольором мітки. + Draws guides as solid lines or as dots, including the guides already in the document. Малює напрямні суцільними лініями або крапками, включно з напрямними, які вже є в документі. + With this on, guides are locked when VectorCraft starts; changing this option locks or unlocks them at once, and View › Guides › Lock Guides still changes the lock. Якщо параметр увімкнено, напрямні заблоковані під час запуску VectorCraft; зміна параметра одразу блокує або розблоковує їх, а «Перегляд › Напрямні › Заблокувати напрямні» і далі змінює блокування. + With this on, holding Cmd/Ctrl as you start dragging from a ruler makes a guide on the active artboard only, or a canvas guide with the Artboard tool. Якщо параметр увімкнено, Cmd/Ctrl, утримувана на початку перетягування з лінійки, створює напрямну лише на активній монтажній області, а з інструментом «Монтажна область» напрямну на все полотно. + The color of the grid; the lines between major gridlines are drawn in a fainter shade of it. Колір сітки; лінії між основними лініями сітки малюються блідішим відтінком цього кольору. + Draws the grid as lines, or as dots along the major gridlines at each subdivision. Малює сітку лініями або крапками вздовж основних ліній сітки на кожній поділці. + The distance between major gridlines, in every open document and in new ones; a VectorCraft document opens with the grid it was saved with. Відстань між основними лініями сітки в усіх відкритих документах і в нових; документ VectorCraft відкривається із сіткою, з якою його збережено. + How many parts each major grid square is divided into; Snap to Grid snaps to these parts, even when the zoom hides their lines. На скільки частин ділиться кожен основний квадрат сітки; «Прив’язати до сітки» прив’язує до цих частин, навіть коли масштаб приховує їхні лінії. + Draws the grid behind the artwork; off, the grid is drawn over it. Малює сітку за графікою; якщо параметр вимкнено, сітка малюється поверх неї. + In Pixel Preview at 600% zoom or more, the active view shows a line at the edge of every document pixel over the artwork. У «Перегляді пікселів» за масштабу 600% і більше активний вигляд показує поверх графіки лінію по краю кожного пікселя документа. + The color of the tile edge and the dashed swatch bounds shown while you edit a pattern. Колір краю плитки та пунктирних меж зразка, які видно під час редагування візерунка. + Snaps drawing, moving and transforming to nearby art and shows guides and labels; Pixel Preview turns them off, and Snap to Grid snaps to the grid instead. Прив’язує малювання, переміщення й трансформування до найближчих об’єктів і показує напрямні та мітки; перегляд пікселів їх вимикає, а «Прив’язати до сітки» замість них прив’язує до сітки. + The color of Smart Guide lines and labels. Колір ліній і міток розумних напрямних. + Shows a line along the edge or center that art lines up with; off, art still lines up without the line, and Snap to Glyph does not apply. Показує лінію вздовж краю або центру, з яким вирівнюються об’єкти; коли параметр вимкнено, вони вирівнюються без лінії, а «Прив’язати до гліфу» не діє. + With a selection tool, outlines the unselected object under the pointer in its layer color while you are not dragging. З інструментом виділення обводить невиділений об’єкт під вказівником кольором його шару, поки ви не перетягуєте. + Shows the size or angle next to the pointer while you scale, rotate, shear or reflect art. Показує розмір або кут поруч із вказівником, поки ви масштабуєте, обертаєте, нахиляєте або відображаєте об’єкти. + While you draw, points snap to lines at the chosen Angles through the point the segment or shape starts from. Під час малювання точки прив’язуються до ліній під вибраними кутами, що проходять через точку початку сегмента або фігури. + The set of angles the construction guides follow while Construction Guides is on. Набір кутів, за якими йдуть напрямні побудови, поки ввімкнено «Напрямні побудови». + Names what a point snaps to, such as an anchor, a path or an alignment; off, points snap the same way without the names. Називає те, до чого прив’язується точка: опорну точку, контур або вирівнювання; коли параметр вимкнено, точки прив’язуються так само, але без назв. + Shows distances, angles and how far art has moved next to the pointer while you draw or move it. Показує поруч із вказівником відстані, кути й зміщення об’єктів під час малювання або переміщення. + Snaps moved or resized art to the same gap as between nearby objects, and marks the equal gaps. Прив’язує переміщені об’єкти або об’єкти зі зміненим розміром до такого самого проміжку, як між найближчими об’єктами, і позначає рівні проміжки. + With something selected, holding Alt/Option over another object or an artboard shows the distances between it and the selection. Коли щось виділено, утримання Alt/Option над іншим об’єктом або монтажною областю показує відстані між ним і виділенням. + A selection dragged back to within the Snapping Tolerance of where the drag began goes back to exactly that place; a copy does not. Виділення, перетягнуте назад у межі допуску прив’язки від місця початку перетягування, повертається точно туди; копія не повертається. + How near on screen the pointer or a dragged point must come to art for Smart Guides to snap to it; the distance is the same at every zoom. Наскільки близько на екрані вказівник або перетягувана точка мають підійти до об’єкта, щоб розумні напрямні їх прив’язали; відстань однакова за будь-якого масштабу. + Snaps the end of a line segment, or a circle drawn from its center, so that it touches a nearby curve. Прив’язує кінець відрізка або коло, намальоване від центру, так, щоб воно торкалося найближчої кривої. + Snaps the end of a line segment so that it meets a nearby straight segment at a right angle. Прив’язує кінець відрізка так, щоб він зустрічав найближчий прямий сегмент під прямим кутом. Reset all preferences to their defaults? Скинути всі налаштування до значень за промовчанням? The defaults are applied when you click OK in Preferences. Cancel there keeps your current preferences. Значення за промовчанням застосовуються, коли ви натискаєте ОК у вікні «Налаштування». Скасувати там зберігає поточні налаштування. Restore Recovered Documents Відновити відновлені документи @@ -4691,6 +4784,11 @@ liquify-list-end {0}, {1} {0} і {1} @msg PDF writer error: {0} Помилка запису PDF: {0} @msgplural Packaged {n} file ({note}) in {folder}|Packaged {n} files ({note}) in {folder} Упаковано файли: {n} {folder} ({note}) @msg Preview in Browser needs the desktop app (the web downloads files instead) Перегляд у браузері вимагає настільної програми (web-версія завантажує файли) +@msg give `desiredK`, the desired file size in K (1024 bytes): a number above 0 and at most 1048576 укажіть `desiredK`, бажаний розмір файлу в K (1024 байти): число більше за 0 і не більше 1048576 +@msg `startWith` is `current` or `auto` `startWith` має значення `current` або `auto` +@msg `use` is `allSlices`, `eachSlice` or `currentSlice` `use` має значення `allSlices`, `eachSlice` або `currentSlice` +@msg `slice` is a slice number from `slice.list`, with `use: currentSlice` `slice` задає номер фрагмента зі `slice.list`, разом з `use: currentSlice` +@msg Optimize to File Size: there is no image to measure Оптимізувати за розміром файлу: немає зображення для вимірювання @msg Release Guides: no guides Звільнення напрямних: немає напрямних @msg Release: no layer to put the rectangle in Звільнення: немає шару для приміщення прямокутника @msg Replace Spine: select a blend and a path Заміна осі: виділіть перехід і контур @@ -5898,6 +5996,19 @@ lighting Light Світло Transform Objects Трансформувати об’єкти @msg unknown parameter `{key}`; did you mean `{near}`? невідомий параметр `{key}`; можливо, ви мали на увазі `{near}`? @msg unknown parameter `{key}`; the command takes no parameters невідомий параметр `{key}`; команда не має параметрів +@msg unknown parameter `{key}`; `{object}` takes: {keys} невідомий параметр `{key}`; `{object}` приймає: {keys} +@msg unknown parameter `{key}`; {why_not} невідомий параметр `{key}`; {why_not} +@msg no format takes it (see document.formats) жоден формат його не приймає (див. document.formats) +@msg no save format takes it (see file.formatOptions) жоден формат збереження його не приймає (див. file.formatOptions) +@msg PDF doesn't take it (see document.formats) PDF його не приймає (див. document.formats) +@msg EPS doesn't take it (see document.formats) EPS його не приймає (див. document.formats) +@msg DXF doesn't take it (see document.formats) DXF його не приймає (див. document.formats) +@msg {name} must be {range} (got {v}) {name} має бути {range} (отримано {v}) +@msg The graphics processor tried first couldn't show the window, so VectorCraft started again on {summary} (Settings › Performance › Graphics Processor › Automatic uses the one that drives your display) Графічний процесор, обраний першим, не зміг показати вікно, тому VectorCraft запустився знову на {summary} (Налаштування › Продуктивність › Графічний процесор › Автоматично використовує той, до якого під’єднано дисплей) +@msg Sent “{title}” to {to} “{title}” відправлено: {to} +@msg Sent “{title}” to {to}. The spooler replied: {note} “{title}” відправлено: {to}. Відповідь черги друку: {note} +@msg the default printer принтер за замовчуванням +@msg raster effects on object {object}: requested {requested} ppi, achieved {achieved} ppi due to the 64 million pixel cap растрові ефекти об’єкта {object}: запитано {requested} ppi, отримано {achieved} ppi через обмеження у 64 мільйони пікселів @msg unknown parameter `{key}`; the command takes: {keys} невідомий параметр `{key}`; команда приймає: {keys} @msg the params must be an object, not {got} параметри мають бути об'єктом, а не {got} @msg unknown parameter `{path}`; the object takes no keys невідомий параметр `{path}`; об'єкт не приймає ключів @@ -7545,6 +7656,11 @@ breakText Glyphs Гліфи @msg Some islands could not be joined to the area around the art Деякі острівці не вдалося з’єднати з областю навколо графіки @msg `width` must be from {lo} to {hi} pt `width` має бути від {lo} до {hi} pt @msg `angle` must be from -180 to 180 degrees `angle` має бути від -180 до 180 градусів +@msg `roundness` must be from 0 to 100% `roundness` має бути від 0 до 100% +@msg `fidelity` must be from 0.01 to 100 pt `fidelity` має бути від 0.01 до 100 pt +@msg style must be "pencil" or "brush" style має бути "pencil" або "brush" +@msg extend end must be "start" or "end" кінець extend має бути "start" або "end" +@msg connect end must be "start" or "end" кінець connect має бути "start" або "end" @msg `roundness` must be from 1 to 100% `roundness` має бути від 1 до 100% @msg `count` must be a whole number from 1 to {MAX_BRIDGES_PER_ISLAND} `count` має бути цілим числом від 1 до {MAX_BRIDGES_PER_ISLAND} Weed Box and Lines… Рамка й лінії вибірки… @@ -8056,7 +8172,6 @@ breakText Glyphs Гліфи @msg anchor `smooth` must be true or false `smooth` опорної точки має бути true або false @msg anchor `{key}` must be [x, y] `{key}` опорної точки має бути [x, y] @msg anchor `{key}` must be a number `{key}` опорної точки має бути числом -@msg angle and roundness must be finite angle і roundness мають бути скінченними @msg angles must be a list as long as pins (degrees or null) angles має бути списком такої самої довжини, як pins (градуси або null) @msg appearance must be flat|center|edge appearance має бути flat|center|edge @msg apply is "fill" or "stroke", not `{other}` apply — це "fill" або "stroke", а не `{other}` @@ -9204,8 +9319,6 @@ breakText Glyphs Гліфи @msg unknown panel невідома панель @msg unknown panel `{panel}` невідома панель `{panel}` @msg unknown parameter `{key}` невідомий параметр `{key}` -@msg unknown parameter `{within}settings.{format}`; {why} невідомий параметр `{within}settings.{format}`; {why} -@msg unknown parameter `{within}{key}`; {why} невідомий параметр `{within}{key}`; {why} @msg unknown pieLegend `{v}` (none, standard or wedges) невідомий pieLegend `{v}` (none, standard або wedges) @msg unknown piePosition `{v}` (even, ratio or stacked) невідомий piePosition `{v}` (even, ratio або stacked) @msg unknown pieSort `{v}` (none, all or first) невідомий pieSort `{v}` (none, all або first) @@ -9331,7 +9444,6 @@ breakText Glyphs Гліфи @msg {label} must be a number from 1 to 10000 {label} має бути числом від 1 до 10000 @msg {name} `{s}`: {ids} {name} `{s}`: {ids} @msg {name} is built in and can't be deleted {name} є вбудованим, його не можна видалити -@msg {name} must be {lo}–{hi}{unit} (got {v}) {name} має бути {lo}–{hi}{unit} (отримано {v}) @msg {name}: CRC or size mismatch {name}: невідповідність CRC або розміру @msg {name}: only this Affinity file's embedded preview could be read; use File › Open to see it with its warning, or export SVG or PDF from Affinity before placing {name}: вдалося прочитати лише вбудований попередній перегляд цього файлу Affinity; скористайтеся командою Файл › Відкрити, щоб побачити його з попередженням, або перед розміщенням експортуйте SVG чи PDF з Affinity @msg {name}: {e} {name}: {e} diff --git a/crates/ui-egui/src/i18n/vi.tsv b/crates/ui-egui/src/i18n/vi.tsv index e20f4a1cd3..2707a23e47 100644 --- a/crates/ui-egui/src/i18n/vi.tsv +++ b/crates/ui-egui/src/i18n/vi.tsv @@ -222,6 +222,8 @@ antiAlias Sharp Sắc nét Crisp Rõ nét Strong Đậm Anti-aliasing: Khử răng cưa: + Art Optimized Tối ưu cho hình vẽ + Type Optimized Tối ưu cho chữ Any Kind Bất kỳ loại Font Technology Công nghệ phông chữ font-technology Variable Biến thiên @@ -705,6 +707,7 @@ font-technology Variable Biến thiên Constrain Giữ tỷ lệ Constrain Angle Ràng buộc góc Constrain Width and Height Proportions Ràng buộc tỷ lệ chiều rộng và chiều cao + Copy Width to Height Sao chép chiều rộng sang chiều cao Construction Guides Đường căn xây dựng Contextual Alternates Ký tự thay thế theo ngữ cảnh Contextual Task Bar Thanh tác vụ theo ngữ cảnh @@ -714,6 +717,8 @@ font-technology Variable Biến thiên Control Điều khiển Convert Chuyển đổi Convert All Spot Colors to Process Chuyển tất cả màu đặc thành màu lai + Convert {name} to process Chuyển {name} thành màu lai + Keep {name} as spot Giữ {name} là màu đặc Convert All Strokes to Outlines Chuyển tất cả nét thành đường bao Convert All Text to Outlines Chuyển tất cả văn bản thành đường bao Convert Anchor Point Chuyển đổi điểm neo @@ -793,6 +798,9 @@ font-technology Variable Biến thiên Create from Selection Tạo từ vùng chọn Create From: Tạo từ: Create Gradient Mesh… Tạo lưới chuyển sắc… + Flat Phẳng + To Center Về tâm + To Edge Về cạnh Create Graph Tạo biểu đồ Create New Fields by Tạo trường mới bằng Create New Layer Tạo lớp mới @@ -3072,6 +3080,18 @@ diagnostics ui giao diện Preview: Xem trước: Preview All Layers Xem trước tất cả lớp Preview in Browser Xem trước trong trình duyệt + Optimize to File Size… Tối ưu theo kích thước tệp… + Optimize to File Size Tối ưu theo kích thước tệp + Desired File Size: Kích thước tệp mong muốn: + Start With: Bắt đầu với: + Use: Dùng: + Current Settings Cài đặt hiện tại + Auto Select GIF/JPEG Tự chọn GIF/JPEG + Total of All Slices Tổng tất cả lát cắt + Each Slice Mỗi lát cắt + Current Slice Lát cắt hiện tại + {size}, within {target} {size}, trong giới hạn {target} + No setting tried fits in {target}; the smallest is {size} Không cài đặt nào đã thử vừa với {target}; nhỏ nhất là {size} Preview in Browser needs the desktop app (the web downloads files instead) Xem trước trong trình duyệt cần ứng dụng máy tính để bàn (web sẽ tải tệp xuống thay thế) Preview Mode Chế độ xem trước Preview the document as it is now Xem trước tài liệu như hiện tại @@ -3413,12 +3433,85 @@ mark-style Japanese Kiểu Nhật Responsive Đáp ứng Restore Khôi phục Restore every preference to its default (applied on OK) Khôi phục tất cả tùy chọn về mặc định (áp dụng khi nhấn OK) + Shows a bar of commands for the selection or tool on the canvas; it hides while you drag and in Presentation Mode. Hiển thị trên khung vẽ một thanh lệnh cho vùng chọn hoặc công cụ; thanh này ẩn khi bạn kéo và trong chế độ trình bày. + How far an arrow key moves the selection; with Shift, it moves ten times as far. Khoảng cách một phím mũi tên di chuyển vùng chọn; khi giữ Shift, phím di chuyển xa gấp mười lần. + The angle of the axes that arrow keys move along and that Shift holds drawing and moving to. Góc của các trục mà phím mũi tên di chuyển theo và Shift giữ việc vẽ và di chuyển theo. + The corner radius the Rounded Rectangle tool draws with; changing the radius while drawing changes this value too. Bán kính góc mà công cụ Hình chữ nhật bo góc dùng để vẽ; đổi bán kính trong khi vẽ cũng đổi giá trị này. + How far right and down Paste moves the copy when it is given no position, as from a script; Paste in the app centers it in the view. Khoảng cách Dán dời bản sao sang phải và xuống dưới khi không có vị trí được chỉ định, như từ một tập lệnh; Dán trong ứng dụng đặt bản sao vào giữa khung nhìn. + Stops the Pen tool from deleting the anchor you click on a selected path, or adding one where you click its segment. Ngăn công cụ Bút xóa điểm neo bạn nhấp trên một đường dẫn đã chọn, hoặc thêm điểm neo nơi bạn nhấp vào đoạn của nó. + Drawing tools show a crosshair pointer instead of their icon; Caps Lock does the same while it is on. Các công cụ vẽ hiển thị con trỏ hình chữ thập thay cho biểu tượng của chúng; Caps Lock cũng làm vậy khi đang bật. + Shows a tip when the pointer rests on a button or field that has one. Hiển thị mẹo khi con trỏ dừng trên một nút hoặc trường có mẹo. + Shows a warning before a script you choose runs. Hiển thị cảnh báo trước khi một tập lệnh bạn chọn chạy. + Smooths the edges of artwork on the canvas. Làm mịn các cạnh của hình minh họa trên khung vẽ. + Select › Same › Fill Color, Stroke Color and Fill & Stroke match only the same tint of a global or spot swatch, not any tint of it. Vùng chọn › Giống nhau › Màu tô, Màu nét và Tô & Nét chỉ khớp với cùng sắc độ của một mẫu màu toàn cục hoặc màu pha, không phải mọi sắc độ của nó. + Shows the Home screen when no document is open; off, the window stays empty until you click Home. Hiển thị màn hình Trang chủ khi không có tài liệu nào mở; khi tắt, cửa sổ để trống cho đến khi bạn nhấp vào Trang chủ. + Measures objects with their strokes and shape-changing effects for size, position and alignment; shadows, glows and blurs are not measured. Đo đối tượng cùng với nét và các hiệu ứng thay đổi hình dạng cho kích thước, vị trí và căn chỉnh; bóng đổ, ánh sáng và làm mờ không được đo. + At 100% zoom, one inch of the document takes 96 screen points instead of 72. Ở mức thu phóng 100%, một inch của tài liệu chiếm 96 điểm màn hình thay vì 72. + Double-clicking a group, path or image with the Selection tool opens it in isolation mode. Nhấp đúp vào một nhóm, đường dẫn hoặc hình ảnh bằng công cụ Vùng chọn sẽ mở nó trong chế độ cô lập. + Pattern fills and strokes transform with the art, unless a transform or the Transform panel's menu chooses otherwise. Phần tô và nét họa tiết biến đổi cùng hình minh họa, trừ khi phép biến đổi hoặc menu của bảng Biến đổi chọn khác. + Live corner radii scale with the art, unless the scale chooses otherwise. Bán kính góc động co giãn cùng hình minh họa, trừ khi phép co giãn chọn khác. + Stroke weights, dashes and effect distances scale with the art, unless the scale chooses otherwise. Độ dày nét, gạch đứt và khoảng cách hiệu ứng co giãn cùng hình minh họa, trừ khi phép co giãn chọn khác. + The mouse wheel zooms the canvas instead of scrolling it. Con lăn chuột thu phóng khung vẽ thay vì cuộn nó. + The mouse wheel with Cmd/Ctrl held scrolls the canvas sideways. Con lăn chuột kèm giữ Cmd/Ctrl cuộn khung vẽ sang ngang. + Dragging sideways on a numeric field's label changes the field's value. Kéo sang ngang trên nhãn của một trường số sẽ thay đổi giá trị của trường. + A two-finger rotate gesture on a trackpad rotates the canvas view. Cử chỉ xoay bằng hai ngón trên bàn di chuột sẽ xoay khung nhìn của khung vẽ. + Holding a tool's shortcut key chooses the tool until you let go, and then the previous tool is chosen again. Giữ phím tắt của một công cụ sẽ chọn công cụ đó cho đến khi bạn thả ra, rồi công cụ trước đó được chọn lại. + Shows the bounding box while you move the selection or draw a shape. Hiển thị hộp giới hạn khi bạn di chuyển vùng chọn hoặc vẽ một hình. + Create Trim Marks draws Japanese-style marks instead of Roman ones. Tạo dấu cắt xén vẽ dấu kiểu Nhật thay cho kiểu La Mã. + New art takes only the fill and stroke of the selection; off, it takes the selected object's whole appearance. Hình minh họa mới chỉ lấy phần tô và nét của vùng chọn; khi tắt, nó lấy toàn bộ diện mạo của đối tượng đã chọn. + Changing the width or height in the Transform panel, the Properties panel or the Control bar changes the other in proportion. Đổi chiều rộng hoặc chiều cao trong bảng Biến đổi, bảng Thuộc tính hoặc thanh Điều khiển sẽ đổi kích thước kia theo tỷ lệ. + A live rectangle's properties show one Corner Radius field for all four corners; off, each corner has its own field. Thuộc tính của một hình chữ nhật động hiển thị một trường Bán kính góc cho cả bốn góc; khi tắt, mỗi góc có trường riêng. + What edits in the Transform panel transform: the object, its pattern tiles or both; Default follows Transform Pattern Tiles. Những gì thao tác trong bảng Biến đổi biến đổi: đối tượng, các ô họa tiết của nó hoặc cả hai; Mặc định theo Biến đổi ô họa tiết. + With one symbol instance selected, the Transform panel uses the symbol's registration point as its reference point. Khi chọn một thể hiện biểu tượng, bảng Biến đổi dùng điểm đăng ký của biểu tượng làm điểm tham chiếu. + Darkens the canvas outside the artboards while the Artboard tool is active. Làm tối khung vẽ bên ngoài các bảng vẽ khi công cụ Bảng vẽ đang hoạt động. + With Fade Region Outside Artboard on, the area outside the artboards stays dark while you drag with the Artboard tool. Khi Làm tối vùng bên ngoài bảng vẽ đang bật, vùng bên ngoài các bảng vẽ vẫn tối trong khi bạn kéo bằng công cụ Bảng vẽ. + How near, in pixels, the pointer must be to an object, anchor or handle for a click to select it. Con trỏ phải cách đối tượng, điểm neo hoặc tay nắm bao nhiêu pixel để một cú nhấp chọn được nó. + Whether the Selection tool's box selects objects it touches or only those fully inside; Drag Direction selects those inside on a drag to the right. E reverses it mid-drag. Khung của công cụ Chọn chọn các đối tượng nó chạm vào hay chỉ những đối tượng nằm hẳn bên trong; Hướng kéo chọn đối tượng bên trong khi kéo sang phải. E đảo quy tắc trong khi kéo. + A click selects a filled object only on its path, not inside its fill. Cú nhấp chỉ chọn đối tượng có tô màu trên đường dẫn của nó, không phải bên trong phần tô. + How near, in pixels, a point must come to an anchor or ruler guide for Snap to Point to snap it; with Smart Guides on, Smart Guides' Snapping Tolerance applies instead. Một điểm phải đến gần điểm neo hoặc đường căn thước bao nhiêu pixel để Hút vào điểm hút nó; khi bật Đường căn thông minh, dung sai hút của chúng được dùng thay thế. + With the Selection tool, Cmd/Ctrl-click selects the object under the selected one at the pointer; each further click goes one object deeper. Với công cụ Chọn, Cmd/Ctrl-nhấp chọn đối tượng nằm dưới đối tượng đã chọn tại con trỏ; mỗi lần nhấp tiếp theo xuống sâu thêm một đối tượng. + Zoom In and Zoom Out bring the center of the selection to the middle of the view. Phóng to và Thu nhỏ đưa tâm vùng chọn vào giữa khung nhìn. + Locked and hidden artwork inside an artboard moves, scales and is copied with the artboard, as the other artwork does. Hình minh họa bị khóa và bị ẩn bên trong một bảng vẽ được di chuyển, co giãn và sao chép cùng bảng vẽ như các hình minh họa khác. + The size of anchor points and direction handle ends on the canvas; larger anchors can also be picked from farther away. Kích thước điểm neo và đầu tay nắm hướng trên canvas; điểm neo lớn hơn cũng có thể được nắm từ xa hơn. + Draws the ends of direction handles as solid dots, hollow dots or larger solid dots. Vẽ đầu tay nắm hướng thành chấm đặc, chấm rỗng hoặc chấm đặc lớn hơn. + With the Direct Selection tool, the anchor under the pointer is highlighted. Với công cụ Chọn trực tiếp, điểm neo dưới con trỏ được làm nổi bật. + Shows direction handles when more than one anchor is selected; off, they show only while a single anchor is selected. Hiện tay nắm hướng khi chọn nhiều hơn một điểm neo; khi tắt, chúng chỉ hiện khi chọn đúng một điểm neo. + Corner widgets hide on corners whose angle is greater than this many degrees. Tiện ích góc ẩn ở những góc có số đo lớn hơn số độ này. + The Pen tool previews the next segment from the last anchor to the pointer before you click. Công cụ Bút xem trước đoạn tiếp theo từ điểm neo cuối đến con trỏ trước khi bạn nhấp. + The Curvature tool previews the curve to the pointer before you place the next point. Công cụ Độ cong xem trước đường cong đến con trỏ trước khi bạn đặt điểm tiếp theo. The unit for new documents from built-in sizes other than pixel sizes and for opened files that record no unit; choosing one here and clicking OK also sets the active document's units. Đơn vị cho tài liệu mới theo kích thước dựng sẵn, trừ kích thước bằng pixel, và cho tệp đã mở không ghi đơn vị; chọn đơn vị ở đây rồi bấm OK cũng đặt nó cho tài liệu đang hoạt động. Stroke weights, dashes and gaps show in this unit, and numbers typed for them are read in it. Độ dày nét, nét đứt và khoảng cách hiển thị theo đơn vị này, và số nhập cho chúng được đọc theo đơn vị này. Type sizes, leading and baseline shift show in this unit, and numbers typed for them are read in it. Cỡ chữ, giãn dòng và dịch chuyển đường cơ sở hiển thị theo đơn vị này, và số nhập cho chúng được đọc theo đơn vị này. The unit for East Asian type measurements, which no field uses yet. Đơn vị cho số đo chữ Đông Á, hiện chưa có trường nào dùng. When on, a number typed without a unit into a field in picas is read in points. Khi bật, số nhập không có đơn vị vào trường tính bằng pica được đọc theo điểm. With XML ID, object names show as XML IDs in the Layers panel, the Variables panel and Layer Options. Với XML ID, tên đối tượng hiển thị dưới dạng XML ID trong Các lớp, Biến số và Tùy chọn lớp. + Snaps drawing, moving and scaling to the grid's subdivisions, even while the grid is hidden; while it is on, Snap to Pixel does not apply. Hút thao tác vẽ, di chuyển và co giãn vào các phân chia của lưới, kể cả khi lưới đang ẩn; khi tùy chọn này bật, Hút vào pixel không có tác dụng. + The color of guides that are not selected; an artboard with a Guide Label draws its own guides in the label's color instead. Màu của các đường căn không được chọn; bảng vẽ có Nhãn đường căn vẽ các đường căn của riêng nó bằng màu của nhãn. + Draws guides as solid lines or as dots, including the guides already in the document. Vẽ đường căn dưới dạng đường liền hoặc chấm, kể cả các đường căn đã có trong tài liệu. + With this on, guides are locked when VectorCraft starts; changing this option locks or unlocks them at once, and View › Guides › Lock Guides still changes the lock. Khi bật, các đường căn bị khóa lúc VectorCraft khởi động; đổi tùy chọn này sẽ khóa hoặc mở khóa chúng ngay, và Hiển thị › Đường căn › Khóa đường căn vẫn đổi được trạng thái khóa. + With this on, holding Cmd/Ctrl as you start dragging from a ruler makes a guide on the active artboard only, or a canvas guide with the Artboard tool. Khi bật, giữ Cmd/Ctrl lúc bắt đầu kéo từ thước sẽ tạo đường căn chỉ trên bảng vẽ đang hoạt động, hoặc đường căn cho toàn bộ khung vẽ khi dùng công cụ Bảng vẽ. + The color of the grid; the lines between major gridlines are drawn in a fainter shade of it. Màu của lưới; các đường nằm giữa những đường lưới chính được vẽ bằng sắc nhạt hơn của màu đó. + Draws the grid as lines, or as dots along the major gridlines at each subdivision. Vẽ lưới dưới dạng đường, hoặc dưới dạng chấm dọc theo các đường lưới chính tại mỗi phân chia. + The distance between major gridlines, in every open document and in new ones; a VectorCraft document opens with the grid it was saved with. Khoảng cách giữa các đường lưới chính trong mọi tài liệu đang mở và trong tài liệu mới; tài liệu VectorCraft mở ra với lưới đã lưu cùng nó. + How many parts each major grid square is divided into; Snap to Grid snaps to these parts, even when the zoom hides their lines. Số phần mà mỗi ô lưới chính được chia thành; Hút vào lưới hút vào các phần này, kể cả khi mức thu phóng ẩn các đường của chúng. + Draws the grid behind the artwork; off, the grid is drawn over it. Vẽ lưới phía sau tác phẩm; khi tắt, lưới được vẽ đè lên tác phẩm. + In Pixel Preview at 600% zoom or more, the active view shows a line at the edge of every document pixel over the artwork. Trong Xem trước pixel ở mức thu phóng 600% trở lên, chế độ xem đang hoạt động hiện một đường tại cạnh của mỗi pixel tài liệu, đè lên tác phẩm. + The color of the tile edge and the dashed swatch bounds shown while you edit a pattern. Màu của cạnh ô và đường giới hạn mẫu màu nét đứt hiện ra khi bạn chỉnh sửa họa tiết. + Snaps drawing, moving and transforming to nearby art and shows guides and labels; Pixel Preview turns them off, and Snap to Grid snaps to the grid instead. Hút thao tác vẽ, di chuyển và biến đổi vào hình vẽ ở gần, đồng thời hiện đường căn và nhãn; Xem trước pixel tắt chúng, còn Hút vào lưới sẽ hút vào lưới thay cho chúng. + The color of Smart Guide lines and labels. Màu của đường và nhãn của đường căn thông minh. + Shows a line along the edge or center that art lines up with; off, art still lines up without the line, and Snap to Glyph does not apply. Hiện một đường dọc theo cạnh hoặc tâm mà hình vẽ thẳng hàng với; khi tắt, hình vẽ vẫn thẳng hàng mà không có đường, và Hút vào glyph không áp dụng. + With a selection tool, outlines the unselected object under the pointer in its layer color while you are not dragging. Với công cụ chọn, viền đối tượng chưa chọn dưới con trỏ bằng màu lớp của nó khi bạn không kéo. + Shows the size or angle next to the pointer while you scale, rotate, shear or reflect art. Hiện kích thước hoặc góc bên cạnh con trỏ khi bạn co giãn, xoay, làm nghiêng hoặc phản chiếu hình vẽ. + While you draw, points snap to lines at the chosen Angles through the point the segment or shape starts from. Khi bạn vẽ, các điểm hút vào những đường theo các góc đã chọn đi qua điểm bắt đầu của đoạn hoặc hình. + The set of angles the construction guides follow while Construction Guides is on. Tập hợp các góc mà đường căn xây dựng đi theo khi Đường căn xây dựng đang bật. + Names what a point snaps to, such as an anchor, a path or an alignment; off, points snap the same way without the names. Gọi tên thứ mà điểm hút vào, như điểm neo, đường dẫn hoặc căn chỉnh; khi tắt, các điểm vẫn hút như vậy nhưng không có tên. + Shows distances, angles and how far art has moved next to the pointer while you draw or move it. Hiện khoảng cách, góc và mức hình vẽ đã di chuyển bên cạnh con trỏ khi bạn vẽ hoặc di chuyển. + Snaps moved or resized art to the same gap as between nearby objects, and marks the equal gaps. Hút hình vẽ được di chuyển hoặc đổi kích thước vào khoảng cách bằng khoảng cách giữa các đối tượng ở gần, và đánh dấu các khoảng bằng nhau. + With something selected, holding Alt/Option over another object or an artboard shows the distances between it and the selection. Khi đã chọn thứ gì đó, giữ Alt/Option trên một đối tượng khác hoặc một bảng vẽ sẽ hiện khoảng cách giữa nó và vùng chọn. + A selection dragged back to within the Snapping Tolerance of where the drag began goes back to exactly that place; a copy does not. Vùng chọn được kéo trở lại trong phạm vi dung sai hút tính từ chỗ bắt đầu kéo sẽ trở về đúng chỗ đó; bản sao thì không. + How near on screen the pointer or a dragged point must come to art for Smart Guides to snap to it; the distance is the same at every zoom. Con trỏ hoặc điểm đang kéo phải đến gần hình vẽ trên màn hình bao nhiêu để đường căn thông minh hút vào; khoảng cách này như nhau ở mọi mức thu phóng. + Snaps the end of a line segment, or a circle drawn from its center, so that it touches a nearby curve. Hút đầu mút của đoạn thẳng, hoặc hình tròn vẽ từ tâm, để nó chạm vào một đường cong ở gần. + Snaps the end of a line segment so that it meets a nearby straight segment at a right angle. Hút đầu mút của đoạn thẳng để nó gặp một đoạn thẳng ở gần theo góc vuông. Reset all preferences to their defaults? Đặt lại tất cả tùy chọn về mặc định? The defaults are applied when you click OK in Preferences. Cancel there keeps your current preferences. Giá trị mặc định được áp dụng khi bạn nhấn OK trong Tùy chọn. Hủy ở đó giữ nguyên các tùy chọn hiện tại của bạn. Restore Recovered Documents Khôi phục tài liệu đã phục hồi @@ -5484,6 +5577,11 @@ liquify-list-end {0}, {1} {0} và {1} @msg plug-in parameters: {0} tham số plug-in: {0} @msg plug-in trapped: {0} plug-in bị kẹt: {0} @msg Preview in Browser needs the desktop app (the web downloads files instead) Xem trước trên trình duyệt cần ứng dụng máy tính (web sẽ tải xuống tệp thay thế) +@msg give `desiredK`, the desired file size in K (1024 bytes): a number above 0 and at most 1048576 hãy cho `desiredK`, kích thước tệp mong muốn tính bằng K (1024 byte): một số lớn hơn 0 và tối đa 1048576 +@msg `startWith` is `current` or `auto` `startWith` là `current` hoặc `auto` +@msg `use` is `allSlices`, `eachSlice` or `currentSlice` `use` là `allSlices`, `eachSlice` hoặc `currentSlice` +@msg `slice` is a slice number from `slice.list`, with `use: currentSlice` `slice` là số lát cắt từ `slice.list`, đi cùng `use: currentSlice` +@msg Optimize to File Size: there is no image to measure Tối ưu theo kích thước tệp: không có ảnh để đo @msg print settings are not an object cài đặt in không phải là đối tượng @msg printing isn't available here in không khả dụng ở đây @msg range `{s}` is empty phạm vi `{s}` trống @@ -5841,6 +5939,19 @@ liquify-list-end {0}, {1} {0} và {1} @msg panels can't be shown in Presentation Mode không thể hiển thị bảng trong chế độ trình bày @msg unknown parameter `{key}`; did you mean `{near}`? tham số không xác định `{key}`; ý bạn là `{near}`? @msg unknown parameter `{key}`; the command takes no parameters tham số không xác định `{key}`; lệnh này không nhận tham số +@msg unknown parameter `{key}`; `{object}` takes: {keys} tham số không xác định `{key}`; `{object}` nhận: {keys} +@msg unknown parameter `{key}`; {why_not} tham số không xác định `{key}`; {why_not} +@msg no format takes it (see document.formats) không định dạng nào nhận tham số này (xem document.formats) +@msg no save format takes it (see file.formatOptions) không định dạng lưu nào nhận tham số này (xem file.formatOptions) +@msg PDF doesn't take it (see document.formats) PDF không nhận tham số này (xem document.formats) +@msg EPS doesn't take it (see document.formats) EPS không nhận tham số này (xem document.formats) +@msg DXF doesn't take it (see document.formats) DXF không nhận tham số này (xem document.formats) +@msg {name} must be {range} (got {v}) {name} phải là {range} (nhận được {v}) +@msg The graphics processor tried first couldn't show the window, so VectorCraft started again on {summary} (Settings › Performance › Graphics Processor › Automatic uses the one that drives your display) Bộ xử lý đồ họa thử trước không hiển thị được cửa sổ, VectorCraft đã khởi động lại trên {summary} (Cài đặt › Hiệu suất › Bộ xử lý đồ họa › Tự động dùng bộ xử lý đang điều khiển màn hình của bạn) +@msg Sent “{title}” to {to} Đã gửi “{title}” đến {to} +@msg Sent “{title}” to {to}. The spooler replied: {note} Đã gửi “{title}” đến {to}. Phản hồi của hàng đợi in: {note} +@msg the default printer máy in mặc định +@msg raster effects on object {object}: requested {requested} ppi, achieved {achieved} ppi due to the 64 million pixel cap hiệu ứng raster trên đối tượng {object}: yêu cầu {requested} ppi, đạt {achieved} ppi do giới hạn 64 triệu điểm ảnh @msg unknown parameter `{key}`; the command takes: {keys} tham số không xác định `{key}`; lệnh nhận: {keys} @msg the params must be an object, not {got} các tham số phải là một đối tượng, không phải {got} @msg unknown parameter `{path}`; the object takes no keys tham số không xác định `{path}`; đối tượng không nhận khóa nào @@ -7472,6 +7583,11 @@ breakText Glyphs Glyph @msg Some islands could not be joined to the area around the art Không thể nối một số đảo với vùng xung quanh hình vẽ @msg `width` must be from {lo} to {hi} pt `width` phải từ {lo} đến {hi} pt @msg `angle` must be from -180 to 180 degrees `angle` phải từ -180 đến 180 độ +@msg `roundness` must be from 0 to 100% `roundness` phải từ 0 đến 100% +@msg `fidelity` must be from 0.01 to 100 pt `fidelity` phải từ 0.01 đến 100 pt +@msg style must be "pencil" or "brush" style phải là "pencil" hoặc "brush" +@msg extend end must be "start" or "end" đầu extend phải là "start" hoặc "end" +@msg connect end must be "start" or "end" đầu connect phải là "start" hoặc "end" @msg `roundness` must be from 1 to 100% `roundness` phải từ 1 đến 100% @msg `count` must be a whole number from 1 to {MAX_BRIDGES_PER_ISLAND} `count` phải là số nguyên từ 1 đến {MAX_BRIDGES_PER_ISLAND} Weed Box and Lines… Khung và đường bóc phần thừa… diff --git a/crates/ui-egui/src/i18n/zh-hans.tsv b/crates/ui-egui/src/i18n/zh-hans.tsv index c8caa3ec44..d766e0f396 100644 --- a/crates/ui-egui/src/i18n/zh-hans.tsv +++ b/crates/ui-egui/src/i18n/zh-hans.tsv @@ -153,6 +153,8 @@ antiAlias Sharp 锐利 Crisp 清晰 Strong 强 Anti-aliasing: 消除锯齿: + Art Optimized 图稿优化 + Type Optimized 文字优化 Appearance 外观 Appearance Attribute 外观属性 Appearance Item 外观项目 @@ -552,6 +554,7 @@ antiAlias Sharp 锐利 Consolidate All Windows 合并所有窗口 Constrain Angle 约束角度 Constrain Width and Height Proportions 约束宽高比例 + Copy Width to Height 将宽度复制到高度 Construction Guides 构造参考线 Contextual Alternates 上下文替代 Contextual Task Bar 上下文任务栏 @@ -562,6 +565,8 @@ antiAlias Sharp 锐利 Control 控制栏 Convert 转换 Convert All Spot Colors to Process 将所有专色转换为印刷色 + Convert {name} to process 将 {name} 转换为印刷色 + Keep {name} as spot 将 {name} 保留为专色 Convert All Strokes to Outlines 将所有描边转换为轮廓 Convert All Text to Outlines 将所有文字转换为轮廓 Convert Anchor Point 转换锚点 @@ -636,6 +641,9 @@ antiAlias Sharp 锐利 Create from Selection 从选区创建 Create From: 创建自: Create Gradient Mesh… 创建渐变网格… + Flat 平面 + To Center 向中心 + To Edge 向边缘 Create Graph 创建图表 Create New Layer 创建新图层 Create New Sublayer 创建新子图层 @@ -2609,6 +2617,18 @@ diagnostics ui 界面 Preview 预览 Preview: 预览: Preview in Browser 在浏览器中预览 + Optimize to File Size… 优化到文件大小… + Optimize to File Size 优化到文件大小 + Desired File Size: 所需文件大小: + Start With: 起始设置: + Use: 使用: + Current Settings 当前设置 + Auto Select GIF/JPEG 自动选择 GIF/JPEG + Total of All Slices 所有切片总计 + Each Slice 每个切片 + Current Slice 当前切片 + {size}, within {target} {size},不超过 {target} + No setting tried fits in {target}; the smallest is {size} 尝试过的设置都无法小于 {target};最小为 {size} Preview in Browser needs the desktop app (the web downloads files instead) 在浏览器中预览需要桌面版应用程序 (网页版会改为下载文件) Preview Mode 预览模式 Preview the document as it is now 按当前状态预览文档 @@ -2957,12 +2977,85 @@ digits Malayalam 马拉雅拉姆数字 Responsive 响应式 Restore 恢复 Restore every preference to its default (applied on OK) 把所有首选项恢复为默认值 (点击确定后应用) + Shows a bar of commands for the selection or tool on the canvas; it hides while you drag and in Presentation Mode. 在画布上显示针对所选对象或工具的命令栏;拖动时和演示模式下会隐藏。 + How far an arrow key moves the selection; with Shift, it moves ten times as far. 按一次箭头键移动所选对象的距离;按住 Shift 时移动十倍距离。 + The angle of the axes that arrow keys move along and that Shift holds drawing and moving to. 箭头键沿其移动、Shift 将绘制和移动约束到的坐标轴角度。 + The corner radius the Rounded Rectangle tool draws with; changing the radius while drawing changes this value too. 圆角矩形工具绘制时使用的圆角半径;在绘制时更改半径也会更改此值。 + How far right and down Paste moves the copy when it is given no position, as from a script; Paste in the app centers it in the view. 未指定位置时(例如从脚本粘贴),粘贴将副本向右和向下移动的距离;在应用中粘贴会把副本放在视图中央。 + Stops the Pen tool from deleting the anchor you click on a selected path, or adding one where you click its segment. 阻止钢笔工具删除在所选路径上点击的锚点,或在点击路径段的位置添加锚点。 + Drawing tools show a crosshair pointer instead of their icon; Caps Lock does the same while it is on. 绘图工具显示十字指针而不是工具图标;Caps Lock 打开时效果相同。 + Shows a tip when the pointer rests on a button or field that has one. 指针停在带有提示的按钮或字段上时显示提示。 + Shows a warning before a script you choose runs. 在你选择的脚本运行前显示警告。 + Smooths the edges of artwork on the canvas. 使画布上图稿的边缘平滑。 + Select › Same › Fill Color, Stroke Color and Fill & Stroke match only the same tint of a global or spot swatch, not any tint of it. 选择 › 相同 › 填色、描边颜色和填色和描边只匹配全局色板或专色色板的相同色调,而不是其任意色调。 + Shows the Home screen when no document is open; off, the window stays empty until you click Home. 没有打开文档时显示主页屏幕;关闭时,窗口保持空白,直到你点击主页。 + Measures objects with their strokes and shape-changing effects for size, position and alignment; shadows, glows and blurs are not measured. 在尺寸、位置和对齐中按对象的描边和改变形状的效果测量对象;阴影、发光和模糊不计入测量。 + At 100% zoom, one inch of the document takes 96 screen points instead of 72. 缩放为 100% 时,文档的一英寸占 96 个屏幕点,而不是 72 个。 + Double-clicking a group, path or image with the Selection tool opens it in isolation mode. 用选择工具双击编组、路径或图像时,会在隔离模式中打开它。 + Pattern fills and strokes transform with the art, unless a transform or the Transform panel's menu chooses otherwise. 图案填色和描边随图稿一起变换,除非变换命令或变换面板的菜单另有选择。 + Live corner radii scale with the art, unless the scale chooses otherwise. 实时转角半径随图稿一起缩放,除非缩放命令另有选择。 + Stroke weights, dashes and effect distances scale with the art, unless the scale chooses otherwise. 描边粗细、虚线和效果距离随图稿一起缩放,除非缩放命令另有选择。 + The mouse wheel zooms the canvas instead of scrolling it. 鼠标滚轮缩放画布,而不是滚动画布。 + The mouse wheel with Cmd/Ctrl held scrolls the canvas sideways. 按住 Cmd/Ctrl 滚动鼠标滚轮会横向滚动画布。 + Dragging sideways on a numeric field's label changes the field's value. 在数值字段的标签上横向拖动可更改字段的值。 + A two-finger rotate gesture on a trackpad rotates the canvas view. 在触控板上用双指旋转手势可旋转画布视图。 + Holding a tool's shortcut key chooses the tool until you let go, and then the previous tool is chosen again. 按住工具的快捷键时选择该工具,松开后重新选择之前的工具。 + Shows the bounding box while you move the selection or draw a shape. 移动所选对象或绘制形状时显示定界框。 + Create Trim Marks draws Japanese-style marks instead of Roman ones. 创建裁切标记绘制日式标记,而不是西式标记。 + New art takes only the fill and stroke of the selection; off, it takes the selected object's whole appearance. 新图稿只采用所选对象的填色和描边;关闭时,采用所选对象的全部外观。 + Changing the width or height in the Transform panel, the Properties panel or the Control bar changes the other in proportion. 在变换面板、属性面板或控制栏中更改宽度或高度时,另一项按比例更改。 + A live rectangle's properties show one Corner Radius field for all four corners; off, each corner has its own field. 实时矩形的属性中为四个角显示一个圆角半径字段;关闭时,每个角都有自己的字段。 + What edits in the Transform panel transform: the object, its pattern tiles or both; Default follows Transform Pattern Tiles. 变换面板中的编辑所变换的内容:对象、其图案拼贴或两者;默认跟随变换图案拼贴。 + With one symbol instance selected, the Transform panel uses the symbol's registration point as its reference point. 选中一个符号实例时,变换面板使用符号的注册点作为参考点。 + Darkens the canvas outside the artboards while the Artboard tool is active. 使用画板工具时调暗画板以外的画布。 + With Fade Region Outside Artboard on, the area outside the artboards stays dark while you drag with the Artboard tool. 调暗画板外的区域打开时,用画板工具拖动期间画板以外的区域保持变暗。 + How near, in pixels, the pointer must be to an object, anchor or handle for a click to select it. 点击时指针需距离对象、锚点或手柄多少像素以内才能选中它。 + Whether the Selection tool's box selects objects it touches or only those fully inside; Drag Direction selects those inside on a drag to the right. E reverses it mid-drag. 选择工具的框选择它接触到的对象,还是只选择完全在框内的对象;拖动方向在向右拖动时选择框内的对象。拖动时按 E 可反转规则。 + A click selects a filled object only on its path, not inside its fill. 点击只在填充对象的路径上选中它,而不是在填充内部。 + How near, in pixels, a point must come to an anchor or ruler guide for Snap to Point to snap it; with Smart Guides on, Smart Guides' Snapping Tolerance applies instead. 点需距离锚点或标尺参考线多少像素以内,对齐点才会将其对齐;打开智能参考线时改用智能参考线的吸附容差。 + With the Selection tool, Cmd/Ctrl-click selects the object under the selected one at the pointer; each further click goes one object deeper. 使用选择工具时,按住 Cmd/Ctrl 点击会选中指针处所选对象下方的对象;每再点击一次就再往下一个对象。 + Zoom In and Zoom Out bring the center of the selection to the middle of the view. 放大和缩小会将所选内容的中心移到视图中央。 + Locked and hidden artwork inside an artboard moves, scales and is copied with the artboard, as the other artwork does. 画板内锁定和隐藏的图稿会像其他图稿一样随画板移动、缩放和复制。 + The size of anchor points and direction handle ends on the canvas; larger anchors can also be picked from farther away. 画布上锚点和方向手柄端点的大小;锚点越大,也能从越远处抓取。 + Draws the ends of direction handles as solid dots, hollow dots or larger solid dots. 将方向手柄的端点绘制为实心点、空心点或更大的实心点。 + With the Direct Selection tool, the anchor under the pointer is highlighted. 使用直接选择工具时,指针下方的锚点会高亮显示。 + Shows direction handles when more than one anchor is selected; off, they show only while a single anchor is selected. 选中多个锚点时显示方向手柄;关闭时,仅在只选中一个锚点时显示。 + Corner widgets hide on corners whose angle is greater than this many degrees. 角度大于此度数的转角上隐藏角控件。 + The Pen tool previews the next segment from the last anchor to the pointer before you click. 点击之前,钢笔工具会预览从最后一个锚点到指针的下一段。 + The Curvature tool previews the curve to the pointer before you place the next point. 放置下一个点之前,曲率工具会预览到指针的曲线。 The unit for new documents from built-in sizes other than pixel sizes and for opened files that record no unit; choosing one here and clicking OK also sets the active document's units. 除像素尺寸外,以内置尺寸新建的文档和未记录单位的已打开文件使用此单位;在此选择并点击确定,也会更改当前文档的单位。 Stroke weights, dashes and gaps show in this unit, and numbers typed for them are read in it. 描边粗细、虚线和间隔以此单位显示,为其输入的数字也按此单位读取。 Type sizes, leading and baseline shift show in this unit, and numbers typed for them are read in it. 字号、行距和基线偏移以此单位显示,为其输入的数字也按此单位读取。 The unit for East Asian type measurements, which no field uses yet. 用于东亚文字度量的单位,目前还没有字段使用。 When on, a number typed without a unit into a field in picas is read in points. 开启后,在以派卡为单位的字段中输入的不带单位的数字按点读取。 With XML ID, object names show as XML IDs in the Layers panel, the Variables panel and Layer Options. 选择 XML ID 时,图层、变量和图层选项中的对象名称显示为 XML ID。 + Snaps drawing, moving and scaling to the grid's subdivisions, even while the grid is hidden; while it is on, Snap to Pixel does not apply. 即使网格已隐藏,绘制、移动和缩放也会对齐到网格的细分;开启期间,“对齐像素”不起作用。 + The color of guides that are not selected; an artboard with a Guide Label draws its own guides in the label's color instead. 未选中参考线的颜色;设置了参考线标签的画板会用标签颜色绘制自己的参考线。 + Draws guides as solid lines or as dots, including the guides already in the document. 将参考线绘制为实线或点,包括文档中已有的参考线。 + With this on, guides are locked when VectorCraft starts; changing this option locks or unlocks them at once, and View › Guides › Lock Guides still changes the lock. 开启后,VectorCraft 启动时参考线处于锁定状态;更改此选项会立即锁定或解锁参考线,“视图 › 参考线 › 锁定参考线”仍可更改锁定状态。 + With this on, holding Cmd/Ctrl as you start dragging from a ruler makes a guide on the active artboard only, or a canvas guide with the Artboard tool. 开启后,从标尺开始拖动时按住 Cmd/Ctrl,会只在当前画板上创建参考线;使用画板工具时则创建贯穿整个画布的参考线。 + The color of the grid; the lines between major gridlines are drawn in a fainter shade of it. 网格的颜色;主网格线之间的线条以该颜色较淡的色调绘制。 + Draws the grid as lines, or as dots along the major gridlines at each subdivision. 将网格绘制为线条,或在每个细分处沿主网格线绘制为点。 + The distance between major gridlines, in every open document and in new ones; a VectorCraft document opens with the grid it was saved with. 所有已打开文档和新文档中主网格线之间的距离;VectorCraft 文档打开时使用保存时的网格。 + How many parts each major grid square is divided into; Snap to Grid snaps to these parts, even when the zoom hides their lines. 每个主网格方格分成多少份;即使缩放使这些线条不显示,“对齐网格”仍对齐到这些分格。 + Draws the grid behind the artwork; off, the grid is drawn over it. 将网格绘制在图稿后面;关闭时网格绘制在图稿上面。 + In Pixel Preview at 600% zoom or more, the active view shows a line at the edge of every document pixel over the artwork. 在像素预览中缩放到 600% 或以上时,当前视图会在图稿上方沿文档每个像素的边缘显示线条。 + The color of the tile edge and the dashed swatch bounds shown while you edit a pattern. 编辑图案时显示的拼贴边缘和虚线色板边界的颜色。 + Snaps drawing, moving and transforming to nearby art and shows guides and labels; Pixel Preview turns them off, and Snap to Grid snaps to the grid instead. 将绘制、移动和变换吸附到附近的图稿,并显示参考线和标签;像素预览会将其关闭,开启对齐网格时则改为对齐网格。 + The color of Smart Guide lines and labels. 智能参考线的线条和标签颜色。 + Shows a line along the edge or center that art lines up with; off, art still lines up without the line, and Snap to Glyph does not apply. 沿图稿对齐的边缘或中心显示一条线;关闭时图稿仍会对齐,只是不显示线条,且靠齐字符不起作用。 + With a selection tool, outlines the unselected object under the pointer in its layer color while you are not dragging. 使用选择工具且未拖动时,用图层颜色勾勒指针下未选中的对象。 + Shows the size or angle next to the pointer while you scale, rotate, shear or reflect art. 缩放、旋转、倾斜或镜像图稿时,在指针旁显示尺寸或角度。 + While you draw, points snap to lines at the chosen Angles through the point the segment or shape starts from. 绘制时,点会吸附到经过线段或形状起点、按所选角度延伸的线上。 + The set of angles the construction guides follow while Construction Guides is on. 构造参考线开启时,构造参考线所遵循的角度组合。 + Names what a point snaps to, such as an anchor, a path or an alignment; off, points snap the same way without the names. 显示点吸附到的对象名称,如锚点、路径或对齐;关闭时点仍以相同方式吸附,只是不显示名称。 + Shows distances, angles and how far art has moved next to the pointer while you draw or move it. 绘制或移动时,在指针旁显示距离、角度和图稿移动的距离。 + Snaps moved or resized art to the same gap as between nearby objects, and marks the equal gaps. 将移动或调整大小的图稿吸附到与附近对象之间相同的间距,并标出相等的间距。 + With something selected, holding Alt/Option over another object or an artboard shows the distances between it and the selection. 选中对象后,在另一个对象或画板上按住 Alt/Option 会显示它与所选对象之间的距离。 + A selection dragged back to within the Snapping Tolerance of where the drag began goes back to exactly that place; a copy does not. 拖回到距拖动起点吸附容差以内的所选对象会精确回到原处;副本不会。 + How near on screen the pointer or a dragged point must come to art for Smart Guides to snap to it; the distance is the same at every zoom. 指针或拖动的点在屏幕上需离图稿多近,智能参考线才会吸附;该距离在任何缩放比例下都相同。 + Snaps the end of a line segment, or a circle drawn from its center, so that it touches a nearby curve. 吸附线段的端点或从中心绘制的圆,使其与附近的曲线相切。 + Snaps the end of a line segment so that it meets a nearby straight segment at a right angle. 吸附线段的端点,使其与附近的直线段成直角相交。 Reset all preferences to their defaults? 将所有首选项重置为默认值? The defaults are applied when you click OK in Preferences. Cancel there keeps your current preferences. 在首选项中点击确定后才会应用默认值。在那里点击取消会保留当前首选项。 Restore Recovered Documents 恢复已恢复的文档 @@ -4829,6 +4922,11 @@ imageTrace Outline 轮廓 @msg 1 hidden object 1 个隐藏的对象 @msg {n} hidden objects {n} 个隐藏的对象 @msg Preview in Browser needs the desktop app (the web downloads files instead) “在浏览器中预览”需要桌面应用 (网页版会改为下载文件) +@msg give `desiredK`, the desired file size in K (1024 bytes): a number above 0 and at most 1048576 请给出 `desiredK`,即以 K (1024 字节) 为单位的所需文件大小:大于 0 且不超过 1048576 的数字 +@msg `startWith` is `current` or `auto` `startWith` 为 `current` 或 `auto` +@msg `use` is `allSlices`, `eachSlice` or `currentSlice` `use` 为 `allSlices`、`eachSlice` 或 `currentSlice` +@msg `slice` is a slice number from `slice.list`, with `use: currentSlice` `slice` 是 `slice.list` 中的切片编号,需配合 `use: currentSlice` +@msg Optimize to File Size: there is no image to measure 优化到文件大小:没有可测量的图像 @msg no file system here 此处没有文件系统 @msg nothing to preview 没有可预览的内容 @msg Saved {n} files beside {path} 已在 {path} 旁保存 {n} 个文件 @@ -6173,6 +6271,19 @@ lighting Light 光源 Transform Objects 变换对象 @msg unknown parameter `{key}`; did you mean `{near}`? 未知参数 `{key}`;您是否想输入 `{near}`? @msg unknown parameter `{key}`; the command takes no parameters 未知参数 `{key}`;该命令没有参数 +@msg unknown parameter `{key}`; `{object}` takes: {keys} 未知参数 `{key}`;`{object}` 接受:{keys} +@msg unknown parameter `{key}`; {why_not} 未知参数 `{key}`;{why_not} +@msg no format takes it (see document.formats) 没有格式接受它 (参见 document.formats) +@msg no save format takes it (see file.formatOptions) 没有存储格式接受它 (参见 file.formatOptions) +@msg PDF doesn't take it (see document.formats) PDF 不接受它 (参见 document.formats) +@msg EPS doesn't take it (see document.formats) EPS 不接受它 (参见 document.formats) +@msg DXF doesn't take it (see document.formats) DXF 不接受它 (参见 document.formats) +@msg {name} must be {range} (got {v}) {name} 必须为 {range} (实际为 {v}) +@msg The graphics processor tried first couldn't show the window, so VectorCraft started again on {summary} (Settings › Performance › Graphics Processor › Automatic uses the one that drives your display) 首先尝试的图形处理器无法显示窗口,因此 VectorCraft 已在 {summary} 上重新启动 (设置 › 性能 › 图形处理器 › 自动 会使用驱动显示器的处理器) +@msg Sent “{title}” to {to} 已将 “{title}” 发送到 {to} +@msg Sent “{title}” to {to}. The spooler replied: {note} 已将 “{title}” 发送到 {to}。打印队列的回复:{note} +@msg the default printer 默认打印机 +@msg raster effects on object {object}: requested {requested} ppi, achieved {achieved} ppi due to the 64 million pixel cap 对象 {object} 上的栅格效果:请求 {requested} ppi,受 6400 万像素上限限制,实际为 {achieved} ppi @msg unknown parameter `{key}`; the command takes: {keys} 未知参数 `{key}`;该命令接受:{keys} @msg the params must be an object, not {got} 参数必须是对象,而不是 {got} @msg unknown parameter `{path}`; the object takes no keys 未知参数 `{path}`;该对象不接受任何键 @@ -7657,6 +7768,11 @@ breakText Glyphs 字形 @msg Some islands could not be joined to the area around the art 部分孤岛无法连接到图稿周围的区域 @msg `width` must be from {lo} to {hi} pt `width` 必须介于 {lo} 到 {hi} pt 之间 @msg `angle` must be from -180 to 180 degrees `angle` 必须介于 -180 到 180 度之间 +@msg `roundness` must be from 0 to 100% `roundness` 必须介于 0 到 100% 之间 +@msg `fidelity` must be from 0.01 to 100 pt `fidelity` 必须介于 0.01 到 100 pt 之间 +@msg style must be "pencil" or "brush" style 必须为 "pencil" 或 "brush" +@msg extend end must be "start" or "end" extend 的端点必须为 "start" 或 "end" +@msg connect end must be "start" or "end" connect 的端点必须为 "start" 或 "end" @msg `roundness` must be from 1 to 100% `roundness` 必须介于 1 到 100% 之间 @msg `count` must be a whole number from 1 to {MAX_BRIDGES_PER_ISLAND} `count` 必须是 1 到 {MAX_BRIDGES_PER_ISLAND} 之间的整数 Weed Box and Lines… 除废框和除废线… @@ -8054,8 +8170,6 @@ breakText Glyphs 字形 @msg unknown dither `{d}` (diffusion, pattern, noise or none) 未知的仿色 `{d}` (diffusion、pattern、noise 或 none) @msg unknown panel `{panel}` 未知的面板 `{panel}` @msg unknown parameter `{key}` 未知的参数 `{key}` -@msg unknown parameter `{within}settings.{format}`; {why} 未知的参数 `{within}settings.{format}`;{why} -@msg unknown parameter `{within}{key}`; {why} 未知的参数 `{within}{key}`;{why} @msg unknown reduction `{reduction}` (selective, perceptual, adaptive, web, gray, blackWhite, uniform or document) 未知的减色方式 `{reduction}` (selective、perceptual、adaptive、web、gray、blackWhite、uniform 或 document) @msg unmatched ')' 不匹配的 ')' @msg unterminated character class 字符类没有结束 @@ -8427,7 +8541,6 @@ breakText Glyphs 字形 @msg anchor `smooth` must be true or false 锚点的 `smooth` 必须为 true 或 false @msg anchor `{key}` must be [x, y] 锚点的 `{key}` 必须是 [x, y] @msg anchor `{key}` must be a number 锚点的 `{key}` 必须是数字 -@msg angle and roundness must be finite angle 和 roundness 必须是有限值 @msg angles must be a list as long as pins (degrees or null) angles 必须是与 pins 等长的列表 (度数或 null) @msg appearance must be flat|center|edge appearance 必须是 flat|center|edge @msg apply is "fill" or "stroke", not `{other}` apply 为 "fill" 或 "stroke",不能是 `{other}` @@ -9477,7 +9590,6 @@ breakText Glyphs 字形 @msg {label} must be a number from 1 to 10000 {label} 必须是 1 到 10000 之间的数字 @msg {name} `{s}`: {ids} {name} `{s}`:{ids} @msg {name} is built in and can't be deleted {name} 是内置项,不能删除 -@msg {name} must be {lo}–{hi}{unit} (got {v}) {name} 必须为 {lo}–{hi}{unit} (实际为 {v}) @msg {name}: CRC or size mismatch {name}:CRC 或大小不匹配 @msg {name}: only this Affinity file's embedded preview could be read; use File › Open to see it with its warning, or export SVG or PDF from Affinity before placing {name}:只能读取此 Affinity 文件的嵌入预览;请使用 文件 › 打开 查看预览及其警告,或在置入前先从 Affinity 导出 SVG 或 PDF @msg {name}: {e} {name}:{e} diff --git a/crates/ui-egui/src/i18n/zh-hant.tsv b/crates/ui-egui/src/i18n/zh-hant.tsv index 08b0868041..f62665063d 100644 --- a/crates/ui-egui/src/i18n/zh-hant.tsv +++ b/crates/ui-egui/src/i18n/zh-hant.tsv @@ -163,6 +163,8 @@ antiAlias Sharp 銳利 Crisp 清晰 Strong 強 Anti-aliasing: 消除鋸齒: + Art Optimized 圖稿最佳化 + Type Optimized 文字最佳化 Any Kind 所有類型 Font Technology 字體技術 font-technology Variable 可變 @@ -569,6 +571,7 @@ font-technology Variable 可變 Consolidate All Windows 合併所有視窗 Constrain Angle 強制角度 Constrain Width and Height Proportions 強制寬度與高度比例 + Copy Width to Height 將寬度複製到高度 Construction Guides 建構參考線 Contextual Alternates 前後關聯替代字 Contextual Task Bar 快捷工作列 @@ -579,6 +582,8 @@ font-technology Variable 可變 Control 控制 Convert 轉換 Convert All Spot Colors to Process 將所有特別色轉換為印刷色 + Convert {name} to process 將 {name} 轉換為印刷色 + Keep {name} as spot 將 {name} 保留為特別色 Convert All Strokes to Outlines 將所有筆畫轉換為外框 Convert All Text to Outlines 將所有文字轉換為外框 Convert Anchor Point 轉換錨點 @@ -654,6 +659,9 @@ font-technology Variable 可變 Create from Selection 從選取範圍建立 Create From: 建立來源: Create Gradient Mesh… 建立漸層網格… + Flat 平面 + To Center 向中心 + To Edge 向邊緣 Create Graph 建立圖表 Create New Layer 建立新圖層 Create New Sublayer 建立新子圖層 @@ -2449,6 +2457,11 @@ file-filter Templates 範本 @msg 1 hidden object 1 個隱藏的物件 @msg {n} hidden objects {n} 個隱藏的物件 @msg Preview in Browser needs the desktop app (the web downloads files instead) 「在瀏覽器中預覽」需要桌面應用程式 (網頁版會改為下載檔案) +@msg give `desiredK`, the desired file size in K (1024 bytes): a number above 0 and at most 1048576 請提供 `desiredK`,即以 K (1024 位元組) 為單位的所需檔案大小:大於 0 且不超過 1048576 的數字 +@msg `startWith` is `current` or `auto` `startWith` 為 `current` 或 `auto` +@msg `use` is `allSlices`, `eachSlice` or `currentSlice` `use` 為 `allSlices`、`eachSlice` 或 `currentSlice` +@msg `slice` is a slice number from `slice.list`, with `use: currentSlice` `slice` 是 `slice.list` 中的切片編號,需搭配 `use: currentSlice` +@msg Optimize to File Size: there is no image to measure 最佳化至檔案大小:沒有可測量的影像 @msg no file system here 此處沒有檔案系統 @msg nothing to preview 沒有可預覽的內容 @msg Saved {n} files beside {path} 已在 {path} 旁儲存 {n} 個檔案 @@ -3885,6 +3898,18 @@ diagnostics ui 介面 Preview: 預覽: Preview All Layers 預覽所有圖層 Preview in Browser 在瀏覽器中預覽 + Optimize to File Size… 最佳化至檔案大小… + Optimize to File Size 最佳化至檔案大小 + Desired File Size: 所需檔案大小: + Start With: 起始設定: + Use: 使用: + Current Settings 目前設定 + Auto Select GIF/JPEG 自動選取 GIF/JPEG + Total of All Slices 所有切片總計 + Each Slice 每個切片 + Current Slice 目前切片 + {size}, within {target} {size},不超過 {target} + No setting tried fits in {target}; the smallest is {size} 嘗試過的設定都無法小於 {target};最小為 {size} Preview in Browser needs the desktop app (the web downloads files instead) 在瀏覽器中預覽需要桌面版應用程式 (網頁版會改為下載檔案) Preview Mode 預覽模式 Preview the document as it is now 以目前狀態預覽文件 @@ -4236,12 +4261,85 @@ digits Malayalam 馬來亞拉姆數字 Responsive 回應式 Restore 還原 Restore every preference to its default (applied on OK) 將所有偏好設定還原為預設值 (按下確定後套用) + Shows a bar of commands for the selection or tool on the canvas; it hides while you drag and in Presentation Mode. 在畫布上顯示適用於選取範圍或工具的指令列;拖曳時和簡報模式下會隱藏。 + How far an arrow key moves the selection; with Shift, it moves ten times as far. 按一次方向鍵移動選取範圍的距離;按住 Shift 時移動十倍距離。 + The angle of the axes that arrow keys move along and that Shift holds drawing and moving to. 方向鍵沿其移動、Shift 將繪製和移動限制在其上的座標軸角度。 + The corner radius the Rounded Rectangle tool draws with; changing the radius while drawing changes this value too. 圓角矩形工具繪製時使用的圓角半徑;在繪製時變更半徑也會變更此值。 + How far right and down Paste moves the copy when it is given no position, as from a script; Paste in the app centers it in the view. 未指定位置時(例如從指令碼貼上),貼上將拷貝向右和向下移動的距離;在應用程式中貼上會把拷貝放在檢視中央。 + Stops the Pen tool from deleting the anchor you click on a selected path, or adding one where you click its segment. 防止筆型工具刪除在選取路徑上按下的錨點,或在按下路徑區段的位置新增錨點。 + Drawing tools show a crosshair pointer instead of their icon; Caps Lock does the same while it is on. 繪圖工具顯示十字指標而不是工具圖示;Caps Lock 開啟時效果相同。 + Shows a tip when the pointer rests on a button or field that has one. 指標停在有提示的按鈕或欄位上時顯示提示。 + Shows a warning before a script you choose runs. 在你選擇的指令碼執行前顯示警告。 + Smooths the edges of artwork on the canvas. 使畫布上圖稿的邊緣平滑。 + Select › Same › Fill Color, Stroke Color and Fill & Stroke match only the same tint of a global or spot swatch, not any tint of it. 選取 › 相同 › 填色顏色、筆畫顏色和填色與筆畫只符合全域色票或特別色色票的相同色調,而不是其任意色調。 + Shows the Home screen when no document is open; off, the window stays empty until you click Home. 沒有開啟文件時顯示首頁畫面;關閉時,視窗保持空白,直到你按下首頁。 + Measures objects with their strokes and shape-changing effects for size, position and alignment; shadows, glows and blurs are not measured. 在尺寸、位置和對齊中依物件的筆畫和改變形狀的效果測量物件;陰影、光暈和模糊不計入測量。 + At 100% zoom, one inch of the document takes 96 screen points instead of 72. 縮放為 100% 時,文件的一英吋佔 96 個螢幕點,而不是 72 個。 + Double-clicking a group, path or image with the Selection tool opens it in isolation mode. 用選取工具按兩下群組、路徑或影像時,會在隔離模式中開啟它。 + Pattern fills and strokes transform with the art, unless a transform or the Transform panel's menu chooses otherwise. 圖樣填色和筆畫隨圖稿一起變形,除非變形指令或變形面板的選單另有選擇。 + Live corner radii scale with the art, unless the scale chooses otherwise. 即時轉角半徑隨圖稿一起縮放,除非縮放指令另有選擇。 + Stroke weights, dashes and effect distances scale with the art, unless the scale chooses otherwise. 筆畫寬度、虛線和效果距離隨圖稿一起縮放,除非縮放指令另有選擇。 + The mouse wheel zooms the canvas instead of scrolling it. 滑鼠滾輪縮放畫布,而不是捲動畫布。 + The mouse wheel with Cmd/Ctrl held scrolls the canvas sideways. 按住 Cmd/Ctrl 捲動滑鼠滾輪會橫向捲動畫布。 + Dragging sideways on a numeric field's label changes the field's value. 在數值欄位的標籤上橫向拖曳可變更欄位的值。 + A two-finger rotate gesture on a trackpad rotates the canvas view. 在觸控式軌跡板上以雙指旋轉手勢可旋轉畫布檢視。 + Holding a tool's shortcut key chooses the tool until you let go, and then the previous tool is chosen again. 按住工具的快速鍵時選擇該工具,放開後重新選擇之前的工具。 + Shows the bounding box while you move the selection or draw a shape. 移動選取範圍或繪製形狀時顯示邊框。 + Create Trim Marks draws Japanese-style marks instead of Roman ones. 建立剪裁標記繪製日式標記,而不是西式標記。 + New art takes only the fill and stroke of the selection; off, it takes the selected object's whole appearance. 新圖稿只採用選取範圍的填色和筆畫;關閉時,採用選取物件的全部外觀。 + Changing the width or height in the Transform panel, the Properties panel or the Control bar changes the other in proportion. 在變形面板、內容面板或控制列中變更寬度或高度時,另一項依比例變更。 + A live rectangle's properties show one Corner Radius field for all four corners; off, each corner has its own field. 即時矩形的屬性中為四個角顯示一個圓角半徑欄位;關閉時,每個角都有自己的欄位。 + What edits in the Transform panel transform: the object, its pattern tiles or both; Default follows Transform Pattern Tiles. 變形面板中的編輯所變形的內容:物件、其圖樣拼貼或兩者;預設依照變形圖樣拼貼。 + With one symbol instance selected, the Transform panel uses the symbol's registration point as its reference point. 選取一個符號實體時,變形面板使用符號的註冊點作為參考點。 + Darkens the canvas outside the artboards while the Artboard tool is active. 使用工作區域工具時調暗工作區域以外的畫布。 + With Fade Region Outside Artboard on, the area outside the artboards stays dark while you drag with the Artboard tool. 調暗工作區域外的區域開啟時,用工作區域工具拖曳期間工作區域以外的區域保持變暗。 + How near, in pixels, the pointer must be to an object, anchor or handle for a click to select it. 按一下時,指標需距離物件、錨點或控制把手多少像素以內才能選取它。 + Whether the Selection tool's box selects objects it touches or only those fully inside; Drag Direction selects those inside on a drag to the right. E reverses it mid-drag. 選取工具的框選取它接觸到的物件,還是只選取完全在框內的物件;拖曳方向在向右拖曳時選取框內的物件。拖曳時按 E 可反轉規則。 + A click selects a filled object only on its path, not inside its fill. 按一下只在填色物件的路徑上選取它,而不是在填色內部。 + How near, in pixels, a point must come to an anchor or ruler guide for Snap to Point to snap it; with Smart Guides on, Smart Guides' Snapping Tolerance applies instead. 點需距離錨點或尺標參考線多少像素以內,靠齊控制點才會讓它靠齊;開啟智慧型參考線時改用智慧型參考線的靠齊容許度。 + With the Selection tool, Cmd/Ctrl-click selects the object under the selected one at the pointer; each further click goes one object deeper. 使用選取工具時,按住 Cmd/Ctrl 並按一下會選取指標處所選物件下方的物件;每再按一下就再往下一個物件。 + Zoom In and Zoom Out bring the center of the selection to the middle of the view. 放大顯示和縮小顯示會將選取範圍的中心移到檢視中央。 + Locked and hidden artwork inside an artboard moves, scales and is copied with the artboard, as the other artwork does. 工作區域內鎖定和隱藏的圖稿會像其他圖稿一樣隨工作區域移動、縮放和複製。 + The size of anchor points and direction handle ends on the canvas; larger anchors can also be picked from farther away. 畫布上錨點和方向控制把手端點的大小;錨點越大,也能從越遠處抓取。 + Draws the ends of direction handles as solid dots, hollow dots or larger solid dots. 將方向控制把手的端點繪製為實心點、空心點或較大的實心點。 + With the Direct Selection tool, the anchor under the pointer is highlighted. 使用直接選取工具時,指標下方的錨點會醒目提示。 + Shows direction handles when more than one anchor is selected; off, they show only while a single anchor is selected. 選取多個錨點時顯示方向控制把手;關閉時,僅在只選取一個錨點時顯示。 + Corner widgets hide on corners whose angle is greater than this many degrees. 角度大於此度數的轉角上隱藏轉角 Widget。 + The Pen tool previews the next segment from the last anchor to the pointer before you click. 按一下之前,筆型工具會預覽從最後一個錨點到指標的下一個區段。 + The Curvature tool previews the curve to the pointer before you place the next point. 放置下一個點之前,曲線工具會預覽到指標的曲線。 The unit for new documents from built-in sizes other than pixel sizes and for opened files that record no unit; choosing one here and clicking OK also sets the active document's units. 除像素尺寸外,以內建尺寸新增的文件及未記錄單位的已開啟檔案使用此單位;在此選擇並按下確定,也會變更目前文件的單位。 Stroke weights, dashes and gaps show in this unit, and numbers typed for them are read in it. 筆畫寬度、虛線和間隙以此單位顯示,為其輸入的數字也以此單位讀取。 Type sizes, leading and baseline shift show in this unit, and numbers typed for them are read in it. 字體大小、行距和基線位移以此單位顯示,為其輸入的數字也以此單位讀取。 The unit for East Asian type measurements, which no field uses yet. 用於東亞文字度量的單位,目前還沒有欄位使用。 When on, a number typed without a unit into a field in picas is read in points. 開啟後,在以派卡為單位的欄位中輸入的不含單位數字以點讀取。 With XML ID, object names show as XML IDs in the Layers panel, the Variables panel and Layer Options. 選擇 XML ID 時,圖層、變數和圖層選項中的物件名稱會顯示為 XML ID。 + Snaps drawing, moving and scaling to the grid's subdivisions, even while the grid is hidden; while it is on, Snap to Pixel does not apply. 即使格點已隱藏,繪製、移動和縮放仍會靠齊格點的細分;開啟期間,「靠齊像素」不會作用。 + The color of guides that are not selected; an artboard with a Guide Label draws its own guides in the label's color instead. 未選取參考線的顏色;設定了參考線標籤的工作區域會以標籤顏色繪製自己的參考線。 + Draws guides as solid lines or as dots, including the guides already in the document. 將參考線繪製為實線或點,包括文件中已有的參考線。 + With this on, guides are locked when VectorCraft starts; changing this option locks or unlocks them at once, and View › Guides › Lock Guides still changes the lock. 開啟後,VectorCraft 啟動時參考線為鎖定狀態;變更此選項會立即鎖定或解除鎖定參考線,「檢視 › 參考線 › 鎖定參考線」仍可變更鎖定狀態。 + With this on, holding Cmd/Ctrl as you start dragging from a ruler makes a guide on the active artboard only, or a canvas guide with the Artboard tool. 開啟後,從尺標開始拖曳時按住 Cmd/Ctrl,只會在作用中的工作區域上建立參考線;使用工作區域工具時則建立貫穿整個畫布的參考線。 + The color of the grid; the lines between major gridlines are drawn in a fainter shade of it. 格點的顏色;主要格線之間的線條會以該顏色較淡的色調繪製。 + Draws the grid as lines, or as dots along the major gridlines at each subdivision. 將格點繪製為線條,或在每個細分處沿主要格線繪製為點。 + The distance between major gridlines, in every open document and in new ones; a VectorCraft document opens with the grid it was saved with. 所有已開啟文件和新文件中主要格線之間的距離;VectorCraft 文件開啟時會使用儲存時的格點。 + How many parts each major grid square is divided into; Snap to Grid snaps to these parts, even when the zoom hides their lines. 每個主要格點方格分成幾份;即使縮放使這些線條不顯示,「靠齊格點」仍會靠齊這些分格。 + Draws the grid behind the artwork; off, the grid is drawn over it. 將格點繪製在圖稿後方;關閉時格點繪製在圖稿上方。 + In Pixel Preview at 600% zoom or more, the active view shows a line at the edge of every document pixel over the artwork. 在像素預視中縮放至 600% 以上時,作用中的檢視會在圖稿上方沿文件每個像素的邊緣顯示線條。 + The color of the tile edge and the dashed swatch bounds shown while you edit a pattern. 編輯圖樣時顯示的拼貼邊緣和虛線色票邊界的顏色。 + Snaps drawing, moving and transforming to nearby art and shows guides and labels; Pixel Preview turns them off, and Snap to Grid snaps to the grid instead. 將繪製、移動和變形靠齊到附近的圖稿,並顯示參考線和標籤;像素預視會將其關閉,開啟靠齊格點時則改為靠齊格點。 + The color of Smart Guide lines and labels. 智慧型參考線的線條和標籤顏色。 + Shows a line along the edge or center that art lines up with; off, art still lines up without the line, and Snap to Glyph does not apply. 沿著圖稿對齊的邊緣或中心顯示一條線;關閉時圖稿仍會對齊,只是不顯示線條,且靠齊字符不會作用。 + With a selection tool, outlines the unselected object under the pointer in its layer color while you are not dragging. 使用選取工具且未拖曳時,以圖層顏色描出指標下未選取物件的外框。 + Shows the size or angle next to the pointer while you scale, rotate, shear or reflect art. 縮放、旋轉、傾斜或鏡射圖稿時,在指標旁顯示尺寸或角度。 + While you draw, points snap to lines at the chosen Angles through the point the segment or shape starts from. 繪製時,點會靠齊到通過線段或形狀起點、依所選角度延伸的線上。 + The set of angles the construction guides follow while Construction Guides is on. 建構參考線開啟時,建構參考線所依循的角度組合。 + Names what a point snaps to, such as an anchor, a path or an alignment; off, points snap the same way without the names. 顯示點靠齊的對象名稱,例如錨點、路徑或對齊;關閉時點仍以相同方式靠齊,只是不顯示名稱。 + Shows distances, angles and how far art has moved next to the pointer while you draw or move it. 繪製或移動時,在指標旁顯示距離、角度和圖稿移動的距離。 + Snaps moved or resized art to the same gap as between nearby objects, and marks the equal gaps. 將移動或調整大小的圖稿靠齊到與附近物件之間相同的間距,並標示相等的間距。 + With something selected, holding Alt/Option over another object or an artboard shows the distances between it and the selection. 選取物件後,在另一個物件或工作區域上按住 Alt/Option 會顯示它與選取範圍之間的距離。 + A selection dragged back to within the Snapping Tolerance of where the drag began goes back to exactly that place; a copy does not. 拖回到距拖曳起點靠齊容許度以內的選取範圍會精確回到原處;複製的物件不會。 + How near on screen the pointer or a dragged point must come to art for Smart Guides to snap to it; the distance is the same at every zoom. 指標或拖曳的點在螢幕上需離圖稿多近,智慧型參考線才會靠齊;此距離在任何縮放比例下都相同。 + Snaps the end of a line segment, or a circle drawn from its center, so that it touches a nearby curve. 靠齊線段的端點或從中心繪製的圓,使其與附近的曲線相切。 + Snaps the end of a line segment so that it meets a nearby straight segment at a right angle. 靠齊線段的端點,使其與附近的直線段成直角相交。 Reset all preferences to their defaults? 要將所有偏好設定重設為預設值嗎? The defaults are applied when you click OK in Preferences. Cancel there keeps your current preferences. 在偏好設定中按下確定後才會套用預設值。在那裡按下取消會保留目前的偏好設定。 Restore Recovered Documents 還原找回的文件 @@ -6009,6 +6107,19 @@ lighting Light 光源 Transform Objects 變形物件 @msg unknown parameter `{key}`; did you mean `{near}`? 未知的參數 `{key}`;您是指 `{near}` 嗎? @msg unknown parameter `{key}`; the command takes no parameters 未知的參數 `{key}`;此指令沒有參數 +@msg unknown parameter `{key}`; `{object}` takes: {keys} 未知的參數 `{key}`;`{object}` 接受:{keys} +@msg unknown parameter `{key}`; {why_not} 未知的參數 `{key}`;{why_not} +@msg no format takes it (see document.formats) 沒有格式接受它 (請參閱 document.formats) +@msg no save format takes it (see file.formatOptions) 沒有儲存格式接受它 (請參閱 file.formatOptions) +@msg PDF doesn't take it (see document.formats) PDF 不接受它 (請參閱 document.formats) +@msg EPS doesn't take it (see document.formats) EPS 不接受它 (請參閱 document.formats) +@msg DXF doesn't take it (see document.formats) DXF 不接受它 (請參閱 document.formats) +@msg {name} must be {range} (got {v}) {name} 必須為 {range} (收到 {v}) +@msg The graphics processor tried first couldn't show the window, so VectorCraft started again on {summary} (Settings › Performance › Graphics Processor › Automatic uses the one that drives your display) 最先嘗試的圖形處理器無法顯示視窗,因此 VectorCraft 已改在 {summary} 上重新啟動 (設定 › 效能 › 圖形處理器 › 自動 會使用驅動顯示器的處理器) +@msg Sent “{title}” to {to} 已將 “{title}” 傳送至 {to} +@msg Sent “{title}” to {to}. The spooler replied: {note} 已將 “{title}” 傳送至 {to}。列印佇列的回覆:{note} +@msg the default printer 預設印表機 +@msg raster effects on object {object}: requested {requested} ppi, achieved {achieved} ppi due to the 64 million pixel cap 物件 {object} 上的點陣效果:要求 {requested} ppi,受 6400 萬像素上限限制,實際為 {achieved} ppi @msg unknown parameter `{key}`; the command takes: {keys} 未知的參數 `{key}`;此指令接受:{keys} @msg the params must be an object, not {got} 參數必須是物件,而不是 {got} @msg unknown parameter `{path}`; the object takes no keys 未知的參數 `{path}`;此物件不接受任何鍵 @@ -7466,6 +7577,11 @@ breakText Glyphs 字符 @msg Some islands could not be joined to the area around the art 部分孤島無法連接到圖稿周圍的區域 @msg `width` must be from {lo} to {hi} pt `width` 必須介於 {lo} 到 {hi} pt 之間 @msg `angle` must be from -180 to 180 degrees `angle` 必須介於 -180 到 180 度之間 +@msg `roundness` must be from 0 to 100% `roundness` 必須介於 0 到 100% 之間 +@msg `fidelity` must be from 0.01 to 100 pt `fidelity` 必須介於 0.01 到 100 pt 之間 +@msg style must be "pencil" or "brush" style 必須為 "pencil" 或 "brush" +@msg extend end must be "start" or "end" extend 的端點必須為 "start" 或 "end" +@msg connect end must be "start" or "end" connect 的端點必須為 "start" 或 "end" @msg `roundness` must be from 1 to 100% `roundness` 必須介於 1 到 100% 之間 @msg `count` must be a whole number from 1 to {MAX_BRIDGES_PER_ISLAND} `count` 必須是介於 1 到 {MAX_BRIDGES_PER_ISLAND} 的整數 Weed Box and Lines… 除廢框與除廢線… @@ -7983,8 +8099,6 @@ breakText Glyphs 字符 @msg unknown dither `{d}` (diffusion, pattern, noise or none) 未知的仿色 `{d}` (diffusion、pattern、noise 或 none) @msg unknown panel `{panel}` 未知的面板 `{panel}` @msg unknown parameter `{key}` 未知的參數 `{key}` -@msg unknown parameter `{within}settings.{format}`; {why} 未知的參數 `{within}settings.{format}`;{why} -@msg unknown parameter `{within}{key}`; {why} 未知的參數 `{within}{key}`;{why} @msg unknown reduction `{reduction}` (selective, perceptual, adaptive, web, gray, blackWhite, uniform or document) 未知的縮減 `{reduction}` (selective、perceptual、adaptive、web、gray、blackWhite、uniform 或 document) @msg unmatched ')' 不成對的 ')' @msg unterminated character class 字元類別未結束 @@ -8356,7 +8470,6 @@ breakText Glyphs 字符 @msg anchor `smooth` must be true or false 錨點的 `smooth` 必須是 true 或 false @msg anchor `{key}` must be [x, y] 錨點的 `{key}` 必須是 [x, y] @msg anchor `{key}` must be a number 錨點的 `{key}` 必須是數字 -@msg angle and roundness must be finite angle 和 roundness 必須是有限值 @msg angles must be a list as long as pins (degrees or null) angles 必須是與 pins 等長的清單 (度數或 null) @msg appearance must be flat|center|edge appearance 必須是 flat|center|edge @msg apply is "fill" or "stroke", not `{other}` apply 是 "fill" 或 "stroke",而非 `{other}` @@ -9407,7 +9520,6 @@ breakText Glyphs 字符 @msg {label} must be a number from 1 to 10000 {label} 必須是 1 到 10000 之間的數字 @msg {name} `{s}`: {ids} {name} `{s}`:{ids} @msg {name} is built in and can't be deleted {name} 是內建項目,無法刪除 -@msg {name} must be {lo}–{hi}{unit} (got {v}) {name} 必須是 {lo}–{hi}{unit} (收到 {v}) @msg {name}: CRC or size mismatch {name}:CRC 或大小不相符 @msg {name}: only this Affinity file's embedded preview could be read; use File › Open to see it with its warning, or export SVG or PDF from Affinity before placing {name}:只能讀取此 Affinity 檔案的內嵌預視;請使用「檔案 › 開啟」查看它及其警告,或在置入前先從 Affinity 匯出 SVG 或 PDF @msg {name}: {e} {name}:{e} diff --git a/crates/ui-egui/src/menus/ui_commands.rs b/crates/ui-egui/src/menus/ui_commands.rs index 1cdd190fc5..677b804720 100644 --- a/crates/ui-egui/src/menus/ui_commands.rs +++ b/crates/ui-egui/src/menus/ui_commands.rs @@ -1337,7 +1337,7 @@ pub const UI_COMMANDS: &[(&str, &str, &str, &str)] = &[ "ui.dialogReset", "Reset", "", - "{} the open dialog's Reset, which its Cancel button reads while Alt (Option on macOS) is held (Flare Tool Options, dialog `flareOptions`): its fields go back to their defaults and the dialog stays open, so OK applies them → the dialog; an error when no dialog is open or the open one has no Reset", + "{} the open dialog's Reset, which its Cancel button reads while Alt (Option on macOS) is held (Flare Tool Options, dialog `flareOptions`; Save PDF, dialog `savePdf`): its fields go back to their defaults (Save PDF: the chosen preset's settings, with the path and artboards kept) and the dialog stays open, so OK applies them → the dialog; an error when no dialog is open, the open one has no Reset, or Save PDF's chosen preset was deleted (the fields stay as they are)", ), ( "ui.justification", diff --git a/crates/ui-egui/src/panel_docking/native_tests.rs b/crates/ui-egui/src/panel_docking/native_tests.rs index 368f7ebae8..23bce58d10 100644 --- a/crates/ui-egui/src/panel_docking/native_tests.rs +++ b/crates/ui-egui/src/panel_docking/native_tests.rs @@ -527,8 +527,8 @@ fn reopened(saved: &craft_ui::docking::Layout<String>, monitors: &[crate::DockMo /// Two monitors side by side, with the main window on the left one (#5582). #[test] fn a_floating_panel_reopens_on_the_monitor_where_it_was_left() { - let left = crate::DockMonitor { name: Some("left".into()), rect: [0.0, 0.0, 1920.0, 1080.0], scale: 1.0 }; - let right = crate::DockMonitor { name: Some("right".into()), rect: [1920.0, 0.0, 1920.0, 1080.0], scale: 1.0 }; + let left = crate::DockMonitor { name: Some("left".into()), rect: [0.0, 0.0, 1920.0, 1080.0], scale: 1.0, work_area: None }; + let right = crate::DockMonitor { name: Some("right".into()), rect: [1920.0, 0.0, 1920.0, 1080.0], scale: 1.0, work_area: None }; let both = [left.clone(), right.clone()]; let mut h = Harness::new(); diff --git a/crates/ui-egui/src/panels/asset_export.rs b/crates/ui-egui/src/panels/asset_export.rs index 3fe249b7e3..3b251ee6cc 100644 --- a/crates/ui-egui/src/panels/asset_export.rs +++ b/crates/ui-egui/src/panels/asset_export.rs @@ -230,6 +230,17 @@ fn collect(app: &mut VectorcraftApp, ctx: &egui::Context, ids: Option<Vec<NodeId } } +/// Does the export of 3D asset `asset` draw a texture for the graphics mapped onto its faces +/// ([`vectorcraft_engine::cmd::fileio::draws_textures`])? Only objects whose 3D effects map graphics +/// are built to find out. +fn writes_textures(doc: &vectorcraft_doc::Document, asset: &ExportAsset) -> bool { + let maps = |e: &vectorcraft_doc::Effect| e.visible && !vectorcraft_render::effects::mapped_graphics(&e.params).is_empty(); + let nodes: Vec<&Node> = asset.nodes.iter().filter_map(|id| doc.node(*id)).collect(); + nodes.iter().any(|n| n.appearance.effects.iter().chain(n.appearance.items.iter().flat_map(|i| i.effects())).any(maps)) + && vectorcraft_render::effects::three_d_meshes_of_in(Some(doc), nodes.iter().copied()) + .is_ok_and(|parts| vectorcraft_engine::cmd::fileio::draws_textures(doc, &parts)) +} + /// Export assets `ids` (`files_each`: the files one asset makes) into a picked folder (without a /// folder picker: the last folder Export for Screens used, else the Desktop); the web downloads /// them, several as one zip. @@ -240,11 +251,20 @@ fn export(app: &mut VectorcraftApp, ids: Vec<u64>, files_each: usize) { fn export_now(app: &mut VectorcraftApp, ids: Vec<u64>, files_each: usize) { // 3D assets are written as mesh files (`assets.export3D`), the others as pictures. + let web = io::is_web(app); let Some(st) = app.session.active() else { return }; let format = |id: &u64| st.doc.asset(*id).and_then(|a| a.format_3d.clone()); let (three_d, ids): (Vec<u64>, Vec<u64>) = ids.into_iter().partition(|id| format(id).is_some()); - // An OBJ is two files. - let mesh_files: usize = three_d.iter().map(|id| if format(id).as_deref() == Some("obj") { 2 } else { 1 }).sum(); + // An OBJ is two files, and an OBJ or a USDA whose graphics draw a texture writes it beside + // them. Only the web, which zips several files, needs the count. + let mesh_files: usize = three_d + .iter() + .map(|id| { + let format = format(id); + let textures = web && matches!(format.as_deref(), Some("obj" | "usda")) && st.doc.asset(*id).is_some_and(|a| writes_textures(&st.doc, a)); + usize::from(format.as_deref() == Some("obj")) + 1 + usize::from(textures) + }) + .sum(); // Create Sub-folders as the panel menu checks it: on by default, and remembered folders (per // row, format or item) are used as Export for Screens uses them (a remembered `subfolders` // false beside them would alone put every file in the folder itself). diff --git a/crates/ui-egui/src/panels/color.rs b/crates/ui-egui/src/panels/color.rs index 7756d18e8d..28fb618dc9 100644 --- a/crates/ui-egui/src/panels/color.rs +++ b/crates/ui-egui/src/panels/color.rs @@ -870,7 +870,7 @@ pub(crate) fn show_sized(app: &mut VectorcraftApp, ui: &mut Ui, height: f32) { } if let (Some((t, phase)), Some(tint)) = (tinted, tgt.tint()) { if phase == Live::Released { - super::color_guide::choose_base(app, tint.base.tinted(t)); + super::color_guide::choose_linked_base(app, tint.base.tinted(t), Some((tint.swatch.clone(), t))); } apply_tint(app, &tgt, tint, t, phase); } diff --git a/crates/ui-egui/src/panels/color_guide.rs b/crates/ui-egui/src/panels/color_guide.rs index bbc1d3db86..b13d00f1d1 100644 --- a/crates/ui-egui/src/panels/color_guide.rs +++ b/crates/ui-egui/src/panels/color_guide.rs @@ -10,34 +10,464 @@ //! Swatches saves as one group (without a selection, the group holds the harmony colors). The //! selection lasts until the guide changes. A harmony color or a cell dragged with the primary button //! carries its color alone, as shown, without applying it or changing the selection; the Swatches -//! panel makes a swatch of it. Limit to Library (the library button, +//! panel makes a swatch of it. When the base is a spot color, or a tint of one, chosen from the +//! Swatches panel, the Color panel's tint slider or the base chip ([`SpotBase`]), the cells right of +//! the center in the base row of Tints/Shades are tints of that spot color: a click applies the tint, +//! a drag carries it, and saving makes tint swatches linked to the spot color. Every other cell is +//! a process color. Limit to Library (the library button, //! `ui.colorGuideLimit`) snaps every colour to a swatch library or the document's swatches; Edit or //! Apply Colors opens Recolor Artwork with the harmony colours, limited the same way. use egui::{Rect, Sense, Ui, vec2}; use serde_json::{Value, json}; -use vectorcraft_color::harmony::{Guide, GuideOptions, Harmony, Variation}; +use vectorcraft_color::harmony::{self, Guide, GuideOptions, Harmony, Variation}; use vectorcraft_color::{Color, Paint}; use vectorcraft_engine::cmd::swatchlib; use super::swatches::{self, colour_libraries, limit_key, limit_name}; -use super::{active_paint, apply_click, c32, color_json, library_panel, pstate, set_pstate}; +use super::{active_paint, apply_click, c32, color_json, library_panel, paint_params, pstate, set_pstate}; use crate::VectorcraftApp; use crate::widgets::{self, PanelDrag, menu_item}; /// The base colour before one is set: an orange. const DEFAULT_BASE: Color = Color::Rgb { r: 230.0 / 255.0, g: 120.0 / 255.0, b: 40.0 / 255.0 }; -/// The guide's base color: the one last chosen or set with the base chip; before that, the current -/// color. +/// The spot color swatch the guide's base is a tint of (`UiState::color_guide_spot`). +#[derive(Clone, Debug, PartialEq)] +pub struct SpotBase { + /// The document the swatch belongs to (its `uid`). + pub doc: u64, + /// The spot color swatch's name. + pub swatch: String, + /// The base's tint of it, 0..1. + pub tint: f32, + /// The names it had before renames, oldest first (at most as many as the History panel keeps + /// states), for an Undo or Redo that gives it one of them back. + pub earlier: Vec<String>, + /// Its swatch went without a command the panel followed: the link waits for an Undo or Redo + /// ([`check_spot`]). + pub resting: bool, +} + +/// Whether `name` is a spot color of `doc`. +fn is_spot(doc: &vectorcraft_doc::Document, name: &str) -> bool { + doc.swatch(name).is_some_and(|w| w.spot) && doc.global_color(name).is_some() +} + +/// The spot color the base is a tint of, while its swatch is still a spot color of the active +/// document. +fn live_spot(app: &VectorcraftApp) -> Option<&SpotBase> { + let s = app.ui.color_guide_spot.as_ref()?; + let st = app.session.active()?; + (st.uid == s.doc && !s.resting && is_spot(&st.doc, &s.swatch)).then_some(s) +} + +/// The color of tint `tint` (0..1) of global swatch `name` in the active document. +fn tint_color(app: &VectorcraftApp, name: &str, tint: f32) -> Option<Color> { + app.session.active()?.doc.tint_paint(name, tint)?.color() +} + +/// The guide's base color: the one last chosen or set with the base chip (a spot color base +/// follows edits to its swatch); before that, the current color. pub(crate) fn base_color(app: &VectorcraftApp) -> Color { + if let Some(c) = live_spot(app).and_then(|s| tint_color(app, &s.swatch, s.tint)) { + return c; + } app.ui.color_guide_base.unwrap_or_else(|| active_paint(app).color().unwrap_or(DEFAULT_BASE)) } /// Make `c` the guide's base color: a color chosen in the Color panel, the Swatches panel or the /// Color Picker. A color applied from the guide itself leaves the base as it is. pub(crate) fn choose_base(app: &mut VectorcraftApp, c: Color) { + choose_linked_base(app, c, None); +} + +/// [`choose_base`] for a color linked to a global swatch at a tint (0..1): when that swatch is a +/// spot color of the active document, the base is that tint of it ([`SpotBase`]). +pub(crate) fn choose_linked_base(app: &mut VectorcraftApp, c: Color, link: Option<(String, f32)>) { app.ui.color_guide_base = Some(c); + app.ui.color_guide_spot = link.and_then(|(swatch, tint)| { + let st = app.session.active()?; + st.doc.swatch(&swatch).filter(|w| w.spot)?; + Some(SpotBase { doc: st.uid, swatch, tint: tint.clamp(0.0, 1.0), earlier: Vec::new(), resting: false }) + }); +} + +/// The spot color base before a command runs ([`before_command`]). +pub(crate) struct LinkBefore { + /// Its document is the active one. + active: bool, + /// The color group that holds its swatch. + group: Option<String>, + /// The color the guide shows as the base. + color: Option<Color>, + /// The open documents' `uid`s in order, while there is a spot color base. + docs: Vec<u64>, + /// The active document's index. + active_index: Option<usize>, +} + +/// The spot color base before a command runs, for [`after_command`]. +pub(crate) fn before_command(app: &VectorcraftApp) -> LinkBefore { + let s = app.ui.color_guide_spot.as_ref(); + let active = app.session.active().is_some_and(|st| s.is_some_and(|s| s.doc == st.uid)); + // Its document, active or not. + let st = s.and_then(|s| app.session.documents().iter().find(|d| d.uid == s.doc)); + let group = + st.zip(s).and_then(|(st, s)| st.doc.swatch_groups.iter().find(|g| g.swatches.iter().any(|w| w.name == s.swatch)).map(|g| g.name.clone())); + let docs = if s.is_some() { app.session.documents().iter().map(|d| d.uid).collect() } else { Vec::new() }; + // The color it shows: its swatch's tint in its document, while that is a spot color there and + // the link does not rest (a resting link shows the color it last showed). + let shown = st + .zip(s) + .filter(|(st, s)| !s.resting && st.doc.swatch(&s.swatch).is_some_and(|w| w.spot)) + .and_then(|(st, s)| st.doc.tint_paint(&s.swatch, s.tint)?.color()); + let color = s.map(|_| shown.unwrap_or_else(|| base_color(app))); + LinkBefore { active, group, color, docs, active_index: app.session.active_index() } +} + +/// Where the steps of a `command.batch` run, as far as the steps before each one show: new +/// documents open after the others and become the active one, and Close and Move Document shift +/// the documents after them. +struct BatchDocs { + /// The tab index of the base's document, when known. + base: Option<usize>, + /// The base's document was closed. + closed: bool, + /// The tab index of the active document, when known. + active: Option<usize>, + /// The number of open documents, when known. + len: Option<usize>, +} + +impl BatchDocs { + /// Whether the next step runs in the base's document, when that is known. + fn in_base(&self) -> Option<bool> { + if self.closed { + return Some(false); + } + Some(self.active? == self.base?) + } + + /// Follow step `id`, which ran with params `p` and replied `r`. + fn step(&mut self, id: &str, p: &Value, r: &Value) { + let index = |key: &str| p[key].as_u64().and_then(|i| usize::try_from(i).ok()); + // The tab index a step that opens a document replies with: a new one after the others, or + // one already open made active. + let opened = r["index"].as_u64().and_then(|i| usize::try_from(i).ok()); + match id { + "document.activate" => self.active = index("index"), + "file.new" | "file.newFromTemplate" | "edit.newDocumentFromState" => { + self.len = self.len.map(|n| n + 1); + self.active = opened.or(self.len.map(|n| n - 1)); + } + "file.close" | "document.close" => { + let i = index("index").or(self.active); + let len = self.len.map(|n| n.saturating_sub(1)); + match (i, self.base) { + (Some(i), Some(b)) if i == b => (self.closed, self.base) = (true, None), + (Some(i), Some(b)) if i < b => self.base = Some(b - 1), + (Some(_), Some(_)) => {} + _ => self.base = None, + } + // Closing another document keeps the active one; closing the active one makes the + // one at its index active (the last one when it was last). + self.active = match (i, self.active) { + (Some(i), Some(a)) if i != a => Some(if i < a { a - 1 } else { a }), + (Some(i), Some(_)) => len.and_then(|n| n.checked_sub(1)).map(|last| i.min(last)), + _ => None, + }; + self.len = len; + } + "file.closeAll" => self.closed = true, + "document.move" => { + let moved = |x: usize, from: usize, to: usize| { + if x == from { + return to; + } + let x = if from < x { x - 1 } else { x }; + if to <= x { x + 1 } else { x } + }; + match (index("from").or(self.active), index("to"), self.len) { + (Some(from), Some(to), Some(n)) if n > 0 => { + let to = to.min(n - 1); + self.base = self.base.map(|b| moved(b, from, to)); + self.active = self.active.map(|a| moved(a, from, to)); + } + _ => (self.base, self.active) = (None, None), + } + } + _ if id.starts_with("file.open") + || id.starts_with("recovery.") + || matches!(id, "document.open" | "document.compare" | "stroke.arrowheads.edit") => + { + match (opened, self.len) { + (Some(i), Some(n)) if i <= n => (self.active, self.len) = (Some(i), Some(n.max(i + 1))), + _ => (self.active, self.len) = (None, None), + } + } + _ => {} + } + } +} + +/// The name the spot color base's swatch `name` of document `base` has after a `command.batch` +/// ran `steps` and replied `results`, or `None` when a step may have +/// removed it or made it a process color ([`follow_step`]). Steps in the base's document are +/// followed and steps in another document are skipped. A step in a document that is not known +/// keeps the name, and a rename there adds a second name to choose from once the batch is done: +/// the one that is a spot color of the base's document. Scripts and plug-ins may do anything, so +/// they end the link. +fn follow_batch(app: &VectorcraftApp, base: u64, name: String, steps: &[Value], results: &[Value], before: &LinkBefore) -> Option<String> { + let mut group = before.group.clone(); + let at = before.docs.iter().position(|&u| u == base); + let mut docs = BatchDocs { base: at, closed: at.is_none(), active: before.active_index, len: Some(before.docs.len()) }; + let mut names = vec![name]; + for (i, step) in steps.iter().enumerate() { + let sid = step["command"].as_str().unwrap_or_default(); + let (p, r) = (&step["params"], results.get(i).unwrap_or(&Value::Null)); + if runs_code(sid) { + return None; + } + match docs.in_base() { + Some(true) => { + let one = names.len() == 1; + let mut next = Vec::with_capacity(names.len()); + for n in names { + let mut scratch = group.clone(); + next.push(follow_step(sid, p, r, n, if one { &mut group } else { &mut scratch })?); + } + names = next; + } + Some(false) => {} + None => { + // The step may have run elsewhere, so the name stays a candidate whatever the step + // did; a rename adds the new name. + let mut next = Vec::with_capacity(names.len() + 1); + for n in names { + if let Some(m) = follow_step(sid, p, r, n.clone(), &mut group.clone()) + && m != n + { + next.push(m); + } + next.push(n); + } + next.sort(); + next.dedup(); + names = next; + } + } + docs.step(sid, p, r); + } + if names.len() == 1 { + return names.pop(); + } + // The one name that is a spot color of the base's document. + let st = app.session.documents().iter().find(|d| d.uid == base)?; + let mut spots = names.into_iter().filter(|n| is_spot(&st.doc, n)); + let first = spots.next()?; + spots.next().is_none().then_some(first) +} + +/// Whether command `id` runs a script or a plug-in (Run Script, a plug-in filter or a plug-in's own +/// command), whose commands the panel does not follow. +fn runs_code(id: &str) -> bool { + matches!(id, "script.run" | "plugin.run") || vectorcraft_engine::cmd::plugin::is_command_id(id) +} + +/// Command `id` ran with `params` and replied `reply`: a spot color base linked to a swatch that +/// Swatch Options renamed links to the new name, and one whose swatch a command deleted or made a +/// process color is no longer linked to it, so a later spot color of the same name does not +/// become the base; the base keeps the color it showed. A `command.batch`'s steps are followed in +/// order ([`follow_batch`]). A script or a plug-in may do anything, so it ends the link. +pub(crate) fn after_command(app: &mut VectorcraftApp, id: &str, params: &Value, reply: &Value, before: LinkBefore) { + let Some(s) = app.ui.color_guide_spot.as_ref() else { return }; + let (base, n) = (s.doc, s.swatch.clone()); + let name = if runs_code(id) { + None + } else if id == "command.batch" { + let steps = params["commands"].as_array().map(Vec::as_slice).unwrap_or_default(); + let results = reply["results"].as_array().map(Vec::as_slice).unwrap_or_default(); + follow_batch(app, base, n, steps, results, &before) + } else if before.active { + follow_step(id, params, reply, n, &mut before.group.clone()) + } else { + Some(n) + }; + let keep = usize::try_from(app.session.prefs.history_states).unwrap_or(usize::MAX).max(1); + let Some(s) = app.ui.color_guide_spot.as_mut() else { return }; + match name { + Some(n) => { + if n != s.swatch { + let old = std::mem::replace(&mut s.swatch, n); + s.earlier.retain(|e| *e != old && *e != s.swatch); + s.earlier.push(old); + if s.earlier.len() > keep { + s.earlier.drain(..s.earlier.len() - keep); + } + } + } + None => app.ui.color_guide_spot = None, + } + let undo = |id: &str| matches!(id, "edit.undo" | "edit.redo"); + let undone = undo(id) + || (id == "command.batch" + && params["commands"].as_array().is_some_and(|a| a.iter().any(|st| undo(st["command"].as_str().unwrap_or_default())))); + check_spot(app, if undone { Ran::UndoRedo } else { Ran::Command }); + if app.ui.color_guide_spot.is_none() + && let Some(c) = before.color + { + app.ui.color_guide_base = Some(c); + } +} + +/// The name swatch `name` (in color group `group`) has after command `id` ran with `params` and +/// replied `reply` in its document, or `None` when the command may have removed it or made it a +/// process color: Swatch Options making it a process color, Delete Swatch naming it or its group, +/// Merge Swatches merging it into another and Edit Color Group leaving it out of its group. +/// `group` follows the step: New Color Group, Move Swatch, Edit Color Group and Ungroup Color +/// Group. +fn follow_step(id: &str, p: &Value, reply: &Value, name: String, group: &mut Option<String>) -> Option<String> { + let ours = |v: &Value| v == name.as_str(); + let in_group = |key: &str| group.as_deref().is_some_and(|g| p[key] == g); + let named = |key: &str| p[key].as_array().is_some_and(|a| a.iter().any(|n| ours(n) || group.as_deref().is_some_and(|g| n == g))); + let members = |key: &str| reply[key].as_array().is_some_and(|a| a.iter().any(ours)); + let removed = match id { + "swatch.edit" => ours(&p["name"]) && p["spot"] == false, + "swatch.delete" => ours(&p["name"]) || in_group("name") || named("names"), + "swatch.merge" => named("names") && !ours(&p["names"][0]), + "swatch.editGroup" => in_group("group") && !members("swatches"), + _ => false, + }; + if removed { + return None; + } + // The color group that holds it after the step. + let moved = match id { + "swatch.newGroup" | "swatch.editGroup" if members("swatches") => Some(reply["name"].as_str().map(str::to_string)), + "swatch.ungroup" if in_group("name") => Some(None), + "swatch.move" if ours(&p["name"]) || p["names"].as_array().is_some_and(|a| a.iter().any(ours)) => { + Some(p["group"].as_str().map(str::to_string)) + } + _ => None, + }; + if let Some(m) = moved { + *group = m; + } + // A rename by Swatch Options, or of the swatch Merge Swatches keeps. + let renamed = match id { + "swatch.edit" if p["name"] == name.as_str() => reply["name"].as_str(), + "swatch.merge" if p["names"][0] == name.as_str() => reply["name"].as_str(), + _ => None, + }; + Some(renamed.map_or(name, str::to_string)) +} + +/// What ran before the spot color base's link is checked ([`check_spot`]). +#[derive(Clone, Copy, PartialEq)] +pub(crate) enum Ran { + /// Nothing the panel followed: a frame of the panel (a script's commands, for example). + Frame, + /// A command other than Undo and Redo. + Command, + /// Undo or Redo, or a batch with one of them. + UndoRedo, +} + +/// Check the spot color base's link after `ran`. A closed document ends it. When its swatch is no +/// longer a spot color of its document (deleted, renamed or made a process color by something the +/// panel did not follow), after an Undo or Redo a name it had before that is one again takes its +/// place (an Undo or Redo of a rename); otherwise the link rests until an Undo or Redo makes it a spot color again, and +/// the next other command ends it. The base keeps the color it last showed. +pub(crate) fn check_spot(app: &mut VectorcraftApp, ran: Ran) { + let Some(s) = app.ui.color_guide_spot.as_mut() else { return }; + if !app.session.documents().iter().any(|d| d.uid == s.doc) { + app.ui.color_guide_spot = None; + return; + } + let Some(st) = app.session.active().filter(|st| st.uid == s.doc) else { return }; + if s.resting && ran != Ran::UndoRedo { + if ran == Ran::Command { + app.ui.color_guide_spot = None; + } + return; + } + if ran == Ran::UndoRedo && !is_spot(&st.doc, &s.swatch) { + // An Undo or Redo of a rename gave it a name it had before. + if let Some(i) = s.earlier.iter().rposition(|n| is_spot(&st.doc, n)) { + let name = s.earlier.remove(i); + let gone = std::mem::replace(&mut s.swatch, name); + s.earlier.push(gone); + } + } + if is_spot(&st.doc, &s.swatch) { + s.resting = false; + // Kept for when the link ends where the color can no longer be read (a closed document). + if let Some(c) = st.doc.tint_paint(&s.swatch, s.tint).and_then(|p| p.color()) { + app.ui.color_guide_base = Some(c); + } + return; + } + if ran != Ran::Command { + s.resting = true; + return; + } + if let Some(c) = st.doc.tint_paint(&s.swatch, s.tint).and_then(|p| p.color()) { + app.ui.color_guide_base = Some(c); + } + app.ui.color_guide_spot = None; +} + +/// The global swatch and tint (0..1) a solid paint links to. +fn paint_link(p: &Paint) -> Option<(String, f32)> { + match p { + Paint::Solid { swatch: Some(n), tint, .. } => Some((n.clone(), *tint)), + _ => None, + } +} + +/// The tint of the spot color base that cell (`row`, `col`) of the guide `g` is: a cell right of +/// the center in the base row of Tints/Shades, without a library limit. Its tint is the base's +/// tint less the share the cell goes towards white. → (swatch, tint 0..1) +fn cell_tint(app: &VectorcraftApp, g: &Guide, row: usize, col: usize) -> Option<(String, f32)> { + let opts = app.ui.color_guide.clamped(); + let centre = g.centre(); + if row != 0 || col <= centre || opts.variation != Variation::TintsShades || !app.ui.color_guide_limit.is_empty() { + return None; + } + let s = live_spot(app)?; + let step = i32::try_from(col - centre).ok()?; + Some((s.swatch.clone(), s.tint * (1.0 - harmony::step_fraction(&opts, step)))) +} + +/// The paint cell (`row`, `col`) of `g` applies, carries and saves: a tint of the spot color base +/// ([`cell_tint`]) or the color the cell shows. +fn cell_paint(app: &VectorcraftApp, g: &Guide, row: usize, col: usize) -> Option<Paint> { + let color = *g.grid.get(row)?.get(col)?; + Some(match cell_tint(app, g, row, col) { + Some((name, tint)) => Paint::Solid { color, swatch: Some(name), tint }, + None => Paint::solid(color), + }) +} + +/// The `swatch.new` / `swatch.newGroup` entry for cell (`row`, `col`) of `g`: `{swatch, tint}` for +/// a tint of the spot color base, the color otherwise. +fn cell_entry(app: &VectorcraftApp, g: &Guide, row: usize, col: usize) -> Option<Value> { + Some(match cell_paint(app, g, row, col)? { + p @ Paint::Solid { swatch: Some(_), .. } => paint_params(&p), + p => color_json(&p.color()?), + }) +} + +/// `g` with the base row's spot color tints ([`cell_tint`]) shown in their own colors. +fn with_spot_tints(app: &VectorcraftApp, mut g: Guide) -> Guide { + let cols = g.grid.first().map_or(0, Vec::len); + let tints: Vec<(usize, Color)> = + (0..cols).filter_map(|col| cell_tint(app, &g, 0, col).and_then(|(n, t)| tint_color(app, &n, t)).map(|c| (col, c))).collect(); + for (col, c) in tints { + g.grid[0][col] = c; + } + g } fn rule(ctx: &egui::Context) -> Harmony { @@ -59,6 +489,7 @@ fn clear_selection(ctx: &egui::Context) { #[derive(Clone, PartialEq)] struct SelKey { base: Color, + spot: Option<SpotBase>, opts: GuideOptions, rule: usize, limit: String, @@ -68,6 +499,7 @@ struct SelKey { fn sel_key(app: &VectorcraftApp, ctx: &egui::Context, g: &Guide) -> SelKey { SelKey { base: base_color(app), + spot: live_spot(app).cloned(), opts: app.ui.color_guide, rule: pstate(ctx, "cg-harmony"), limit: app.ui.color_guide_limit.clone(), @@ -93,12 +525,13 @@ struct GuideKey { doc: Option<(u64, u64)>, } -/// The guide the panel shows, limited to the Limit to Library colours. +/// The guide the panel shows, limited to the Limit to Library colours; without a limit, a spot +/// color base's tints show in their own colors. fn guide(app: &VectorcraftApp, ctx: &egui::Context) -> Guide { let (base, rule, opts) = (base_color(app), rule(ctx), app.ui.color_guide); let limit = &app.ui.color_guide_limit; if limit.is_empty() { - return Guide::new(base, rule, &opts); + return with_spot_tints(app, Guide::new(base, rule, &opts)); } let doc = app.session.active().filter(|_| limit == swatchlib::DOCUMENT_SWATCHES).map(|d| (d.uid, d.revision)); let key = GuideKey { base, rule, opts, limit: limit.clone(), doc }; @@ -156,10 +589,11 @@ fn edit_or_apply(app: &mut VectorcraftApp, g: &Guide) { app.run("ui.recolorDialog", p).ok(); } -/// Save the selected cells' colors as swatches (one undo step), each in its own model. +/// Save the selected cells' colors as swatches (one undo step), each in its own model; a tint of a +/// spot color base becomes a tint swatch of it. fn save_selected(app: &mut VectorcraftApp, ctx: &egui::Context) { let g = guide(app, ctx); - let colors: Vec<Value> = live_selection(app, ctx, &g).into_iter().filter_map(|(r, c)| g.grid.get(r)?.get(c)).map(color_json).collect(); + let colors: Vec<Value> = live_selection(app, ctx, &g).into_iter().filter_map(|(r, c)| cell_entry(app, &g, r, c)).collect(); if !colors.is_empty() { app.run("swatch.new", json!({ "colors": colors, "keepModel": true })).ok(); } @@ -168,13 +602,13 @@ fn save_selected(app: &mut VectorcraftApp, ctx: &egui::Context) { /// Save Color Group to Swatches: the selected cells as one swatch group, in grid order (row by /// row, left to right), each cell once; with no cell of the shown guide selected, the harmony /// colors. The group is named after the harmony rule, saved in one undo step, and each color -/// keeps its own model. +/// keeps its own model; a tint of a spot color base becomes a tint swatch of it. fn save_group(app: &mut VectorcraftApp, ctx: &egui::Context) { let g = guide(app, ctx); let mut cells = live_selection(app, ctx, &g); cells.sort_unstable(); cells.dedup(); - let mut colors: Vec<Value> = cells.into_iter().filter_map(|(r, c)| g.grid.get(r)?.get(c)).map(color_json).collect(); + let mut colors: Vec<Value> = cells.into_iter().filter_map(|(r, c)| cell_entry(app, &g, r, c)).collect(); if colors.is_empty() { colors = g.colors.iter().map(color_json).collect(); } @@ -184,29 +618,33 @@ fn save_group(app: &mut VectorcraftApp, ctx: &egui::Context) { pub fn show(app: &mut VectorcraftApp, ui: &mut Ui) { let t = crate::theme::Tokens::get(ui.ctx()); let ctx = ui.ctx().clone(); + check_spot(app, Ran::Frame); // The current color becomes the base when the panel first shows; selecting artwork later // leaves it as it is. - let first = base_color(app); - let set = *app.ui.color_guide_base.get_or_insert(first); + if app.ui.color_guide_base.is_none() { + let current = active_paint(app); + choose_linked_base(app, current.color().unwrap_or(DEFAULT_BASE), paint_link(¤t)); + } let h = rule(&ctx); let g = guide(app, &ctx); // Selected cells belong to the guide they were picked from: a new base, new options, another // harmony rule, another library limit or new grid colors clear them. - let key = SelKey { base: set, ..sel_key(app, &ctx, &g) }; + let key = sel_key(app, &ctx, &g); if pstate::<Option<SelKey>>(&ctx, "cg-sel-key").as_ref() != Some(&key) { set_pstate(&ctx, "cg-sel-key", Some(key)); clear_selection(&ctx); } let base = g.colors[0]; - let mut chosen: Option<Color> = None; + let mut chosen: Option<Paint> = None; ui.horizontal(|ui| { let (r, resp) = ui.allocate_exact_size(vec2(26.0, 26.0), Sense::click()); widgets::swatch_tile(ui, r, &Paint::solid(base), false, resp.hovered()); - if resp.on_hover_text(tl!("Set base color to the current color")).clicked() - && let Some(c) = active_paint(app).color() - { - app.ui.color_guide_base = Some(c); - clear_selection(&ctx); + if resp.on_hover_text(tl!("Set base color to the current color")).clicked() { + let current = active_paint(app); + if let Some(c) = current.color() { + choose_linked_base(app, c, paint_link(¤t)); + clear_selection(&ctx); + } } let labels: Vec<&str> = Harmony::ALL.iter().map(|h| h.label()).collect(); if let Some(i) = widgets::dropdown(ui, "cg-rule", h.label(), &labels, ui.available_width() - 4.0) { @@ -223,7 +661,7 @@ pub fn show(app: &mut VectorcraftApp, ui: &mut Ui) { widgets::drag_source(ui, &resp, || PanelDrag::paint(Paint::solid(*c))); ui.painter().rect_filled(r, 0.0, c32(c)); if resp.on_hover_text(c.to_hex()).clicked() { - chosen = Some(*c); + chosen = Some(Paint::solid(*c)); } } ui.add_space(6.0); @@ -241,7 +679,8 @@ pub fn show(app: &mut VectorcraftApp, ui: &mut Ui) { for (ci, v) in row.iter().enumerate() { let r = Rect::from_min_size(rr.min + vec2(x(ci), 0.0), vec2(x(ci + 1) - x(ci) - gap, 17.0)); let resp = ui.interact(r, ui.scope_id().with(("cg-v", ri, ci)), Sense::click_and_drag()); - widgets::drag_source(ui, &resp, || PanelDrag::paint(Paint::solid(*v))); + let paint = cell_paint(app, &g, ri, ci).unwrap_or_else(|| Paint::solid(*v)); + widgets::drag_source(ui, &resp, || PanelDrag::paint(paint.clone())); ui.painter().rect_filled(r, 0.0, c32(v)); if sel.contains(&(ri, ci)) { ui.painter().rect_stroke(r.shrink(1.0), 0.0, egui::Stroke::new(1.0, egui::Color32::WHITE), egui::StrokeKind::Inside); @@ -252,7 +691,7 @@ pub fn show(app: &mut VectorcraftApp, ui: &mut Ui) { if resp.on_hover_text(v.to_hex()).clicked() { if !multi { sel.clear(); - chosen = Some(*v); + chosen = Some(paint); } match sel.iter().position(|s| *s == (ri, ci)) { Some(i) => { @@ -299,8 +738,8 @@ pub fn show(app: &mut VectorcraftApp, ui: &mut Ui) { save_group(app, &ctx); } }); - if let Some(c) = chosen { - apply_click(app, ui, json!({"color": color_json(&c)})); + if let Some(p) = chosen { + apply_click(app, ui, paint_params(&p)); } } @@ -703,6 +1142,532 @@ mod tests { assert!(selected(&ctx).is_empty(), "the panel clears the selection"); } + /// A document with a selected rectangle and the spot color swatch "Ink", made the guide's base + /// as clicking it in the Swatches panel makes it, at `tint` (0..1) of the spot color. + fn spot_app(tint: f32) -> VectorcraftApp { + let mut app = app(); + app.run("swatch.new", json!({"name": "Ink", "color": "#0066cc", "spot": true})).unwrap(); + app.run("shape.rectangle", json!({"x": 0, "y": 0, "width": 10, "height": 10})).unwrap(); + app.run("paint.setFill", json!({"color": "#808080"})).unwrap(); + let ink = app.session.active().unwrap().doc.global_color("Ink").unwrap(); + choose_linked_base(&mut app, ink.tinted(tint), Some(("Ink".to_string(), tint))); + app + } + + /// The selected art's fill: (the swatch it links to, its tint 0..1, its color). + fn fill_link(app: &VectorcraftApp) -> (Option<String>, f32, String) { + match crate::panels::current_paints(app).0 { + Paint::Solid { color, swatch, tint } => (swatch, tint, color.to_hex()), + other => panic!("a solid fill: {other:?}"), + } + } + + /// The tint the cell `steps` right of the centre has with a base at `base` tint. + fn expected_tint(app: &VectorcraftApp, base: f32, steps: i32) -> f32 { + base * (1.0 - harmony::step_fraction(&app.ui.color_guide.clamped(), steps)) + } + + /// With a spot color base, a cell right of the centre in the base row of Tints/Shades paints the + /// art with a tint of the spot color, which follows an edit of the spot color; the shades, the + /// other rows, the other variation modes and a library limit give process colors. + #[test] + fn a_spot_color_base_gives_tints_of_that_spot_color() { + let mut app = spot_app(1.0); + let ctx = egui::Context::default(); + frame(&mut app, &ctx); + let g = guide(&app, &ctx); + let c = g.centre(); + let ink = app.session.active().unwrap().doc.global_color("Ink").unwrap(); + assert_eq!(g.grid[0][c].to_hex(), ink.to_hex(), "the spot color in the centre"); + let at = rect_of(&mut app, &ctx, ("cg-v", 0usize, c + 2)).center(); + click(&mut app, &ctx, at); + let (swatch, tint, hex) = fill_link(&app); + assert_eq!(swatch.as_deref(), Some("Ink"), "a tint of the spot color"); + let want = expected_tint(&app, 1.0, 2); + assert!((tint - want).abs() < 1e-4, "{tint} vs {want}"); + assert_eq!(hex, g.grid[0][c + 2].to_hex(), "the color the cell shows"); + assert_eq!(hex, ink.tinted(tint).to_hex()); + // The painted tint follows an edit of the spot color, and so does the base. + app.run("swatch.edit", json!({"name": "Ink", "color": "#cc0000"})).unwrap(); + let red = app.session.active().unwrap().doc.global_color("Ink").unwrap(); + assert_eq!(fill_link(&app).2, red.tinted(tint).to_hex(), "the art follows the spot color"); + assert_eq!(base_color(&app), red, "the base follows the spot color"); + frame(&mut app, &ctx); + // Shades, another harmony row and the harmony strip are process colors. + for id in [("cg-v", 0usize, c - 1), ("cg-v", 1, c + 1)] { + let at = rect_of(&mut app, &ctx, id).center(); + click(&mut app, &ctx, at); + assert_eq!(fill_link(&app).0, None, "{id:?}"); + } + let at = rect_of(&mut app, &ctx, ("cg-h", 0usize)).center(); + click(&mut app, &ctx, at); + assert_eq!(fill_link(&app).0, None, "the harmony strip"); + // Warm/Cool and a library limit: process colors. + app.ui.color_guide.variation = Variation::WarmCool; + frame(&mut app, &ctx); + let at = rect_of(&mut app, &ctx, ("cg-v", 0usize, c + 1)).center(); + click(&mut app, &ctx, at); + assert_eq!(fill_link(&app).0, None, "Warm/Cool"); + app.ui.color_guide.variation = Variation::TintsShades; + app.run("ui.colorGuideLimit", json!({"library": "web-safe-216"})).unwrap(); + frame(&mut app, &ctx); + let at = rect_of(&mut app, &ctx, ("cg-v", 0usize, c + 1)).center(); + click(&mut app, &ctx, at); + assert_eq!(fill_link(&app).0, None, "limited to a library"); + } + + /// A base that is already a tint of the spot color gives lighter tints of it; a plain color with + /// the spot color's values, a deleted swatch and a swatch that is no longer a spot color give + /// process colors. + #[test] + fn a_tinted_spot_base_gives_lighter_tints_and_a_lost_link_gives_process_colors() { + let mut app = spot_app(0.5); + let ctx = egui::Context::default(); + frame(&mut app, &ctx); + let c = guide(&app, &ctx).centre(); + let cell = |app: &VectorcraftApp, ctx: &egui::Context, col| cell_paint(app, &guide(app, ctx), 0, col).unwrap(); + let Paint::Solid { swatch, tint, .. } = cell(&app, &ctx, c + 1) else { panic!("a solid") }; + assert_eq!(swatch.as_deref(), Some("Ink")); + let want = expected_tint(&app, 0.5, 1); + assert!((tint - want).abs() < 1e-4 && tint < 0.5, "{tint} vs {want}"); + // The same values without the link. + choose_base(&mut app, Color::from_hex("#0066cc").unwrap()); + assert_eq!(cell(&app, &ctx, c + 1), Paint::solid(guide(&app, &ctx).grid[0][c + 1])); + // The spot color made a process color, then deleted. + let link = Some(("Ink".to_string(), 1.0)); + let ink = app.session.active().unwrap().doc.global_color("Ink").unwrap(); + choose_linked_base(&mut app, ink, link.clone()); + assert!(matches!(cell(&app, &ctx, c + 1), Paint::Solid { swatch: Some(_), .. })); + app.run("swatch.edit", json!({"name": "Ink", "spot": false, "global": false})).unwrap(); + assert!(matches!(cell(&app, &ctx, c + 1), Paint::Solid { swatch: None, .. }), "no longer a spot color"); + choose_linked_base(&mut app, ink, link.clone()); + assert!(app.ui.color_guide_spot.is_none(), "a process swatch gives no spot base"); + app.run("swatch.edit", json!({"name": "Ink", "spot": true})).unwrap(); + choose_linked_base(&mut app, ink, link); + app.run("swatch.delete", json!({"name": "Ink"})).unwrap(); + assert!(matches!(cell(&app, &ctx, c + 1), Paint::Solid { swatch: None, .. }), "a deleted swatch"); + } + + /// A spot color base stays linked to its swatch when Swatch Options renames it: the tints link to + /// the new name and follow an edit of it. + #[test] + fn a_renamed_spot_color_stays_the_base() { + let mut app = spot_app(1.0); + let ctx = egui::Context::default(); + frame(&mut app, &ctx); + let c = guide(&app, &ctx).centre(); + app.run("swatch.edit", json!({"name": "Ink", "newName": "Deep Ink"})).unwrap(); + let Paint::Solid { swatch, .. } = cell_paint(&app, &guide(&app, &ctx), 0, c + 1).unwrap() else { panic!("a solid") }; + assert_eq!(swatch.as_deref(), Some("Deep Ink")); + app.run("swatch.edit", json!({"name": "Deep Ink", "color": "#cc0000"})).unwrap(); + let red = app.session.active().unwrap().doc.global_color("Deep Ink").unwrap(); + assert_eq!(base_color(&app), red, "the base follows the renamed spot color"); + // Renames in a batch, in step order. + let steps = json!([ + {"command": "swatch.edit", "params": {"name": "Deep Ink", "newName": "Ink A"}}, + {"command": "swatch.edit", "params": {"name": "Ink A", "newName": "Ink B"}}, + ]); + app.run("command.batch", json!({"commands": steps})).unwrap(); + let Paint::Solid { swatch, .. } = cell_paint(&app, &guide(&app, &ctx), 0, c + 1).unwrap() else { panic!("a solid") }; + assert_eq!(swatch.as_deref(), Some("Ink B"), "renamed in a batch"); + } + + /// Deleting the spot color, or making it a process color, ends the base's link: a new spot color + /// of the same name, or the swatch made a spot color again, gives process colors until it is + /// chosen again. + #[test] + fn a_deleted_spot_color_ends_the_link() { + let mut app = spot_app(1.0); + let ctx = egui::Context::default(); + frame(&mut app, &ctx); + let c = guide(&app, &ctx).centre(); + let linked = |app: &VectorcraftApp, ctx: &egui::Context| { + matches!(cell_paint(app, &guide(app, ctx), 0, c + 1).unwrap(), Paint::Solid { swatch: Some(_), .. }) + }; + assert!(linked(&app, &ctx)); + app.run("swatch.delete", json!({"name": "Ink"})).unwrap(); + app.run("swatch.new", json!({"name": "Ink", "color": "#00cc66", "spot": true})).unwrap(); + assert!(!linked(&app, &ctx), "a new spot color of the same name"); + assert!(app.ui.color_guide_spot.is_none()); + let ink = app.session.active().unwrap().doc.global_color("Ink").unwrap(); + choose_linked_base(&mut app, ink, Some(("Ink".to_string(), 1.0))); + assert!(linked(&app, &ctx)); + app.run("swatch.edit", json!({"name": "Ink", "spot": false, "global": false})).unwrap(); + app.run("swatch.edit", json!({"name": "Ink", "spot": true})).unwrap(); + assert!(!linked(&app, &ctx), "a spot color again"); + // The same in a batch: a step that deletes the swatch, or one that makes it a process color. + let relink = |app: &mut VectorcraftApp| { + let ink = app.session.active().unwrap().doc.global_color("Ink").unwrap(); + choose_linked_base(app, ink, Some(("Ink".to_string(), 1.0))); + }; + for steps in [ + json!([ + {"command": "swatch.edit", "params": {"name": "Ink", "newName": "Ink 2"}}, + {"command": "swatch.delete", "params": {"name": "Ink 2"}}, + {"command": "swatch.new", "params": {"name": "Ink 2", "color": "#cc6600", "spot": true}}, + {"command": "swatch.edit", "params": {"name": "Ink 2", "newName": "Ink"}}, + ]), + json!([ + {"command": "swatch.edit", "params": {"name": "Ink", "spot": false, "global": false}}, + {"command": "swatch.edit", "params": {"name": "Ink", "spot": true}}, + ]), + ] { + relink(&mut app); + assert!(linked(&app, &ctx)); + app.run("command.batch", json!({"commands": steps})).unwrap(); + assert!(!linked(&app, &ctx), "{steps}"); + } + // A batch that edits the spot color's values and deletes another swatch keeps the link. + relink(&mut app); + app.run("swatch.new", json!({"name": "Spare", "color": "#999999"})).unwrap(); + let steps = json!([ + {"command": "swatch.edit", "params": {"name": "Ink", "color": "#cc0000"}}, + {"command": "swatch.delete", "params": {"name": "Spare"}}, + ]); + app.run("command.batch", json!({"commands": steps})).unwrap(); + assert!(linked(&app, &ctx), "an unrelated batch"); + // `global: false` leaves a spot color global, so the link stays. + let steps = json!([{"command": "swatch.edit", "params": {"name": "Ink", "global": false}}, {"command": "swatch.sortByName"}]); + app.run("command.batch", json!({"commands": steps})).unwrap(); + assert!(linked(&app, &ctx), "global: false on a spot color"); + // Closing its document ends the link, and the base keeps the color it showed. + app.run("swatch.edit", json!({"name": "Ink", "color": "#00aa00"})).unwrap(); + let shown = base_color(&app); + // Closed the way the tab's close button closes it, outside `app.run`. + app.session.execute("file.new", &json!({})).unwrap(); + app.session.execute("file.close", &json!({"index": 0})).unwrap(); + frame(&mut app, &ctx); + assert_eq!(app.session.documents().len(), 1); + assert!(app.ui.color_guide_spot.is_none(), "its document closed"); + assert_eq!(base_color(&app), shown, "the color it showed before the close"); + } + + /// An Undo or a Redo of a rename keeps the spot color base's link under the name the swatch has + /// again, also after more renames than a short list would hold and after a rename the panel did + /// not follow (a script's); another command after such a rename ends the link. + #[test] + fn an_undone_rename_keeps_the_link() { + let mut app = spot_app(1.0); + let ctx = egui::Context::default(); + frame(&mut app, &ctx); + let c = guide(&app, &ctx).centre(); + let linked = |app: &VectorcraftApp, ctx: &egui::Context| { + matches!(cell_paint(app, &guide(app, ctx), 0, c + 1).unwrap(), Paint::Solid { swatch: Some(_), .. }) + }; + let spot_name = |app: &VectorcraftApp| app.ui.color_guide_spot.as_ref().map(|s| s.swatch.clone()); + app.run("swatch.edit", json!({"name": "Ink", "newName": "Ink U"})).unwrap(); + app.run("edit.undo", json!({})).unwrap(); + assert!(linked(&app, &ctx), "a rename undone"); + assert_eq!(spot_name(&app).as_deref(), Some("Ink")); + app.run("edit.redo", json!({})).unwrap(); + assert!(linked(&app, &ctx), "a rename redone"); + assert_eq!(spot_name(&app).as_deref(), Some("Ink U")); + app.run("edit.undo", json!({})).unwrap(); + // Forty renames undone one by one. + for i in 0..40 { + let from = if i == 0 { "Ink".to_string() } else { format!("Ink {i}") }; + app.run("swatch.edit", json!({"name": from, "newName": format!("Ink {}", i + 1)})).unwrap(); + } + for _ in 0..40 { + app.run("edit.undo", json!({})).unwrap(); + } + assert_eq!(spot_name(&app).as_deref(), Some("Ink"), "forty renames undone"); + assert!(linked(&app, &ctx)); + // A rename the panel did not follow: the link rests, and the Undo brings it back. + app.session.execute("swatch.edit", &json!({"name": "Ink", "newName": "Ink S"})).unwrap(); + frame(&mut app, &ctx); + assert!(!linked(&app, &ctx), "resting"); + app.run("edit.undo", json!({})).unwrap(); + assert!(linked(&app, &ctx), "an unfollowed rename undone"); + assert_eq!(spot_name(&app).as_deref(), Some("Ink")); + // Another command while it rests ends it. + app.session.execute("swatch.edit", &json!({"name": "Ink", "newName": "Ink S"})).unwrap(); + frame(&mut app, &ctx); + app.run("swatch.new", json!({"name": "Spare", "color": "#999999"})).unwrap(); + assert!(app.ui.color_guide_spot.is_none(), "another command while it rests"); + // Outside an Undo or Redo, a new spot color with an earlier name does not take its place. + app.run("swatch.edit", json!({"name": "Ink S", "newName": "Ink"})).unwrap(); + let ink = app.session.active().unwrap().doc.global_color("Ink").unwrap(); + choose_linked_base(&mut app, ink, Some(("Ink".to_string(), 1.0))); + app.run("swatch.edit", json!({"name": "Ink", "newName": "Ink U"})).unwrap(); + app.run("swatch.new", json!({"name": "Ink", "color": "#00cc66", "spot": true})).unwrap(); + app.session.execute("swatch.edit", &json!({"name": "Ink U", "newName": "Ink V"})).unwrap(); + frame(&mut app, &ctx); + assert!(!linked(&app, &ctx), "a new spot color with an earlier name"); + assert_eq!(spot_name(&app).as_deref(), Some("Ink U")); + } + + /// While the link rests, a new spot color of the same name that the panel did not follow does + /// not give the base its color when the next command ends the link. + #[test] + fn a_resting_link_keeps_the_color_it_showed() { + let mut app = spot_app(1.0); + let ctx = egui::Context::default(); + frame(&mut app, &ctx); + let shown = base_color(&app); + app.session.execute("swatch.delete", &json!({"name": "Ink"})).unwrap(); + frame(&mut app, &ctx); + app.session.execute("swatch.new", &json!({"name": "Ink", "color": "#00cc66", "spot": true})).unwrap(); + frame(&mut app, &ctx); + assert!(app.ui.color_guide_spot.as_ref().is_some_and(|s| s.resting), "resting"); + assert_eq!(base_color(&app), shown, "a resting link shows the color it showed"); + app.run("swatch.new", json!({"name": "Spare", "color": "#999999"})).unwrap(); + assert!(app.ui.color_guide_spot.is_none(), "another command ends it"); + assert_eq!(base_color(&app), shown, "the base keeps the color it showed"); + } + + /// A script run ends the link: a script that deletes the spot color and makes another of the + /// same name does not make the new one the base, and the base keeps the color it showed. Listing + /// scripts or plug-ins keeps it. + #[test] + fn a_script_run_ends_the_link() { + let mut app = spot_app(1.0); + let ctx = egui::Context::default(); + frame(&mut app, &ctx); + // Commands that only list scripts or plug-ins keep the link, also as batch steps. + app.run("script.engines", json!({})).unwrap(); + app.run("plugin.list", json!({})).unwrap(); + app.run("command.batch", json!({"commands": [{"command": "script.engines"}]})).unwrap(); + assert!(app.ui.color_guide_spot.is_some(), "a script or plug-in listing"); + let shown = base_color(&app); + let source = "vc.run('swatch.delete', {name: 'Ink'}); vc.run('swatch.new', {name: 'Ink', color: '#00cc66', spot: true});"; + app.run("script.run", json!({"source": source, "name": "t.js"})).unwrap(); + assert!(app.ui.color_guide_spot.is_none(), "a script ran"); + assert_eq!(base_color(&app), shown, "the base keeps the color it showed"); + } + + /// A `command.batch` that switches, opens, closes or moves documents follows the spot color + /// base's swatch in its own document and leaves the link alone for steps in the others. + #[test] + fn a_batch_follows_the_spot_color_across_documents() { + let mut app = spot_app(1.0); + let ctx = egui::Context::default(); + frame(&mut app, &ctx); + let c = guide(&app, &ctx).centre(); + let linked = |app: &VectorcraftApp, ctx: &egui::Context| { + matches!(cell_paint(app, &guide(app, ctx), 0, c + 1).unwrap(), Paint::Solid { swatch: Some(_), .. }) + }; + let relink = |app: &mut VectorcraftApp| { + let ink = app.session.active().unwrap().doc.global_color("Ink").unwrap(); + choose_linked_base(app, ink, Some(("Ink".to_string(), 1.0))); + }; + assert!(linked(&app, &ctx)); + // Undo, Activate Document and New in a batch keep the link while the swatch is a spot color, + // and the steps in the base's document are still followed. + app.run("swatch.new", json!({"name": "Spare 2", "color": "#777777"})).unwrap(); + let steps = json!([ + {"command": "edit.undo"}, + {"command": "document.activate", "params": {"index": 0}}, + {"command": "swatch.sortByName"}, + ]); + app.run("command.batch", json!({"commands": steps})).unwrap(); + assert!(linked(&app, &ctx), "an undo, an activate and a sort"); + let steps = json!([ + {"command": "file.new"}, + {"command": "swatch.new", "params": {"name": "Other", "color": "#123456", "spot": true}}, + {"command": "swatch.delete", "params": {"name": "Other"}}, + {"command": "document.activate", "params": {"index": 0}}, + ]); + app.run("command.batch", json!({"commands": steps})).unwrap(); + assert!(linked(&app, &ctx), "steps in a new document"); + let spot_name = |app: &VectorcraftApp| app.ui.color_guide_spot.as_ref().map(|s| s.swatch.clone()); + let steps = json!([ + {"command": "file.new"}, + {"command": "document.activate", "params": {"index": 0}}, + {"command": "swatch.edit", "params": {"name": "Ink", "newName": "Ink C"}}, + ]); + app.run("command.batch", json!({"commands": steps})).unwrap(); + assert!(linked(&app, &ctx), "renamed after a new document"); + assert_eq!(spot_name(&app).as_deref(), Some("Ink C")); + // Moves and closes shift the tabs: [base, 1, 2] becomes [1, 2, base], then [2, base], then + // [base, 2]; the steps in tab 2 leave the link alone. + let steps = json!([ + {"command": "document.move", "params": {"from": 0, "to": 2}}, + {"command": "document.activate", "params": {"index": 2}}, + {"command": "swatch.edit", "params": {"name": "Ink C", "newName": "Ink M"}}, + {"command": "file.close", "params": {"index": 0}}, + {"command": "document.activate", "params": {"index": 0}}, + {"command": "swatch.new", "params": {"name": "Ink M", "color": "#123456", "spot": true}}, + {"command": "swatch.delete", "params": {"name": "Ink M"}}, + {"command": "document.activate", "params": {"index": 1}}, + {"command": "document.move", "params": {"from": 1, "to": 0}}, + ]); + app.run("command.batch", json!({"commands": steps})).unwrap(); + assert_eq!(app.session.active_index(), Some(0)); + assert!(linked(&app, &ctx), "moved and closed tabs"); + assert_eq!(spot_name(&app).as_deref(), Some("Ink M")); + app.run("swatch.edit", json!({"name": "Ink M", "newName": "Ink"})).unwrap(); + assert!(linked(&app, &ctx), "renamed back"); + // A batch that starts in another document follows the base's color group too. + app.run("swatch.newGroup", json!({"name": "Held", "swatches": ["Ink"]})).unwrap(); + app.run("document.activate", json!({"index": 1})).unwrap(); + let steps = json!([ + {"command": "document.activate", "params": {"index": 0}}, + {"command": "swatch.delete", "params": {"names": ["Held"]}}, + {"command": "swatch.new", "params": {"name": "Ink", "color": "#cc6600", "spot": true}}, + {"command": "document.activate", "params": {"index": 1}}, + ]); + app.run("command.batch", json!({"commands": steps})).unwrap(); + app.run("document.activate", json!({"index": 0})).unwrap(); + assert!(!linked(&app, &ctx), "its group deleted in a batch that started elsewhere"); + relink(&mut app); + // Where an opened document's steps run is not known: deleting a swatch of the same name + // there keeps the link. + let svg = r#"<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10"/>"#; + let steps = json!([ + {"command": "document.open", "params": {"name": "a.svg", "dataBase64": vectorcraft_format::base64_encode(svg.as_bytes())}}, + {"command": "swatch.new", "params": {"name": "Ink", "color": "#123456", "spot": true}}, + {"command": "swatch.delete", "params": {"name": "Ink"}}, + {"command": "document.activate", "params": {"index": 0}}, + ]); + app.run("command.batch", json!({"commands": steps})).unwrap(); + assert!(linked(&app, &ctx), "deleted in an opened document"); + // The opened document's tab is known from its reply: a rename there is not the base's, + // even when the base's document has spot colors of both names. + app.run("swatch.new", json!({"name": "Ink Alt", "color": "#654321", "spot": true})).unwrap(); + let steps = json!([ + {"command": "document.open", "params": {"name": "b.svg", "dataBase64": vectorcraft_format::base64_encode(svg.as_bytes())}}, + {"command": "swatch.new", "params": {"name": "Ink", "color": "#123456", "spot": true}}, + {"command": "swatch.edit", "params": {"name": "Ink", "newName": "Ink Alt"}}, + {"command": "document.activate", "params": {"index": 0}}, + ]); + app.run("command.batch", json!({"commands": steps})).unwrap(); + assert!(linked(&app, &ctx), "renamed in an opened document"); + assert_eq!(spot_name(&app).as_deref(), Some("Ink")); + // Deleted by a batch that starts in another tab: the base keeps the color it showed. + app.run("swatch.edit", json!({"name": "Ink", "color": "#00aa00"})).unwrap(); + let shown = base_color(&app); + app.run("document.activate", json!({"index": 1})).unwrap(); + let steps = json!([ + {"command": "document.activate", "params": {"index": 0}}, + {"command": "swatch.delete", "params": {"name": "Ink"}}, + ]); + app.run("command.batch", json!({"commands": steps})).unwrap(); + assert!(app.ui.color_guide_spot.is_none()); + assert_eq!(base_color(&app), shown, "the edited color"); + app.run("swatch.new", json!({"name": "Ink", "color": "#cc0000", "spot": true})).unwrap(); + relink(&mut app); + let steps = json!([ + {"command": "document.activate", "params": {"index": 1}}, + {"command": "swatch.new", "params": {"name": "Ink", "color": "#123456", "spot": true}}, + {"command": "swatch.delete", "params": {"name": "Ink"}}, + {"command": "document.activate", "params": {"index": 0}}, + ]); + app.run("command.batch", json!({"commands": steps})).unwrap(); + assert!(linked(&app, &ctx), "a swatch of the same name deleted in another document"); + let steps = json!([ + {"command": "document.activate", "params": {"index": 0}}, + {"command": "swatch.delete", "params": {"name": "Ink"}}, + {"command": "swatch.new", "params": {"name": "Ink", "color": "#123456", "spot": true}}, + ]); + app.run("command.batch", json!({"commands": steps})).unwrap(); + assert!(!linked(&app, &ctx), "deleted after an activate"); + relink(&mut app); + assert!(linked(&app, &ctx)); + } + + /// Deleting the color group that holds the spot color base's swatch ends the link; an Edit + /// Color Group that keeps it does not. + #[test] + fn a_deleted_color_group_ends_the_link() { + let mut app = spot_app(1.0); + let ctx = egui::Context::default(); + frame(&mut app, &ctx); + let c = guide(&app, &ctx).centre(); + let linked = |app: &VectorcraftApp, ctx: &egui::Context| { + matches!(cell_paint(app, &guide(app, ctx), 0, c + 1).unwrap(), Paint::Solid { swatch: Some(_), .. }) + }; + let relink = |app: &mut VectorcraftApp| { + let ink = app.session.active().unwrap().doc.global_color("Ink").unwrap(); + choose_linked_base(app, ink, Some(("Ink".to_string(), 1.0))); + }; + // Deleting the color group that holds it, then a new spot color of the same name. + app.run("swatch.newGroup", json!({"name": "Inks", "swatches": ["Ink"]})).unwrap(); + assert!(linked(&app, &ctx), "moved into a group"); + let steps = json!([ + {"command": "swatch.delete", "params": {"names": ["Inks"]}}, + {"command": "swatch.new", "params": {"name": "Ink", "color": "#cc6600", "spot": true}}, + ]); + app.run("command.batch", json!({"commands": steps})).unwrap(); + assert!(!linked(&app, &ctx), "its group deleted"); + // Moved into a group and the group deleted in the same batch. + relink(&mut app); + let steps = json!([ + {"command": "swatch.newGroup", "params": {"name": "Spots", "swatches": ["Ink"]}}, + {"command": "swatch.delete", "params": {"names": ["Spots"]}}, + {"command": "swatch.new", "params": {"name": "Ink", "color": "#336699", "spot": true}}, + ]); + app.run("command.batch", json!({"commands": steps})).unwrap(); + assert!(!linked(&app, &ctx), "moved into a group that was deleted"); + // Edit Color Group that keeps it, with a new group name, keeps the link. + relink(&mut app); + app.run("swatch.newGroup", json!({"name": "Spots", "swatches": ["Ink"]})).unwrap(); + let ink = app.session.active().unwrap().doc.global_color("Ink").unwrap(); + app.run("swatch.editGroup", json!({"group": "Spots", "colors": [ink.to_hex()], "rename": "Spot Inks"})).unwrap(); + assert!(linked(&app, &ctx), "a group edit that keeps it"); + // A deleted base keeps the color it showed after an edit. + app.run("swatch.edit", json!({"name": "Ink", "color": "#cc0000"})).unwrap(); + let shown = base_color(&app); + app.run("swatch.delete", json!({"name": "Ink"})).unwrap(); + assert_eq!(base_color(&app), shown, "the color it showed"); + } + + /// Save Colors as Swatches and Save Color Group save a spot color base's tints as tint swatches + /// linked to it, beside process colors for the other cells, each in one undo step. + #[test] + fn saved_spot_tints_are_tint_swatches_of_the_spot_color() { + let mut app = spot_app(1.0); + let ctx = egui::Context::default(); + frame(&mut app, &ctx); + let g = guide(&app, &ctx); + let c = g.centre(); + let undo = app.session.doc().unwrap().history.undo.len(); + set_pstate(&ctx, "cg-sel", vec![(0usize, c + 1), (0, c - 1), (0, c + 3)]); + save_selected(&mut app, &ctx); + let st = app.session.doc().unwrap(); + assert_eq!(st.history.undo.len(), undo + 1, "one undo step"); + let made: Vec<_> = st.doc.swatches[st.doc.swatches.len() - 3..].to_vec(); + let tint = |w: &vectorcraft_color::Swatch| w.tint_of().map(|(b, t)| (b.to_string(), t)); + assert_eq!(tint(&made[0]).map(|(b, _)| b).as_deref(), Some("Ink")); + assert!((tint(&made[0]).unwrap().1 - expected_tint(&app, 1.0, 1)).abs() < 1e-4); + assert_eq!(made[1].paint, Paint::solid(g.grid[0][c - 1]), "a shade is a process color"); + assert_eq!(tint(&made[2]).map(|(b, _)| b).as_deref(), Some("Ink")); + assert!(made[0].name.starts_with("Ink ") && made[0].name.ends_with('%'), "{}", made[0].name); + // A group of the selected cells, in grid order. + set_pstate(&ctx, "cg-sel", vec![(1usize, c + 1), (0, c + 2)]); + save_group(&mut app, &ctx); + let group = app.session.doc().unwrap().doc.swatch_groups.last().cloned().unwrap(); + assert_eq!(group.swatches.len(), 2); + assert_eq!(tint(&group.swatches[0]).map(|(b, _)| b).as_deref(), Some("Ink"), "the base row's tint"); + assert_eq!(group.swatches[1].paint, Paint::solid(g.grid[1][c + 1]), "another row is a process color"); + // The saved tints follow an edit of the spot color. + app.run("swatch.edit", json!({"name": "Ink", "color": "#cc0000"})).unwrap(); + let d = &app.session.active().unwrap().doc; + let red = d.global_color("Ink").unwrap(); + let first = d.swatch(&made[0].name).unwrap(); + assert_eq!(first.paint.color(), Some(red.tinted(first.tint_of().unwrap().1))); + } + + /// A spot color base's tint dragged from the guide carries the tint, and the Swatches panel makes + /// a tint swatch of it. + #[test] + fn a_dragged_spot_tint_becomes_a_tint_swatch() { + let mut app = spot_app(1.0); + let ctx = egui::Context::default(); + crate::theme::install_fonts(&ctx); + guide_frame(&mut app, &ctx, vec![], 0.0, true, ("cg-h", 0usize)); + let g = guide(&app, &ctx); + let c = g.centre(); + let tile = |ctx: &egui::Context| ctx.read_response(egui::Id::unique(("swatch-tile", "Red"))).expect("the Red swatch is drawn").rect.center(); + let held = drag_from(&mut app, &ctx, ("cg-v", 0, c + 1), Some(tile(&ctx)), 1.0, true); + let Some(PanelDrag::Paint { paint: Paint::Solid { swatch, tint, .. }, .. }) = held else { panic!("a solid paint: {held:?}") }; + assert_eq!(swatch.as_deref(), Some("Ink")); + let newest = app.session.doc().unwrap().doc.swatches.last().cloned().expect("a swatch"); + let (base, made) = newest.tint_of().unwrap_or_else(|| panic!("a tint swatch: {newest:?} {}", app.ui.status)); + assert_eq!(base, "Ink"); + assert!((made - tint).abs() < 1e-4, "{made} vs {tint}"); + } + /// Every colour of the panel's guide. fn shown(app: &VectorcraftApp, ctx: &egui::Context) -> Vec<String> { let g = guide(app, ctx); diff --git a/crates/ui-egui/src/panels/gradient.rs b/crates/ui-egui/src/panels/gradient.rs index e0e032c086..7baaa062ab 100644 --- a/crates/ui-egui/src/panels/gradient.rs +++ b/crates/ui-egui/src/panels/gradient.rs @@ -815,7 +815,7 @@ fn ramp(app: &mut VectorcraftApp, ui: &mut Ui, g: &Gradient, is_grad: bool, w: f let add_resp = ui.interact(below, ui.scope_id().with("grad-add"), Sense::click()); let bar_resp = ui.interact(bar, ui.scope_id().with("grad-bar"), Sense::click()); if add_resp.hovered() && is_grad { - ui.ctx().set_cursor_icon(egui::CursorIcon::Copy); + crate::cursors::set_add_cursor(app, ui.ctx()); } if !is_grad && (bar_resp.clicked() || add_resp.clicked()) { edit(app, json!({}), Live::Released); diff --git a/crates/ui-egui/src/panels/gradient/tests.rs b/crates/ui-egui/src/panels/gradient/tests.rs index 14a711bf57..bbf833b1aa 100644 --- a/crates/ui-egui/src/panels/gradient/tests.rs +++ b/crates/ui-egui/src/panels/gradient/tests.rs @@ -915,3 +915,43 @@ fn a_stop_dragged_off_the_ramp_or_deleted_with_the_button_beside_it_goes() { p.click(&mut app, del.center()); assert_eq!(hexes(&app), ["#ffffff", "#000000"]); } + +/// #8241: over the strip under the ramp, where a click adds a stop, the panel shows the white arrow +/// with a plus. Where the window shows glyphs as OS cursors (Windows, X11), it hands the glyph to +/// the OS, since winit shows the plain arrow for the system copy cursor there; elsewhere the +/// system copy cursor. Over the ramp itself, which adds nothing, neither. +#[test] +fn the_strip_under_the_ramp_shows_the_add_cursor() { + let stops = json!([{"offset": 0, "color": "#ffffff"}, {"offset": 1, "color": "#000000"}]); + let mut app = app(json!({"gradient": {"stops": stops}})); + let mut p = Panel::new(); + p.frame(&mut app, vec![], Modifiers::NONE); + let bar = p.widget("grad-bar"); + let output = |p: &mut Panel, app: &mut VectorcraftApp, at: Pos2| { + p.time += 0.1; + let events = vec![Event::PointerMoved(at)]; + let input = egui::RawInput { + time: Some(p.time), + events, + screen_rect: Some(Rect::from_min_size(Pos2::ZERO, vec2(260.0, 600.0))), + ..Default::default() + }; + let mut out = p.ctx.run_ui(input, |ui| show(app, ui)); + out.textures_delta.clear(); + out.platform_output + }; + // Between the two stops, just under the ramp. + let under = output(&mut p, &mut app, pos2(bar.center().x, bar.bottom() + 10.0)); + assert_eq!(under.cursor_icon, egui::CursorIcon::Copy); + // The same condition the panel uses (the build, Wayland, VECTORCRAFT_SYSTEM_CURSORS). + if crate::cursors::add_cursor_is_a_glyph(&app) { + let glyph = app.canvas.cursors.get(vectorcraft_tools::Cursor::GroupSelection, 1.0); + assert!(glyph.is_some()); + assert_eq!(under.cursor_image, glyph, "the white arrow with a plus, as an OS cursor"); + } else { + assert!(under.cursor_image.is_none(), "the system copy cursor alone"); + } + let over = output(&mut p, &mut app, bar.center()); + assert_ne!(over.cursor_icon, egui::CursorIcon::Copy); + assert!(over.cursor_image.is_none(), "over the ramp, no add cursor"); +} diff --git a/crates/ui-egui/src/panels/layers.rs b/crates/ui-egui/src/panels/layers.rs index eed20e12cb..6e8c2648fa 100644 --- a/crates/ui-egui/src/panels/layers.rs +++ b/crates/ui-egui/src/panels/layers.rs @@ -378,6 +378,19 @@ pub fn show(app: &mut VectorcraftApp, ui: &mut Ui) { { drag_ghost(ui, &view, widgets::ghost_row(ids, grabbed), pos); } + let alt = ui.input(|i| i.modifiers.alt); + let over_list = ui.input(|i| i.pointer.hover_pos()).is_some_and(|p| list_rect.contains(p)); + if !released + && let Some(drag) = egui::DragAndDrop::payload::<LayersDrag>(ui.ctx()) + && let Some(cursor) = drag_cursor(&drag, alt, over_list) + { + // The copy cursor is the panels' add cursor, which Windows can show (#8217, #8241). + if cursor == egui::CursorIcon::Copy { + crate::cursors::set_add_cursor(app, ui.ctx()); + } else { + ui.ctx().set_cursor_icon(cursor); + } + } // Keyboard: Delete removes the highlighted rows while the panel has the keyboard (a row was // clicked last, not the canvas). // The panel keeps it while it is drawn ([`super::has_row_keys`]); the app's shortcuts leave @@ -409,6 +422,19 @@ pub fn show(app: &mut VectorcraftApp, ui: &mut Ui) { see_selection(app, ui, selected); } +/// The cursor while `drag` is held (`alt` down, `over_list`: the pointer is over the rows): the +/// copy cursor where a drop copies, as a drop in the list with Alt does, else the grabbing hand. +/// The trash and New Layer ignore Alt, so outside the list the hand stays. Read every frame, as +/// the drop reads Alt when it lands (#8217). None for guide rows, which never copy and set their +/// own cursor. +fn drag_cursor(drag: &LayersDrag, alt: bool, over_list: bool) -> Option<egui::CursorIcon> { + match drag { + LayersDrag::Rows(_) | LayersDrag::Art if alt && over_list => Some(egui::CursorIcon::Copy), + LayersDrag::Rows(_) | LayersDrag::Art => Some(egui::CursorIcon::Grabbing), + LayersDrag::Guides(_) => None, + } +} + /// The search typed into the Layers panel's Search All field, as the panel matches it. fn search_query(ctx: &egui::Context) -> String { ctx.data(|d| d.get_temp::<String>(egui::Id::unique("layers-search"))).unwrap_or_default().trim().to_lowercase() diff --git a/crates/ui-egui/src/panels/layers/rows.rs b/crates/ui-egui/src/panels/layers/rows.rs index f532d4a1f1..62e32f1097 100644 --- a/crates/ui-egui/src/panels/layers/rows.rs +++ b/crates/ui-egui/src/panels/layers/rows.rs @@ -446,9 +446,7 @@ pub(super) fn row(ui: &mut Ui, view: &View, item: &Row, out: &mut Out) { d.insert_temp(key("grabbed"), n.id); }); } - if resp.dragged_by(egui::PointerButton::Primary) { - ui.ctx().set_cursor_icon(egui::CursorIcon::Grabbing); - } + // The cursor of a row drag is the panel's ([`super::drag_cursor`]): Alt can change it on any frame. drop_target(ui, view, n, r, x - 16.0, open, &resp, out); } diff --git a/crates/ui-egui/src/panels/layers/tests.rs b/crates/ui-egui/src/panels/layers/tests.rs index 5e453f5aba..2570e77df7 100644 --- a/crates/ui-egui/src/panels/layers/tests.rs +++ b/crates/ui-egui/src/panels/layers/tests.rs @@ -1493,6 +1493,57 @@ fn dragging_rows_moves_them_into_other_layers_and_alt_copies() { let _ = (layer, c); } +/// One headless frame of the panel with `events` (Alt held when `alt`) → the cursor it asks for, +/// and the cursor bitmap it hands the OS, if any. +fn cursor_frame( + app: &mut VectorcraftApp, + ctx: &egui::Context, + events: Vec<egui::Event>, + alt: bool, +) -> (egui::CursorIcon, Option<egui::CustomCursorImage>) { + let mut events = events; + events.insert(0, egui::Event::ModifiersChanged(egui::Modifiers { alt, ..Default::default() })); + let mut out = ctx.run_ui(egui::RawInput { events, ..Default::default() }, |ui| show(app, ui)); + out.textures_delta.clear(); + (out.platform_output.cursor_icon, out.platform_output.cursor_image) +} + +/// #8217: a row dragged over the list shows the copy cursor while Alt is held, as the drop then +/// copies, and the grabbing hand otherwise, following Alt as it goes down and up mid-drag. The copy +/// cursor is the panels' add cursor (#8241): where the window shows glyphs as OS cursors (Windows, +/// X11, which have no system copy cursor winit can show), the white arrow with a plus. +#[test] +fn alt_shows_the_copy_cursor_while_rows_are_dragged() { + let (mut app, _) = nested(); + let ctx = egui::Context::default(); + // Rows: Layer 1, Sub, g, b, a, c. + let (circles, _) = frame(&mut app, &ctx, vec![], false); + assert_eq!(circles.len(), 6); + let (from, to) = (egui::pos2(150.0, circles[2].y), egui::pos2(150.0, circles[5].y)); + frame(&mut app, &ctx, vec![egui::Event::PointerMoved(from)], false); + frame(&mut app, &ctx, vec![button(from, true)], false); + frame(&mut app, &ctx, vec![egui::Event::PointerMoved(from + vec2(0.0, 6.0))], false); + let glyph = crate::cursors::add_cursor_is_a_glyph(&app).then(|| app.canvas.cursors.get(vectorcraft_tools::Cursor::GroupSelection, 1.0)).flatten(); + assert_eq!(cursor_frame(&mut app, &ctx, vec![egui::Event::PointerMoved(to)], false), (egui::CursorIcon::Grabbing, None), "a move"); + assert_eq!(cursor_frame(&mut app, &ctx, vec![], true), (egui::CursorIcon::Copy, glyph), "Alt held: the drop copies"); + assert_eq!(cursor_frame(&mut app, &ctx, vec![], false), (egui::CursorIcon::Grabbing, None), "Alt let go: a move again"); + cursor_frame(&mut app, &ctx, vec![button(to, false)], false); + assert_ne!(cursor_frame(&mut app, &ctx, vec![], true).0, egui::CursorIcon::Copy, "no drag, no copy cursor"); +} + +/// The selected-art square copies with Alt as rows do; off the list (the trash, New Layer) Alt +/// copies nothing, and guide rows keep their own cursor. +#[test] +fn drag_cursor_shows_a_copy_only_where_the_drop_copies() { + let (copy, grabbing) = (Some(egui::CursorIcon::Copy), Some(egui::CursorIcon::Grabbing)); + for drag in [LayersDrag::Rows(vec![NodeId(1)]), LayersDrag::Art] { + assert_eq!(super::drag_cursor(&drag, true, true), copy); + assert_eq!(super::drag_cursor(&drag, false, true), grabbing); + assert_eq!(super::drag_cursor(&drag, true, false), grabbing, "off the list"); + } + assert_eq!(super::drag_cursor(&LayersDrag::Guides(vec![0]), true, true), None); +} + /// An Intertwine group's row takes a dragged row inside it, as a group's does, and the object /// becomes a member; a row that can't be intertwined gets no inside box and goes beside it. #[test] diff --git a/crates/ui-egui/src/panels/swatches.rs b/crates/ui-egui/src/panels/swatches.rs index a27c8b65ff..7b70844dcc 100644 --- a/crates/ui-egui/src/panels/swatches.rs +++ b/crates/ui-egui/src/panels/swatches.rs @@ -46,7 +46,7 @@ pub(crate) use libraries::{ }; #[cfg(test)] pub(crate) use tiles::describe; -pub(crate) use tiles::{draw_folder, folder_tile, global_mark, list_row, list_row_name, tile_grid}; +pub(crate) use tiles::{CMYK_INKS, draw_folder, folder_tile, global_mark, list_row, list_row_name, tile_grid}; /// View modes of the swatch list (and of the library panels: `ui.libraryPanel {view}`). #[derive(Clone, Copy, Debug, Default, PartialEq, Eq, serde::Serialize, serde::Deserialize)] @@ -190,13 +190,14 @@ fn swatch_params(e: &Entry) -> Option<Value> { /// Apply a clicked swatch to the active proxy (Alt: the inactive one). An Alt-click on a color /// swatch with a gradient stop selected recolors the stop as dropping the swatch on it does, /// and with a freeform gradient point selected it recolors the point. A color swatch also becomes -/// the Color Guide's base color. +/// the Color Guide's base color, linked to the spot color it is or is a tint of. fn apply(app: &mut VectorcraftApp, ui: &Ui, e: &Entry) { let Some(params) = swatch_params(e) else { return }; - if let Entry::Swatch { paint, .. } = e + if let Entry::Swatch { name, paint, .. } = e && let Some(c) = paint.color() { - super::color_guide::choose_base(app, c); + let link = app.session.active().and_then(|st| st.doc.swatch_link(name)); + super::color_guide::choose_linked_base(app, c, link); } if super::alt_held(ui) && let Some(c) = drag_of(e, vec![]).color() diff --git a/crates/ui-egui/src/panels/swatches/actions.rs b/crates/ui-egui/src/panels/swatches/actions.rs index b183787366..1779f9dfa6 100644 --- a/crates/ui-egui/src/panels/swatches/actions.rs +++ b/crates/ui-egui/src/panels/swatches/actions.rs @@ -1,6 +1,9 @@ use super::dnd::{group_of, selection}; use super::libraries::SwatchLibraries; -use super::{Kind, LibraryKind, Ui, Value, VectorcraftApp, View, active_paint, json, library_panel, menu_item, pstate, set_pstate, widgets}; +use super::{ + Kind, LibraryKind, PanelDrag, Response, Ui, Value, VectorcraftApp, View, active_paint, json, library_panel, menu_item, pstate, set_pstate, + widgets, +}; /// The selected swatches and groups that can be deleted (all but None and Registration). pub(super) fn deletable(sel: &[String]) -> Vec<String> { @@ -84,14 +87,52 @@ pub(super) fn bottom(app: &mut VectorcraftApp, ui: &mut Ui, sel: &[String]) { if widgets::icon_button(ui, "dc-new-item", tl!("New Swatch"), false, 24.0).clicked() { new_swatch(app, sel, ui.input(|i| i.modifiers)); } - // Alt-click deletes without asking. + // Alt-click deletes without asking. Swatches or color groups dragged from the list can be + // dropped on it, also with nothing selected: the button is enabled while they are held. let del = deletable(sel); - if widgets::icon_button_enabled(ui, "trash-2", tl!("Delete Swatch"), false, !del.is_empty(), 24.0).clicked() { + let dragged = dragged_deletable(app, ui.ctx()); + let trash = widgets::icon_button_enabled(ui, "trash-2", tl!("Delete Swatch"), false, !del.is_empty() || !dragged.is_empty(), 24.0); + if trash.clicked() && !del.is_empty() { delete(app, del, ui.input(|i| i.modifiers.alt)); } + drop_on_delete(app, ui, &trash, dragged); }); } +/// The panel state key of the document (`uid`) the swatches being dragged from the list belong to. +pub(super) const DRAG_DOC: &str = "swatch-drag-doc"; + +/// The swatches and color groups of the active document being dragged from the list that Delete +/// Swatch can delete: neither None nor Registration, and still in the document. Empty for any other +/// drag, and for a drag started in another document. +fn dragged_deletable(app: &VectorcraftApp, ctx: &egui::Context) -> Vec<String> { + let Some(st) = app.session.active() else { return vec![] }; + if pstate::<Option<u64>>(ctx, DRAG_DOC) != Some(st.uid) { + return vec![]; + } + match egui::DragAndDrop::payload::<PanelDrag>(ctx).as_deref() { + Some(PanelDrag::Paint { rows: Some(r), .. }) => deletable(&r.names).into_iter().filter(|n| st.doc.swatch_name_taken(n)).collect(), + _ => vec![], + } +} + +/// Swatches or color groups (`names`) dragged onto Delete Swatch (`button`): the button is +/// outlined while they are held over it, and the release of the primary button asks to delete them +/// as a plain click does ([`delete`]); Alt does not skip the question. The release of another +/// button ends the drag, and other drags are left to their own targets. +fn drop_on_delete(app: &mut VectorcraftApp, ui: &Ui, button: &Response, names: Vec<String>) { + if names.is_empty() || button.dnd_hover_payload::<PanelDrag>().is_none() { + return; + } + widgets::drop_target_outline(ui, button.rect); + if !ui.input(|i| i.pointer.button_released(egui::PointerButton::Primary)) { + return; + } + if button.dnd_release_payload::<PanelDrag>().is_some() { + delete(app, names, false); + } +} + /// The colour group the selection points at: the last selected group, or the group of the last /// selected swatch. fn target_group(app: &VectorcraftApp, sel: &[String]) -> Option<String> { diff --git a/crates/ui-egui/src/panels/swatches/body.rs b/crates/ui-egui/src/panels/swatches/body.rs index 32d65c08d7..bcecabb20c 100644 --- a/crates/ui-egui/src/panels/swatches/body.rs +++ b/crates/ui-egui/src/panels/swatches/body.rs @@ -1,4 +1,4 @@ -use super::actions::{bottom, edit_group}; +use super::actions::{DRAG_DOC, bottom, edit_group}; use super::dnd::{TileEvents, apply_drop, click_selection, highlighted, selection, tile_input, zone_input}; use super::tiles::{ draw_folder, draw_registration, folder_tile, global_mark, list_icons, list_row, list_row_name, pattern_thumb, tile_grid, tile_id, @@ -116,7 +116,9 @@ pub(super) fn body(app: &mut VectorcraftApp, ui: &mut Ui, salt: &'static str) { } } }); - let zone = ui.interact(out.inner_rect, ui.scope_id().with("swatch-drop"), Sense::hover()); + // The drop zone ends where the list does, so it does not reach over the buttons below a list + // shrunk to its rows. + let zone = ui.interact(out.inner_rect.intersect(ui.min_rect()), ui.scope_id().with("swatch-drop"), Sense::hover()); zone_input(ui, &zone, &mut ev); let r = ui.min_rect(); ui.ctx().accesskit_node_builder(ui.unique_id(), |node| { @@ -130,6 +132,9 @@ pub(super) fn body(app: &mut VectorcraftApp, ui: &mut Ui, salt: &'static str) { } None => {} } + if ev.started { + set_pstate(ui.ctx(), DRAG_DOC, app.session.active().map(|st| st.uid)); + } if let Some(drop) = ev.drop { apply_drop(app, drop); } diff --git a/crates/ui-egui/src/panels/swatches/dnd.rs b/crates/ui-egui/src/panels/swatches/dnd.rs index 2c36dabcb3..ea3282db68 100644 --- a/crates/ui-egui/src/panels/swatches/dnd.rs +++ b/crates/ui-egui/src/panels/swatches/dnd.rs @@ -114,6 +114,8 @@ pub(super) struct TileEvents { pub(super) drop: Option<Drop>, /// A drag is held over a tile or row. over: bool, + /// A drag of swatches or color groups started on a tile or row. + pub(super) started: bool, } /// Clicks, double-clicks, tooltips and drag and drop of the tile or row `resp` of entry `e` @@ -133,6 +135,7 @@ pub(super) fn tile_input(ui: &Ui, resp: Response, e: &Entry, items: &[Entry], se .map(|x| x.name().to_string()) .collect(); egui::DragAndDrop::set_payload(ui.ctx(), drag_of(e, names)); + ev.started = true; } tile_drop(ui, &resp, e, list, ev); // The default swatches' names show in the UI's language; the document keeps them as they are. @@ -144,7 +147,10 @@ pub(super) fn tile_input(ui: &Ui, resp: Response, e: &Entry, items: &[Entry], se }), _ => resp.on_hover_text(shown), }; - if resp.clicked() { + // Only the first click of a run of quick clicks applies and selects the swatch. The second + // opens the editor, and the later ones (counted as triple clicks) do nothing. Pattern editing + // selects the tile art, and a later click would paint it with the pattern itself. + if resp.clicked() && !resp.double_clicked() && !resp.triple_clicked() { ev.clicked = Some((e.clone(), ui.input(|i| i.modifiers))); } } diff --git a/crates/ui-egui/src/panels/swatches/tests.rs b/crates/ui-egui/src/panels/swatches/tests.rs index a84f61dcc5..a67e604f2b 100644 --- a/crates/ui-egui/src/panels/swatches/tests.rs +++ b/crates/ui-egui/src/panels/swatches/tests.rs @@ -178,6 +178,23 @@ fn a_clicked_color_swatch_becomes_the_color_guides_base() { assert_eq!(base(&app), "#2050a0"); } +/// A clicked spot color swatch, or a tint swatch of one, becomes the Color Guide's base linked to +/// that spot color at the swatch's tint; a process color swatch clears the link. +#[test] +fn a_clicked_spot_color_swatch_becomes_a_linked_color_guide_base() { + let mut app = app(); + let ctx = context(); + app.run("swatch.new", json!({"name": "Ink", "color": "#0066cc", "spot": true})).unwrap(); + app.run("swatch.new", json!({"swatch": "Ink", "tint": 40})).unwrap(); + let spot = |app: &VectorcraftApp| app.ui.color_guide_spot.as_ref().map(|s| (s.swatch.clone(), (s.tint * 100.0).round())); + click_tile(&mut app, &ctx, "Ink", Modifiers::NONE, 0.0); + assert_eq!(spot(&app), Some(("Ink".to_string(), 100.0))); + click_tile(&mut app, &ctx, "Ink 40%", Modifiers::NONE, 2.0); + assert_eq!(spot(&app), Some(("Ink".to_string(), 40.0)), "a tint swatch: its tint of the spot color"); + click_tile(&mut app, &ctx, "Red", Modifiers::NONE, 4.0); + assert_eq!(spot(&app), None, "a process color"); +} + /// The hex colors of the stops of the selection's gradient fill, and its stroke's color. fn stops_and_stroke(app: &VectorcraftApp) -> (Vec<String>, String) { let (fill, stroke) = crate::panels::current_paints(app); @@ -501,6 +518,49 @@ fn list_view_rows_take_double_clicks_and_folder_clicks_select_the_group() { assert_eq!(describe(&Paint::solid(Color::gray(0.5)), true, true), "Spot Color, Grayscale"); } +/// The test sends each click on its own frame, as a real pointer does. The first click paints the +/// selected art with the pattern. The second click opens pattern editing on that pattern, which +/// selects the tile art. Neither the second click nor quick clicks after it paint the tile art +/// with the pattern itself (#7095). +#[test] +fn double_clicking_a_pattern_edits_it_without_painting_its_tile() { + let mut app = app(); + let tile = app.run("shape.rectangle", json!({"x": 0, "y": 0, "width": 10, "height": 10})).unwrap()["id"].as_u64().unwrap(); + app.run("object.pattern.make", json!({"ids": [tile], "name": "Dots", "width": 20, "height": 20})).unwrap(); + app.run("object.pattern.done", json!({})).unwrap(); + let art = app.run("shape.rectangle", json!({"x": 100, "y": 100, "width": 50, "height": 50})).unwrap()["id"].as_u64().unwrap(); + for view in [View::SmallThumb, View::SmallList] { + // A solid fill each time, so the first click must paint the art in this view too. + app.run("paint.setFill", json!({"ids": [art], "color": "#2050a0"})).unwrap(); + app.run("select.set", json!({"ids": [art]})).unwrap(); + app.ui.swatches_view = view; + let ctx = context(); + // Only the pattern shows, so its row is on screen in the list view too. + set_pstate(&ctx, "swatch-show-find", true); + ctx.data_mut(|d| d.insert_temp(find_id(), "Dots".to_string())); + frame(&mut app, &ctx, vec![], 0.0, show); + let at = tile_center(&ctx, "Dots"); + let button = |pressed| Event::PointerButton { pos: at, button: PointerButton::Primary, pressed, modifiers: Modifiers::NONE }; + // Four quick clicks: a double-click, then two more that count as triple clicks. + let mut events = vec![Event::PointerMoved(at)]; + for _ in 0..4 { + events.extend([button(true), button(false)]); + } + for (i, e) in events.into_iter().enumerate() { + frame(&mut app, &ctx, vec![e], 1.0 + i as f64 * 0.05, show); + } + let d = &app.session.doc().unwrap().doc; + let pe = d.pattern_edit.as_ref().unwrap_or_else(|| panic!("{view:?}: the double-click opens pattern editing")); + assert_eq!(pe.pattern, "Dots"); + let fill = d.node(vectorcraft_doc::NodeId(art)).unwrap().appearance.fill_paint(); + assert!(matches!(fill, Paint::Pattern { pattern, .. } if pattern == "Dots"), "{view:?}: the first click paints the art"); + for n in d.node(pe.layer).unwrap().children().unwrap() { + assert!(!matches!(n.appearance.fill_paint(), Paint::Pattern { .. }), "{view:?}: the tile keeps its own fill: {}", app.ui.status); + } + app.run("object.pattern.done", json!({})).unwrap(); + } +} + #[test] fn dragging_tiles_reorders_and_moves_into_groups_as_one_undo_step_each() { let mut app = app(); @@ -579,6 +639,177 @@ fn only_a_primary_drag_moves_swatches_and_groups() { assert_eq!(app.session.doc().unwrap().history.undo.len(), undo + 1); } +/// One frame of the panel at `time` with `modifiers` held and the accessibility tree on; returns +/// the frame's output. +fn frame_out(app: &mut VectorcraftApp, ctx: &egui::Context, events: Vec<Event>, modifiers: Modifiers, time: f64) -> egui::FullOutput { + ctx.enable_accesskit(); + let screen_rect = Some(Rect::from_min_size(Pos2::ZERO, vec2(280.0, 700.0))); + let events = std::iter::once(Event::ModifiersChanged(modifiers)).chain(events).collect(); + let input = egui::RawInput { events, time: Some(time), screen_rect, ..Default::default() }; + let mut out = ctx.run_ui(input, |ui| show(app, ui)); + out.textures_delta.clear(); + out +} + +/// The Delete Swatch button in `out`: its rectangle and whether it is enabled. +fn trash_button(out: &egui::FullOutput) -> (Rect, bool) { + let nodes = &out.platform_output.accesskit_update.as_ref().expect("an accessibility tree").nodes; + let node = nodes.iter().map(|(_, n)| n).find(|n| n.label().is_some_and(|l| l.trim() == "Delete Swatch")).expect("a Delete Swatch button"); + let b = node.bounds().expect("the button's bounds"); + (Rect::from_min_max(pos2(b.x0 as f32, b.y0 as f32), pos2(b.x1 as f32, b.y1 as f32)), !node.is_disabled()) +} + +/// Whether `out` draws the drop outline around `rect`. +fn outlined(out: &egui::FullOutput, rect: Rect) -> bool { + out.shapes.iter().any(|c| match &c.shape { + Shape::Rect(r) => r.rect.center().distance(rect.center()) < 0.5 && (r.stroke.width - 1.5).abs() < 0.01, + _ => false, + }) +} + +/// Drag the tile of `name` with `modifiers` held onto Delete Swatch and release the primary button +/// there, a frame per step from `time`. Returns whether the button was outlined and enabled while +/// the drag was held over it. +fn drag_to_trash(app: &mut VectorcraftApp, ctx: &egui::Context, name: &str, modifiers: Modifiers, time: f64) -> (bool, bool) { + frame_out(app, ctx, vec![], modifiers, time); + let (trash, _) = trash_button(&frame_out(app, ctx, vec![], modifiers, time + 0.05)); + let from = tile_center(ctx, name); + let button = |pos, pressed| Event::PointerButton { pos, button: PointerButton::Primary, pressed, modifiers }; + frame_out(app, ctx, vec![Event::PointerMoved(from), button(from, true)], modifiers, time + 0.1); + frame_out(app, ctx, vec![Event::PointerMoved(from + vec2(6.0, 4.0))], modifiers, time + 0.2); + frame_out(app, ctx, vec![Event::PointerMoved(trash.center())], modifiers, time + 0.3); + let held = frame_out(app, ctx, vec![Event::PointerMoved(trash.center())], modifiers, time + 0.4); + let seen = (outlined(&held, trash), trash_button(&held).1); + frame_out(app, ctx, vec![Event::PointerMoved(trash.center()), button(trash.center(), false)], modifiers, time + 0.5); + seen +} + +fn undo_steps(app: &VectorcraftApp) -> usize { + app.session.doc().unwrap().history.undo.len() +} + +fn dialog_message(app: &VectorcraftApp) -> Option<String> { + app.ui.dialog.as_ref().map(|d| d.str("message")) +} + +/// Swatches and color groups dragged from the list onto Delete Swatch are deleted as a plain click +/// on the button deletes the selection: the drop asks first, Cancel keeps them, and OK deletes them +/// in one undo step. The button is outlined and enabled while they are held over it, also with +/// nothing selected. A selected swatch carries the other selected swatches with it, but not the +/// selected groups, None or Registration, and Alt does not skip the question. +#[test] +fn swatches_dropped_on_delete_swatch_are_deleted_after_asking() { + let mut app = app(); + let ctx = context(); + let doc = |app: &VectorcraftApp| app.session.doc().unwrap().doc.clone(); + let has_group = |app: &VectorcraftApp, g: &str| doc(app).swatch_groups.iter().any(|x| x.name == g); + assert!(!trash_button(&frame_out(&mut app, &ctx, vec![], Modifiers::NONE, 0.0)).1, "disabled with nothing selected"); + let undo = undo_steps(&app); + // An unselected swatch, nothing selected. + assert_eq!(drag_to_trash(&mut app, &ctx, "Orange", Modifiers::NONE, 1.0), (true, true), "outlined and enabled while held"); + assert_eq!(dialog_message(&app).as_deref(), Some("Delete “Orange”?")); + crate::dialogs::cancel(&mut app); + assert!(doc(&app).swatch("Orange").is_some(), "Cancel keeps it"); + assert_eq!(undo_steps(&app), undo, "Cancel adds no undo step"); + drag_to_trash(&mut app, &ctx, "Orange", Modifiers::NONE, 2.0); + crate::dialogs::confirm(&mut app).unwrap(); + assert!(app.ui.dialog.is_none() && doc(&app).swatch("Orange").is_none(), "OK deletes it"); + assert_eq!(undo_steps(&app), undo + 1, "one undo step"); + app.run("edit.undo", json!({})).unwrap(); + assert!(doc(&app).swatch("Orange").is_some(), "Undo brings it back"); + // A selected swatch carries the selected swatches; Alt still asks. + let sel = ["[None]", "Red", "Grays", "Lime"].map(String::from).to_vec(); + set_pstate(&ctx, "swatch-selected", sel); + let undo = undo_steps(&app); + assert_eq!(drag_to_trash(&mut app, &ctx, "Lime", Modifiers::ALT, 3.0), (true, true)); + assert_eq!(dialog_message(&app).as_deref(), Some("Delete these 2 swatches and groups?")); + crate::dialogs::confirm(&mut app).unwrap(); + let d = doc(&app); + assert!(d.swatch("Red").is_none() && d.swatch("Lime").is_none(), "the dragged selection is deleted"); + assert!(has_group(&app, "Grays") && d.swatch("[None]").is_some() && d.swatch("Orange").is_some(), "the rest stays"); + assert_eq!(undo_steps(&app), undo + 1, "one undo step for both"); + // A color group is deleted with its swatches. + drag_to_trash(&mut app, &ctx, "Grays", Modifiers::NONE, 4.0); + assert_eq!(dialog_message(&app).as_deref(), Some("Delete “Grays”?")); + crate::dialogs::confirm(&mut app).unwrap(); + assert!(!has_group(&app, "Grays") && doc(&app).swatch("K=50").is_none()); + assert_eq!(undo_steps(&app), undo + 2); + // None and Registration are never deleted, and the button does not take them. + set_pstate(&ctx, "swatch-selected", Vec::<String>::new()); + let kept = doc(&app); + for (i, name) in ["[None]", REGISTRATION].into_iter().enumerate() { + assert_eq!(drag_to_trash(&mut app, &ctx, name, Modifiers::NONE, 5.0 + i as f64), (false, false), "{name}"); + assert_eq!(dialog_message(&app), None, "{name}"); + assert_eq!(doc(&app), kept, "{name}"); + } + assert_eq!(undo_steps(&app), undo + 2); +} + +/// Delete Swatch takes only swatches dragged from the active document's list: a paint dragged from +/// elsewhere, art, and a swatch dragged from another document whose name the active document also +/// has delete nothing, ask nothing and are not outlined. A secondary button released while a swatch +/// is held over the button ends the drag without asking. +#[test] +fn delete_swatch_ignores_other_drags() { + let mut app = app(); + let id = app.run("shape.rectangle", json!({"x": 0, "y": 0, "width": 50, "height": 50})).unwrap()["id"].as_u64().unwrap(); + let ctx = context(); + let (trash, _) = trash_button(&frame_out(&mut app, &ctx, vec![], Modifiers::NONE, 0.0)); + let (before, undo) = (app.session.doc().unwrap().doc.clone(), undo_steps(&app)); + let unchanged = |app: &VectorcraftApp, case: &str| { + assert_eq!(dialog_message(app), None, "{case}: asks nothing"); + assert_eq!(app.session.doc().unwrap().doc, before, "{case}: deletes nothing"); + assert_eq!(undo_steps(app), undo, "{case}: no undo step"); + }; + // The payloads are set directly, as if dragged from this document's list. + set_pstate(&ctx, super::actions::DRAG_DOC, app.session.active().map(|st| st.uid)); + let release = |at| Event::PointerButton { pos: at, button: PointerButton::Primary, pressed: false, modifiers: Modifiers::NONE }; + let cases = [ + ("a paint", PanelDrag::paint(Paint::solid(Color::from_hex("#ed1c24").unwrap()))), + ("art", PanelDrag::Art(vec![vectorcraft_doc::NodeId(id)])), + ]; + for (i, (case, drag)) in cases.into_iter().enumerate() { + egui::DragAndDrop::set_payload(&ctx, drag); + let held = frame_out(&mut app, &ctx, vec![Event::PointerMoved(trash.center())], Modifiers::NONE, 1.0 + i as f64); + assert!(!outlined(&held, trash), "{case}: not outlined"); + frame_out(&mut app, &ctx, vec![release(trash.center())], Modifiers::NONE, 1.5 + i as f64); + unchanged(&app, case); + egui::DragAndDrop::clear_payload(&ctx); + } + // A secondary release over the button, then the primary release. + frame_out(&mut app, &ctx, vec![], Modifiers::NONE, 3.0); + let from = tile_center(&ctx, "Orange"); + let press = |at, button, pressed| Event::PointerButton { pos: at, button, pressed, modifiers: Modifiers::NONE }; + frame_out(&mut app, &ctx, vec![Event::PointerMoved(from), press(from, PointerButton::Primary, true)], Modifiers::NONE, 3.1); + frame_out(&mut app, &ctx, vec![Event::PointerMoved(from + vec2(6.0, 4.0))], Modifiers::NONE, 3.2); + frame_out(&mut app, &ctx, vec![Event::PointerMoved(trash.center())], Modifiers::NONE, 3.3); + let held = frame_out(&mut app, &ctx, vec![Event::PointerMoved(trash.center())], Modifiers::NONE, 3.4); + assert!(outlined(&held, trash), "Orange is held over the button"); + frame_out(&mut app, &ctx, vec![press(trash.center(), PointerButton::Secondary, true)], Modifiers::NONE, 3.5); + frame_out(&mut app, &ctx, vec![press(trash.center(), PointerButton::Secondary, false)], Modifiers::NONE, 3.6); + unchanged(&app, "a secondary release"); + frame_out(&mut app, &ctx, vec![release(trash.center())], Modifiers::NONE, 3.7); + unchanged(&app, "the primary release after it"); + // A swatch dragged from this document while another document with the same swatches becomes + // active. + frame_out(&mut app, &ctx, vec![], Modifiers::NONE, 4.0); + let from = tile_center(&ctx, "Orange"); + frame_out(&mut app, &ctx, vec![Event::PointerMoved(from), press(from, PointerButton::Primary, true)], Modifiers::NONE, 4.1); + frame_out(&mut app, &ctx, vec![Event::PointerMoved(from + vec2(6.0, 4.0))], Modifiers::NONE, 4.2); + assert!(egui::DragAndDrop::payload::<PanelDrag>(&ctx).is_some(), "Orange is dragged"); + app.run("file.new", json!({"width": 200, "height": 200})).unwrap(); + let undo_new = undo_steps(&app); + frame_out(&mut app, &ctx, vec![Event::PointerMoved(trash.center())], Modifiers::NONE, 4.3); + let held = frame_out(&mut app, &ctx, vec![Event::PointerMoved(trash.center())], Modifiers::NONE, 4.4); + let (trash_new, enabled) = trash_button(&held); + assert!(!outlined(&held, trash_new) && !enabled, "not outlined or enabled in the other document"); + frame_out(&mut app, &ctx, vec![release(trash_new.center())], Modifiers::NONE, 4.5); + assert_eq!(dialog_message(&app), None, "the other document asks nothing"); + assert!(app.session.doc().unwrap().doc.swatch("Orange").is_some() && undo_steps(&app) == undo_new, "the other document keeps Orange"); + assert!(app.session.set_active(0)); + unchanged(&app, "the first document"); +} + #[test] fn art_dropped_on_the_panel_becomes_a_pattern_swatch() { let mut app = app(); diff --git a/crates/ui-egui/src/panels/swatches/tiles.rs b/crates/ui-egui/src/panels/swatches/tiles.rs index 42ff8b381c..7e92615c17 100644 --- a/crates/ui-egui/src/panels/swatches/tiles.rs +++ b/crates/ui-egui/src/panels/swatches/tiles.rs @@ -64,7 +64,8 @@ pub(crate) fn draw_folder(ui: &Ui, r: Rect) { } /// The ink colours of the CMYK glyph (cyan, magenta, yellow, black) and the RGB glyph's bars. -const CMYK_INKS: [Color32; 4] = [Color32::from_rgb(0, 174, 239), Color32::from_rgb(236, 0, 140), Color32::from_rgb(255, 242, 0), Color32::BLACK]; +pub(crate) const CMYK_INKS: [Color32; 4] = + [Color32::from_rgb(0, 174, 239), Color32::from_rgb(236, 0, 140), Color32::from_rgb(255, 242, 0), Color32::BLACK]; const RGB_BARS: [Color32; 3] = [Color32::from_rgb(255, 0, 0), Color32::from_rgb(0, 200, 0), Color32::from_rgb(0, 0, 255)]; diff --git a/crates/ui-egui/src/prefs_dialog/descriptions.rs b/crates/ui-egui/src/prefs_dialog/descriptions.rs index 679e207dc3..eb8156f8dd 100644 --- a/crates/ui-egui/src/prefs_dialog/descriptions.rs +++ b/crates/ui-egui/src/prefs_dialog/descriptions.rs @@ -4,6 +4,93 @@ /// (preference key, sentence), in the order the dialog lists the settings. pub(crate) const DESCRIPTIONS: &[(&str, &str)] = &[ + // General + ("__taskBar", "Shows a bar of commands for the selection or tool on the canvas; it hides while you drag and in Presentation Mode."), + ("keyboardIncrement", "How far an arrow key moves the selection; with Shift, it moves ten times as far."), + ("constrainAngle", "The angle of the axes that arrow keys move along and that Shift holds drawing and moving to."), + ("cornerRadius", "The corner radius the Rounded Rectangle tool draws with; changing the radius while drawing changes this value too."), + ( + "pasteOffset", + "How far right and down Paste moves the copy when it is given no position, as from a script; Paste in the app centers it in the view.", + ), + ("disableAutoAddDelete", "Stops the Pen tool from deleting the anchor you click on a selected path, or adding one where you click its segment."), + ("usePreciseCursors", "Drawing tools show a crosshair pointer instead of their icon; Caps Lock does the same while it is on."), + ("showToolTips", "Shows a tip when the pointer rests on a button or field that has one."), + ("showExternalScriptWarning", "Shows a warning before a script you choose runs."), + ("antiAliasedArtwork", "Smooths the edges of artwork on the canvas."), + ( + "selectSameTintPercent", + "Select › Same › Fill Color, Stroke Color and Fill & Stroke match only the same tint of a global or spot swatch, not any tint of it.", + ), + ("showHomeScreen", "Shows the Home screen when no document is open; off, the window stays empty until you click Home."), + ( + "usePreviewBounds", + "Measures objects with their strokes and shape-changing effects for size, position and alignment; shadows, glows and blurs are not measured.", + ), + ("displayPrintSize", "At 100% zoom, one inch of the document takes 96 screen points instead of 72."), + ("doubleClickToIsolate", "Double-clicking a group, path or image with the Selection tool opens it in isolation mode."), + ( + "transformPatternTiles", + "Pattern fills and strokes transform with the art, unless a transform or the Transform panel's menu chooses otherwise.", + ), + ("scaleCorners", "Live corner radii scale with the art, unless the scale chooses otherwise."), + ("scaleStrokes", "Stroke weights, dashes and effect distances scale with the art, unless the scale chooses otherwise."), + ("zoomWithMouseWheel", "The mouse wheel zooms the canvas instead of scrolling it."), + ("ctrlWheelScrollsSideways", "The mouse wheel with Cmd/Ctrl held scrolls the canvas sideways."), + ("scrubNumericFields", "Dragging sideways on a numeric field's label changes the field's value."), + ("trackpadRotateView", "A two-finger rotate gesture on a trackpad rotates the canvas view."), + ("holdToolKeys", "Holding a tool's shortcut key chooses the tool until you let go, and then the previous tool is chosen again."), + ("boundingBoxWhileMovingAndDrawing", "Shows the bounding box while you move the selection or draw a shape."), + ("japaneseCropMarks", "Create Trim Marks draws Japanese-style marks instead of Roman ones."), + ("newArtBasic", "New art takes only the fill and stroke of the selection; off, it takes the selected object's whole appearance."), + ( + "constrainProportions", + "Changing the width or height in the Transform panel, the Properties panel or the Control bar changes the other in proportion.", + ), + ("singleCornerRadius", "A live rectangle's properties show one Corner Radius field for all four corners; off, each corner has its own field."), + ( + "transformPanelPatterns", + "What edits in the Transform panel transform: the object, its pattern tiles or both; Default follows Transform Pattern Tiles.", + ), + ( + "useRegistrationPointForSymbol", + "With one symbol instance selected, the Transform panel uses the symbol's registration point as its reference point.", + ), + ("fadeRegionOutsideArtboard", "Darkens the canvas outside the artboards while the Artboard tool is active."), + ( + "artboardUpdateWhileDragging", + "With Fade Region Outside Artboard on, the area outside the artboards stays dark while you drag with the Artboard tool.", + ), + // Selection & Anchor Display + ("selectionTolerance", "How near, in pixels, the pointer must be to an object, anchor or handle for a click to select it."), + ( + "marqueeSelection", + "Whether the Selection tool's box selects objects it touches or only those fully inside; Drag Direction selects those inside on a drag to the right. E reverses it mid-drag.", + ), + ("objectSelectionByPathOnly", "A click selects a filled object only on its path, not inside its fill."), + ( + "snapToPointTolerance", + "How near, in pixels, a point must come to an anchor or ruler guide for Snap to Point to snap it; with Smart Guides on, Smart Guides' Snapping Tolerance applies instead.", + ), + ( + "ctrlClickSelectsBehind", + "With the Selection tool, Cmd/Ctrl-click selects the object under the selected one at the pointer; each further click goes one object deeper.", + ), + ("zoomToSelection", "Zoom In and Zoom Out bring the center of the selection to the middle of the view."), + ( + "moveLockedWithArtboard", + "Locked and hidden artwork inside an artboard moves, scales and is copied with the artboard, as the other artwork does.", + ), + ("anchorSize", "The size of anchor points and direction handle ends on the canvas; larger anchors can also be picked from farther away."), + ("handleStyle", "Draws the ends of direction handles as solid dots, hollow dots or larger solid dots."), + ("highlightAnchorsOnHover", "With the Direct Selection tool, the anchor under the pointer is highlighted."), + ( + "showHandlesMultipleAnchors", + "Shows direction handles when more than one anchor is selected; off, they show only while a single anchor is selected.", + ), + ("hideCornerWidgetAbove", "Corner widgets hide on corners whose angle is greater than this many degrees."), + ("penRubberBand", "The Pen tool previews the next segment from the last anchor to the pointer before you click."), + ("curvatureRubberBand", "The Curvature tool previews the curve to the pointer before you place the next point."), // Units ( "unitsGeneral", @@ -14,6 +101,65 @@ pub(crate) const DESCRIPTIONS: &[(&str, &str)] = &[ ("unitsAsianType", "The unit for East Asian type measurements, which no field uses yet."), ("numbersWithoutUnitsArePoints", "When on, a number typed without a unit into a field in picas is read in points."), ("identifyObjectsBy", "With XML ID, object names show as XML IDs in the Layers panel, the Variables panel and Layer Options."), + // Guides & Grid + ( + "__snapToGrid", + "Snaps drawing, moving and scaling to the grid's subdivisions, even while the grid is hidden; while it is on, Snap to Pixel does not apply.", + ), + ("guideColor", "The color of guides that are not selected; an artboard with a Guide Label draws its own guides in the label's color instead."), + ("guideStyle", "Draws guides as solid lines or as dots, including the guides already in the document."), + ( + "lockGuidesByDefault", + "With this on, guides are locked when VectorCraft starts; changing this option locks or unlocks them at once, and View › Guides › Lock Guides still changes the lock.", + ), + ( + "cmdRulerDragArtboardGuides", + "With this on, holding Cmd/Ctrl as you start dragging from a ruler makes a guide on the active artboard only, or a canvas guide with the Artboard tool.", + ), + ("gridColor", "The color of the grid; the lines between major gridlines are drawn in a fainter shade of it."), + ("gridStyle", "Draws the grid as lines, or as dots along the major gridlines at each subdivision."), + ( + "gridlineEvery", + "The distance between major gridlines, in every open document and in new ones; a VectorCraft document opens with the grid it was saved with.", + ), + ( + "gridSubdivisions", + "How many parts each major grid square is divided into; Snap to Grid snaps to these parts, even when the zoom hides their lines.", + ), + ("gridsInBack", "Draws the grid behind the artwork; off, the grid is drawn over it."), + ("showPixelGrid", "In Pixel Preview at 600% zoom or more, the active view shows a line at the edge of every document pixel over the artwork."), + ("patternTileEdgeColor", "The color of the tile edge and the dashed swatch bounds shown while you edit a pattern."), + // Smart Guides + ( + "__smartGuides", + "Snaps drawing, moving and transforming to nearby art and shows guides and labels; Pixel Preview turns them off, and Snap to Grid snaps to the grid instead.", + ), + ("smartGuideColor", "The color of Smart Guide lines and labels."), + ( + "alignmentGuides", + "Shows a line along the edge or center that art lines up with; off, art still lines up without the line, and Snap to Glyph does not apply.", + ), + ("objectHighlighting", "With a selection tool, outlines the unselected object under the pointer in its layer color while you are not dragging."), + ("transformToolsGuides", "Shows the size or angle next to the pointer while you scale, rotate, shear or reflect art."), + ("constructionGuides", "While you draw, points snap to lines at the chosen Angles through the point the segment or shape starts from."), + ("constructionAngles", "The set of angles the construction guides follow while Construction Guides is on."), + ("anchorPathLabels", "Names what a point snaps to, such as an anchor, a path or an alignment; off, points snap the same way without the names."), + ("measurementLabels", "Shows distances, angles and how far art has moved next to the pointer while you draw or move it."), + ("spacingGuides", "Snaps moved or resized art to the same gap as between nearby objects, and marks the equal gaps."), + ( + "distanceGuides", + "With something selected, holding Alt/Option over another object or an artboard shows the distances between it and the selection.", + ), + ( + "snapToLastLocation", + "A selection dragged back to within the Snapping Tolerance of where the drag began goes back to exactly that place; a copy does not.", + ), + ( + "snappingTolerance", + "How near on screen the pointer or a dragged point must come to art for Smart Guides to snap to it; the distance is the same at every zoom.", + ), + ("snapTangent", "Snaps the end of a line segment, or a circle drawn from its center, so that it touches a nearby curve."), + ("snapPerpendicular", "Snaps the end of a line segment so that it meets a nearby straight segment at a right angle."), ]; /// The sentence that describes the setting `key`, in English, or `None` when it has none yet. diff --git a/crates/ui-egui/src/prefs_dialog/tests.rs b/crates/ui-egui/src/prefs_dialog/tests.rs index 3ecf868532..f7c676d441 100644 --- a/crates/ui-egui/src/prefs_dialog/tests.rs +++ b/crates/ui-egui/src/prefs_dialog/tests.rs @@ -1773,8 +1773,8 @@ fn a_row_without_a_description_leaves_the_line_empty() { description_frame(&mut a, &ctx, vec![egui::Event::PointerMoved(at(&texts, "General:"))]); let (texts, _) = description_frame(&mut a, &ctx, vec![]); assert!(painted(&texts, general), "the General row's sentence shows: {texts:?}"); - // Go to the General category and point at a row with no sentence. - let button = at(&texts, "General"); + // Go to the Type category and point at a row with no sentence. + let button = at(&texts, "Type"); let press = |pressed| egui::Event::PointerButton { pos: button, button: egui::PointerButton::Primary, pressed, modifiers: Default::default() }; description_frame(&mut a, &ctx, vec![egui::Event::PointerMoved(button), press(true), press(false)]); let (texts, _) = description_frame(&mut a, &ctx, vec![]); @@ -1788,16 +1788,237 @@ fn a_row_without_a_description_leaves_the_line_empty() { description_frame(&mut a, &ctx, vec![egui::Event::PointerMoved(line.center())]); let (after, _) = description_frame(&mut a, &ctx, vec![]); empty(&after, "on the line after changing category"); - assert_eq!(descriptions::description("keyboardIncrement"), None); - description_frame(&mut a, &ctx, vec![egui::Event::PointerMoved(at(&texts, "Keyboard Increment:"))]); + assert_eq!(descriptions::description("typeSizeIncrement"), None); + description_frame(&mut a, &ctx, vec![egui::Event::PointerMoved(at(&texts, "Size/Leading:"))]); let (after, _) = description_frame(&mut a, &ctx, vec![]); - empty(&after, "on Keyboard Increment"); + empty(&after, "on Size/Leading"); description_frame(&mut a, &ctx, vec![egui::Event::PointerMoved(line.center())]); let (after, _) = description_frame(&mut a, &ctx, vec![]); - empty(&after, "on the line after Keyboard Increment"); + empty(&after, "on the line after Size/Leading"); assert_eq!(preferences_window(&ctx).size(), size); } +/// Every setting the General, Selection & Anchor Display, Guides & Grid and Smart Guides categories +/// show, the Smart Guides box included, has exactly one sentence, and no key has two. +#[test] +fn every_general_selection_guides_and_smart_guides_setting_has_one_description() { + let mut bad = vec![]; + for s in settings().filter(|s| ["General", "Selection & Anchor Display", "Guides & Grid", "Smart Guides"].contains(&s.category)) { + match descriptions::DESCRIPTIONS.iter().filter(|(k, _)| *k == s.key).count() { + 1 => {} + n => bad.push(format!("`{}` ({}) has {n} sentences", s.key, s.label)), + } + if descriptions::description(s.key).is_some_and(|d| d.trim().is_empty()) { + bad.push(format!("`{}` has an empty sentence", s.key)); + } + } + for (i, (key, _)) in descriptions::DESCRIPTIONS.iter().enumerate() { + if descriptions::DESCRIPTIONS[..i].iter().any(|(k, _)| k == key) { + bad.push(format!("`{key}` is listed twice")); + } + } + assert!(bad.is_empty(), "{}", bad.join("\n")); +} + +/// Cmd/Ctrl-wheel scrolls sideways with Zoom with Mouse Wheel on as well as off +/// (`canvas::tests::zoom_with_mouse_wheel_preference`), so the sentence for Scroll Sideways with +/// Cmd/Ctrl + Wheel does not make the sideways scroll depend on that setting. +#[test] +fn the_sideways_scroll_sentence_does_not_depend_on_zoom_with_mouse_wheel() { + let zoom = settings().find(|s| s.key == "zoomWithMouseWheel").expect("General has Zoom with Mouse Wheel").label; + let sideways = descriptions::description("ctrlWheelScrollsSideways").expect("Scroll Sideways with Cmd/Ctrl + Wheel has a sentence"); + assert!(!sideways.contains(zoom.trim_end_matches(':')), "`{sideways}` names `{zoom}`"); + assert!(sideways.contains("Cmd/Ctrl") && sideways.contains("sideways"), "`{sideways}` describes the sideways scroll"); +} + +/// The pointer over General's Contextual Task Bar row and over its Keyboard Increment row shows +/// each row's sentence. +#[test] +fn hovering_a_general_row_shows_its_description() { + let mut a = app(); + open(&mut a, Some("General")); + let ctx = egui::Context::default(); + crate::theme::install_fonts(&ctx); + description_frame(&mut a, &ctx, vec![]); + let (texts, _) = description_frame(&mut a, &ctx, vec![]); + let row = |texts: &[(String, egui::Rect)], label: &str| { + texts.iter().find(|(t, _)| t == label).map(|(_, r)| r.center()).unwrap_or_else(|| panic!("no `{label}` in {texts:?}")) + }; + let task_bar = descriptions::description("__taskBar").expect("Enable Contextual Task Bar has a sentence"); + let increment = descriptions::description("keyboardIncrement").expect("Keyboard Increment has a sentence"); + description_frame(&mut a, &ctx, vec![egui::Event::PointerMoved(row(&texts, "Enable Contextual Task Bar"))]); + let (after, _) = description_frame(&mut a, &ctx, vec![]); + assert!(painted(&after, task_bar) && !painted(&after, increment), "the task bar row's sentence shows: {after:?}"); + description_frame(&mut a, &ctx, vec![egui::Event::PointerMoved(row(&texts, "Keyboard Increment:"))]); + let (after, _) = description_frame(&mut a, &ctx, vec![]); + assert!(painted(&after, increment) && !painted(&after, task_bar), "the Keyboard Increment row's sentence shows: {after:?}"); +} + +/// Tab from the search field reaches General's first control, the Contextual Task Bar box: the line +/// shows its sentence and a screen reader gets it as the control's description. +#[test] +fn keyboard_focus_on_a_general_row_shows_its_description() { + let mut a = app(); + open(&mut a, Some("General")); + let ctx = egui::Context::default(); + ctx.enable_accesskit(); + crate::theme::install_fonts(&ctx); + description_frame(&mut a, &ctx, vec![]); + description_frame(&mut a, &ctx, vec![]); + let task_bar = descriptions::description("__taskBar").expect("Enable Contextual Task Bar has a sentence"); + let mut shown = None; + for _ in 0..40 { + let (texts, described) = description_frame(&mut a, &ctx, key_press(egui::Key::Tab, egui::Modifiers::NONE)); + if painted(&texts, task_bar) { + shown = Some(described); + break; + } + } + let described = shown.expect("Tab reaches the Contextual Task Bar row and its sentence shows"); + assert!(described.iter().any(|d| d == task_bar), "the focused control carries the sentence: {described:?}"); +} + +/// The pointer over Selection & Anchor Display's Tolerance row and over its Highlight anchors on +/// mouse over row shows each row's sentence. +#[test] +fn hovering_a_selection_row_shows_its_description() { + let mut a = app(); + open(&mut a, Some("Selection & Anchor Display")); + let ctx = egui::Context::default(); + crate::theme::install_fonts(&ctx); + description_frame(&mut a, &ctx, vec![]); + let (texts, _) = description_frame(&mut a, &ctx, vec![]); + let row = |texts: &[(String, egui::Rect)], label: &str| { + texts.iter().find(|(t, _)| t == label).map(|(_, r)| r.center()).unwrap_or_else(|| panic!("no `{label}` in {texts:?}")) + }; + let tolerance = descriptions::description("selectionTolerance").expect("Tolerance has a sentence"); + let highlight = descriptions::description("highlightAnchorsOnHover").expect("Highlight anchors on mouse over has a sentence"); + description_frame(&mut a, &ctx, vec![egui::Event::PointerMoved(row(&texts, "Tolerance:"))]); + let (after, _) = description_frame(&mut a, &ctx, vec![]); + assert!(painted(&after, tolerance) && !painted(&after, highlight), "the Tolerance row's sentence shows: {after:?}"); + description_frame(&mut a, &ctx, vec![egui::Event::PointerMoved(row(&texts, "Highlight anchors on mouse over"))]); + let (after, _) = description_frame(&mut a, &ctx, vec![]); + assert!(painted(&after, highlight) && !painted(&after, tolerance), "the Highlight anchors row's sentence shows: {after:?}"); +} + +/// Tab from the search field reaches Selection & Anchor Display's first control, the Tolerance +/// field: the line shows its sentence and a screen reader gets it as the control's description. +#[test] +fn keyboard_focus_on_a_selection_row_shows_its_description() { + let mut a = app(); + open(&mut a, Some("Selection & Anchor Display")); + let ctx = egui::Context::default(); + ctx.enable_accesskit(); + crate::theme::install_fonts(&ctx); + description_frame(&mut a, &ctx, vec![]); + description_frame(&mut a, &ctx, vec![]); + let tolerance = descriptions::description("selectionTolerance").expect("Tolerance has a sentence"); + let mut shown = None; + for _ in 0..40 { + let (texts, described) = description_frame(&mut a, &ctx, key_press(egui::Key::Tab, egui::Modifiers::NONE)); + if painted(&texts, tolerance) { + shown = Some(described); + break; + } + } + let described = shown.expect("Tab reaches the Tolerance row and its sentence shows"); + assert!(described.iter().any(|d| d == tolerance), "the focused control carries the sentence: {described:?}"); +} + +/// The pointer over Guides & Grid's Snap to Grid row and over its Gridline every row shows each +/// row's sentence. +#[test] +fn hovering_a_guides_and_grid_row_shows_its_description() { + let mut a = app(); + open(&mut a, Some("Guides & Grid")); + let ctx = egui::Context::default(); + crate::theme::install_fonts(&ctx); + description_frame(&mut a, &ctx, vec![]); + let (texts, _) = description_frame(&mut a, &ctx, vec![]); + let row = |texts: &[(String, egui::Rect)], label: &str| { + texts.iter().find(|(t, _)| t == label).map(|(_, r)| r.center()).unwrap_or_else(|| panic!("no `{label}` in {texts:?}")) + }; + let snap = descriptions::description("__snapToGrid").expect("Snap to Grid has a sentence"); + let every = descriptions::description("gridlineEvery").expect("Gridline every has a sentence"); + description_frame(&mut a, &ctx, vec![egui::Event::PointerMoved(row(&texts, "Snap to Grid"))]); + let (after, _) = description_frame(&mut a, &ctx, vec![]); + assert!(painted(&after, snap) && !painted(&after, every), "the Snap to Grid row's sentence shows: {after:?}"); + description_frame(&mut a, &ctx, vec![egui::Event::PointerMoved(row(&texts, "Gridline every:"))]); + let (after, _) = description_frame(&mut a, &ctx, vec![]); + assert!(painted(&after, every) && !painted(&after, snap), "the Gridline every row's sentence shows: {after:?}"); +} + +/// Tab from the search field reaches Guides & Grid's first control, the Snap to Grid box: the line +/// shows its sentence and a screen reader gets it as the control's description. +#[test] +fn keyboard_focus_on_a_guides_and_grid_row_shows_its_description() { + let mut a = app(); + open(&mut a, Some("Guides & Grid")); + let ctx = egui::Context::default(); + ctx.enable_accesskit(); + crate::theme::install_fonts(&ctx); + description_frame(&mut a, &ctx, vec![]); + description_frame(&mut a, &ctx, vec![]); + let snap = descriptions::description("__snapToGrid").expect("Snap to Grid has a sentence"); + let mut shown = None; + for _ in 0..40 { + let (texts, described) = description_frame(&mut a, &ctx, key_press(egui::Key::Tab, egui::Modifiers::NONE)); + if painted(&texts, snap) { + shown = Some(described); + break; + } + } + let described = shown.expect("Tab reaches the Snap to Grid row and its sentence shows"); + assert!(described.iter().any(|d| d == snap), "the focused control carries the sentence: {described:?}"); +} + +/// The pointer over Smart Guides' own Smart Guides row and over its Alignment Guides row shows each +/// row's sentence. +#[test] +fn hovering_a_smart_guides_row_shows_its_description() { + let mut a = app(); + open(&mut a, Some("Smart Guides")); + let ctx = egui::Context::default(); + crate::theme::install_fonts(&ctx); + description_frame(&mut a, &ctx, vec![]); + let (texts, _) = description_frame(&mut a, &ctx, vec![]); + let row = |texts: &[(String, egui::Rect)], label: &str| { + texts.iter().find(|(t, _)| t == label).map(|(_, r)| r.center()).unwrap_or_else(|| panic!("no `{label}` in {texts:?}")) + }; + let smart = descriptions::description("__smartGuides").expect("Smart Guides has a sentence"); + let alignment = descriptions::description("alignmentGuides").expect("Alignment Guides has a sentence"); + description_frame(&mut a, &ctx, vec![egui::Event::PointerMoved(row(&texts, "Smart Guides (View → Smart Guides)"))]); + let (after, _) = description_frame(&mut a, &ctx, vec![]); + assert!(painted(&after, smart) && !painted(&after, alignment), "the Smart Guides row's sentence shows: {after:?}"); + description_frame(&mut a, &ctx, vec![egui::Event::PointerMoved(row(&texts, "Alignment Guides"))]); + let (after, _) = description_frame(&mut a, &ctx, vec![]); + assert!(painted(&after, alignment) && !painted(&after, smart), "the Alignment Guides row's sentence shows: {after:?}"); +} + +/// Tab from the search field reaches Smart Guides' first control, the Smart Guides box: the line +/// shows its sentence and a screen reader gets it as the control's description. +#[test] +fn keyboard_focus_on_a_smart_guides_row_shows_its_description() { + let mut a = app(); + open(&mut a, Some("Smart Guides")); + let ctx = egui::Context::default(); + ctx.enable_accesskit(); + crate::theme::install_fonts(&ctx); + description_frame(&mut a, &ctx, vec![]); + description_frame(&mut a, &ctx, vec![]); + let smart = descriptions::description("__smartGuides").expect("Smart Guides has a sentence"); + let mut shown = None; + for _ in 0..40 { + let (texts, described) = description_frame(&mut a, &ctx, key_press(egui::Key::Tab, egui::Modifiers::NONE)); + if painted(&texts, smart) { + shown = Some(described); + break; + } + } + let described = shown.expect("Tab reaches the Smart Guides row and its sentence shows"); + assert!(described.iter().any(|d| d == smart), "the focused control carries the sentence: {described:?}"); +} + /// A sentence shown when the dialog closed does not come back when it opens again with the /// pointer away from the rows. #[test] diff --git a/crates/ui-egui/src/render_worker.rs b/crates/ui-egui/src/render_worker.rs index 50d5bc087c..a4a750953f 100644 --- a/crates/ui-egui/src/render_worker.rs +++ b/crates/ui-egui/src/render_worker.rs @@ -52,6 +52,15 @@ pub struct Done { pub reused: bool, } +/// Render `job` as the worker thread does: inside the job's automation roots and deferred +/// effects, with the worker's renderer `r` and its last frame `kept`. +pub(crate) fn render(r: &mut Renderer, kept: &mut Option<crate::canvas::KeptFrame>, job: Job) -> Done { + let t0 = crate::now_ms(); + let frame = job.scope.clone().run(|| job.effects.view(|| crate::canvas::render_job(r, kept, &job))); + let ms = crate::now_ms() - t0; + Done { key: job.key, doc: job.doc, opts: job.opts, img: frame.img, ms, moved: frame.moved, reused: frame.reused } +} + pub struct Worker { tx: Sender<Job>, rx: Receiver<Done>, @@ -76,11 +85,7 @@ impl Worker { while let Ok(newer) = jobs.try_recv() { job = newer; } - let t0 = crate::now_ms(); - let frame = job.scope.clone().run(|| job.effects.view(|| crate::canvas::render_job(&mut r, &mut kept, &job))); - let ms = crate::now_ms() - t0; - let done = Done { key: job.key, doc: job.doc, opts: job.opts, img: frame.img, ms, moved: frame.moved, reused: frame.reused }; - if done_tx.send(done).is_err() { + if done_tx.send(render(&mut r, &mut kept, job)).is_err() { break; } ctx.request_repaint(); diff --git a/crates/ui-egui/src/state.rs b/crates/ui-egui/src/state.rs index b6bf1793d5..c6d542c218 100644 --- a/crates/ui-egui/src/state.rs +++ b/crates/ui-egui/src/state.rs @@ -726,6 +726,10 @@ pub struct UiState { /// saved. #[serde(skip)] pub color_guide_base: Option<vectorcraft_color::Color>, + /// Color Guide panel: the spot color swatch the base is a tint of, when it was chosen from one + /// ([`crate::panels::color_guide::SpotBase`]). Not saved. + #[serde(skip)] + pub color_guide_spot: Option<crate::panels::color_guide::SpotBase>, /// Align panel: the Align To choice, Selection or Artboard, which Object → Align and the align /// buttons follow ([`crate::panels::align::with_align_to`]). #[serde(default, deserialize_with = "crate::panels::align::deserialize_align_to")] @@ -1245,6 +1249,7 @@ impl Default for UiState { flattener_preview: Default::default(), color_guide_limit: String::new(), color_guide_base: None, + color_guide_spot: None, align_to: Default::default(), align_spacing: 0.0, color_mode: None, diff --git a/crates/ui-egui/src/tests/font_menu.rs b/crates/ui-egui/src/tests/font_menu.rs index 3873868af2..52df50fd2c 100644 --- a/crates/ui-egui/src/tests/font_menu.rs +++ b/crates/ui-egui/src/tests/font_menu.rs @@ -1045,17 +1045,20 @@ fn open_menu_with(id: &str, left: f32, width: f32, screen: egui::Vec2, look: Men } // egui places the menu by the size it had the frame before. When a name measured late (a face // added for its script, a font found in the background) widens it on that frame, the menu sits - // where the narrower one fit until the next: draw until it stays put. - let filter_at = |shapes: &[egui::epaint::ClippedShape]| { - shapes.iter().find_map(|s| match &s.shape { + // where the narrower one fit until the next: draw until it stays put. The filter alone can stay + // put on the frame that widens the menu, so the menu's own rect must stay put too. + let placed = |shapes: &[egui::epaint::ClippedShape]| { + let filter = shapes.iter().find_map(|s| match &s.shape { egui::Shape::Text(t) if t.galley.text() == crate::i18n::t("Any Kind") => Some(t.pos), _ => None, - }) + }); + let menu = filter.and_then(|p| ctx.layer_id_at(p)).and_then(|l| ctx.memory(|m| m.area_rect(l.id))); + (filter, menu) }; for _ in 0..100 { - let before = filter_at(&shapes); + let before = placed(&shapes); shapes = frame(vec![]); - if filter_at(&shapes) == before && !crate::font_menu::wait_for_samples(&ctx) { + if placed(&shapes) == before && !crate::font_menu::wait_for_samples(&ctx) { break; } } diff --git a/crates/ui-egui/src/toolbar.rs b/crates/ui-egui/src/toolbar.rs index 8afa8f571a..56de30acff 100644 --- a/crates/ui-egui/src/toolbar.rs +++ b/crates/ui-egui/src/toolbar.rs @@ -33,7 +33,7 @@ const STRIP_BUTTON: egui::Vec2 = vec2(32.0, PITCH); /// The Basic toolbar: (category, slots); each slot is a flyout group (first = default). pub const BASIC: &[(&str, &[&[&str]])] = &[ - ("Select", &[&["selection"], &["directSelection", "groupSelection"], &["lasso", "magicWand"]]), + ("Select", &[&["selection"], &["directSelection", "groupSelection"], &["lasso", "enclosingLasso", "magicWand"]]), ( "Shapes", &[ diff --git a/crates/ui-egui/src/toolbar/tests.rs b/crates/ui-egui/src/toolbar/tests.rs index d13b47a0db..37613c72e8 100644 --- a/crates/ui-egui/src/toolbar/tests.rs +++ b/crates/ui-egui/src/toolbar/tests.rs @@ -102,7 +102,7 @@ fn the_tool_buttons_are_centred_in_the_panel() { fn saved_flyout_choices_must_still_belong_to_the_slot() { let mut app = VectorcraftApp::new(Session::new(), Default::default()); app.run("file.new", json!({"width": 300, "height": 300})).unwrap(); - for (saved, shown) in [(vectorcraft_tools::addons::enclosing_lasso::ID, "lasso"), ("magicWand", "magicWand")] { + for (saved, shown) in [(vectorcraft_tools::addons::polygonal_lasso::ID, "lasso"), ("magicWand", "magicWand")] { app.ui.slot_tool.insert("lasso".into(), saved.into()); let tree = tree(|ui| show(&mut app, ui)); assert_eq!(role_and_state(&tree, &tip(tool_info(shown).unwrap())), (Role::Button, Some(Toggled::False))); diff --git a/crates/ui-egui/src/updates_ui.rs b/crates/ui-egui/src/updates_ui.rs index 41f5e68372..eb8a4d530c 100644 --- a/crates/ui-egui/src/updates_ui.rs +++ b/crates/ui-egui/src/updates_ui.rs @@ -239,13 +239,45 @@ mod tests { #[cfg(not(target_arch = "wasm32"))] pub(super) fn offer(app: &mut VectorcraftApp) { app.updates_rt.updater = isolated_updater(env!("CARGO_PKG_VERSION"), "prompt"); - app.updates_rt.updater.offer(craft_update::Release { + offer_and_wait(&mut app.updates_rt.updater, release_99()); + } + + /// The release the tests offer. + #[cfg(not(target_arch = "wasm32"))] + fn release_99() -> craft_update::Release { + craft_update::Release { tag: "v99.0.0".into(), version: craft_update::parse_version("99.0.0"), name: "VectorCraft 99.0.0".into(), html_url: "https://github.com/storytold/vectorcraft/releases/tag/v99.0.0".into(), ..Default::default() + } + } + + /// Offers `release` and returns once its prompt is open. The updater reads the installed + /// files for an offer on a thread of its own, which asks the context the updater keeps for a + /// repaint after it answers; the next tick opens the prompt. The observer sees every repaint + /// request, so each immediate one is followed by a tick until the prompt opens. The updater + /// must not have kept another context, which its thread would ask instead. A copy the + /// launcher manages ignores the offer and fails the test. + #[cfg(not(target_arch = "wasm32"))] + fn offer_and_wait(updater: &mut Updater, release: craft_update::Release) { + let ctx = egui::Context::default(); + let (answered, wait) = std::sync::mpsc::channel(); + ctx.set_repaint_observer(move |info| { + if info.delay.is_zero() { + let _ = answered.send(()); + } }); + // Keeps `ctx` for the offer's thread. + updater.tick(&ctx); + updater.offer(release); + // `offer` reads the launcher's choice; a managed copy starts no inspection. + assert!(updater.managed().is_none(), "the launcher manages this copy, so it ignored the offer"); + while !updater.prompt_open() { + wait.recv().unwrap(); + updater.tick(&ctx); + } } /// An app with one saved document holding a selected rectangle. @@ -336,14 +368,8 @@ mod tests { fn startup_prompt_shows_and_closes() { let mut app = VectorcraftApp::new(Session::new(), Default::default()); let ctx = egui::Context::default(); - let release = craft_update::Release { - tag: "v99.0.0".into(), - version: craft_update::parse_version("99.0.0"), - name: "VectorCraft 99.0.0".into(), - html_url: "https://github.com/storytold/vectorcraft/releases/tag/v99.0.0".into(), - ..Default::default() - }; - app.updates_rt.updater.offer(release); + app.updates_rt.updater = isolated_updater(env!("CARGO_PKG_VERSION"), "startup"); + offer_and_wait(&mut app.updates_rt.updater, release_99()); let mut output = ctx.run_ui(egui::RawInput::default(), |ui| { show(&mut app, ui.ctx()); diff --git a/docs/control-protocol.md b/docs/control-protocol.md index b68a79b4af..adac088a13 100644 --- a/docs/control-protocol.md +++ b/docs/control-protocol.md @@ -669,7 +669,9 @@ agents) opens the `rasterEffectsSettings` dialog. Its fields are what `document. (`resolution`, `colorModel`, `background`, `antiAlias`, `clippingMask`, `addAround` in pt, `preserveSpotColors`); `ui.dialog.confirm` runs it with them as one undo step; a bad value keeps the dialog open. Object → Rasterize… opens a `command` dialog for `object.rasterize` whose fields (`ppi`, `colorModel`, `background`, `antiAlias`, `clippingMask`, -`addAround`) start from these settings. +`addAround`) start from these settings. `colorModel`, `antiAlias` (`none`, `art`, `type`) and `background` (`white`, +`transparent`) are dropdowns; `ui.dialog.set` also takes any other value the command takes, and the dialog sends it +unchanged. Missing linked files: `app.open` of a document whose linked images' files can't be found (`document.open`'s `missingLinks`) opens the `missingLinks` dialog for the first (fields `missing`: `[{name, path, ids}]`, `modified`, diff --git a/docs/development.md b/docs/development.md index d12c22bb17..508c0aea06 100644 --- a/docs/development.md +++ b/docs/development.md @@ -297,7 +297,11 @@ other `sv-*` locale resolve to it), Georgian (`ka`, complete; `ka-GE` and `ka_GE control channel, MCP and tests read them) and are translated only where the status bar draws them (`i18n::msg`). `@msg` catalog rows hold a whole message or a template such as `Couldn't open {name}: {e}`; `{_1}`, `{_2}` … stand for the format string's `{}`, and the values in the - placeholders are translated in turn (the reason after `: {e}` is often a message too). A value that starts with + placeholders are translated in turn (the reason after `: {e}` is often a message too). A template needs text + between any two placeholders, since the catalog cannot tell where `{a}{b}` splits: make the message with the + side-by-side values joined into one (`unknown parameter `{key}``, where `key` is `marks.ofset`). The catalog + leaves out a row whose template has two placeholders in a row or no text; `i18n::tests` fails on such a row + and on such a message, and the untranslated report counts it as missing. A value that starts with `{` is translated only when it has an exact row, so a JSON object stays as it is; a value that starts with `[` is also matched against a template that starts with `[` and an index of digits, such as an effect's refusal ``[{j}] `{_1}`: {why}``, so its reason is translated while a JSON array stays as it is. A literal brace in a diff --git a/docs/effects-parity.md b/docs/effects-parity.md index 4bc558341f..b797dcfd45 100644 --- a/docs/effects-parity.md +++ b/docs/effects-parity.md @@ -1,6 +1,6 @@ # Effects parity -> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-11-12 · **Change:** minor (Extrude & Bevel, Inflate and Rotate seams have round joins under a white light and in the 3D (Classic) effects too, no longer reaching past the solid as thorns; previously: Effect Gallery: a thumbnail for each filter and an in-dialog preview on an original drawing; the 1–2 h for those is done; Extrude & Bevel, Inflate and Rotate merge contours that cross, touch or overlap, as type often draws a glyph, before building a solid; previously: Extrude & Bevel, Inflate and Rotate apply to groups and layers, their objects turning about one shared axis (#4506); the Transform effect's copies of a path with a fill and a stroke (or several fills and strokes, an even-odd fill, or a partly transparent one) are drawn each above the one before, as Expand Appearance makes them (#5920); Expand Appearance makes each copy of a path's Transform effect an object of its own (#5612); previously: Pixelate › Color Halftone: Max Radius in pixels of the Document Raster Effects resolution, 4–127 px, with older documents converted on opening and radii written back in points for older app versions (#3260); Effect dialogs clamp bounded length inputs immediately on commit and flash rejection on invalid input (#4638); previously: Drop Shadow Darkness uses fixed RGB subtraction and CMYK black addition; scores unchanged; Pathfinder › Trap: the Pathfinder panel's Trap… and Effect › Pathfinder › Trap… add an overprinting strip of the lighter colour where two solid colours meet; recounted with Hard Mix (#3061) and Soft Mix already in the catalogue: Pathfinder 13/13, Illustrator effects 49/50) · **Target:** Adobe Illustrator 2026 (30.x) +> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-11-17 · **Change:** minor (Twist: a strongly twisted path joins its pieces without kinks, #7069; scores and estimates unchanged; previously: Extrude & Bevel, Inflate and Rotate seams have round joins under a white light and in the 3D (Classic) effects too, no longer reaching past the solid as thorns; previously: Effect Gallery: a thumbnail for each filter and an in-dialog preview on an original drawing; the 1–2 h for those is done; Extrude & Bevel, Inflate and Rotate merge contours that cross, touch or overlap, as type often draws a glyph, before building a solid; previously: Extrude & Bevel, Inflate and Rotate apply to groups and layers, their objects turning about one shared axis (#4506); the Transform effect's copies of a path with a fill and a stroke (or several fills and strokes, an even-odd fill, or a partly transparent one) are drawn each above the one before, as Expand Appearance makes them (#5920); Expand Appearance makes each copy of a path's Transform effect an object of its own (#5612); previously: Pixelate › Color Halftone: Max Radius in pixels of the Document Raster Effects resolution, 4–127 px, with older documents converted on opening and radii written back in points for older app versions (#3260); Effect dialogs clamp bounded length inputs immediately on commit and flash rejection on invalid input (#4638); previously: Drop Shadow Darkness uses fixed RGB subtraction and CMYK black addition; scores unchanged; Pathfinder › Trap: the Pathfinder panel's Trap… and Effect › Pathfinder › Trap… add an overprinting strip of the lighter colour where two solid colours meet; recounted with Hard Mix (#3061) and Soft Mix already in the catalogue: Pathfinder 13/13, Illustrator effects 49/50) · **Target:** Adobe Illustrator 2026 (30.x) Every entry of Illustrator's Effect menu, by its public feature name, against VectorCraft's effects catalogue (`effect_catalog()` in `crates/effects/src/lib.rs`) and the Effect menu built from it @@ -22,7 +22,7 @@ Part of [target-app-parity.md](target-app-parity.md); open work is in [gaps.md]( |---|---|---:|---| | Convert to Shape | Rectangle, Rounded Rectangle, Ellipse | 3/3 | — | | Crop Marks | Crop Marks | 1/1 | — | -| Distort & Transform | Free Distort, Pucker & Bloat, Roughen, Transform, Tweak, Twist, Zig Zag | 7/7 | Free Distort's dialog has a handle on each corner of the object's bounds, moved by dragging or with the arrow keys; Zig Zag's ridges are evenly spaced along each segment (#1558), and Smooth points make a continuous wave whose peaks and valleys have handles along the path (#2343); Roughen with Smooth keeps turn-backs smooth instead of cusps that draw as spikes (#1646); Expand Appearance of a path whose Transform effect makes copies gives a group of one object per copy, each painted as the path, and a second Transform effect's copies nest in a group per copy of the first (#5612); drawn, each copy of a path with a fill and a stroke (or several, an even-odd fill or a partly transparent one) paints below the one before, the fills above covering the strokes of the copies below, instead of one path of every copy (#5920), and a group's copies each hold all its members except guides, the original group on top (#6316); a clipping group, a group with a fill or stroke of its own, a group whose type is kept as type, and a group with a member that carries a geometry, Pathfinder or 3D effect copy each member in its place | +| Distort & Transform | Free Distort, Pucker & Bloat, Roughen, Transform, Tweak, Twist, Zig Zag | 7/7 | Free Distort's dialog has a handle on each corner of the object's bounds, moved by dragging or with the arrow keys; Zig Zag's ridges are evenly spaced along each segment (#1558), and Smooth points make a continuous wave whose peaks and valleys have handles along the path (#2343); Roughen with Smooth keeps turn-backs smooth instead of cusps that draw as spikes (#1646); Expand Appearance of a path whose Transform effect makes copies gives a group of one object per copy, each painted as the path, and a second Transform effect's copies nest in a group per copy of the first (#5612); drawn, each copy of a path with a fill and a stroke (or several, an even-odd fill or a partly transparent one) paints below the one before, the fills above covering the strokes of the copies below, instead of one path of every copy (#5920), and a group's copies each hold all its members except guides, the original group on top (#6316); a clipping group, a group with a fill or stroke of its own, a group whose type is kept as type, and a group with a member that carries a geometry, Pathfinder or 3D effect copy each member in its place; Twist's handles follow the rotation's derivative, so a strongly twisted path is a smooth spiral without kinks where its pieces join (#7069, `twist_joins_its_pieces_smoothly`). | | Path | Offset Path, Outline Object, Outline Stroke | 3/3 | With Use Preview Bounds on, Align, Distribute and the Transform panel still measure type that carries Outline Object by its layout box (preview bounds leave out effects) | | Pathfinder | Add, Intersect, Exclude, Subtract, Minus Back, Divide, Trim, Merge, Crop, Outline, Hard Mix, Soft Mix, Trap | 13/13 | Trap traps only solid fills (gradients and patterns hide what is below them but don't trap) and spreads each colour's visible area as a whole; the public page gives no default values, so Trap's 0.25 pt, 100% and 40% are VectorCraft's own | | Rasterize | Rasterize… (as a live effect) | 1/1 | — | @@ -183,7 +183,7 @@ VectorCraft choices; an original approximation, never compared with another appl | Materials panel, lighting, ray-traced render | Window › 3D and Materials panel with the object types (Plane, Extrude, Revolve, Inflate) and the Object, Rotation and Lighting settings of the applied effect, Render Settings › Wireframe, which draws the live effect as the edges of its faces, and Quick Actions › Expand as Wireframes ([three-d.md](three-d.md#3d-and-materials-panel)); one to ten directional lights with per-light Color (opaque RGB, white by default), Intensity, Rotation, Height, Softness and neutral Ambient Light, Revolve and colored Inflate use smooth vector shading; Extrude & Bevel and Rotate retain planar shading; original Standard, Diffuse, Top Left and Right lighting rigs; shadows behind or below the object from the first light, blurred by its Softness ([three-d.md](three-d.md#shadows)); the Materials tab's Graphics, document symbols mapped onto Extrude & Bevel's caps and onto a plane, moved with an artboard handle, and wrapped around Revolve's side ([three-d.md](three-d.md#graphics)); no base materials, graphics on Inflate or on Extrude & Bevel's walls and bevels, or ray tracing | | 3D (Classic): Extrude & Bevel, Revolve, Rotate | Extrude & Bevel (Classic) initial: live, round seam joins, Extrude Depth, Cap, five original bevel shapes with Height and Bevel Extent In or Out, Position presets and rotation gizmo, Perspective, Wireframe, No Shading, Diffuse and Plastic surfaces with one to ten lights, Light Intensity, Ambient Light, Highlight Intensity and Size, Blend Steps, Black, Custom, Black Overprint or no Shading Color ([Black Overprint](https://web.archive.org/web/20210601162814/https://helpx.adobe.com/pdf/illustrator_reference.pdf#page=188)), Draw Hidden Faces ([create 3D objects](https://helpx.adobe.com/illustrator/desktop/special-effects-styles/create-3d-graphics/create-3d-objects.html)); Revolve (Classic) initial: live, round seam joins, Angle, Cap, Offset from the left or right edge, Position presets and rotation gizmo, Perspective, the same four surfaces, lights, highlight, Blend Steps and Shading Color, groups and layers revolved about one shared axis (same page); Rotate (Classic) initial: live, round seam joins, every fill and stroke turned as one plane, Position presets and rotation gizmo, Perspective, No Shading and Diffuse surfaces with lights, Ambient Light, Blend Steps and Shading Color ([rotate objects in 3D](https://helpx.adobe.com/illustrator/desktop/special-effects-styles/create-3d-graphics/rotate-objects-in-3d.html)); Preserve Spot Colors in all three, unavailable with a Custom Shading Color ([Preserve Spot Color](https://help.adobe.com/archive/en_US/illustrator/cs5/illustrator_cs5_help.pdf#page=260)); all three: a lighting sphere on the Lighting tab whose lights drag, move to the back or front, and are added at the front center or deleted down to one ([lighting options](https://help.adobe.com/archive/en_US/illustrator/cs5/illustrator_cs5_help.pdf#page=272)); all three: the track cube (face, edge, Shift and ring drags, keyboard steps; [three-d.md](three-d.md#track-cube)); Map Art: none | | Turntable (30.0 beta) | none | -| Export 3D objects (OBJ, USDA, glTF) | initial: Asset Export's Export 3D Object, and the 3D and Materials panel's Export 3D Object button (which then shows Asset Export with the new assets selected, [three-d.md](three-d.md#3d-and-materials-panel)), collect an object with Extrude & Bevel, Revolve, Inflate or Rotate as a 3D asset, and Export writes its solids as a USDA (the default), USDZ, glTF or OBJ mesh with a material in each solid's paint color (`assets.add3D`, `assets.set3DFormat`, `assets.export3D`); no textures, map art or shading ([3D export help](https://helpx.adobe.com/illustrator/desktop/special-effects-styles/create-3d-graphics/export-3d-vector-artwork.html)) | +| Export 3D objects (OBJ, USDA, glTF) | initial: Asset Export's Export 3D Object, and the 3D and Materials panel's Export 3D Object button (which then shows Asset Export with the new assets selected, [three-d.md](three-d.md#3d-and-materials-panel)), collect an object with Extrude & Bevel, Revolve, Inflate or Rotate as a 3D asset, and Export writes its solids as a USDA (the default), USDZ, glTF or OBJ mesh with a material in each solid's paint color (`assets.add3D`, `assets.set3DFormat`, `assets.export3D`); graphics mapped onto a plane or Extrude & Bevel's caps are exported as PNG textures of those faces, flat and unlit; no graphics on Revolve's side, no materials and no shading ([3D export help](https://helpx.adobe.com/illustrator/desktop/special-effects-styles/create-3d-graphics/export-3d-vector-artwork.html)) | The `three-d` crate (depends on `geom` and `pathops`, with no UI or GPU dependencies) builds, rotates, projects, shades and depth-sorts the surfaces; the effects crate turns them into art. What's left (materials and shadows, ray-traced rendering, @@ -193,6 +193,7 @@ angular cut caps, exact visibility, the rest of 3D Classic (Map Art), Turntable) | Date | Change | Summary | |---|---|---| +| 2026-11-17 | minor | Distort & Transform › Twist: handles follow the rotation's derivative, so a strongly twisted path is a smooth spiral instead of pieces meeting at kinks (#7069; `twist_joins_its_pieces_smoothly` in `crates/effects/src/tests.rs`). Scores and estimates unchanged. | | 2026-11-12 | minor | The seams of Extrude & Bevel, Inflate and Rotate under a white light, and of the faces of Extrude & Bevel (Classic), Revolve (Classic) and Rotate (Classic), went from miter to round joins (the seams of Revolve and of colored lights, and 3D (Classic) Wireframe edges, were already round): no thorns on edge-on facets, and facets with no neighbor now have rounded convex corners ([three-d.md](three-d.md#seams)); scores and estimates unchanged | | 2026-11-10 | minor | Effect Gallery: each filter has a thumbnail, and the dialog has a preview of the visible stack (or the browsed filter when the stack is empty). Both are an original landscape drawing passed through the filter ([Filter Gallery overview](https://helpx.adobe.com/photoshop/desktop/effects-filters/get-started-with-filters/filter-gallery.html)). The canvas preview and one-undo OK are unchanged. Remaining hours for the gallery's thumbnails and in-dialog preview: 1–2 → none. Counts unchanged (57/57). | | 2026-11-08 | minor | Extrude & Bevel, Inflate and Rotate merge contours that cross, touch or overlap (a glyph's arm across its stem) before building a solid, so the solid follows the shape as it is filled; others are built as drawn ([three-d.md](three-d.md)); scores and estimates unchanged | diff --git a/docs/file-format-parity.md b/docs/file-format-parity.md index 4512ca7927..48250c14e6 100644 --- a/docs/file-format-parity.md +++ b/docs/file-format-parity.md @@ -1,6 +1,6 @@ # File format parity -> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-11-15 · **Change:** minor (PDF import: stroked type keeps the line cap, line join and miter limit the file strokes it with, not butt caps and miter joins, #7741; `.ai` and EPS import: in layers that don't draw as the page, art that differs away from an envelope of type no longer costs it its editable type; it keeps its drawn art where, in the pixels it and its drawn art ink, the layers with it differ from the page more than its own check allows, or past the envelopes' share of the page check, #7141; `.ai` and EPS import: a top-object envelope whose mesh saves its sides' curves in pieces draws its contents along each whole curve, as its drawn art does, #7097; previously: PDF import: glyphs in a span with an empty ActualText come in as outlines, #6971; scores and estimates unchanged; previously: `.ai` and EPS import: type from the text document, type a PostScript program sets and legacy `.ai` type are set in an installed face of their font's PostScript name, exact name first, in the version a text document's record keeps; the `.ai` save writes a static font's version when its name alone gives another copy, #6983; `.ai` and EPS import: type keeps the manual kerning of its text document, #6899; `.ai` and EPS import: type in an envelope with Distort Appearance is also tried mapped from the box of what it paints, its strokes' miter tips and strokes a Transform effect moves included, after its glyphs grown by half its strokes' weight, #6824; `.ai` and EPS import: type filled or stroked with a pattern swatch keeps its pattern, from the art style its text document paint names, #6856; #6865: explicitly requested oversized editing artboard; PDF import: Indic type keeps its marks on their line, and a line whose type would not draw as the file does keeps the file's glyphs as outlines, #5235; previously: newly imported SVG/SVGZ titles are filtered and bounded without changing restored titles, #3626; `.ai` and EPS import, and what every export and `.ai` save draw: type's strokes in an envelope paint at their own weight along its bent outlines, Distort Appearance on or off, #6644; `.ai` and EPS import: centred and right-aligned lines of tracked type are aligned without the tracking after their last character, as the file's page aligns them, #6610; `.ai` and EPS import: an envelope saved in Edit Contents whose mesh lies away from its drawn art by a move opens live on that art, #6570; `.ai` save and open: layer colour presets Yellow, Magenta and Cyan keep their colour, as the `Lb` colour index now follows the file's numbering, #6502; `.ai` save: stroked type keeps its stroke's cap, join and miter limit in the text document, #6472; `.ai` and EPS import, PDF import: tracking and manual kerning in horizontally scaled type take the Horizontal Scale, as the file's page spaces such type; `.ai` and EPS import: stroked type in an envelope maps from its glyphs grown by half its stroke, #3179; `.ai` and EPS import: warps of type open as mesh envelopes on their saved grid, #3179; `.ai` and EPS import: stroked type keeps its stroke's cap, join and miter limit from the text document, #6472; `.ai` save: type in a variable font's named instance names its design-space setting, #6388; `.ai` and EPS import: envelopes of type open live where they draw as their drawn art and the layers with them draw as the page, #3179; `.ai` and EPS import: a note for type in an envelope, #3179; `.ai` and EPS import: the live envelope and warped type check sees white art; PDF import: DeviceN images of one ink or of process plates keep their inks, #6348; `.ai` import: images in a spot ink's Separation space keep their ink, #6350; PDF import: Separation images keep their ink, #6314; PDF editable import preserves authored ActualText once, including empty/nested spans and authored ordering (#6165); cross-line/style layout remains approximate; scores and estimates unchanged; PDF marked-text export (#6309): compatible glyphs stay on one layout line with per-glyph offsets; scores and estimates unchanged; PDF import: image masks open colorized by the color they are painted in, #6313; EPS and `.ai` editing data: a ligature the page names by a private-use glyph matches its text object; EPS import: CIDFonts only named, over a Unicode CMap, set as live type; EPS import: CMap mappings to base-font codes and glyph names; EPS import: CID-keyed fonts in FontSets (CFF) draw their glyphs; EPS import: `kshow` procedures kern live type; EPS import: embedded Type 1 fonts' glyphs and widths; EPS import: CID-keyed fonts draw their glyphs; EPS import: Type 42 fonts' characters and widths from the font they carry, show operators' spacing kept as tracking; EPS import: an image decoder's own buffers stop counting against the memory budget once it is decoded; EPS import: sampled functions interpolate between their samples; `.ai` and EPS type from the text document keeps its tab stops; it keeps auto leading and hyphenation options, and may show more of the file's last lines in an area frame; `.ai` and EPS import: Art brushes in the older form of their objects come into the Brushes panel; EPS import: gradients drawn as abutting strips come in as one gradient, without seams; EPS import: composite fonts draw their Type 42 glyphs; SVG import: filter and mask regions clip, #5876, #5875; SVG import: Gaussian blurs keep `color-interpolation-filters`, #5877; PDF and `.ai` export: objects' URLs as links, #5785; SVG import: `color-interpolation="linearRGB"` gradients, #5878; `.ai` import: paths with a Calligraphic brush open brushed, #372) · **Target:** Adobe Illustrator 2026 (30.x) +> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-11-17 · **Change:** minor (PDF import: a glyph filled only after a glyph filled and stroked comes in filled only, not stroked, #8300; PDF import: translucent type filled and stroked comes in as a filled type object and a stroked one, as the file composites them, and an upright glyph is never kept as the outline of its glyph alone, #8015; PDF import: type filled and stroked by one text-showing operator comes in as one type object, filled and stroked, not a stroked copy over a filled one, #8015; scores and estimates unchanged; previously: PDF import: stroked type keeps the line cap, line join and miter limit the file strokes it with, not butt caps and miter joins, #7741; `.ai` and EPS import: in layers that don't draw as the page, art that differs away from an envelope of type no longer costs it its editable type; it keeps its drawn art where, in the pixels it and its drawn art ink, the layers with it differ from the page more than its own check allows, or past the envelopes' share of the page check, #7141; `.ai` and EPS import: a top-object envelope whose mesh saves its sides' curves in pieces draws its contents along each whole curve, as its drawn art does, #7097; previously: PDF import: glyphs in a span with an empty ActualText come in as outlines, #6971; scores and estimates unchanged; previously: `.ai` and EPS import: type from the text document, type a PostScript program sets and legacy `.ai` type are set in an installed face of their font's PostScript name, exact name first, in the version a text document's record keeps; the `.ai` save writes a static font's version when its name alone gives another copy, #6983; `.ai` and EPS import: type keeps the manual kerning of its text document, #6899; `.ai` and EPS import: type in an envelope with Distort Appearance is also tried mapped from the box of what it paints, its strokes' miter tips and strokes a Transform effect moves included, after its glyphs grown by half its strokes' weight, #6824; `.ai` and EPS import: type filled or stroked with a pattern swatch keeps its pattern, from the art style its text document paint names, #6856; #6865: explicitly requested oversized editing artboard; PDF import: Indic type keeps its marks on their line, and a line whose type would not draw as the file does keeps the file's glyphs as outlines, #5235; previously: newly imported SVG/SVGZ titles are filtered and bounded without changing restored titles, #3626; `.ai` and EPS import, and what every export and `.ai` save draw: type's strokes in an envelope paint at their own weight along its bent outlines, Distort Appearance on or off, #6644; `.ai` and EPS import: centred and right-aligned lines of tracked type are aligned without the tracking after their last character, as the file's page aligns them, #6610; `.ai` and EPS import: an envelope saved in Edit Contents whose mesh lies away from its drawn art by a move opens live on that art, #6570; `.ai` save and open: layer colour presets Yellow, Magenta and Cyan keep their colour, as the `Lb` colour index now follows the file's numbering, #6502; `.ai` save: stroked type keeps its stroke's cap, join and miter limit in the text document, #6472; `.ai` and EPS import, PDF import: tracking and manual kerning in horizontally scaled type take the Horizontal Scale, as the file's page spaces such type; `.ai` and EPS import: stroked type in an envelope maps from its glyphs grown by half its stroke, #3179; `.ai` and EPS import: warps of type open as mesh envelopes on their saved grid, #3179; `.ai` and EPS import: stroked type keeps its stroke's cap, join and miter limit from the text document, #6472; `.ai` save: type in a variable font's named instance names its design-space setting, #6388; `.ai` and EPS import: envelopes of type open live where they draw as their drawn art and the layers with them draw as the page, #3179; `.ai` and EPS import: a note for type in an envelope, #3179; `.ai` and EPS import: the live envelope and warped type check sees white art; PDF import: DeviceN images of one ink or of process plates keep their inks, #6348; `.ai` import: images in a spot ink's Separation space keep their ink, #6350; PDF import: Separation images keep their ink, #6314; PDF editable import preserves authored ActualText once, including empty/nested spans and authored ordering (#6165); cross-line/style layout remains approximate; scores and estimates unchanged; PDF marked-text export (#6309): compatible glyphs stay on one layout line with per-glyph offsets; scores and estimates unchanged; PDF import: image masks open colorized by the color they are painted in, #6313; EPS and `.ai` editing data: a ligature the page names by a private-use glyph matches its text object; EPS import: CIDFonts only named, over a Unicode CMap, set as live type; EPS import: CMap mappings to base-font codes and glyph names; EPS import: CID-keyed fonts in FontSets (CFF) draw their glyphs; EPS import: `kshow` procedures kern live type; EPS import: embedded Type 1 fonts' glyphs and widths; EPS import: CID-keyed fonts draw their glyphs; EPS import: Type 42 fonts' characters and widths from the font they carry, show operators' spacing kept as tracking; EPS import: an image decoder's own buffers stop counting against the memory budget once it is decoded; EPS import: sampled functions interpolate between their samples; `.ai` and EPS type from the text document keeps its tab stops; it keeps auto leading and hyphenation options, and may show more of the file's last lines in an area frame; `.ai` and EPS import: Art brushes in the older form of their objects come into the Brushes panel; EPS import: gradients drawn as abutting strips come in as one gradient, without seams; EPS import: composite fonts draw their Type 42 glyphs; SVG import: filter and mask regions clip, #5876, #5875; SVG import: Gaussian blurs keep `color-interpolation-filters`, #5877; PDF and `.ai` export: objects' URLs as links, #5785; SVG import: `color-interpolation="linearRGB"` gradients, #5878; `.ai` import: paths with a Calligraphic brush open brushed, #372) · **Target:** Adobe Illustrator 2026 (30.x) > > Oversized artboard import update (2026-11-12): Explicit editing-data import retains a single artboard beyond a capped 14,400 pt PDF page (#6865). @@ -120,14 +120,39 @@ private editing data. VectorCraft: Scatter and Art brushes with their art, are written in its order: Scatter and Art brushes in Tints or keeping their art's colors, Art brushes that run their art from left to right without overlap at a fixed width, with their width, flips and scale (Stretch Between Guides with guides that leave art between them), and art of paths and - compound paths with points and groups with members, with one solid fill and one plain stroke each. Other brushes, + compound paths with points and groups with members, with one solid fill and one plain stroke each. Such art may + hold opacity masks whose art is of the same kinds, up to seven deep in one another's art; the masks are written + with their options, and an Art brush whose art holds one is written with its strokes as their drawn look. Other + brushes, Pattern and Bristle brushes among them, and brushes past the number or the art VectorCraft's reader reads are left out with a warning; no brush is written on a large canvas. A path or compound path with a Calligraphic brush, or with an Art brush whose art bends along the path and that doesn't scale its art proportionately, keeps the brush on its stroke; other brushed strokes are written as their brush's art. A document that uses a new document's brushes writes none until a path keeps one on its stroke; then the brushes are written, and the file opens without the new document's Pattern and Bristle - brushes. + brushes. Blends are written live: their key objects, their spine when they have one of their own, their steps + drawn, and their spacing (Smooth Color, Specified Steps, Specified Distance) and orientation (Align to Page, Align to + Path); a replaced spine is written with an anchor where each key object sits, so it opens with those anchors and + lays out the same steps. Blends with easing, a color shift or start points, with effects, an appearance or an + opacity mask of their own, of objects other than paths, compound paths and groups, of clipping groups, of more than + 62 key objects, with a hidden key object, holding another blend, of key objects with geometry or Pathfinder effects + or a group's own fills and strokes, of key objects the editing copy would change (empty paths or subpaths, paths and + compound path members of several subpaths, several fills or strokes, strokes a plain line can't draw, dashes of + more than 64 lengths, hidden fills or strokes, fills or strokes other than a color, in a Lab color or with + transparency or effects of their own, effects, opacity masks), where one key object has a fill or stroke of no paint + or a stroke of no width and another has one that draws, whose spine has more than one part, whose step count is + close to where rounding changes it, or that VectorCraft's reader wouldn't open with their settings or as they + are drawn, are written as their steps with a warning, as are blends inside objects with geometry or Pathfinder + effects or a group's own fills and strokes, blends in opacity masks, pattern tiles, symbols and art cut to a + clipping object or nested eight levels deep in art written in place of other objects (symbol instances, live + objects, brushed strokes), blends whose art would pass the most objects VectorCraft's reader reads, and every blend + on a large canvas. Gradient meshes are written as meshes: each mesh point's place, color, opacity and handles, patch by + patch; a reflected mesh is written with its columns in reverse order, and opens with each row's points in reverse + order. Meshes with a point in a Lab color, with + more than 128 rows or columns, folded meshes (patches whose corners turn different ways), meshes VectorCraft's reader + wouldn't open as they are drawn, meshes in pattern tiles and in art cut to a clipping object, and every mesh on a + large canvas are written as their drawn look with a warning. In a symbol's art, an envelope's contents are written in + the canvas's space with y down. Point type, area type (with its rows, columns, gutters and first baseline, threaded frames included) and type on a path are written as text: a text object for each, naming its story in the text document, with the characters, fonts, sizes, leading, tracking, baseline shift, @@ -142,7 +167,7 @@ private editing data. VectorCraft: clipping object, mirrored type, turned or unevenly scaled area type and type on a path, area type in an open frame, type on an open path whose ends meet, area type whose wrap cannot be reconstructed from plain saved paths, compound paths or groups, type of only white space, threads of type on a path, threads whose frames differ in orientation, type and stories past the sizes VectorCraft's reader reads, and - type with inline graphics, ruby, gradient or pattern paint or an appearance or opacity mask of its own, other patterns, other clipping objects and live + type with inline graphics, ruby, gradient or pattern paint or an appearance or opacity mask of its own, other patterns, other clipping objects and other live objects (placed documents included) are written as plain filled and stroked paths, and freeform gradients, gradients along or across a stroke and gradients without stops, with more than 256 stops or without extent as their average color, each with a warning. Gradients that dither are written without dither's noise, Perceptual gradients and @@ -272,7 +297,7 @@ private editing data. VectorCraft: ### Illustrator's private editing data -The app's own editing copy of a file (an EPS after its `%%EOF`, a `.ai`'s `AIPrivateData` streams, a PDF's `AIPDFPrivateData` streams when it was saved with the editing data (#868), Zstandard or zlib, the EPS's in ASCII85) is not documented as a whole. VectorCraft reads its structure: layers and sublayers (names, order, visibility, lock, printing, preview, dimming, colour), groups as they were nested, compound paths (painted by their last path, or the last painted one, with the paths of groups inside them kept as their paths: #1410), clipping groups and layer clipping (several clipping paths in a clipping group, a layer or an opacity mask's art clip to their intersection, and a compound path of clipping paths stays one clip; a filled clipping path keeps its fill, which paints under the art it clips, except the path of a mask that covers several layers, whose fill is read as a path of its own in the layer that holds the mask's path, and a compound clipping path whose subpaths paint differently, whose filled subpaths are read as a compound path of their own under the art it clips; clipping paths that would nest the art past the document's 32 levels stop the editing data from being read: #5789), object names, hidden and locked objects, fills and strokes (grey, CMYK, RGB, named and spot colours, spot colours defined in Lab with their Lab values (#1032), global process colours as global swatches at their tint; a stroke of width 0, `0 w`, on a path, a gradient-filled path, legacy type or in an art style comes in as a 0.25 pt hairline, as from PDF: #1671), linear and radial gradients, pattern fills with their patterns as pattern swatches (#1025), gradient and pattern names in the file up to their first newline (a name that another swatch, or a gradient or pattern defined earlier, already has is numbered "Sky 2"; a name without a newline is kept, and when another swatch has it, the pattern's swatch, or a named color sharing a gradient or pattern swatch's name, is numbered the same way), opacity, blend modes, isolation and knockout, embedded images where their matrix puts them, rotated ones too (#2269), with their alpha channel (CMYK images keep their ink amounts, as they do when a `.ai` opens from its PDF part, and an alpha channel that hides part of a CMYK image becomes a grayscale opacity mask), placed (linked) files as linked images in their place, each showing the low-resolution preview the file keeps of it until its file is found or relinked in the Links panel (#1264), with the folder the file keeps relative to the document's, where the link is looked for when its path is gone, placed PDF and `.ai` pages as placed documents of the [page and Crop to box](https://helpx.adobe.com/illustrator/desktop/add-and-import-files/import-other-file-types/adobe-pdf-placement-options.html) their dictionary names (`AI11 PlacedPDFPageIndex`, `AI11 PlacedPDFCropTo`; a value VectorCraft doesn't read, or a binding to an image variable, leaves a linked image), guides, and every artboard where it is, with its center mark, cross hairs, video safe areas and video ruler pixel aspect ratio. VectorCraft reads `CropAreaActive`, an `/Int` in the dictionary that holds the artboard array, as the index of the active artboard in that array, and the file opens with that artboard active; without it, or when it names no artboard that opens, the first artboard is active. It also reads the Document Raster Effects Settings (resolution, color model, background, anti-alias, clipping mask, Add Around Object and Preserve Spot Colors), the author from the header's `%%For` (an EPS's own header when the editing data's has none), swatches for the header's `%%CMYKCustomColor` and `%%RGBCustomColor` colors that the document has none of, and `%%TemplateBox` in older files; a setting with a value of another type or out of range keeps its default. Objects on Path groups open live, with their path, their objects in order along it, Pivot and Rotate; one with a dragged spacing or other options opens as a plain group. A gradient with stops in the middle runs its whole ramp across its shape, and a gradient object does not pass its fill to the next path (#1390). An object whose art style is one fill and one stroke at most (solid colours, its own gradient, a variable-width profile on a Stroke Offset stroke or written as each side's widths) with Drop Shadow, Inner Glow, Outer Glow, Feather, Round Corners, Scribble, Offset Path, Outline Object, Outline Stroke, Convert to Shape, Tweak (only when it moves nothing), Pucker & Bloat at 0 or Bas Relief (read from its settings block: [raster effects reference](https://helpx.adobe.com/illustrator/desktop/special-effects-styles/apply-filter-effects/raster-effects-reference.html), [layered image file format specification](https://www.adobe.com/devnet-apps/photoshop/fileformatashtml/), [scripting the filter gallery](https://community.adobe.com/questions-712/scripting-support-for-the-filter-gallery-1064646)) comes in as itself with them and their saved settings. A path, compound path or group (not a clipping group) whose only effect is Transform (not with copies or Random) or a Free Distort whose corners make a parallelogram comes in as itself with it too, when neither it nor anything in it paints with a gradient or pattern and everything in it is a path, compound path or group with no opacity mask and no effects of its own; Transform that scales, rotates or reflects needs nothing in it to be stroked. Twist as the only effect is read the same way when nothing in the object is stroked: up to 180° either way (a limit VectorCraft sets) on a path or compound path whose segments are all straight, except a compound path with a guide member that reaches past its other members at an angle other than 0°, and up to 90° either way (a limit VectorCraft sets) on another path, compound path or group with no guide in it. One with more, other effects (Zig Zag, a Pucker & Bloat of another amount, a Free Distort with other corners), an effect setting that is not read (an unknown key, a missing or out-of-range value, a Scribble with a color of its own), a variable-width stroke with one centered width array, dashes aligned to corners, a brush other than a Calligraphic or Art one, a Calligraphic brush with settings of its own, an entry that isn't read, a variable width or an angle that follows the path, a path followed by samples of the pen (`(…) Xt n XD`) whose Calligraphic brush varies with the pen, or an Art brush other than the ones described next comes in as its drawn look (a group named after it). Objects in a symbol defined before the file's art styles section, as newer files write it, take the same styles as the layers' objects. A path with a Calligraphic brush otherwise comes in as the path, the brush on its stroke at the stroke's weight, which scales the brush (#372), and so does a path with an Art brush, whose weight scales the art across the path, when all of these hold: the brush is in Tints or None, at a fixed width from 1% to 1,000%, stretched to the path or stretched between guides that leave art between them, flipped along or across or not ([Art brush options](https://web.archive.org/web/20220911143322/https://helpx.adobe.com/pdf/cs6/illustrator_reference.pdf), printed page 193), with `Spacing` 0, `Adjustment` 1 and `FoldAdjustment` 1 (VectorCraft's own reading of these numbers; a brush that scales its art proportionately comes into the Brushes panel with that option, and its paths keep their drawn look); the path's settings are the brush's own (apart from the lowest and highest width of a fixed width and the guides' lengths without Stretch Between Guides, which don't draw), with no entry that isn't read, no variable width and no effects; a stroke in Tints isn't a swatch; and the art is paths, compound paths and groups in solid fills, with no strokes, masks or effects, and has some length along the path. A stroke takes the brush the Brushes panel keeps under its name, and one whose name the panel doesn't keep comes in as its drawn look. Type with an Art brush keeps its drawn look under the type. A Calligraphic brush's Pressure, Tilt, Bearing and Rotation come in as those channels (a 6D Art Pen's brushes vary with the pressure, the bearing and the barrel's rotation); its Stylus Wheel varies at random. The file's Calligraphic, Scatter, Art and Bristle brushes replace the default ones in the Brushes panel, in the file's order, also when the file comes in as its PDF part (a brush library has no layers); pattern brushes and brushes it can't read are left out with a note. When the file opens from its layers, the spot colors in the art of each brush that comes in become swatches, and that art's colors count toward the document's color mode, as a pattern's do. The swatches take at most 20,000 color names in all across the brush art, and each brush-art section keeps at most 20,000 names. Each name keeps its first definition, with the color operators' names before the gradient stops' names. A spot color past those limits makes no swatch, and its color still counts toward the color mode. A spot color that the page's art, a pattern or a symbol also defines keeps the value defined there. Type keeps its art style as a live appearance whatever its stack (an Art brush aside), so it can be retyped: each fill and stroke of the style's stack (solid colours, gradients and pattern fills, placed as the drawn look places them) with its own opacity, blend mode and effects, the effects on the whole object, and where the characters paint among them; the effects read are Warp, Offset Path, Outline Object, Outline Stroke, Transform (with copies, Transform Objects, Transform Patterns and Scale Strokes & Effects; not with Random), Free Distort, Pucker & Bloat, Twist, Zig Zag, Tweak (only when it moves nothing, the file holding none of its random outline), Drop Shadow, Inner Glow, Outer Glow, Feather, Round Corners, Scribble, Gaussian Blur, Bas Relief (its detail, smoothness and light direction from its settings block, or the effect's defaults when the style holds no settings block; a settings block that isn't read keeps the drawn look) and Convert to Shape, and a style with others, or with an effect setting that isn't read, keeps the type's drawn look. Convert to Shape keeps its Rectangle, Rounded Rectangle or Ellipse, its Absolute or Relative size (a relative size in the file is added to each side) and its corner radius; a relative Ellipse, or a setting that isn't read, keeps the drawn look. The page's drawing of such a style isn't held to look like VectorCraft's where its drawn look lay. Gradients take their matrix (`Xm`, radials and skewed ones too), focal point and the order of stops sharing a ramp point; gradient meshes, a clipping path's own fill and its stroke, and the artboards' names are read too. `editingData: "always"` (`convert --editing-data`) opens a `.ai` or an EPS with editing data from its editing data even where it draws differently from its page, which can be older, with a note. Type is made from the file's text document, whole and editable, shown or not: point type (its frame's matrix, which newer files leave out when it is neither turned nor scaled, read as none), area type (a story in several frames as threaded type) and type on a path, with its characters, fonts, size, leading, tracking, scaling, baseline shift, fill and stroke (grey, RGB or CMYK), alignment, indents and paragraph spacing (a character attribute a run doesn't set comes from its character style, then the style that one is based on, then the document's defaults); area type keeps its frame's Area Type Options rows and columns, the gutter between rows and the gutter between columns, and its first baseline (Fixed, Cap Height, Leading or x Height) with its minimum; type on a path keeps its frame's Type on a Path effect, Align to Path and Flip (a frame whose options set key 6 to true keeps their defaults), and the first frame's Spacing is fitted from the file's layout, not read from the dialog's value; the distance from the path under Align to Path is measured for each character at its size and vertical scale (in vertical type, its horizontal scale), from the top of its font's em box (Ascender), half the height of the top of its font's H (Center) or the bottom of its font's bounding box (Descender); the fit under Gravity does not reproduce the file's layout, and its glyphs can lie up to 7.4 pt from the positions the file keeps; the page's drawing of it (often in pieces) is left out. Vertical type keeps its orientation, its columns from right to left, and a run set to Tate-chu-yoko keeps that setting. When it makes the type of every text object that shows, the page's type is only compared with it, each text object keeps its own group, frame and layer, and a line break inside a paragraph stays one. Where it can't make a text object's type (a frame of another kind), that text object takes the page's type where the text document puts its lines, or else what is left of the page's type in painting order (no group around it); the page's type where made type draws stays that type's, and hidden type is left out with a note. Text wrap is read too: an object whose dictionary has the wrap options (offset and Invert Wrap), or any graphic of a legacy wraparound group (`*w` … `*W`, before or after its type, with no offset), is a wrap object, and area type below it in its layer flows around it when the file opens, threaded type included (#2763). Kerning, underline and the other character and paragraph options aren't read yet. A `.ai` saved without PDF compatibility (a placeholder page) opens from its editing data alone, its point type, area type and type on a path made from the text document. A `.ai` whose PDF part shows only text isn't taken for that placeholder when its page states an art, trim or bleed box: it opens from its editing data alone where that reads, else from its PDF part (#1387). A `.ai` whose PDF part draws nothing at all (an empty page, with or without those boxes) opens from its editing data alone where that reads too: there is no page art to check its layers against, and the empty page would lose all of it. Text objects with an appearance keep their own text and frame, type of hidden layers stays hidden, and type on later artboards lands on its text objects (#1391); area type whose frame is too short for a line of the fallback font shows its first line (the frame is made taller, with a warning in the open result) (#1392). In a PDF saved with some of its artboards, the type on each page after the first goes to an artboard of that page's size after the previous page's artboard, and only to one that leaves an artboard for each later page; the first page's artboard also leaves one for each later page. When several artboards fit a later page, VectorCraft takes the one whose art draws most like the page, and compares at most 16 artboards for all the later pages together. Symbols are read into the Symbols panel, in the file's symbol list order, with their art, their registration point and the instances in their art, and their instances come in live with their matrix, name, hide, lock, opacity, blending mode, isolation, knockout and opacity mask; a symbol whose art isn't read whole (type, placed files, an image it leaves out or anything else it doesn't read) isn't kept. A file that comes in as its page or PDF part because its editing data has no layers (a symbol library), or because its layers can't be read or used (any of the cases below), gets the symbols its editing data defines before its first layer, in the symbol list's order, while its page art stays as the page draws it. Instances of symbols it can't read, instances with appearance changes of their own (a dynamic symbol's), pattern fills whose pattern it can't read, placed files the data keeps no preview of and anything else it doesn't read make the file come in as its page (on a layer that doesn't show, they are left out of that layer), with a warning saying what. An unread object on a shown layer whose box can be found instead comes in as a group of the page's objects inside that box, named after it, with the rest of the layers and groups kept and a warning listing what came in as the page's art; the file still comes in as its page when live art or another unread object shares that page art, when the object spans two artboards or lies on an artboard that has no page, when no page art lies inside its box, when that page art is inside a page group with a clip, mask, transparency or appearance, when the object holds a frame of threaded type, when the page art uses a pattern, image or swatch that the page lacks or that differs from the editing data's, or when the page art doesn't carry its transparency (#4806). The layers' art is also compared with the page (by lightness, so colours written as their CMYK equivalents compare alike, and by whether a pixel is inked at all); the page is used when they differ by more than 5% (away from type, when all the type is made from the text document), where one draws an object the other doesn't (away from type, whose lines may be laid out afresh), and when an EPS whose page is its art's box has art printed outside it (#735). A `.ai` is not compared with its page, and its PDF part is not imported, when its text document makes the type of every text object (at least one shows, and none is drawn by the appearance of the layer or group it is in), no object is unread, no placed file has a second placement, no live envelope keeps its drawn art, it declares no large canvas, and its artboards are its pages' trim boxes one for one, in points or in the first page's `UserUnit`: it opens from its layers, with the bleed of its pages' bleed boxes. When they differ because some objects draw differently (an object in another color, or one that only one of them draws), each top-level object of the layers that holds such a difference comes in as a group of the page's objects inside its box and the layers stay, with a warning that names the layer or sublayer of each such object as the Layers panel shows it (`<Layer>` for one without a name) and how many came in from it; an export or Save As to the file's own path then needs `acknowledgeLoss: true`, and a wrap object replaced this way keeps its wrap options. The file still comes in as its page when only edges or type differ, when a difference lies outside every top-level object, when more than half of the top-level objects or more than 64 hold one, when such an object is or holds type or holds a wrap object inside a group, when the page's type of a text object that stays lies inside such an object's box, when the page's art can't replace such an object for one of the reasons above for an unread object, when matching the differences to the objects would take too much work, or when the result still differs from the page. `editingData: "always"` keeps the objects as read, and placed files at the other point their data gives are tried as well. An EPS whose page is its art's box keeps that page when it comes in through its layers, not the editing data's artboard, and a text object counts as drawn by the page by its colours, not only its lightness, so a red stroke stacked over a dark red one stays (#1102). `textAs: "outlines"` opens a `.ai` whose type shows from its PDF part, which has the outlines; `editingData: false` opens any of them as its page or PDF part only, for print pipelines (#735). A file whose import left something out (hidden text, art or layers) is never written over by an export or Save As to its own path unless `acknowledgeLoss: true` (`convert --replace-lossy`), so the original keeps what the document lacks. Where a `.ai` can't be read that way (or its layers are turned off in the import options), we read its PDF-compatible part, so live objects that only the editing data holds arrive as appearance, and plain groups arrive ungrouped: that part draws each object on its own and marks only layers, clipping groups and groups with opacity, blending or a mask (those come back). Art outside the artboards isn't in that part at all (the PDF part leaves it out), so it doesn't open; the import says so in a note (#472). Its pages still go where the editing data puts the artboards (a grid stays a grid), with the art on each, when it has as many artboards as pages, of the same sizes (#1068); the page of the artboard `CropAreaActive` names is then the active artboard. A `.ai` whose editing data has artboards but no layers also opens on that page under the same check, and its pages stay where they are. A `.ai` whose PDF part's pages are cropped to its art (each page the box of all the art, which is the editing data's bounding box) instead of its artboards opens from its layers, with its own artboards, where they draw as that page does. Its pages are laid out so that art one of them draws past its artboard (notes beside a design, which the part doesn't clip) doesn't lie over the page before it in the row, where it was taken for that page's art: the check against the editing data then found art its layers don't have there and opened the file as its PDF part, without the art outside the artboards. That part also has no paragraphs: area type is written line by line, and comes back as area type only where its font is installed and lays the lines out with the same breaks, else as a point type object per line (#508). Art off the page that a PDF does draw opens on the pasteboard. +The app's own editing copy of a file (an EPS after its `%%EOF`, a `.ai`'s `AIPrivateData` streams, a PDF's `AIPDFPrivateData` streams when it was saved with the editing data (#868), Zstandard or zlib, the EPS's in ASCII85) is not documented as a whole. VectorCraft reads its structure: layers and sublayers (names, order, visibility, lock, printing, preview, dimming, colour), groups as they were nested, compound paths (painted by their last path, or the last painted one, with the paths of groups inside them kept as their paths: #1410), clipping groups and layer clipping (several clipping paths in a clipping group, a layer or an opacity mask's art clip to their intersection, and a compound path of clipping paths stays one clip; a filled clipping path keeps its fill, which paints under the art it clips, except the path of a mask that covers several layers, whose fill is read as a path of its own in the layer that holds the mask's path, and a compound clipping path whose subpaths paint differently, whose filled subpaths are read as a compound path of their own under the art it clips; clipping paths that would nest the art past the document's 32 levels stop the editing data from being read: #5789), object names, hidden and locked objects, fills and strokes (grey, CMYK, RGB, named and spot colours, spot colours defined in Lab with their Lab values (#1032), global process colours as global swatches at their tint; a stroke of width 0, `0 w`, on a path, a gradient-filled path, legacy type or in an art style comes in as a 0.25 pt hairline, as from PDF: #1671), linear and radial gradients, pattern fills with their patterns as pattern swatches (#1025), gradient and pattern names in the file up to their first newline (a name that another swatch, or a gradient or pattern defined earlier, already has is numbered "Sky 2"; a name without a newline is kept, and when another swatch has it, the pattern's swatch, or a named color sharing a gradient or pattern swatch's name, is numbered the same way), opacity, blend modes, isolation and knockout, embedded images where their matrix puts them, rotated ones too (#2269), with their alpha channel (CMYK images keep their ink amounts, as they do when a `.ai` opens from its PDF part, and an alpha channel that hides part of a CMYK image becomes a grayscale opacity mask), placed (linked) files as linked images in their place, each showing the low-resolution preview the file keeps of it until its file is found or relinked in the Links panel (#1264), with the folder the file keeps relative to the document's, where the link is looked for when its path is gone, placed PDF and `.ai` pages as placed documents of the [page and Crop to box](https://helpx.adobe.com/illustrator/desktop/add-and-import-files/import-other-file-types/adobe-pdf-placement-options.html) their dictionary names (`AI11 PlacedPDFPageIndex`, `AI11 PlacedPDFCropTo`; a value VectorCraft doesn't read, or a binding to an image variable, leaves a linked image), guides, and every artboard where it is, with its center mark, cross hairs, video safe areas and video ruler pixel aspect ratio. VectorCraft reads `CropAreaActive`, an `/Int` in the dictionary that holds the artboard array, as the index of the active artboard in that array, and the file opens with that artboard active; without it, or when it names no artboard that opens, the first artboard is active. It also reads the Document Raster Effects Settings (resolution, color model, background, anti-alias, clipping mask, Add Around Object and Preserve Spot Colors), the author from the header's `%%For` (an EPS's own header when the editing data's has none), swatches for the header's `%%CMYKCustomColor` and `%%RGBCustomColor` colors that the document has none of, and `%%TemplateBox` in older files; a setting with a value of another type or out of range keeps its default. Objects on Path groups open live, with their path, their objects in order along it, Pivot and Rotate; one with a dragged spacing or other options opens as a plain group. A gradient with stops in the middle runs its whole ramp across its shape, and a gradient object does not pass its fill to the next path (#1390). An object whose art style is one fill and one stroke at most (solid colours, its own gradient, a variable-width profile on a Stroke Offset stroke or written as each side's widths) with Drop Shadow, Inner Glow, Outer Glow, Feather, Round Corners, Scribble, Offset Path, Outline Object, Outline Stroke, Convert to Shape, Tweak (only when it moves nothing), Pucker & Bloat at 0 or Bas Relief (read from its settings block: [raster effects reference](https://helpx.adobe.com/illustrator/desktop/special-effects-styles/apply-filter-effects/raster-effects-reference.html), [layered image file format specification](https://www.adobe.com/devnet-apps/photoshop/fileformatashtml/), [scripting the filter gallery](https://community.adobe.com/questions-712/scripting-support-for-the-filter-gallery-1064646)) comes in as itself with them and their saved settings. A path, compound path or group (not a clipping group) whose only effect is Transform (not with copies or Random) or a Free Distort whose corners make a parallelogram comes in as itself with it too, when neither it nor anything in it paints with a gradient or pattern and everything in it is a path, compound path or group with no opacity mask and no effects of its own; Transform that scales, rotates or reflects needs nothing in it to be stroked and, with Transform Objects on, no guide in it that reaches past the rest of its art (hidden members count as art), and a Free Distort that moves a corner of a group needs no guide in the group that reaches past the rest of its art. Twist as the only effect is read the same way when nothing in the object is stroked: up to 180° either way (a limit VectorCraft sets) on a path or compound path whose segments are all straight, except a compound path with a guide member that reaches past its other members at an angle other than 0°, and up to 90° either way (a limit VectorCraft sets) on another path, compound path or group with no guide in it. One with more, other effects (Zig Zag, a Pucker & Bloat of another amount, a Free Distort with other corners), an effect setting that is not read (an unknown key, a missing or out-of-range value, a Scribble with a color of its own), a variable-width stroke with one centered width array, dashes aligned to corners, a brush other than a Calligraphic or Art one, a Calligraphic brush with settings of its own, an entry that isn't read, a variable width or an angle that follows the path, a path followed by samples of the pen (`(…) Xt n XD`) whose Calligraphic brush varies with the pen, or an Art brush other than the ones described next comes in as its drawn look (a group named after it). Objects in a symbol defined before the file's art styles section, as newer files write it, take the same styles as the layers' objects. A path with a Calligraphic brush otherwise comes in as the path, the brush on its stroke at the stroke's weight, which scales the brush (#372), and so does a path with an Art brush, whose weight scales the art across the path, when all of these hold: the brush is in Tints or None, at a fixed width from 1% to 1,000%, stretched to the path or stretched between guides that leave art between them, flipped along or across or not ([Art brush options](https://web.archive.org/web/20220911143322/https://helpx.adobe.com/pdf/cs6/illustrator_reference.pdf), printed page 193), with `Spacing` 0, `Adjustment` 1 and `FoldAdjustment` 1 (VectorCraft's own reading of these numbers; a brush that scales its art proportionately comes into the Brushes panel with that option, and its paths keep their drawn look); the path's settings are the brush's own (apart from the lowest and highest width of a fixed width and the guides' lengths without Stretch Between Guides, which don't draw), with no entry that isn't read, no variable width and no effects; a stroke in Tints isn't a swatch; and the art is paths, compound paths and groups in solid fills, with no strokes, masks or effects, and has some length along the path. A stroke takes the brush the Brushes panel keeps under its name, and one whose name the panel doesn't keep comes in as its drawn look. Type with an Art brush keeps its drawn look under the type. A Calligraphic brush's Pressure, Tilt, Bearing and Rotation come in as those channels (a 6D Art Pen's brushes vary with the pressure, the bearing and the barrel's rotation); its Stylus Wheel varies at random. The file's Calligraphic, Scatter, Art and Bristle brushes replace the default ones in the Brushes panel, in the file's order, also when the file comes in as its PDF part (a brush library has no layers); pattern brushes and brushes it can't read are left out with a note. When the file opens from its layers, the spot colors in the art of each brush that comes in become swatches, and that art's colors count toward the document's color mode, as a pattern's do. The swatches take at most 20,000 color names in all across the brush art, and each brush-art section keeps at most 20,000 names. Each name keeps its first definition, with the color operators' names before the gradient stops' names. A spot color past those limits makes no swatch, and its color still counts toward the color mode. A spot color that the page's art, a pattern or a symbol also defines keeps the value defined there. Type keeps its art style as a live appearance whatever its stack (an Art brush aside), so it can be retyped: each fill and stroke of the style's stack (solid colours, gradients and pattern fills, placed as the drawn look places them) with its own opacity, blend mode and effects, the effects on the whole object, and where the characters paint among them; the effects read are Warp, Offset Path, Outline Object, Outline Stroke, Transform (with copies, Transform Objects, Transform Patterns and Scale Strokes & Effects; not with Random), Free Distort, Pucker & Bloat, Twist, Zig Zag, Tweak (only when it moves nothing, the file holding none of its random outline), Drop Shadow, Inner Glow, Outer Glow, Feather, Round Corners, Scribble, Gaussian Blur, Bas Relief (its detail, smoothness and light direction from its settings block, or the effect's defaults when the style holds no settings block; a settings block that isn't read keeps the drawn look) and Convert to Shape, and a style with others, or with an effect setting that isn't read, keeps the type's drawn look. Convert to Shape keeps its Rectangle, Rounded Rectangle or Ellipse, its Absolute or Relative size (a relative size in the file is added to each side) and its corner radius; a relative Ellipse, or a setting that isn't read, keeps the drawn look. The page's drawing of such a style isn't held to look like VectorCraft's where its drawn look lay. Gradients take their matrix (`Xm`, radials and skewed ones too), focal point and the order of stops sharing a ramp point; gradient meshes, a clipping path's own fill and its stroke, and the artboards' names are read too. `editingData: "always"` (`convert --editing-data`) opens a `.ai` or an EPS with editing data from its editing data even where it draws differently from its page, which can be older, with a note. Type is made from the file's text document, whole and editable, shown or not: point type (its frame's matrix, which newer files leave out when it is neither turned nor scaled, read as none), area type (a story in several frames as threaded type) and type on a path, with its characters, fonts, size, leading, tracking, scaling, baseline shift, fill and stroke (grey, RGB or CMYK), alignment, indents and paragraph spacing (a character attribute a run doesn't set comes from its character style, then the style that one is based on, then the document's defaults); area type keeps its frame's Area Type Options rows and columns, the gutter between rows and the gutter between columns, and its first baseline (Fixed, Cap Height, Leading or x Height) with its minimum; type on a path keeps its frame's Type on a Path effect, Align to Path and Flip (a frame whose options set key 6 to true keeps their defaults), and the first frame's Spacing is fitted from the file's layout, not read from the dialog's value; the distance from the path under Align to Path is measured for each character at its size and vertical scale (in vertical type, its horizontal scale), from the top of its font's em box (Ascender), half the height of the top of its font's H (Center) or the bottom of its font's bounding box (Descender); the fit under Gravity does not reproduce the file's layout, and its glyphs can lie up to 7.4 pt from the positions the file keeps; the page's drawing of it (often in pieces) is left out. Vertical type keeps its orientation, its columns from right to left, and a run set to Tate-chu-yoko keeps that setting. When it makes the type of every text object that shows, the page's type is only compared with it, each text object keeps its own group, frame and layer, and a line break inside a paragraph stays one. Where it can't make a text object's type (a frame of another kind), that text object takes the page's type where the text document puts its lines, or else what is left of the page's type in painting order (no group around it); the page's type where made type draws stays that type's, and hidden type is left out with a note. Text wrap is read too: an object whose dictionary has the wrap options (offset and Invert Wrap), or any graphic of a legacy wraparound group (`*w` … `*W`, before or after its type, with no offset), is a wrap object, and area type below it in its layer flows around it when the file opens, threaded type included (#2763). Kerning, underline and the other character and paragraph options aren't read yet. A `.ai` saved without PDF compatibility (a placeholder page) opens from its editing data alone, its point type, area type and type on a path made from the text document. A `.ai` whose PDF part shows only text isn't taken for that placeholder when its page states an art, trim or bleed box: it opens from its editing data alone where that reads, else from its PDF part (#1387). A `.ai` whose PDF part draws nothing at all (an empty page, with or without those boxes) opens from its editing data alone where that reads too: there is no page art to check its layers against, and the empty page would lose all of it. Text objects with an appearance keep their own text and frame, type of hidden layers stays hidden, and type on later artboards lands on its text objects (#1391); area type whose frame is too short for a line of the fallback font shows its first line (the frame is made taller, with a warning in the open result) (#1392). In a PDF saved with some of its artboards, the type on each page after the first goes to an artboard of that page's size after the previous page's artboard, and only to one that leaves an artboard for each later page; the first page's artboard also leaves one for each later page. When several artboards fit a later page, VectorCraft takes the one whose art draws most like the page, and compares at most 16 artboards for all the later pages together. Symbols are read into the Symbols panel, in the file's symbol list order, with their art, their registration point and the instances in their art, and their instances come in live with their matrix, name, hide, lock, opacity, blending mode, isolation, knockout and opacity mask; a symbol whose art isn't read whole (type, placed files, an image it leaves out or anything else it doesn't read) isn't kept. A file that comes in as its page or PDF part because its editing data has no layers (a symbol library), or because its layers can't be read or used (any of the cases below), gets the symbols its editing data defines before its first layer, in the symbol list's order, while its page art stays as the page draws it. Instances of symbols it can't read, instances with appearance changes of their own (a dynamic symbol's), pattern fills whose pattern it can't read, placed files the data keeps no preview of and anything else it doesn't read make the file come in as its page (on a layer that doesn't show, they are left out of that layer), with a warning saying what. An unread object on a shown layer whose box can be found instead comes in as a group of the page's objects inside that box, named after it, with the rest of the layers and groups kept and a warning listing what came in as the page's art; the file still comes in as its page when live art or another unread object shares that page art, when the object spans two artboards or lies on an artboard that has no page, when no page art lies inside its box, when that page art is inside a page group with a clip, mask, transparency or appearance, when the object holds a frame of threaded type, when the page art uses a pattern, image or swatch that the page lacks or that differs from the editing data's, or when the page art doesn't carry its transparency (#4806). The layers' art is also compared with the page (by lightness, so colours written as their CMYK equivalents compare alike, and by whether a pixel is inked at all); the page is used when they differ by more than 5% (away from type, when all the type is made from the text document), where one draws an object the other doesn't (away from type, whose lines may be laid out afresh), and when an EPS whose page is its art's box has art printed outside it (#735). A `.ai` is not compared with its page, and its PDF part is not imported, when its text document makes the type of every text object (at least one shows, and none is drawn by the appearance of the layer or group it is in), no object is unread, no placed file has a second placement, no live envelope keeps its drawn art, it declares no large canvas, and its artboards are its pages' trim boxes one for one, in points or in the first page's `UserUnit`: it opens from its layers, with the bleed of its pages' bleed boxes. When they differ because some objects draw differently (an object in another color, or one that only one of them draws), each top-level object of the layers that holds such a difference comes in as a group of the page's objects inside its box and the layers stay, with a warning that names the layer or sublayer of each such object as the Layers panel shows it (`<Layer>` for one without a name) and how many came in from it; an export or Save As to the file's own path then needs `acknowledgeLoss: true`, and a wrap object replaced this way keeps its wrap options. The file still comes in as its page when only edges or type differ, when a difference lies outside every top-level object, when more than half of the top-level objects or more than 64 hold one, when such an object is or holds type or holds a wrap object inside a group, when the page's type of a text object that stays lies inside such an object's box, when the page's art can't replace such an object for one of the reasons above for an unread object, when matching the differences to the objects would take too much work, or when the result still differs from the page. `editingData: "always"` keeps the objects as read, and placed files at the other point their data gives are tried as well. An EPS whose page is its art's box keeps that page when it comes in through its layers, not the editing data's artboard, and a text object counts as drawn by the page by its colours, not only its lightness, so a red stroke stacked over a dark red one stays (#1102). `textAs: "outlines"` opens a `.ai` whose type shows from its PDF part, which has the outlines; `editingData: false` opens any of them as its page or PDF part only, for print pipelines (#735). A file whose import left something out (hidden text, art or layers) is never written over by an export or Save As to its own path unless `acknowledgeLoss: true` (`convert --replace-lossy`), so the original keeps what the document lacks. Where a `.ai` can't be read that way (or its layers are turned off in the import options), we read its PDF-compatible part, so live objects that only the editing data holds arrive as appearance, and plain groups arrive ungrouped: that part draws each object on its own and marks only layers, clipping groups and groups with opacity, blending or a mask (those come back). Art outside the artboards isn't in that part at all (the PDF part leaves it out), so it doesn't open; the import says so in a note (#472). Its pages still go where the editing data puts the artboards (a grid stays a grid), with the art on each, when it has as many artboards as pages, of the same sizes (#1068); the page of the artboard `CropAreaActive` names is then the active artboard. A `.ai` whose editing data has artboards but no layers also opens on that page under the same check, and its pages stay where they are. A `.ai` whose PDF part's pages are cropped to its art (each page the box of all the art, which is the editing data's bounding box) instead of its artboards opens from its layers, with its own artboards, where they draw as that page does. Its pages are laid out so that art one of them draws past its artboard (notes beside a design, which the part doesn't clip) doesn't lie over the page before it in the row, where it was taken for that page's art: the check against the editing data then found art its layers don't have there and opened the file as its PDF part, without the art outside the artboards. That part also has no paragraphs: area type is written line by line, and comes back as area type only where its font is installed and lays the lines out with the same breaks, else as a point type object per line (#508). Art off the page that a PDF does draw opens on the pasteboard. A run of type in the editing data whose baseline direction is 1 opens with Standard Vertical Roman Alignment (https://helpx.adobe.com/illustrator/using/formatting-asian-characters.html) on, which is VectorCraft's own mapping: its half-width characters stand upright in vertical type, and horizontal type keeps the mark with no change to its layout. A run whose baseline direction is 2 or 3 (Tate-chu-yoko), or that names none in the run, its character style or the document's defaults, opens with it off. The scripting reference lists 1, 2 and 3 as the Standard, vertical rotated and Tate-chu-yoko baseline directions (https://web.archive.org/web/20170621180804/https://wwwimages.adobe.com/content/dam/Adobe/en/devnet/illustrator/sdk/CC2015_3/Illustrator%20VBScript%20Reference.pdf, page 256). A Scatter brush in the editing data whose last 15 numbers start with 1 comes into the Brushes panel in Tints. Each brush art section is read without its frame: an unnamed, unpainted rectangle with no settings of its own at the art's bounds (within 1/1000 pt), closed, or open with its first corner again at the end. A wider frame stays in the art, and an art group with a state or look of its own (hidden, locked, isolated, knockout, an opacity, a blend mode, a name, a mask, a note or an appearance) stays a group. @@ -281,6 +306,8 @@ An object in a pattern's art or in a brush's art takes the file's art styles in Names in the editing data that aren't UTF-8 (layers, objects, artboards, colors, gradients, patterns, graphic styles, swatches, brushes, symbols, variables and data sets) are read as Windows-1252 unless `legacyNameEncoding` (`convert --legacy-name-encoding`) picks `macintosh`, `windows-949`, `shift_jis`, `gbk` or `big5`; the open result's warnings list the first three such names as read and count the rest. The text values of data sets are read in the same encoding. +Gradient meshes in the editing data keep each point's own color where a patch's corners differ in color model. In a symbol's art, a gradient mesh's corners and an envelope's grid are read in the space an image's matrix is read in there, and an envelope's contents in its dictionary in the canvas's space with y down. In a file without a template box such a mesh or grid is not read, and its symbol's instances open as the page draws them, as with an image there. An envelope in a symbol's art whose grid and contents are in the symbol's own space, as earlier VectorCraft builds wrote them, opens as the art it draws. + ## Format by format | Format | Illustrator | Ours: open/place | Ours: save/export | Fidelity and tests | @@ -296,7 +323,7 @@ Names in the editing data that aren't UTF-8 (layers, objects, artboards, colors, | DXF | open, export | yes | yes (R12–2018) | R13–2018 closed SPLINE flags and control-point closure on import verified (#1299); circular cubic paths export as native CIRCLE/ARC where stroke semantics permit; R12 weighted strokes remain POLYLINE while non-circular curves keep the existing fallback (`crates/cad/src/tests.rs`); [Autodesk group 70](https://help.autodesk.com/cloudhelp/2024/ENU/AutoCAD-DXF/files/GUID-E1F884F8-AA90-4864-A215-3182D47A9C74.htm). DXF 2000–2018 LAYOUT objects write the paper image origin as 148/149 (was a stray 158), the shade plot codes (2004+) and the model type flag, and the plot style placeholder carries no subclass marker (#3085; structure test `r2000_and_later_files_have_the_structure_cad_apps_require`, checked with ezdxf's audit; not yet confirmed in Autodesk Fusion). DXF Options' Preset menu and `document.exportDxf`'s `dxfPreset: "cnc"` set the CNC / CAM options (#5500); VCarve QA remains open | | 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) | +| EMF / WMF | open, export | yes | yes | an oversized embedded PNG or JPEG is refused from its header, before any pixels are decoded (#1776); a picture cut short by a reader limit, images and pattern brushes that are not read, clips that are not applied and raster operations other than a plain copy come back as warnings; tests in `crates/metafile/src/tests/import.rs` | | 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, point type as editable type layers with `preserveText`; `tests_psd.rs`) | 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, Import Slices; `tests_psdlayers.rs`, `dialogs/psd_import.rs`); slices (image resource 1050, version 6 and the version 7 and 8 descriptor) open and embed as user slices with `importSlices` (`tests_psdslices.rs`); layer comps 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) | @@ -318,6 +345,15 @@ Names in the editing data that aren't UTF-8 (layers, objects, artboards, colors, | Affinity `.af`, `.afdesign`, `.afpub` | no | yes (beyond Illustrator) | no (#665) | 51 pinned files, [affinity-validation.md](affinity-validation.md) | | Clipboard: PDF, SVG, PNG, EMF, text | yes | yes | yes | copied files paste as art; cells copied from a spreadsheet (tab-separated text) paste as a table of point type over gridlines, at most 1000 rows, 256 columns and 20,000 cells (#5296) | +Opaque CMYK PSD/PSB merged images preserve their 8-bit or 16-bit ink samples, CMYK ICC profile, resolution, +and clipping path through placement, relinking, updating, and embedding (#8316). VectorCraft stores these images +as CMYK TIFFs up to its native limit of 67,108,864 pixels and within its allocation allowance. Other CMYK composites +use the RGB import path, subject to its allocation limit; importing individual layers keeps its existing behavior. +Synthetic regressions in +`tests_psdread.rs` cover native samples, compression, metadata, and linked-image operations. The +[public PSD specification](https://www.adobe.com/devnet-apps/photoshop/fileformatashtml/index.html) defines +the CMYK planes and profile and resolution resources. + ## PDF form gradients PDF export's linear and radial gradients stay aligned inside transparency groups, opacity masks, @@ -334,6 +370,8 @@ Stop opacity on translated artboards remains outside this regression coverage. - [ ] Exact redistribution of one replacement over several lines/styles, and general mixed-direction paragraph layout. Replacement uses the first placed glyph's line/style. Tags deeper than 128 and replacements over 64 KiB encoded (at most 192 KiB decoded) fall back to glyph mappings with a warning; an outer accepted owner survives deeper tags. - [x] Stroked type (text rendering modes 1, 2, 5 and 6, with or without `ActualText`) keeps the line cap, line join and miter limit of the graphics state it is stroked with, as paths do; glyphs stroked with another cap, join or miter limit are a run of their own, also a glyph filled and then stroked otherwise than the run its fill joined (#7741, `imported_stroked_type_keeps_the_files_cap_join_and_miter_limit` in `crates/pdf/src/tests/textstroke.rs`). The dash array is not carried to the characters yet. +- [x] Type filled and stroked by one text-showing operator (text rendering modes 2 and 6: the reader fills all of a `Tj` or `TJ`, every string of the array, before it strokes the same glyphs) comes in as one type object, filled and stroked, as it does glyph by glyph; a stroke over no filled glyph (modes 1 and 5, or stroked type of its own) stays stroke only (#8015, `a_word_filled_then_stroked_imports_as_one_filled_and_stroked_type` in `crates/pdf/src/tests/textstroke.rs`, `a_vertical_column_filled_then_stroked_is_one_filled_and_stroked_type` in `crates/pdf/src/tests/text_placement.rs`). Translucent type filled and stroked stays a filled object and a stroked one, as the file composites them apiece (`translucent_fill_and_stroke_text_stays_two_objects`). A glyph filled only right after one filled and stroked (`2 Tr (B) Tj 0 Tr (C) Tj`) joins the same type object filled only, not stroked (#8300, `a_glyph_filled_only_after_one_filled_and_stroked_is_not_stroked`). +- [ ] PDF type filled and stroked at less than full opacity as one type object, and a `TJ` whose kerning starts a new line part way through, filled and stroked: both still come in as a filled object and a stroked one (#8015). - [x] Place from bytes or unlinked paths, and PDF clipboard paste, keep the selected page's live text. Synthetic two-page regressions in `crates/engine/src/cmd/fileio/tests_pdffidelity.rs` cover both sources, page selection and explicit outlines. The single-page importer honors the same text choice as Open; existing PDF fallback rules are unchanged. @@ -345,6 +383,9 @@ Stop opacity on translated artboards remains outside this regression coverage. | Date | Change | Summary | |---|---|---| +| 2026-11-17 | minor | PDF import (#8300): a glyph filled only (text rendering mode 0) right after one filled and stroked (mode 2) joined the stroked run and came in stroked too: `2 Tr (B) Tj 0 Tr (C) Tj` came in as `BC` stroked throughout. A glyph filled only now joins only a run drawn alike, so it starts a run of its own, filled only, in the same type object, and takes a stroke only when the file draws one over it (the #8015 matching); a word filled whole then stroked whole, and fill and stroke rendering glyph by glyph, still come in as one run filled and stroked. Tests: `a_glyph_filled_only_after_one_filled_and_stroked_is_not_stroked`, `glyphs_filled_and_stroked_one_by_one_stay_one_run`; scores and estimates unchanged. | +| 2026-11-17 | minor | PDF import (#8015 follow-up): type filled and stroked at less than full opacity is no longer joined into one type object, since the file composites the fill and the stroke apiece, darker where they overlap, while one object's opacity applies to both together; it stays a filled object and a stroked one, as a fill and stroke at different opacities already did. An upright glyph (vertical type) filled and stroked is no longer kept as an outline for a line that comes in as its outlines, as glyphs filled only weren't, so such a line can't lose them. The #8015 entries now say what is left: translucent type filled and stroked, and a `TJ` whose kerning starts a new line part way through, still come in as two objects. Tests: `translucent_fill_and_stroke_text_stays_two_objects`, `a_vertical_line_with_one_glyph_filled_and_stroked_keeps_every_glyph_filled`; scores and estimates unchanged. | +| 2026-11-16 | minor | PDF import: fill and stroke rendering (text rendering modes 2 and 6) draws all the glyphs of a text-showing operator (`Tj`, `TJ`, `'`, `"`) filled, then the same glyphs stroked, so a word shown at once came in as two type objects: a stroke-only copy over a fill-only one. Each stroke is now matched, in order, to the glyph filled with the same placement (where, how large, how wide, slanted and turned) in the same font with the same text on the line, and only that glyph takes the stroke, so the word comes in as one type object, filled and stroked; glyphs stroked with another join part way through still split into runs of their own, and stroked type over no filled glyph (modes 1 and 5) stays stroke only (#8015; `a_word_filled_then_stroked_imports_as_one_filled_and_stroked_type` in `crates/pdf/src/tests/textstroke.rs`, `a_vertical_column_filled_then_stroked_is_one_filled_and_stroked_type` in `crates/pdf/src/tests/text_placement.rs`). Scores and estimates unchanged. | | 2026-11-15 | minor | PDF import: stroked type (text rendering modes 1, 2, 5 and 6, and glyphs under `ActualText`) came in with butt caps, miter joins and a miter limit of 10 whatever the file stroked it with, while paths kept the graphics state's. The characters' stroke now takes the line cap (`J`), line join (`j`) and miter limit (`M`) of the graphics state, as a path's stroke does, and glyphs stroked with other ones start a run of their own, also a glyph filled and then stroked otherwise than the run its fill joined, so the glyphs before it keep their stroke (#7741). Test `imported_stroked_type_keeps_the_files_cap_join_and_miter_limit` in `crates/pdf/src/tests/textstroke.rs`. Scores and estimates unchanged. | | 2026-11-13 | minor | `.ai` and EPS import: layers that don't draw as the page, even with the drawn art of every live envelope put back, no longer put back the drawn art of every envelope of type. Each live envelope of type is weighed in the page check's own drawing of the pages it lies on, on the pixels that it and its drawn art ink there (the two drawn together on a layer of their own, without the rest of the layers; a pixel inks with an alpha above 8 of 255): it keeps its drawn art and its type, hidden, with the note, where the layers with it differ from the page in more of those pixels than its own check allows against its drawn art (10% of them, or 3% differing with all their neighbours, away from type), or where the envelopes of type that stay live, in the order they were read, would together differ there in more of a page than half of what the page check allows (a budget of the same size as the one their own checks share, kept apart from it). Art that differs elsewhere on the page no longer costs them their editable type; art that differs on their pixels still does. An envelope of type that a clip group or a clipping sublayer clips, an opacity mask masks, or a group with an appearance of its own, another envelope, a repeat or a blend holds keeps its drawn art as before, wherever it lies: drawn on its own it would be weighed elsewhere than it draws, and what holds it can draw it onto the page from off it. An envelope on no page stays live, as the page check doesn't see it, unless the page holds all the art that prints (an EPS's page that is its art's box, where art past the page is compared too): there one reaching past the page keeps its drawn art. Past 12 of them on the pages, all keep it. This holds where the editing data is trusted, where the objects that differ come in as the page's art (the placed files' other placement weighed on its own, as it draws them elsewhere under or over the envelopes; layers that draw as the page with only the envelopes the page holds put back are used as they are; where none of the objects that differ can then come in as the page's art, because an object holds type, the drawn art of every envelope of type is put back and that is tried again, as before), and for a `.ai` whose layers would open alone, which still opens alone: its envelopes of type are all settled again as they were with the page, in the same order and with the same checks, so each that opens live draws as it was weighed, and those the page held get their drawn art back. Where putting the drawn art of every live envelope back makes the layers draw as the page, it is still put back (#5065). In 224 users' files (used locally, never committed): envelopes of type that open live go from 174 to 186, in 8 files, none fewer in any file; no file changes between its layers and its PDF part; 7 renders change, by at most 0.7% of their pixels at 40 ppi (1 closer to the page, 1 alike, 5 further, by at most 0.7 of a percentage point, where VectorCraft's own envelope draws a little apart from the drawn art, within its check); the note for type in an envelope goes from 6 files. Of the 14 envelopes of type that had opened live and lost it to the page check, 2 keep their drawn art: one where the page draws something else where it is, and one in a file that comes in as its PDF part (#7141). Tests `build::candidate_tests::the_page_holds_back_only_envelopes_of_type_where_it_differs_from_them`, `envelopes_of_type_stay_live_within_half_of_what_the_page_check_allows`, `an_envelope_of_type_differing_in_more_of_its_pixels_than_its_check_allows_is_held_back`, `envelopes_of_type_the_layers_dont_draw_in_place_are_held_back`, `on_a_page_that_holds_all_the_art_an_envelope_of_type_past_it_is_held_back`, `objects_come_in_as_the_page_art_with_every_envelope_of_type_put_back_where_a_live_one_holds_a_difference`, `tests_native::layers_that_would_open_alone_keep_an_envelope_of_type_live_where_other_art_differs_from_the_page`, `layers_that_would_open_alone_keep_live_only_the_envelopes_of_type_the_page_doesnt_hold`, `trusted_layers_that_would_open_alone_open_alone_with_an_envelope_of_type_the_page_doesnt_hold_live`, `layers_with_objects_that_come_in_as_the_page_art_keep_an_envelope_of_type_that_draws_as_the_page_live`, `trusted_layers_keep_an_envelope_of_type_live_where_other_art_differs_from_the_page`, `trusted_layers_leave_an_envelope_of_type_the_page_draws_otherwise_its_drawn_art`, `build::candidate_tests::the_other_placement_of_placed_files_is_weighed_on_its_own`, `layers_that_draw_as_the_page_with_the_held_envelopes_of_type_put_back_are_used_so` | | 2026-11-13 | minor | PDF import: glyphs inside a marked-content span with an empty `ActualText` come in as outlines in their fill and stroke instead of being left out, adding no text (#6971; `empty_actual_text_keeps_the_glyphs_art` in `crates/pdf/src/tests/actual_text.rs`). Scores and estimates unchanged. | diff --git a/docs/gaps.md b/docs/gaps.md index a6f6defbb0..2822e483b2 100644 --- a/docs/gaps.md +++ b/docs/gaps.md @@ -490,8 +490,8 @@ macOS cursor delivery (#2292) is narrowed to a native host adapter using the exi Until a choice is made (`default`), the panels follow General › Transform Pattern Tiles as before, and the menu checks Transform Both while it is on and Transform Object Only while it is off; a choice overrides it. Estimate unchanged. -- **Done (2026-10-21, #394):** General › Constrain Angle turns the arrow keys' axes (guides stay on the page's), holds Shift drags of the Selection, Direct Selection, Free Transform, Slice Selection, Reshape and Measure tools and the Pen's handles to the turned axes, and new rectangles, rounded rectangles, ellipses, grids, point and area type, Shift-drawn polygons and stars and the shape size dialogs are drawn along it with their bounding box turned; 0° and whole turns are exactly as before, quarter turns exact (<https://helpx.adobe.com/illustrator/desktop/manage-objects/arrange-objects/rotate-objects-by-specific-angles.html>). Spirals, flares and the Pen's new paths are not turned yet. Estimate unchanged. -- **Done (2026-10-21, #394):** General › Constrain Angle turns the arrow keys' axes (guides stay on the page's), holds Shift drags of the Selection, Direct Selection, Free Transform, Slice Selection, Reshape and Measure tools and the Pen's handles to the turned axes, and new rectangles, rounded rectangles, ellipses, grids, point and area type, Shift-drawn polygons and stars and the shape size dialogs are drawn along it with their bounding box turned; 0° and whole turns are exactly as before, quarter turns exact (<https://helpx.adobe.com/illustrator/desktop/manage-objects/arrange-objects/rotate-objects-by-specific-angles.html>). Spirals, flares and the Pen's new paths are not turned yet. Estimate unchanged. **2026-10-24:** General › Corner Radius is the Rounded Rectangle tool's radius: the tool takes the preference when chosen and when it changes while the tool is active (or lent a selection tool for a drag), and the radius ↑/↓ set while drawing one, or a Tool Options value, becomes the preference, clamped to its 0–1296 pt range (<https://helpx.adobe.com/illustrator/using/drawing-simple-lines-shapes.html>). Estimate unchanged. +- **Done (2026-10-21, #394):** General › Constrain Angle turns the arrow keys' axes (guides stay on the page's), holds Shift drags of the Selection, Direct Selection, Free Transform, Slice Selection, Reshape and Measure tools and the Pen's handles to the turned axes, and new rectangles, rounded rectangles, ellipses, grids, point and area type, Shift-drawn polygons and stars and the shape size dialogs are drawn along it with their bounding box turned; 0° and whole turns are exactly as before, quarter turns exact (<https://helpx.adobe.com/illustrator/desktop/manage-objects/arrange-objects/rotate-objects-by-specific-angles.html>). Flares and the Pen's new paths are not turned yet. Estimate unchanged. +- **Done (2026-10-21, #394):** General › Constrain Angle turns the arrow keys' axes (guides stay on the page's), holds Shift drags of the Selection, Direct Selection, Free Transform, Slice Selection, Reshape and Measure tools and the Pen's handles to the turned axes, and new rectangles, rounded rectangles, ellipses, grids, point and area type, Shift-drawn polygons and stars and the shape size dialogs are drawn along it with their bounding box turned; 0° and whole turns are exactly as before, quarter turns exact (<https://helpx.adobe.com/illustrator/desktop/manage-objects/arrange-objects/rotate-objects-by-specific-angles.html>). Flares and the Pen's new paths are not turned yet. Estimate unchanged. **2026-10-24:** General › Corner Radius is the Rounded Rectangle tool's radius: the tool takes the preference when chosen and when it changes while the tool is active (or lent a selection tool for a drag), and the radius ↑/↓ set while drawing one, or a Tool Options value, becomes the preference, clamped to its 0–1296 pt range (<https://helpx.adobe.com/illustrator/using/drawing-simple-lines-shapes.html>). Estimate unchanged. - **Done (2026-10-17):** Background Export shows its progress in a dialog with Cancel and Continue in Background (#2564), on the shared cancel token (#2546); a cancelled export writes no file. Save As, Export for Screens and Export Selection don't show it yet. Estimate unchanged. **2026-11-06:** opening a file that takes longer than 0.4 s shows a progress window too, with a moving bar, Cancel and Continue in Background (part of #5930); Save and Place still show only the status bar's spinner. Estimate unchanged. - **Done:** quick Image Trace presets trace at once and leave the panel as it was; the Image Trace button (Control bar, Properties) opens the controls with Threshold and Advanced (Paths, Corners, Noise), as the public documentation describes (<https://helpx.adobe.com/illustrator/using/image-trace-results-optimization.html>). Other context-specific Properties gaps remain. - **Done (2026-10-31, #394):** Units › East Asian Type is read, and Q and Ha are units. 1 Q and 1 Ha are each a @@ -517,8 +517,9 @@ macOS cursor delivery (#2292) is narrowed to a native host adapter using the exi afterwards opens in a floating window of its own (G7's Float in Window); documents already open stay where they are. Estimate unchanged. - **Done:** Hyphenation › Default Language is the language of new type, unless Document Setup chose one, and each - run hyphenates in its own language (Character panel). English and eleven Indian languages have break - points; other languages stay whole apart from the Exceptions list (#394, #4947). + run hyphenates in its own language (Character panel). English, eleven Indian languages, Bulgarian, Turkish + and Russian have break points, and German, Polish, Portuguese and Italian have them in builds that embed + their patterns; other languages stay whole apart from the Exceptions list (#394, #4947). - **Done (2026-11-14):** Layers panel row context menu: right-clicking a layer, group, or object row shows a context menu (Options…, Duplicate, Delete, Lock Others / Unlock All, Hide Others / Show All, Locate Object, Collect for Export) with proper selection behavior and Undo/Redo tracking. Tests in `crates/ui-egui/src/panels/layers/tests.rs`. - **Missing:** 2 Preferences options stored but not acted on (#394), each waiting on a subsystem of its own: Plug-ins & Scratch Disks › Primary and Secondary (documents are kept in memory; nothing pages to @@ -703,7 +704,8 @@ macOS cursor delivery (#2292) is narrowed to a native host adapter using the exi Extrude & Bevel, Inflate and Rotate with Position presets ([three-d.md](three-d.md), #1407). Colored Inflate has automatic smooth vector lighting from shared membrane normals. White-light Inflate keeps its polygon shading. Every 3D facet's seam has round joins ([three-d.md](three-d.md#seams)). All four take one to ten colored directional lights, with neutral ambient applied once, a light list and independent previewing controls. Standard, Diffuse, Top Left and Right select original rigs, shared with commands; manual settings show Custom. - **Missing:** materials (base, Substance, graphics), shadows, ray-traced rendering, angular cut caps, exact visibility for intersecting and concave surfaces, the rest of 3D - Classic (Map Art), Turntable, textures, map art and shading in 3D export. + Classic (Map Art), Turntable, and in 3D export the graphics on Revolve's side, materials and shading (graphics on + planes and Extrude & Bevel's caps are exported as textures). - **Impact:** specialist; Materials is the one menu stub left. - **Estimate:** 25–45 h; plan in `plan/` before coding. diff --git a/docs/image-trace-adjustments.md b/docs/image-trace-adjustments.md index 6d2357dbe3..e4830e31b2 100644 --- a/docs/image-trace-adjustments.md +++ b/docs/image-trace-adjustments.md @@ -23,7 +23,10 @@ versions. Among those presets, Corners is 100 in Technical Drawing, 75 in Defaul Logo, Line Art and Outline, and 50 in the other eight. Noise is 1 px in Technical Drawing, 5 in High Fidelity Photo and Black and White Logo, 8 in 6 Colors and 16 Colors, 10 in Low Fidelity Photo, 15 in 3 Colors and Shades of Gray, 20 in Sketched Art, Line Art and Outline, 25 in Default, and 90 in Silhouettes (see -[image-trace-quality.md](image-trace-quality.md#preset-paths-corners-and-noise)). +[image-trace-quality.md](image-trace-quality.md#preset-paths-corners-and-noise)). High Fidelity Photo +traces with Palette › Full Tone at Color detail 85 and Method › Abutting (VectorCraft's own values; see +[image-trace-quality.md](image-trace-quality.md#high-fidelity-photo-in-full-tone)); Low Fidelity Photo +traces with a Limited palette of 20 colors, Overlapping. Sliders apply on release, and their numeric fields can be edited directly. Each committed adjustment re-traces the selected object as one undo step and changes the preset to Custom. @@ -83,9 +86,9 @@ leaves out every white area whatever `ignoreBackground` is. color nearest to it in lightness and hue, with a difference in hue or chroma counted three times as much as one in lightness, so a gray or a muted brown takes a black, white or other neutral library color rather than a saturated color of the same lightness. -**Abutting and Overlapping.** Abutting is the default Method, and the Default, Auto Color, 3 Colors, -6 Colors and 16 Colors presets use it. With Abutting, two neighboring colors share one exact edge. The -canvas smooths the edges of each path on its own, so each of the two paths covers only part of the +**Abutting and Overlapping.** Abutting is the default Method, and the Default, Auto Color, High Fidelity +Photo, 3 Colors, 6 Colors and 16 Colors presets use it. With Abutting, two neighboring colors share one +exact edge. The canvas smooths the edges of each path on its own, so each of the two paths covers only part of the pixels along that edge, and a thin line of the background can show between the colors. Web browsers and PDF viewers usually draw an exported SVG or PDF file the same way and show the same line. Raster exports (PNG, JPEG, TIFF and the other bitmap formats) with None anti-aliasing do not show it at any diff --git a/docs/image-trace-quality.md b/docs/image-trace-quality.md index b111a25fb7..ab8ee313d7 100644 --- a/docs/image-trace-quality.md +++ b/docs/image-trace-quality.md @@ -83,8 +83,9 @@ gradient, texture, sensor noise): Photo trace was 86,000 anchors under the old limit; a noisier scan of the same size would have been refused. At 8,000,000 anchors a trace keeps about 0.7 GB, with a peak of about 0.9 GB while tracing. The preset rows were measured with the earlier preset values: High Fidelity Photo at Paths 90, Corners 25 -and Noise 4, Low Fidelity Photo at Paths 60, Noise 12 and 16 Colors at Paths 70, Corners 55 and Noise 10 -(see [Preset Paths, Corners and Noise](#preset-paths-corners-and-noise)). +and Noise 4 with a Limited palette of 64 colors and Overlapping, Low Fidelity Photo at Paths 60, Noise 12 +and 16 Colors at Paths 70, Corners 55 and Noise 10 (see [Preset Paths, Corners and +Noise](#preset-paths-corners-and-noise) and [High Fidelity Photo in Full Tone](#high-fidelity-photo-in-full-tone)). ## Collapsed loops keep few segments A small closed loop (or a piece that returns to its own junction) whose fit collapsed to a single cubic cannot stay as one, so it kept every positioned point as a straight segment. A looser Paths @@ -250,7 +251,8 @@ Every built-in preset other than Auto Color and Flat Logo traces at Paths 50. Co The palettes, color counts, thresholds and other options of the presets did not change. The enhanced versions of these presets use the same Paths, Corners and Noise. 6 Colors and 16 Colors were at Noise 15 and Black and White Logo at 25 until [Noise joins the nearest color](#noise-joins-the-nearest-color); -the measurements below were made at those values. +the measurements below were made at those values. High Fidelity Photo's palette and Method changed +later (see [High Fidelity Photo in Full Tone](#high-fidelity-photo-in-full-tone)). Measured with the harness below (section 1, each preset on the inputs it is meant for), before and after: anchors fall in 10 of the 12 changed presets, for example 5,494 to 3,136 (High Fidelity Photo), 33 to 27 @@ -271,6 +273,47 @@ the other sections of this file, and in the Image Trace entries of [target-app-parity.md](target-app-parity.md), were measured at the earlier values. Test: `presets_have_their_paths_corners_and_noise` in `crates/trace/src/tests.rs`. +## High Fidelity Photo in Full Tone +High Fidelity Photo traces with Palette › Full Tone at Color detail 85 and Method › Abutting. It traced +with a Limited palette of 64 colors, Overlapping, before. Paths, Corners and Noise stay 50, 50 and 5. +These are VectorCraft's own values. Low Fidelity Photo keeps its Limited palette of 20 colors. + +Palette › Full Tone splits its colors until none spans more than its width limit. Then, while it has +fewer colors than Color detail's value (85 at 85), it splits the narrower ones too, where the image has +that many colors. The colors that look alike merge after that, and a merged color can merge again, so a +trace can end with far fewer colors than that count: a gray-to-green ramp 256 px wide with up to 8 levels +of grain a channel ends with 6 colors at Color detail 85, where the RGB test leaves 4. Full Tone's colors +merge when they are thoroughly mixed and less than 5 apart in Oklab × 100, or mixed in patches +(compression blocks) and less than 1.5 apart. The other palettes, Automatic included, keep the RGB test +(under 30 levels and thoroughly mixed, or under 12 and mixed in patches), and Automatic's continuous-tone +colors do not take the least count. These rules apply to every trace with Palette › Full Tone, so an +existing Full Tone trace or saved preset traces differently when it is traced again. + +On 19 photos, cartoons and synthetic shapes of 400 to 4,000 px, the mean pixel difference summed over the +inputs fell from 80.5 to 65.6 levels. It fell by more than 1% on 14 inputs (2.88 to 2.19 and 2.59 to 2.48 +on two photos, the second a JPEG at quality 40; 1.88 to 1.45 on a 4000 × 3000 photo; 12.40 to 7.44 on an +upscaled cartoon) and changed by less than 1% on the other 5. Anchors rose 1.66 times (1.98 million to +3.29 million) and the SVG size 1.31 times. The trace time rose 1.7 times (18.9 to 31.5 s for all 19, with +both builds tracing 3 images at a time in the same run). Flat synthetic art costs the most: 12 to 400 +anchors on a 4000 × 3000 image of two flat colors, and about 3 times the anchors on two images of +synthetic shapes (400 × 300 and 1600 × 1200), with the same pixel difference. A flat gray 192 × 128 with +up to 3 levels of grain a channel traces as 25 colors and 244 anchors, where the Limited palette of 64 +traced 1 color and 4 anchors; with up to 5 or 8 levels both trace it as 25 to 37 colors, on each of the +grays tested (28, 60, 128 and 200). + +In the same run, peak memory fell on 16 of the 19 inputs, for example 906 to 625 MiB on a 1536 × 2048 +cartoon, and rose on 3 small ones (by 5 to 11 MiB). Abutting accounts for the fall: the earlier preset +with Method › Abutting peaked at 523 MiB on the same cartoon, against 924 MiB with Overlapping, in another +run. Low Fidelity Photo, 16 Colors, 6 Colors, Black and White Logo and Auto Color give byte-identical +SVGs. On three flat colors stored in 8 × 8 blocks, each block off by up to 8 levels a channel, High +Fidelity Photo traces 3 colors as 3 paths; without the patch rule it traced 7 colors as 74 paths. + +Tests: `high_fidelity_photo_traces_in_full_tone`, `full_tone_keeps_more_of_a_noisy_ramps_tones`, +`full_tone_traces_a_noisy_dark_ground_like_a_light_one` and +`full_tone_merges_a_flat_colors_compression_blocks` in `crates/trace/src/tests.rs`, +`full_tone_merges_only_mixed_colors_that_look_alike` in `crates/trace/src/quantize.rs`, and +`full_tone_makes_one_color_per_step_of_color_detail` in `crates/trace/src/quantize/palette.rs`. + ## A simpler contour walk `contour::trace_mask` follows each region's outline along the pixel cracks with the inside on the right. It used to build a table of outgoing directions for every pixel corner in a raster pass and diff --git a/docs/mcp.md b/docs/mcp.md index 46cf846fae..4c1b661f42 100644 --- a/docs/mcp.md +++ b/docs/mcp.md @@ -723,8 +723,9 @@ For SVG/SVGZ, `export`'s top-level `outlineText: true` writes text as paths; DXF PDF instead uses `options: {"advanced": {"outlineText": true}}`; its default is false (live text). With `mods.shift`, a marquee dragged with the Selection tool toggles the objects it reaches (the selected ones leave -the selection, the others join it, the rest stays), and one dragged with Direct or Group Selection toggles the anchors -inside it (a path left with none leaves the selection, one with all of them is selected whole). The Lasso adds anchors +the selection, the others join it, the rest stays), one dragged with Group Selection toggles the objects it touches, +whole, and one dragged with Direct Selection toggles the anchors inside it (a path left with none leaves the +selection, one with all of them is selected whole). The Lasso adds anchors with `mods.shift` and takes them away with `mods.alt`. They run `select.toggle {ids}` and `select.anchorsMany {items, mode: "set"|"add"|"toggle"|"subtract"}`: @@ -769,6 +770,17 @@ Constrain Angle's negative. `shape.arc` takes `rotation` in degrees clockwise on reference point `x`, `y`; the arc's bounding box turns with it. Without `rotation`, or at 0° or a whole turn, the arc is upright, and a `rotation` that is not a number is an error that adds nothing. +A Spiral tool drag sends `shape.spiral` with the spiral's outer end at the pointer: `radius` is the pointer's distance +from the center `cx`, `cy` and `rotation` its direction in degrees clockwise on the page from the x axis, left out when +it is 0, so dragging around the center turns the spiral. A pointer less than 0.01 pt from the center keeps the last +direction (none before the first). Shift and General › Constrain Angle do not change a dragged spiral's direction. The +Spiral dialog's spiral, placed by a click, takes a `rotation` of the Constrain Angle's negative when the angle is other +than 0° or a whole turn, so its outer end starts along the turned x axis, and its bounding box turns with it. +`shape.spiral` takes `rotation` in degrees clockwise about `cx`, `cy`; without it, or at 0 or a whole turn, the outer +end is at `cx + radius`, `cy` as before, and a `rotation` that is not a number is an error that adds nothing. The +bounding box turns only when `rotation` is the Constrain Angle's negative, as for `shape.polygon` and `shape.star`, so a +drag that points along the turned x axis makes the same spiral, with the same turned box, as the dialog. + `shape.arc` checks `reference`, `baseAlong` and `slope` in both of its forms. `reference` is a whole number from 0 to 8 (`4.0` is 4) and is 0 when left out; `baseAlong` is `x` or `y` in either case and is `x` when left out; `slope` is from −100 to 100 and is 50 when left out with `lengthX` and `lengthY`, or 100 with `x1`, `y1`, `x2`, `y2`. A @@ -1072,7 +1084,9 @@ given and the swatch already has keeps its model, as does a stop color that `pai gradient already has; a stop that names a swatch takes the swatch's color as it is, and `swatch.new` or `swatch.edit` with `mode` converts a color into that mode only. RGB documents keep colors as given. Harmonies, Edit Colors blends, inversions and Recolor Artwork keep each colour's model (a blend between models takes the document's). -`swatch.new {colors: [...]}` saves several colours as swatches in one undo step. `color.harmony {color, rule, steps?, variation?, amount?}` answers what the Color +`swatch.new {colors: [...]}` saves several colours as swatches in one undo step. An entry of `swatch.new {colors}` or +`swatch.newGroup {colors}` may be `{swatch, tint}`: a tint of a global or spot color below 100% becomes a tint swatch +("Name 40%") linked to it, as the Color Guide panel saves the tints of a spot color base. `color.harmony {color, rule, steps?, variation?, amount?}` answers what the Color Guide panel shows: the harmony rule's colours, base first, and per colour its row of `2·steps+1` variations (shades, cool or muted on the left, tints, warm or vivid on the right). With `limitTo` (a swatch library id or name, or `"document"` for the document's swatches) every colour snaps to the library's nearest colour (ΔE 2000), as the @@ -1260,6 +1274,10 @@ exporter plug-in's parameters. Other formats are written at once. OK writes the OK returns what `file.exportAs` returns, which has no `format` or `bounds` (Text Export Options: `{path}`). Any option skips the options dialog, but without `path` the save panel still picks the file. To write without a dialog, pass `path`. `file.exportAs {path, exportSelection: true, …options}` writes the selection the same way. +In the Save PDF dialog, `ui.dialogReset {}` (Cancel while Alt, or Option on macOS, is held) puts every option back to +the chosen preset's settings, clears the passwords, and leaves the dialog open with its preset, path, artboard range and +section; `answer_dialog {action: "cancel"}` still closes it without saving. If the chosen saved preset was deleted +while the dialog is open, `ui.dialogReset` returns an error naming it and leaves every field, passwords included, as it is. Raster exports default to the document's raster effects resolution. An explicit `scale` sets pixels per point (72 times that value in ppi); `options.ppi` wins over either scale option. CLI `run --export` and @@ -1654,7 +1672,8 @@ its noise). PDF exports write it the same way, except for a linear, radial, coni stops whose other stops are all paper white or written in CMYK or gray, that is not a dithered fill and whose curve does not have too many stops (a diamond as four such shadings). An export that converts colors to a CMYK destination profile writes RGB and Lab stops in CMYK, and so does a CMYK document unless the export converts colors to an RGB destination profile. PDF writes tints of one spot ink as a Separation shading in that ink, and spot inks mixed with other spot, CMYK -or gray inks as a DeviceN shading. +or gray inks as a DeviceN shading. A legacy `.ai` file gets the colors between a Perceptual gradient's stops as stops +of their own, in process colors (at most 256, with a warning). `hue-clockwise` and `hue-counterclockwise` (VectorCraft's own methods) mix a linear, radial, conic or diamond gradient's colors around the hue wheel: hue, saturation and brightness each change evenly from one stop to the next. With `hue-clockwise` the hue angle falls (red, magenta, blue, cyan, green, yellow, red), which is clockwise on the @@ -2070,7 +2089,10 @@ commands fail and change nothing, and `appearance.removeItem` removes nothing. A `artboard.reorder`, `graphicStyle.move`, `appearance.moveItem`, `appearance.duplicateItem` and `effect.move`) puts the item last. A text `start` or `end` is past the end of the text. `object.slice.divide` refuses such a `rows` or `columns`, `recolor.reduce` keeps each color in its own row for such a `colors`, and `layer.setProps` refuses such a -`color`. `object.setBounds` reads a `reference` past 8 as 8, as `object.transformEach` does. +`color`. `object.setBounds` reads a whole-number `reference` past 8 as 8, as `object.transformEach` does. +For `object.setBounds`, `reference` accepts whole numbers of 0 or more, including floating-point representations +such as `0.0`. Negative and fractional values are errors. An omitted or null `reference` uses the center point, 4. +These rules apply to both whole objects and directly selected anchors. An index or place given as a value that is not a whole number of 0 or more, such as `"3"`, `2.5`, `-1` or `true`, is refused with `` `anchor` must be a whole number ``, naming the key: `anchor` of `path.setHandle`, `path.moveAnchor` and `text.setPathHandle`, `segment` of `path.insertAnchor`, `to` of `artboard.reorder`, `library.moveGroup` and @@ -3612,7 +3634,10 @@ already walks Image Trace. Short agent entry points: a straight Pencil line too, or with Alt held at the release. The stroke's end then joins the other end when it is within four times the Fidelity of it (at least 6 pt and at most 400 pt), and a straight segment closes the path from farther away. Without `closed`, the stroke closes the path when it ends within that four-times-Fidelity distance. The - Blob Brush's `path.blob` Fidelity stays in points, 0.01 to 100 pt. + Blob Brush's `path.blob` Fidelity stays in points, 0.01 to 100 pt, and is + not used when left out or null. `path.blob` rejects a `fidelity` outside 0.01 to 100 pt, an `angle` outside -180° to + 180° and a `roundness` outside 0% to 100% with an error such as `` `angle` must be from -180 to 180 degrees ``; the + document does not change and no undo step is recorded. These ranges are VectorCraft's own values. - Variables: `variable.list`, `variable.define {name, kind: text|visibility|image|graph}`, `variable.bind {variable, ids?}`, `variable.makeTextDynamic`, `variable.makeVisibilityDynamic`, `variable.makeImageDynamic`, `variable.makeGraphDynamic` (`variable.bind` and `variable.makeTextDynamic` refuse type that already has another text variable and name it), @@ -5416,7 +5441,11 @@ and `layerRows`, the rows highlighted in the panel. runs Hide or Lock Others for the row's layer, or Show or Unlock All when the others already are), `layer.pasteRemembersLayers`, `object.isolate {id?}` (a group, a layer or a single object, by default the first selected object; not type, not a hidden or locked object or one in a hidden or locked group or layer, not a guide path while Lock Guides is on, and - while a symbol is edited only the editing layer or art on it) / `object.exitIsolation`. + while a symbol is edited only the editing layer or art on it) / `object.exitIsolation`. Leaving an isolated Live + Paint group (`object.exitIsolation`, or `object.isolate` on a level outside it) adds the paths, compound paths and + groups of them drawn in it, shown and unlocked with everything in them, to the group as `livePaint.merge` does, in + one undo step; type, images and other objects stay in it as they are, and with nothing drawn no undo step is + recorded. - **Dialogs and panel state** (control channel and the app's MCP): `ui.layerOptions {ids?}` and `ui.newLayer {sublayer?}` open Layer Options (dialog `layerOptions`: name, color, template, locked, visible, printable, preview, dimImages, dimPercent; OK is one undo step; `ui.dialog.set` of `template` also sets `locked` and `dimImages`, as the @@ -6051,6 +6080,11 @@ These commands refuse a string, a number or another value that is not true or fa in `path.curvatureEdit`; `perpendicular` in `path.reshapeSegment`; and `keepSelected`, `mergeOnlySelection` and `merge` in `path.blob`. A null is read as a key left out. +`path.freehand` (and `brush.freehand`, which runs it) refuses a `style` other than "pencil" or "brush" with +`style must be "pencil" or "brush"`, and an `end` of `extend` other than "start" or "end" with +`extend end must be "start" or "end"`; the document does not change and no undo step is recorded. Left out or null, +`style` is "pencil" and the `end` of `extend` is "end". + A `pointer_gesture` with `mods: {cmd: true}` held at the press, with any tool but the selection tools (Command on macOS, Ctrl elsewhere), drags with the selection tool chosen last (`select_tool`), or Direct Selection with the Pen, Curvature and anchor tools until one is chosen; the release gives the tool back as it was, so the Pen goes on drawing @@ -7554,7 +7588,7 @@ nothing. Opening a document reads a DCS file and its plates again even with the keeps the saved preview of other linked EPS files. These rules are VectorCraft's own: the screen, composite print and exports show the image as its plates mixed into CMYK (each ink amount times the ink's CMYK values, plates combined as `1 − (1 − a)(1 − b)`); Separations Preview and `file.print` separations show each plate on its own ink, and a spot plate prints as the document's swatch -of its ink (else its CMYK values) with `spotsToProcess`. Separations Preview shows a reduced image's plates as the +of its ink (else its CMYK values) with `spotsToProcess` or that ink's own `convertToProcess`. Separations Preview shows a reduced image's plates as the mean of the plate pixels each shown pixel covers. A file may name 64 plates, a plate file may be 1 GB, and the plates together may hold 512 MB of ink amounts; a plate that can't be read is an error naming the plate, and nothing is placed. The plates go on the first plate's pixel grid, grown to hold every plate where it prints; a plate of another size or position is resampled onto @@ -7568,6 +7602,12 @@ they can't be read, as with a PNG cut short by a download or a sync still runnin can't be read" and places nothing; `clipboard.importImage` fails the same way. A JPEG cut short is placed when its pixels still decode. Both keep the decoded pixels (except a CMYK JPEG's) in the image store the renderers share, so the first render that draws the image does not decode the file again. +Opaque CMYK PSD/PSB merged images retain their 8-bit or 16-bit ink samples, CMYK ICC profile, resolution, and +clipping path when placed, linked, relinked, updated, or embedded. `file.place.info`, `image.info`, and `links.info` +report CMYK for these images. VectorCraft's native CMYK limit is 67,108,864 pixels. Composites with transparency, +images beyond that limit, and native samples beyond the allocation allowance use the RGB import path, subject to +its allocation limit. Importing individual layers with `layers: true` retains its existing behavior. + `file.place.info` describes a file without placing it and `image.info` reports a placed image's link, colour mode and effective ppi. `file.place.queue` loads the place cursor (the `place` tool) with several files: headless, drive it with `pointer_gesture` (a click places at 100% with the top-left corner there, a drag at the dragged size) and @@ -8640,7 +8680,9 @@ picked as the printer, File → Print saves the PDF instead (see Printing). Head `{pages, path | dataBase64, bytes, warnings}`; `print.preview {settings?}` answers what it would print without writing it: `{pages (copies included), sheets: [{artboard, tile?, ink?, width, height, orientation, scale}] (one copy, in order), tiles: [{artboard, columns, rows, printed, tiles}] (document -space), inks: [{name, spot, print, frequency, angle}], warnings, settings}`. `print.setup {settings?}` saves the +space), inks: [{name, spot, print, frequency, angle}] (the plates), documentInks: [{name, spot, print, frequency, +angle, convertToProcess?}] (every ink of the document, the spot inks printing as process included), warnings, +settings}`. `print.setup {settings?}` saves the settings with the document (one undo step, kept in the native file as `print_setup`); both other commands start from the saved settings, or from a print preset's with `preset` (see Print presets), with `settings` over them (`null` keeps a value). `list_commands` with filter `print.setup` @@ -8670,17 +8712,29 @@ documents every field: - `marks` and `bleed` as `document.exportPdf` takes them (the bleed is the document's unless `useDocument: false`), drawn around the artboard at the paper's scale; the page information adds the tile and the ink with its screen. - `output: {mode: composite|separations, emulsion: up|down, image: positive|negative, spotsToProcess, overprintBlack, - inks: [{name, print, frequency, angle}]}`: separations print one page per ink in the gray of its coverage (images - too; overprinting fills, strokes and characters don't knock out), Registration on every plate; emulsion down mirrors - the page and a negative inverts it. + inks: [{name, print, frequency, angle, convertToProcess}]}`: separations print one page per ink in the gray of its + coverage (images too; overprinting fills, strokes and characters don't knock out), Registration on every plate; + emulsion down mirrors the page and a negative inverts it. +- `output.inks[].convertToProcess` (default false) prints one spot ink as process inks: it gets no plate of its own, + and its color prints on the Cyan, Magenta, Yellow and Black plates, while other spot inks keep their plates. The + Print dialog's Document Ink Options list shows an icon before each spot ink's name, and a click on it switches that + ink between spot and process output, as + [the help page](https://helpx.adobe.com/illustrator/using/printing-color-separations.html) describes for single + spot colors. The rest is VectorCraft's own rule. `spotsToProcess` converts every spot ink whatever each one's + own setting says, and the dialog then dims the icons; turning it off again applies each ink's own setting. A + converted ink's `print`, `frequency` and `angle` are kept for when it prints as a spot ink again, and its Print + checkbox and fields are dimmed: `print: false` does not leave its color out of the process plates. Process inks and + Registration have no icon, and `convertToProcess` on a process ink is ignored with a setting note. - `output.overprintBlack` (default false) makes black ink overprint in separations, as the Output step of [Print color separations](https://helpx.adobe.com/illustrator/using/printing-color-separations.html) describes: black art leaves the inks under it on the other plates. Which paints count as black is VectorCraft's own rule: a fill, stroke or character paint of solid 100% process K or 100% gray, or a gradient whose every stop is (every color point of a freeform gradient), each to within half a percent (99.5% K counts, and so does 0.4% cyan beside - it). Rich black, RGB and Lab black, tints below 99.5% and colors linked to a spot swatch or to Registration still - knock out. A symbol instance's art is judged with the paints the instance prints it in, its own fill and stroke - changes and its fill's stain included. Only the printed copy is marked: the document and its own overprint settings do not change. Composite + it). Rich black, RGB and Lab black, tints below 99.5% and colors linked to a spot swatch or to Registration are not + marked, and paints already set to overprint keep that setting. A symbol instance's art is judged with the paints the + instance prints it in, its own fill and stroke changes and its fill's stain included. An instance that print leaves + unplaced, because placing its art would take the printed art past 16,000,000 objects or draw it deeper than 128 + levels, is judged by its symbol's own art instead. Only the printed copy is marked: the document and its own overprint settings do not change. Composite output ignores the option, and the Print dialog's Overprint Black checkbox is disabled unless Mode is Separations. - `graphics: {autoFlatness, flatness, fonts}` and `color: {intent, preserveNumbers}` (the intent colours separate with; without preserveNumbers CMYK colours are separated again). @@ -8804,10 +8858,22 @@ starts a new point type object at the position the advance gives, and an underli of the last character's advance. Type on more than one line is placed a line at a time: each line is aligned by its own advances and split as a single line is. An EMF that draws with EMF+ records is read from them. Hatched and pattern brushes fill with their average color. Records VectorCraft doesn't read are skipped with one warning. +Each of these adds one warning, with a count: a file, or a metafile image inside it, cut short by one of the reader's +limits; images and pattern brushes whose bitmap can't be read, which are left out; clips that can't be applied as the +file sets them; and raster operations other than a plain copy, drawn as a plain copy or left out. `clipboard.importEmf {dataBase64, center?}` loads an EMF or WMF picture into the clipboard for `edit.paste`; the app pastes `image/emf` from the system clipboard ahead of text and bitmaps when the platform's clipboard service offers it (the Windows desktop service doesn't read metafiles yet). +The type size comes from the font's height. A negative height is the em. A positive height is the character cell, and +the em is the cell times the face's units per em divided by its OS/2 `usWinAscent` plus `usWinDescent`, with a +variable font's `MVAR` changes at the face's instance (its ascent plus descent when it has no OS/2 table). When the face gives an average width (OS/2 `xAvgCharWidth`), a font's average +character width, negative or positive, becomes Horizontal Scale: the face's average width at the type size is +stretched or narrowed to the font's width. VectorCraft's own rules are that a negative width is read as its absolute +value and that the width is ignored when the height is 0. For a font the system doesn't have, both values are measured +in the face that replaces it. Characters that face has no glyph for are drawn from other faces at the same size and +Horizontal Scale. + ```json {"name":"export","arguments":{"path":"/tmp/logo.emf"}} {"name":"run_command","arguments":{"command":"document.export","params":{"format":"wmf","useArtboards":true,"path":"/tmp/icons.wmf"}}} @@ -8969,6 +9035,25 @@ file size), `seconds` to download at `kbps` (default 56.6), the size, and for pa `source` (the colour the reduction made), so a colour keeps its edits when it is web-shifted or snapped. `slice: n` previews one slice; `image: true` adds the file; `warnings` holds the export's warnings. +Optimize to File Size (the dialog's button under Preset) is `webExport.optimizeToFileSize {desiredK, startWith?, +use?, slice?, …settings}`. It searches for settings whose files fit in `desiredK` K (1 K is 1024 bytes; above 0, at +most 1048576) and returns them without writing a file or changing the remembered settings: `{targetBytes, achieved, +bytes, format, settings, trials, images, warnings}`. `startWith: current` (the default) keeps the format and takes the +highest JPEG quality (1 to the current quality) or the most GIF/PNG-8 colors (2 to the current count) that fit, +measured by encoding. A lower value can give a larger file, so the search measures up to 6 values spread over the +range, from the top down, and then narrows the step above the first one that fits. When no value measured fits, GIF +tries lossy 100 with the most colors that fit. PNG-24 has no +setting to lower. `startWith: auto` takes GIF for art with transparent pixels or at most 256 colors and JPEG +otherwise. With `transparency: false` it counts the colors the pixels have once blended over the matte, as the file +is written. For opaque art it tries the other format when the first one cannot reach the size. `use: allSlices` (the +default) measures the image, or the image slices' files together; `eachSlice` measures the largest slice file; +`currentSlice` measures `slice` (a number from `slice.list`), else the selected image slice, else the first. The +slices share one setting, so every `use` changes the setting of all of them. The search encodes at most 32 trial +settings. When none fits, `achieved` is false and `settings` are the smallest trial. A `desiredK` that is missing, +not a number, 0 or less or above 1048576 is an error, as are an unknown `startWith` or `use` and a `slice` that is +not a slice number or comes with another `use`. In the dialog, the desired size starts at the size of what Total of All +Slices measures with the current settings, rounded up to 0.001 K. + Presets: `webExport.presets.list` (built-in ones, then saved ones), `webExport.presets.save {name, newName?, …settings}`, `webExport.presets.delete {name}`; any name works as `preset` in the other commands (its settings, then the keys given). `webExport.settings {…}` remembers the settings the dialog opens on (`{}` reads them, `reset: true` restores the @@ -9030,13 +9115,28 @@ default), `usdz`, `gltf` or `obj`; the panel shows a Format row for the 3D asset `assets.set3DFormat {assets, format}` sets it (an undo step only when the format changes). `assets.list` gives each asset's `format3D` (null for a picture asset). -`assets.export3D {assets?, folder?, zip?}` writes each 3D asset (default: all of them) as a mesh file named after it: +`assets.export3D {assets?, folder?, zip?, textureSize?}` writes each 3D asset (default: all of them) as a mesh file named after it: `.usda`, `.usdz`, `.gltf` (glTF 2.0, its buffer embedded) or `.obj` with its `.mtl` (whitespace and `#` in an OBJ's name become `_`). Every solid of the object (the fill's, each stroke's, a group's members') is its own mesh, with a two-sided material in the color it is painted (a gradient's stops averaged, a pattern gray). The mesh holds the solid's faces before they are projected onto the page, those turned away from the viewer included, at the object's 3D rotation, y up, about the point the object turns about: in points (USD's layer gives `metersPerUnit`), in meters in glTF. Files that would share a name get `-2`, `-3` and so on. +Graphics mapped onto a plane or onto Extrude & Bevel's front or back cap (`threeD.mapGraphic`) are exported as a PNG +texture of that face: the face's color with its graphics drawn over it, flat and unlit, on a mesh of the face's own +triangles with texture coordinates and a material that shows the texture. A face that is not opaque keeps its opacity +in the texture's alpha: as on the canvas, the graphics take the opacity of the face's fill or stroke, and the object's +opacity applies to the face and its graphics together. glTF embeds the PNG as a data URI +(`TEXCOORD_0`, `baseColorTexture`), USDZ stores it after the layer, USDA reads it through `primvars:st`, a +`UsdPrimvarReader_float2` and a `UsdUVTexture` connected to the surface's `diffuseColor`, and OBJ gives `vt` coordinates +and an MTL `map_Kd`; OBJ and USDA write the PNG beside them as `<name>-texture-1.png`, `-texture-2.png` and so on +(whitespace, `#` and `@` become `_`). USD reads a face's opacity from the texture's alpha (`outputs:a`), and an OBJ +whose face is not opaque also gets `<name>-texture-1-opacity.png`, the alpha as gray levels, for the MTL's `map_d`. +Faces with the same color, graphics and bounds share one texture. `textureSize` (128 to +4096, default 1024, VectorCraft's own values) is the number of pixels along the longer side of each texture; one export +draws at most 67,108,864 texture pixels in all, and past that it is refused. Graphics on Revolve's side are not +exported yet. The layouts follow glTF 2.0, UsdPreviewSurface (<https://openusd.org/release/spec_usdpreviewsurface.html>) +and OBJ/MTL (<https://www.loc.gov/preservation/digital/formats/fdd/fdd000508.shtml>). With `zip`, the files go into one ZIP named after the document with `-3D` added (`Untitled-1-3D.zip`), or `3D Assets.zip` when the document's title gives no file name. An object whose face has a hole that crosses the face's outline or another hole is refused, by `assets.add3D` and @@ -9354,7 +9454,7 @@ layers are refused. destination or output intent is refused. Transparency is flattened before writing. - **pdfX3** (PDF/X-3:2002, written as PDF 1.3): colours are tagged with ICC profiles; transparency is flattened. - **pdfX4** (PDF/X-4:2010, PDF 1.6 at most): transparency and layers are kept, colours are tagged, and the XMP metadata - names the standard. + names the standard and has an `xmp:MetadataDate` equal to its `xmp:ModifyDate`. Flattening uses `flattenerPreset` (default High Resolution, see PDF 1.3 above) on a copy (the document is untouched; a warning says so), and images with see-through pixels count as transparency. The written file is checked against @@ -9724,6 +9824,20 @@ on again. {"name":"run_command","arguments":{"command":"type.convertToAreaType","params":{"ids":[42]}}} ``` +## Insert Special, Whitespace and Break Characters + +`type.insert {char?, text?, code?, unicode?, ids?|id?}` inserts one character (`char` names it, `code` and `unicode` give +its code) or the string `text`. While the Type tool edits text and neither `ids` nor `id` is given, it replaces the +tool's selection, or inserts at its caret, and the caret goes after the insertion; otherwise it appends to the end of each +selected text object. Each call is one undo step; an empty `text` at the Type tool's caret changes nothing and records no undo step. +`char: "forcedLineBreak"` (Type › Insert Break Character › Forced Line Break) inserts U+2028, which starts a new line in +the same paragraph, as Shift+Enter does; `char: "paragraphReturn"` inserts a line feed, which starts a new paragraph. A +`text` that holds U+2028 inserts the same break. + +```json +{"name":"run_command","arguments":{"command":"type.insert","params":{"char":"forcedLineBreak"}}} +``` + ## Smart Punctuation `type.smartPunctuation` replaces keyboard characters in the selected type, or in every text object with `scope: @@ -11461,7 +11575,9 @@ it while the drag sizes the halo: the halo's radius keeps the ratio to the point went down, through `growth` within 0 to 300 %. Letting the key go sizes the center with the drag again, and the flare keeps the new `growth`. While the rings' end point is placed, Up and Down Arrow add and remove rings (0 to 50; with Rings off they do nothing), and each press of backquote (the ~ key; a pointer event's `backquote` turning true) sends a -new `ringSeed`, which moves the rings along the path and keeps their count and sizes. Each new flare starts from the +new `ringSeed`, which moves the rings along the path and keeps their count and sizes. In VectorCraft, small seed +values, including 0, distribute the first ring along the path; the same seed and parameters reproduce the same +positions. Each new flare starts from the options' counts and growth, without a `ringSeed`. The Artboard tool's are the active artboard's Artboard Options (dialog `artboardOptions`; the Artboard tool's active artboard while it is in use, else the window's; its `x` and `y` are the artboard's top-left corner in document points, while the dialog shows X and Y at the reference point the @@ -12154,7 +12270,12 @@ away); its click on a gradient mesh's line picks the line's two ends, and a click inside a patch picks the four points around it. The picked points show filled. Dragging one of them moves them all as one undo step (`object.mesh.movePoints`), a click on one of several picked points picks it alone, and the arrow keys nudge them by the keyboard increment. The active tool lists them in its options -(`tool.setOption {}` returns them as `meshPoints: [{id, index}…]`). On gradient meshes a solid fill colour (`paint.setFill`, from the +(`tool.setOption {}` returns them as `meshPoints: [{id, index}…]`). Switching to the Eyedropper keeps them picked, its +options list them too, and the Mesh tool, Direct Selection or a Lasso chosen next picks them again. While a selected, editable mesh has +points picked, an Eyedropper click or Shift-click on an image or other art samples the color under the pointer into +those points alone as `paint.sampleColor {color, stroke: false, ids}` with the meshes that have points picked: one undo +step, none when the color is unchanged. Other selected objects keep their paint. A click on one of those meshes, and +Alt-click and Shift+Alt-click anywhere, are unchanged. On gradient meshes a solid fill colour (`paint.setFill`, from the Color panel, Swatches or the Eyedropper) recolours just the picked points, and when every target of `transparency.set` is a gradient mesh with points picked, its `opacity` fades those points instead of the objects (`transparency.info` then shows their opacity, `null` when it differs). Both are one undo step, and neither goes to the @@ -12164,6 +12285,16 @@ picked point's color, and `fillMixed` compares the picked points' colors with ea selected objects. The Transparency panel shows the picked points' opacity (blank when it differs), and the Control bar shows the first picked point's opacity. +A solid color dragged from the Color or Swatches panel or a Fill proxy and dropped on a selected gradient mesh, while the +Fill proxy is active, recolors the mesh point under the pointer (within 5 screen pixels), else the four points around the +patch there, as `object.mesh.setPointColor {id, points, color, keepModel: true}`. With a gradient mesh selected and a +solid fill color set, a plain Eyedropper click does the same with the fill color: on a point of any selected mesh, or +inside a patch of the selected mesh the click hits. A gradient, a pattern, a fill of None, a stroke proxy or a mesh that +is not selected keeps the earlier behavior (the whole object takes the paint, and the Eyedropper copies the appearance), +and so does an unselected object on top of the mesh at that place. +See [Edit mesh objects](https://web.archive.org/web/20210601162814/https://helpx.adobe.com/pdf/illustrator_reference.pdf#page=312); +the 5-pixel reach is VectorCraft's own. + `object.mesh.movePoints {id, points: [index…], dx, dy}` (or `{items: [{id, points}…], dx, dy}` over several meshes) moves points by (dx, dy), their handles with them; `object.mesh.setPointColor` takes `points` or `items` the same way to colour or fade several points at once. An index out of range, an index that is not a whole number ≥ 0, or a @@ -12471,8 +12602,9 @@ Commands: - `addon.pathtools.crossings {cut?, selfCrossings?, ids?}` adds anchors where the selected paths cross one another (and where each crosses itself, with `selfCrossings`), or with `cut` also cuts them there: a path of one subpath becomes a path per piece. Segments that meet at an anchor they share, or with only segments of no length between them, don't - cross there, and they cross where they meet again elsewhere. With `selfCrossings`, a curved segment that loops over - itself crosses itself. At most 10,000 segments at once. + cross there, and they cross where they meet again elsewhere. An open end of a path that lies within 0.001 pt of + another path crosses it there. With `selfCrossings`, a curved segment that loops over itself crosses itself. At most + 10,000 segments at once. - `addon.pathtools.divideDashes {dash?, gap?, fit?, removeGaps?}` cuts the selected paths into separate open paths along the curve, each `dash` long (0.01 to 1,000,000 pt, 10 by default) with `gap` between them (0 to 1,000,000 pt, 0 by default: the pieces touch), every piece keeping the path's appearance, as one undo step. The gap pieces are left @@ -12554,7 +12686,7 @@ Commands: Every path that can be edited takes part, selected or not, compound path members included. Hidden and locked paths, guides and clipping paths are not trimmed and do not count as crossing, the members of a compound clipping path included; type, images and symbol instances take no part. In isolation mode only paths inside the isolated object - are trimmed, and paths outside it still count as crossing. A path that ends on another marks a place on the other. Paths that lie along each other do not cross there. + are trimmed, and paths outside it still count as crossing. A path that ends on another, or within 0.001 pt of it, marks a place on the other. Paths that lie along each other do not cross there. Crossings are found on the paths' own outlines, without strokes, brushes or effects. A closed path that loses a stretch becomes open. An open path that loses a middle stretch becomes two paths with its appearance, in its place in the stacking order. A path that nothing crosses is removed whole, a compound path that loses its last member is diff --git a/docs/roadmap.md b/docs/roadmap.md index e10e3adae2..4c8cc28361 100644 --- a/docs/roadmap.md +++ b/docs/roadmap.md @@ -1,6 +1,6 @@ # Roadmap: milestones and what's next -> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-11-16 · **Change:** minor (Recolor Artwork follow-up (#8031, remaining #4028): native Lab input, picker swatch libraries and Assign-row menus; UI interaction regression coverage; scores and estimates unchanged; previously: #8005: the Color spectrum fills a resized panel; scores and estimates unchanged; previously: M7: Check Spelling modal dialog (Edit › Spelling › Check Spelling…), #4936; spell check complete; previously: PDF import: stroked type keeps the line cap, line join and miter limit the file strokes it with, a glyph stroked otherwise than the run it joins coming in as a run of its own, #7741; M10/G5: Neon & Glow built-in graphic style library (Cyan Neon, Magenta Laser, Amber Tube, Electric Lime, Pulse Violet, Cobalt Phosphor); previously: Tech Circuit brush library, G5; previously: Graphic Styles list fills a taller panel, #2992; scores and estimates unchanged; previously: PDF import: glyphs in a span with an empty ActualText come in as outlines, #6971; scores and estimates unchanged; previously: library panels' lists fill a taller panel, #2992; scores and estimates unchanged; previously: Swatches list fills a taller panel, #1638; scores and estimates unchanged; previously: icon-strip flyouts also resize from the top edge and the canvas-side top corner, keeping the moved top in workspaces (storytold/craft-libs#1094); scores and estimates unchanged; previously: #6865: explicitly requested oversized editing artboard; Live Paint Bucket fills faces crossed in one drag (#6373); previously: #6404: transform-aware Eyedropper character copying; scores and estimates unchanged; previously: M10/G5: Energy Beams brush library; MCP docs list Energy Beams; previously minor: M10/G5: Skill Icons symbol library; MCP docs list Skill Icons; previously minor: M10/G5: Status Effects graphic style library; MCP docs catch-up for symbol libraries; previously minor: M10/G5: Inventory Icons built-in symbol library; previously minor: Edit › Edit Custom Dictionary…: its dialog adds, deletes and changes the custom dictionary's words, #4936; previously minor: M10/G5: Game HUD graphic style library; previously minor: resizable icon-strip flyouts and bottom-aligned panel footers, #5713; previously minor: M10/G5: Map Markers built-in symbol library; previously minor: right-click on type: Spelling › Auto Spell Check, with its check mark, #4936; previously minor: right-click on a word Auto Spell Check underlined: its suggestions, Ignore All and Add to Dictionary, #4936; previously minor: G2: Effect Gallery thumbnails and in-dialog preview are in; Auto Spell Check: `edit.autoSpellCheck` underlines the unknown words, #4936; previously minor: PDF editable import preserves authored ActualText once, including empty/nested spans and authored ordering (#6165); cross-line/style layout remains approximate; scores and estimates unchanged; PDF marked-text export (#6309): compatible glyphs stay on one layout line with per-glyph offsets; scores and estimates unchanged; interim macOS cursor delivery, #2292; native validation pending; scores and estimates unchanged; Control bar › Snapping includes the existing Snap to Glyph and Alignment Guides toggles (#6164); scores and estimates unchanged; custom dictionary and Ignore All: `text.spelling.addWord`, `removeWord`, `changeWord`, `dictionary` and `ignoreAll`, #4936; previously minor: EPS import: embedded fonts (composite, Type 42, CID-keyed, Type 1, CFF FontSet) draw their glyphs; spell check engine: `text.spelling.check` and `text.spelling.suggest` on craft-proof, #4936; previously minor: floating tab groups collapse into the side icon rail and opened rail panels fold back into it, #5925 in part; M4/M7: `.ai`/EPS type keeps its tab stops, and right-aligned lines with tabs lay out as the file's page, #6147; M4/M7: `.ai`/EPS type from the text document lays its lines out closer to the file's page, within limits, #6137; numeric fields step on wheel hover without taking keyboard focus, #5949; Character Styles panel: a double-click on a style's row opens its Character Style Options; the dialog keeps a fixed width and scrolls its sections, so its buttons stay on screen; Selection QoL: marquee modes and visible feedback, #5313; SVG CSS classes survive export and repeated import in all four styling modes (#2480); current-main integration retains event attributes and scripts; #3380 deletion-only review follow-up: independent survivors keep gradient placement, owned subpaths avoid discarded copies, and contracts/status/evidence are clarified; endpoint highlighting remains open; scores and estimates unchanged; Indian-language hyphenation review and license allowlist, #4947; Hindi catalog and contributor loanword preferences; full wording review in progress; Effect dialogs: a colour swatch beside a hex colour opens the Color Picker, #5365; shape tools move the selection from its centre point and turn it from the zone outside a box corner, #5477; scores and estimates unchanged) · **Target:** Adobe Illustrator 2026 (30.x) +> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-11-17 · **Change:** minor (PDF import: a glyph filled only after a glyph filled and stroked comes in filled only, not stroked, #8300; PDF import: translucent type filled and stroked comes in as a filled type object and a stroked one, as the file composites them, and an upright glyph is never kept as the outline of its glyph alone, #8015; PDF import: type filled and stroked by one text-showing operator comes in as one type object, filled and stroked, not a stroked copy over a filled one, #8015; M1: Layers panel Alt-drag shows the copy cursor, #8217; scores and estimates unchanged; previously: Gradient panel: the add-stop strip shows the white arrow with a plus on Windows and X11, #8241; scores and estimates unchanged; previously: Recolor Artwork follow-up (#8031, remaining #4028): native Lab input, picker swatch libraries and Assign-row menus; UI interaction regression coverage; scores and estimates unchanged; previously: #8005: the Color spectrum fills a resized panel; scores and estimates unchanged; previously: M7: Check Spelling modal dialog (Edit › Spelling › Check Spelling…), #4936; spell check complete; previously: PDF import: stroked type keeps the line cap, line join and miter limit the file strokes it with, a glyph stroked otherwise than the run it joins coming in as a run of its own, #7741; M10/G5: Neon & Glow built-in graphic style library (Cyan Neon, Magenta Laser, Amber Tube, Electric Lime, Pulse Violet, Cobalt Phosphor); previously: Tech Circuit brush library, G5; previously: Graphic Styles list fills a taller panel, #2992; scores and estimates unchanged; previously: PDF import: glyphs in a span with an empty ActualText come in as outlines, #6971; scores and estimates unchanged; previously: library panels' lists fill a taller panel, #2992; scores and estimates unchanged; previously: Swatches list fills a taller panel, #1638; scores and estimates unchanged; previously: icon-strip flyouts also resize from the top edge and the canvas-side top corner, keeping the moved top in workspaces (storytold/craft-libs#1094); scores and estimates unchanged; previously: #6865: explicitly requested oversized editing artboard; Live Paint Bucket fills faces crossed in one drag (#6373); previously: #6404: transform-aware Eyedropper character copying; scores and estimates unchanged; previously: M10/G5: Energy Beams brush library; MCP docs list Energy Beams; previously minor: M10/G5: Skill Icons symbol library; MCP docs list Skill Icons; previously minor: M10/G5: Status Effects graphic style library; MCP docs catch-up for symbol libraries; previously minor: M10/G5: Inventory Icons built-in symbol library; previously minor: Edit › Edit Custom Dictionary…: its dialog adds, deletes and changes the custom dictionary's words, #4936; previously minor: M10/G5: Game HUD graphic style library; previously minor: resizable icon-strip flyouts and bottom-aligned panel footers, #5713; previously minor: M10/G5: Map Markers built-in symbol library; previously minor: right-click on type: Spelling › Auto Spell Check, with its check mark, #4936; previously minor: right-click on a word Auto Spell Check underlined: its suggestions, Ignore All and Add to Dictionary, #4936; previously minor: G2: Effect Gallery thumbnails and in-dialog preview are in; Auto Spell Check: `edit.autoSpellCheck` underlines the unknown words, #4936; previously minor: PDF editable import preserves authored ActualText once, including empty/nested spans and authored ordering (#6165); cross-line/style layout remains approximate; scores and estimates unchanged; PDF marked-text export (#6309): compatible glyphs stay on one layout line with per-glyph offsets; scores and estimates unchanged; interim macOS cursor delivery, #2292; native validation pending; scores and estimates unchanged; Control bar › Snapping includes the existing Snap to Glyph and Alignment Guides toggles (#6164); scores and estimates unchanged; custom dictionary and Ignore All: `text.spelling.addWord`, `removeWord`, `changeWord`, `dictionary` and `ignoreAll`, #4936; previously minor: EPS import: embedded fonts (composite, Type 42, CID-keyed, Type 1, CFF FontSet) draw their glyphs; spell check engine: `text.spelling.check` and `text.spelling.suggest` on craft-proof, #4936; previously minor: floating tab groups collapse into the side icon rail and opened rail panels fold back into it, #5925 in part; M4/M7: `.ai`/EPS type keeps its tab stops, and right-aligned lines with tabs lay out as the file's page, #6147; M4/M7: `.ai`/EPS type from the text document lays its lines out closer to the file's page, within limits, #6137; numeric fields step on wheel hover without taking keyboard focus, #5949; Character Styles panel: a double-click on a style's row opens its Character Style Options; the dialog keeps a fixed width and scrolls its sections, so its buttons stay on screen; Selection QoL: marquee modes and visible feedback, #5313; SVG CSS classes survive export and repeated import in all four styling modes (#2480); current-main integration retains event attributes and scripts; #3380 deletion-only review follow-up: independent survivors keep gradient placement, owned subpaths avoid discarded copies, and contracts/status/evidence are clarified; endpoint highlighting remains open; scores and estimates unchanged; Indian-language hyphenation review and license allowlist, #4947; Hindi catalog and contributor loanword preferences; full wording review in progress; Effect dialogs: a colour swatch beside a hex colour opens the Color Picker, #5365; shape tools move the selection from its centre point and turn it from the zone outside a box corner, #5477; scores and estimates unchanged) · **Target:** Adobe Illustrator 2026 (30.x) > > Oversized artboard import update (2026-11-12): Explicit editing-data import retains a single artboard beyond a capped 14,400 pt PDF page (#6865). > @@ -37,8 +37,9 @@ Window → Help Bar toggles the bottom tool-help strip independently of the stat **Feature evidence last updated:** 2026-11-03. M1 selection: Enclosing Lasso selects whole objects enclosed by a freehand loop. It is an add-on -under Object › Plug-ins and has its own heading in All Tools. It has no default shortcut or Basic -toolbar slot. Shift adds and Alt subtracts enclosed objects; Escape cancels the loop. +under Object › Plug-ins, and its tool is also in the Lasso tool's group in both shipped toolbars, +after the Lasso. It has no default shortcut. Shift adds and Alt subtracts enclosed objects; Escape +cancels the loop. This is a VectorCraft addition; milestone estimates and parity scores are unchanged. The shared assessment status line and revision history are current upstream; this dated section records the submission's feature evidence and revisions without rescoring upstream or claiming a new combined build or runtime measurement. @@ -160,7 +161,7 @@ Gujarati interface follow-up (2026-11-14): the catalog and zero/one plural rule | M1 | Selection, transform, layers, MCP (common command tools, strict keys, session resources and version-aware result hints) | ✅ mostly done (document-tab artwork drag with lossless resource transfer and one target Undo; malformed MCP app replies discard the connection without replay, #1761; bounded control socket waits and connection-slot recovery, #1726; bounded synthetic control input, #1709; no-op anchor Align keeps Undo, Redo and saved state (#1180 follow-up); transform reference point snaps to anchors/centres; rotated objects keep a rotated bounding box and their angle; Free Transform, Scale and Reflect along a rotated box pending; the Transform fields take one Tab each, the W/H link after them) | 4–6 | | M2 | Drawing tools + smart guides | ✅ mostly done (#3380 deletion creates independent selected path pieces and keeps bounds-fitted gradients in place; endpoint highlighting remains open; Polygon/Star exact-size count persistence, with repeated-drag, tool-switch and Cancel regression coverage; Curvature point markers without direction handles (#1236, in part); Direct Selection segment click/Delete preserves neighboring edges, #1278; Flare, Reshape, Live Corners widget dragging and per-corner radii and kinds landed, on any path's corners; Shaper rough-shape recognition and orientation steps, the remaining Pen modifier nuances; Shaper Groups with editable sources and separate fill/stroke edits landed; custom ruler origin with drag preview, active-artboard reset, relative X/Y fields and native round-trip (#1212); construction widget/refinements pending); a shape just drawn moves by its centre point and turns from the zone outside a corner with its tool still active (#5477); Tangent and straight-segment perpendicular snapping use saved Smart Guides Geometric Guides preferences and Control bar quick access (#2537), including the existing Snap to Glyph and Alignment Guides toggles (#6164); no View submenu; Copy and Cut with the Pen or Curvature tool take the anchors a Cmd/Ctrl-lent Direct Selection picked (#6123) | 12–18 | | M3 | Paint & appearance (swatches, color, gradient, stroke, appearance, transparency, styles) | ✅ done (M3.7–M3.98): swatches, groups, libraries, tints, Lab spots and Registration; Eyedropper copies transformed character dimensions (#6404) and styles highlighted text only (atomic transparency rejection); Eyedropper reads visible locked and outside-isolation sources (#1251); Color Picker, Color panel (its spectrum grows with a resized panel, #8005), Color Guide, Color Themes, Edit Colors and Recolor Artwork (screen-bounded Edit chip list, #3416; native Lab entry and swatch libraries in the picker, Assign-row menus, #8031/#4028); gradients that follow every transform, the annotator, linked stops, freeform gradients, focal points, gradients on strokes and Expand; visible strokes when paint is added to inherited None/zero-width art (#1253); stroke geometry, arrowheads, dashes fitted to corners, stroke on type, width profiles and the Width tool (Shift-double-click enables adjoining adjustment in Width Point Edit; finite-arithmetic follow-up regressions and full CI passed ([Validation evidence](target-app-parity.md#evidence-what-ships-today-by-area))), Scale Strokes and preview bounds; Appearance targeting, container appearance, target circles, Expand Appearance; knockout, isolation, blend accuracy, CMYK blending, overprint, Attributes, masks and clipping, Flatten Transparency; graphic styles, links and libraries; CSS library export preserves fractional linear and radial gradient stop positions. Left: freeform gradients in SVG/PDF, mixed spot/process gradients in SVG and PDF gradients mixing a spot color with RGB or Lab stops export as stops or process colors; PDF export writes dithered gradient fills with spot stops, and Perceptual spot gradients with RGB or Lab stops other than white or more than 4,096 stops on their curve, as images in process colors; confirm the Scale Strokes & Effects default; Recolor model selection is available through the engine and MCP only (#2520); the dialog retains its existing controls; Library panels' lists (swatch, Color Book, brush, symbol and graphic style libraries) fill a taller panel above its footer (#2992; scores and estimates unchanged); Graphic Styles list fills a taller panel above its footer (#2992; scores and estimates unchanged); Swatches list fills a taller panel above its footer (#1638; `the_list_fills_a_tall_panel_above_its_footer`; scores and estimates unchanged); | 4–8 | -| M4 | Files (native, SVG, PDF, raster, Export for Screens, clipboard interop) | PDF import: stroked type keeps the file's line cap, line join and miter limit (#7741; estimates unchanged); Rename artboards in Export for Screens (#7275); Explicit editing-data import keeps oversized capped-page artboards (#6865; estimates unchanged); Save refusal continuation (#6146): ordinary Save offers Save As; unchanged format keeps options, changed format opens its Save options; cancellation/automation isolation; focused UI regressions passed, native acceptance pending; PDF authored ActualText preserved once in editable import (#6165; first-glyph line/style, bounded input; estimates unchanged); PDF export keeps harakat and zero-advance Noto Arabic dot glyphs in one compatible batch per layout line, with per-glyph vertical offsets (#6309). `crates/pdf/src/tests/realtext.rs` (`mark_text_*`) checks decoded cluster mappings, mixed Arabic/Latin/digits, contour placement against outline export, vertical columns, differing path rotations and PDF/X-1a/3/4. Editable-text import preserves authored ActualText separately (#6165), with cross-line/style layout limits; separately styled or differently rotated clusters and external viewer search/copy remain outside this export-only evidence. `.ai`/EPS type from the text document keeps its paragraphs' tab stops (#6147); `.ai`/EPS type from the text document keeps auto leading per line, its hyphenation options, and may show more of the last lines the file sets in an area frame of its own, when growing the frame by its lines' deepest descent plus 0.05 pt shows them (#6137); ✅ done (M4.14–M4.98 on 2026-10-05): Save As/Save a Copy/Revert/templates, Data Recovery and background save, SVG import and export fidelity (units, text, symbols, filters, SVGZ, Preserve Editing, SVG Options), shared guarded PDF writer and windowed reader ([pdf-backend.md](pdf-backend.md)), PDF import (colours, layers, masks, editable text, security) and export (presets, marks, bleed, ICC and output intent, raster effects, subset fonts, PDF/X-1a, X-3 and X-4, PDF layers, overprint, page thumbnails, fast web view, PDF 1.3), Place and Links, Package, EPS and DXF in and out (EPS legacy mesh corners, vector opacity masks and raster page comparison verified; closed SPLINE flags round-trip and circular paths export as native CIRCLE/ARC, #1299), EMF/WMF, TIFF/BMP/Targa/PSD/GIF/PNG-8 export, Print and print presets, slices, Save for Web, TIFF in Export for Screens and Asset Export, clipboard flavours, File Info; AF.1–AF.4 add Affinity import (native layers, artboards, vectors, text and images from Affinity 1–3 files; the embedded preview only as a warned fallback; AF.4 expands current `.af` fixtures and every-board round-trip validation); EPS Save and Save As keep an opened EPS as EPS with its page frame and complete editable VectorCraft document (2026-10-26; G9 import fidelity unchanged). Left: DWG (use DXF), PSD placement as layers, overprint read back from PDF, Affinity export, polish; SVG CSS classes survive export and repeated import in all four styling modes (#2480); current-main integration retains event attributes and scripts; SVG CSS classes survive export and repeated import in all four styling modes (#2480); current-main integration retains event attributes and scripts; PDF import: glyphs inside a marked-content span with an empty `ActualText` come in as outlines in their fill and stroke, adding no text (#6971; scores and estimates unchanged); | 3–6 (existing scope; Affinity export unestimated) | +| M4 | Files (native, SVG, PDF, raster, Export for Screens, clipboard interop) | PDF import: a glyph filled only after a glyph filled and stroked comes in filled only, not stroked (#8300; estimates unchanged); PDF import: type filled and stroked by one text-showing operator comes in as one filled and stroked type object (#8015; not yet for type filled and stroked at less than full opacity, or a `TJ` whose kerning starts a new line part way through, which still come in as a filled object and a stroked one; estimates unchanged); PDF import: stroked type keeps the file's line cap, line join and miter limit (#7741; estimates unchanged); Rename artboards in Export for Screens (#7275); Explicit editing-data import keeps oversized capped-page artboards (#6865; estimates unchanged); Save refusal continuation (#6146): ordinary Save offers Save As; unchanged format keeps options, changed format opens its Save options; cancellation/automation isolation; focused UI regressions passed, native acceptance pending; PDF authored ActualText preserved once in editable import (#6165; first-glyph line/style, bounded input; estimates unchanged); PDF export keeps harakat and zero-advance Noto Arabic dot glyphs in one compatible batch per layout line, with per-glyph vertical offsets (#6309). `crates/pdf/src/tests/realtext.rs` (`mark_text_*`) checks decoded cluster mappings, mixed Arabic/Latin/digits, contour placement against outline export, vertical columns, differing path rotations and PDF/X-1a/3/4. Editable-text import preserves authored ActualText separately (#6165), with cross-line/style layout limits; separately styled or differently rotated clusters and external viewer search/copy remain outside this export-only evidence. `.ai`/EPS type from the text document keeps its paragraphs' tab stops (#6147); `.ai`/EPS type from the text document keeps auto leading per line, its hyphenation options, and may show more of the last lines the file sets in an area frame of its own, when growing the frame by its lines' deepest descent plus 0.05 pt shows them (#6137); ✅ done (M4.14–M4.98 on 2026-10-05): Save As/Save a Copy/Revert/templates, Data Recovery and background save, SVG import and export fidelity (units, text, symbols, filters, SVGZ, Preserve Editing, SVG Options), shared guarded PDF writer and windowed reader ([pdf-backend.md](pdf-backend.md)), PDF import (colours, layers, masks, editable text, security) and export (presets, marks, bleed, ICC and output intent, raster effects, subset fonts, PDF/X-1a, X-3 and X-4, PDF layers, overprint, page thumbnails, fast web view, PDF 1.3), Place and Links, Package, EPS and DXF in and out (EPS legacy mesh corners, vector opacity masks and raster page comparison verified; closed SPLINE flags round-trip and circular paths export as native CIRCLE/ARC, #1299), EMF/WMF, TIFF/BMP/Targa/PSD/GIF/PNG-8 export, Print and print presets, slices, Save for Web, TIFF in Export for Screens and Asset Export, clipboard flavours, File Info; AF.1–AF.4 add Affinity import (native layers, artboards, vectors, text and images from Affinity 1–3 files; the embedded preview only as a warned fallback; AF.4 expands current `.af` fixtures and every-board round-trip validation); EPS Save and Save As keep an opened EPS as EPS with its page frame and complete editable VectorCraft document (2026-10-26; G9 import fidelity unchanged). Left: DWG (use DXF), PSD placement as layers, overprint read back from PDF, Affinity export, polish; SVG CSS classes survive export and repeated import in all four styling modes (#2480); current-main integration retains event attributes and scripts; SVG CSS classes survive export and repeated import in all four styling modes (#2480); current-main integration retains event attributes and scripts; PDF import: glyphs inside a marked-content span with an empty `ActualText` come in as outlines in their fill and stroke, adding no text (#6971; scores and estimates unchanged); | 3–6 (existing scope; Affinity export unestimated) | | M5 | Performance | 🟡 background render + caches + MT done; `vectorcraft-cli bench` and `vectorcraft-cli perf` (budget suite); opaque solid-fill knockout paths draw once in hard-edge/supersampled raster export, with analytical-AA compositing unchanged; file format v2 opens 3× faster (50k paths: 722 → 244 ms); raster effects (glows, shadows, blur, feather) no longer force the whole frame single-threaded (filtered offscreen per effect, verified equal to the single-threaded reference); Craquelure/Mosaic Tiles/Stained Glass distance searches optimized with pixel-invariance checks and the `texture_drag_perf` probe (#1257); effect-heavy demos need a clean-machine benchmark; dirty-region rendering, GPU backend spike pending | 15–25 | | M6 | Path operations (Pathfinder, Shape Builder, offset…) | ✅ mostly done (live compound shapes: Make, Alt-click a Shape Mode, member modes, Release, Expand (#4522); single-result Pathfinder names and SVG IDs retained (#1293); Divide open-cutting-path geometry, appearance and history verified (#1307; existing segment cap remains); Simplify preview/counts and rewritten-path component selection verified (#1272; the slider opens at the Auto-Simplify level; a Direct Selection part of a path simplifies on its own); Compound appearance and member fill-rule edits verified (#1197); Boolean precision on almost-horizontal edges fixed and the property tests made deterministic; Shape Builder gap detection, large-offset bug open); Shape Builder Gap Detection shares Live Paint’s spatial gap finder and temporary merge bridges (#2526); Custom is capped at 72 pt in the existing options dialog | 3–6 | | M7 | Type (point/area/path, editing, styles, OpenType, threading, glyphs) | Spell check engine: `text.spelling.check` and `text.spelling.suggest` on craft-proof, the custom dictionary and Ignore All commands, Auto Spell Check with its right-click suggestions, Ignore All and Add to Dictionary, Spelling › Auto Spell Check in the context menu of type, the Edit Custom Dictionary dialog, and the modal Check Spelling dialog (Edit › Spelling › Check Spelling…, `Cmd+I`, `ui.checkSpelling`, #4936); Right-aligned area type sets the text after a line's last tab against the right edge, the text before it at its stops (#6147); A line a soft return ends is justified as a wrapped line is (#6137); Indian-language pattern hyphenation preserves syllables in both composers (#4947); 🟡 Hanging punctuation keeps its published amounts under Glyph Scaling, and Standard burasagari counts a hung line start as room; Fullwidth `!` / `?` keep an upright fallback in vertical type; Hyphenation… and Justification… per paragraph (#2310, #2755), Auto Leading also driving the Character panel's Leading, the Alt+↑/↓ leading nudge and Fill with Placeholder Text; Document-point character controls after object/group scaling (#1034; optional font-size preservation remains separate), Character/Paragraph Styles (explicit Auto-leading resets and local leading overrides), per-paragraph paragraph attributes, mixed paragraph alignment indication (headless regressions, full integration CI and visual review pass), Area Type Options (with Width/Height, Auto Size and Shrink Text to Fit; overflow reported to agents and vertical Align), type areas resized by their handles and reshaped with Direct Selection, threaded text, Fit Headline, Glyphs (feature-valued alternates and unencoded glyphs applied in one Undo step while keeping Arabic joining, #5514), OpenType panel (including font-defined Stylistic Sets), Find Font (Document, Recent and System replacement sources, #5217), installed system fonts in every font menu (fonts registered with Windows outside its font folders, the XDG and Flatpak host font folders on Linux, and fonts installed while the app runs, listed when it comes back to the front; searchable; the Character and Properties menus show each family's sample of the selected text, preview it live under the pointer or ↑/↓, show recently applied families first (#3515), filter by script and kind, list a family's styles, and star favourites; the Glyphs panel and Find Font's Replace With use the same menu without the live preview) and found by name on open/import (full-name aliases and Missing Fonts searches verified, #1258; Windows font-service QA pending), variable fonts' named instances as styles, CJK names in the UI, input methods (marked text in place, candidate window at the caret; Japanese IME), Text Wrap (offset, invert, both sides of an object; follows edits), Type on a Path effects and Options with draggable start/centre/end brackets (slide, flip), tab stops + Tabs panel (Above Text floats it over the selected text, its ruler at the canvas zoom so stops line up with the columns, #729), inline symbols in text (beyond parity), Hebrew/Arabic bidirectional text, Paragraph Direction, Every-line/Single-line Composer per object (ragged text too) done; paint-only Arabic harakat keep joining with GDEF-mark ownership and Insert Kashidas tatweels on the base letter's paint (`tests::harakat`); tab leaders, vertical type pending | 45–60 | @@ -212,6 +213,11 @@ not take the artwork yet. Overflow-menu drag remains separate. Scores and hours | Date | Change | Summary | |---|---|---| +| 2026-11-17 | minor | PDF import (#8300): a glyph filled only (text rendering mode 0) right after one filled and stroked (mode 2) joined the stroked run and came in stroked too: `2 Tr (B) Tj 0 Tr (C) Tj` came in as `BC` stroked throughout. A glyph filled only now joins only a run drawn alike, so it starts a run of its own, filled only, in the same type object, and takes a stroke only when the file draws one over it (the #8015 matching); a word filled whole then stroked whole, and fill and stroke rendering glyph by glyph, still come in as one run filled and stroked. Tests: `a_glyph_filled_only_after_one_filled_and_stroked_is_not_stroked`, `glyphs_filled_and_stroked_one_by_one_stay_one_run`; scores and estimates unchanged. | +| 2026-11-17 | minor | PDF import (#8015 follow-up): type filled and stroked at less than full opacity is no longer joined into one type object, since the file composites the fill and the stroke apiece, darker where they overlap, while one object's opacity applies to both together; it stays a filled object and a stroked one, as a fill and stroke at different opacities already did. An upright glyph (vertical type) filled and stroked is no longer kept as an outline for a line that comes in as its outlines, as glyphs filled only weren't, so such a line can't lose them. The #8015 entries now say what is left: translucent type filled and stroked, and a `TJ` whose kerning starts a new line part way through, still come in as two objects. Tests: `translucent_fill_and_stroke_text_stays_two_objects`, `a_vertical_line_with_one_glyph_filled_and_stroked_keeps_every_glyph_filled`; scores and estimates unchanged. | +| 2026-11-16 | minor | PDF import: fill and stroke rendering (text rendering modes 2 and 6) draws all the glyphs of a text-showing operator (`Tj`, `TJ`, `'`, `"`) filled, then the same glyphs stroked, so a word shown at once came in as two type objects: a stroke-only copy over a fill-only one. Each stroke is now matched, in order, to the glyph filled with the same placement (where, how large, how wide, slanted and turned) in the same font with the same text on the line, and only that glyph takes the stroke, so the word comes in as one type object, filled and stroked; glyphs stroked with another join part way through still split into runs of their own, and stroked type over no filled glyph (modes 1 and 5) stays stroke only (#8015; `a_word_filled_then_stroked_imports_as_one_filled_and_stroked_type` in `crates/pdf/src/tests/textstroke.rs`, `a_vertical_column_filled_then_stroked_is_one_filled_and_stroked_type` in `crates/pdf/src/tests/text_placement.rs`). Scores and estimates unchanged. | +| 2026-11-16 | minor | M1: rows or the selected-art square dragged over the Layers panel's list show the copy cursor while Alt is held, as the drop then copies, and the grabbing hand otherwise (#8217). Scores and estimates unchanged. | +| 2026-11-16 | minor | Gradient panel: the strip under the ramp, where a click adds a stop, shows the white arrow with a plus on Windows and X11, where the system copy cursor showed as the plain arrow (#8241). Scores and estimates unchanged. | | 2026-11-16 | minor | Recolor Artwork follow-up (#8031, remaining #4028): native Lab input, picker swatch libraries and Assign-row menus; UI interaction regression coverage; scores and estimates unchanged. | | 2026-11-16 | minor | Color panel: the spectrum fills the vertical space of a resized panel, with options shown or hidden (#8005). Compact auto-fit flyouts and embedded mixers keep their existing size. Evidence: panels::color::tests::the_spectrum_grows_with_the_color_panel. Scores and estimates unchanged. | | 2026-11-15 | minor | PDF import: stroked type (text rendering modes 1, 2, 5 and 6, and glyphs under `ActualText`) keeps the line cap, line join and miter limit of the graphics state it is stroked with, as paths do, instead of butt caps, miter joins and a miter limit of 10; a glyph filled and then stroked otherwise than the run its fill joined comes in as a run of its own, so the glyphs before it keep their stroke (#7741; `imported_stroked_type_keeps_the_files_cap_join_and_miter_limit` in `crates/pdf/src/tests/textstroke.rs`). Scores and estimates unchanged. | diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md index 3d8ef1d447..1e22e610cd 100644 --- a/docs/target-app-parity.md +++ b/docs/target-app-parity.md @@ -1,6 +1,6 @@ # Parity with Adobe Illustrator -> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-11-16 · **Change:** minor (Properties panel: the Character section shows the font of the Type tool's selection, not the first run's (#8189); scores and estimates unchanged; previously: Recolor Artwork follow-up (#8031, remaining #4028): native Lab input, picker swatch libraries and Assign-row menus; UI interaction regression coverage; scores and estimates unchanged; previously: #8005: the Color spectrum fills a resized panel; scores and estimates unchanged; previously: Paragraph composers (#4935): the Paragraph panel menu and paragraph styles offer four composers, the Middle Eastern & South Asian Single-line and Every-line (how all type is set, and the default) and a Standard Single-line and Every-line that set Indic, Arabic and Hebrew type glyph by glyph as the font maps it, for legacy fonts that keep a script on Latin character codes; PDF import: stroked type keeps the line cap, line join and miter limit the file strokes it with, a glyph stroked otherwise than the run it joins coming in as a run of its own, #7741; G5: Neon & Glow joins built-in graphic style libraries (Cyan Neon, Magenta Laser, Amber Tube, Electric Lime, Pulse Violet, Cobalt Phosphor); scores and estimates unchanged; previously: Pencil ignores Smart Guides and Snap to Point and shows no Smart Guides, #7252; previously: Pencil continuation, straight-line and closing cursors; scores and estimates unchanged; previously: G5: Weather Icons joins built-in symbol libraries (Sun, Moon, Cloud, Rain, Thunder, Snow); scores and estimates unchanged; previously: a closed Pencil stroke closes with a straight segment; previously: Snap to Point with Smart Guides off draws no Smart Guides labels or lines, #7250; previously: 3D: the seams of Extrude & Bevel, Inflate and Rotate under a white light, and of the faces of Extrude & Bevel (Classic), Revolve (Classic) and Rotate (Classic), went from miter to round joins, so white-light 3D output is expected to differ from the 2026-10-17 comparison at facet corners (not measured: the scenes were not exported again); previously: `.ai` and EPS import: in layers that don't draw as the page, art that differs away from an envelope of type no longer costs it its editable type; it keeps its drawn art where, in the pixels it and its drawn art ink, the layers with it differ from the page more than its own check allows, or past the envelopes' share of the page check, #7141; Character panel: the Set Font Height Reference dropdown shows an icon before each reference, #6304; scores and estimates unchanged; previously: Envelopes: a top object's side whose pieces are all one curve split at anchors follows that curve's parameter, so a top object saved with its sides' curves in pieces draws as its `.ai` drawn art, #7097; scores and estimates unchanged; previously: Graphic Styles list fills a taller panel, #2992; scores and estimates unchanged; previously: PDF import: glyphs in a span with an empty ActualText come in as outlines, #6971; scores and estimates unchanged; previously: library panels' lists fill a taller panel, #2992; scores and estimates unchanged; previously: Swatches list fills a taller panel, #1638; scores and estimates unchanged; previously minor: Object › Rasterize with the Grayscale or Bitmap colour model makes a grayscale image, #6969; scores and estimates unchanged; previously minor: `.ai` and EPS import: type in an envelope with Distort Appearance is also tried mapped from the box of what it paints, miter tips and moved strokes included, after its glyphs grown by half its strokes' weight (#6824; #6617: Swatches panel menu: Show Recent Colors; scores unchanged; previously minor: icon-strip flyouts also resize from the top edge and the canvas-side top corner, keeping the moved top in workspaces (storytold/craft-libs#1094); scores and estimates unchanged; previously: #6865: explicitly requested oversized editing artboard; macOS: the canvas cursor stays after the pointer moves, #6362; scores and estimates unchanged; previously minor: Type tool: kerning at a caret at the start of a line moves the character after it, #5111; scores and estimates unchanged; previously minor: Rulers: the zero point dragged out of the rulers' corner snaps as a drawn point does; previously minor: Live Paint Bucket fills faces crossed in one drag (#6373); previously: #6404: transform-aware Eyedropper character copying; scores and estimates unchanged; previously: Envelopes: with Distort Appearance, type's strokes paint along the bent glyph outlines at their own weight, as users' `.ai` files draw them, which changes how VectorCraft's own envelopes of stroked type draw (#6644; scores and estimates unchanged); previously minor: G5: Energy Beams brush library; bundled content ~44% → ~46%; previously minor: G5: Skill Icons symbol library; bundled content ~42% → ~44%; previously minor: `.ai` and EPS import: an envelope saved in Edit Contents whose mesh lies away from its drawn art by a move opens live on that art (#6570; scores and estimates unchanged); previously minor: ruler double-click adds a guide at the pointer, #5239; G5: Status Effects graphic style library; bundled content ~40% → ~42%; MCP symbol libraries list UI Frames and Map Markers; previously minor: G5: Inventory Icons built-in symbol library; bundled content ~38% → ~40%; previously minor: `.ai` and EPS import: stroked type in an envelope maps from its glyphs grown by half its stroke (#3179; scores and estimates unchanged); previously minor: `.ai` and EPS import: warps of type open as mesh envelopes on their saved grid where VectorCraft's warp doesn't draw as their drawn art (#3179; scores and estimates unchanged); G5: Game Trails brush library; bundled content ~36% → ~38%; previously minor: Edit › Edit Custom Dictionary…: its dialog adds, deletes and changes the custom dictionary's words, #4936; previously minor: `.ai` and EPS import: envelopes of type open live where they draw as their drawn art and the layers with them draw as the page (#3179; scores and estimates unchanged); G5: Game HUD graphic style library; bundled content ~34% → ~36%; previously minor: Line Arrow arrowhead (#5421; scores and estimates unchanged); G5: Map Markers built-in symbol library; bundled content ~32% → ~34%; previously minor: right-click on type: Spelling › Auto Spell Check, with its check mark, #4936; previously minor: right-click on a word Auto Spell Check underlined: its suggestions, Ignore All and Add to Dictionary, #4936; previously minor: Canvas: a 3D effect changed on type or a group redraws where its solid was; Fit to Artwork Bounds and per-artboard SVG export build each solid once for all artboards; previously minor: Effect Gallery: a thumbnail for each filter and a preview area inside the dialog, on an original drawing; Raster effects 52% → 55%, hours 1–2 → none; headline numbers unchanged; Auto Spell Check: `edit.autoSpellCheck` underlines the unknown words, #4936; previously minor: PDF editable import preserves authored ActualText once, including empty/nested spans and authored ordering (#6165); cross-line/style layout remains approximate; scores and estimates unchanged; PDF marked-text export (#6309): compatible glyphs stay on one layout line with per-glyph offsets; scores and estimates unchanged; G5: UI Frames built-in symbol library with default 9-slice; bundled content ~32%; previously minor: G5: dynamic symbol part on-canvas opacity/blend/gradient/pattern; strokes remaining no longer lists Overlap/auto corners; symbols ~88%; previously minor: interim macOS cursor delivery, #2292; native validation pending; scores and estimates unchanged; previously minor: harakat paint fallback clarified; previously minor: current Guides feature-area rows consolidated using existing ruler evidence; scores and estimates unchanged; previously minor: Control bar › Snapping includes the existing Snap to Glyph and Alignment Guides toggles (#6164); scores and estimates unchanged; previously minor: G5 docs: Art brush Overlap and Pattern brush auto corners removed from strokes remaining; symbols remaining lists dynamic on-canvas beyond solid and guides outside the art; previously minor: custom dictionary and Ignore All: `text.spelling.addWord`, `removeWord`, `changeWord`, `dictionary` and `ignoreAll`, #4936; previously minor: EPS import: embedded fonts (composite, Type 42, CID-keyed, Type 1, CFF FontSet) draw their glyphs; spell check engine: `text.spelling.check` and `text.spelling.suggest` on craft-proof, #4936; previously minor: floating tab groups collapse into the side icon rail and opened rail panels fold back into it, #5925 in part; `.ai`/EPS type keeps its tab stops, and right-aligned lines with tabs lay out as the file's page, #6147; `.ai`/EPS type from the text document lays its lines out closer to the file's page, within limits, #6137; `.ai` and EPS import: older Art brush objects read; numeric fields step on wheel hover without taking keyboard focus, and a panel wheel turn cannot seed a canvas zoom glide, #5949; Character Styles panel: a double-click on a style's row opens its Character Style Options; the dialog keeps a fixed width and scrolls its sections, so its buttons stay on screen; Tools stays beside the canvas with left-side panels; new gradients follow document color mode; Selection QoL: marquee modes and visible feedback, #5313; SVG CSS classes survive export and repeated import in all four styling modes (#2480); current-main integration retains event attributes and scripts; #3380 deletion-only review follow-up: independent survivors keep gradient placement, owned subpaths avoid discarded copies, and contracts/status/evidence are clarified; endpoint highlighting remains open; scores and estimates unchanged; the canvas keeps selection outlines and anchors between frames; Indian-language hyphenation review and license allowlist, #4947; Stroke gradients: an arrowhead aligned to the tip is painted to the corners of its base, #5964; Drop Shadow and glow dialogs: spinner arrows, #5367, #5368; Stroke Weight Up and Down shortcuts, #5797; Hindi catalog and contributor loanword preferences; full wording review in progress; Properties in Edit Artboards: a Transform section with the reference point above the Artboards section, #5219; the Control bar's Stroke: and Opacity: links scrub their fields, #4088; an image zoomed in on is separated, colorized or proofed only where it shows (#4155); a document's first frame renders on the render worker, so opening a heavy file no longer freezes the window, #4155; Control bar Paragraph section with type selected, #5372; translating unchanged type reuses its glyph and character-stroke outlines; scores and estimates unchanged) · **Target:** Adobe Illustrator 2026 (30.x; public release notes through 30.7, August 2026; Units › East Asian Type acts, with Q and Ha units; scores unchanged) +> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-11-17 · **Change:** minor (Twist: a strongly twisted path joins its pieces without kinks, #7069; scores and estimates unchanged; previously: PDF import: a glyph filled only after a glyph filled and stroked comes in filled only, not stroked, #8300; PDF import: translucent type filled and stroked comes in as a filled type object and a stroked one, as the file composites them, and an upright glyph is never kept as the outline of its glyph alone, #8015; PDF import: type filled and stroked by one text-showing operator comes in as one type object, filled and stroked, not a stroked copy over a filled one, #8015; Layers panel: Alt over the list shows the copy cursor while rows or the selection square are dragged, #8217; scores and estimates unchanged; previously: Gradient panel: the add-stop strip under the ramp shows the white arrow with a plus on Windows and X11, #8241; scores and estimates unchanged; previously: Properties panel: the Character section shows the font of the Type tool's selection, not the first run's (#8189); scores and estimates unchanged; previously: Recolor Artwork follow-up (#8031, remaining #4028): native Lab input, picker swatch libraries and Assign-row menus; UI interaction regression coverage; scores and estimates unchanged; previously: #8005: the Color spectrum fills a resized panel; scores and estimates unchanged; previously: Paragraph composers (#4935): the Paragraph panel menu and paragraph styles offer four composers, the Middle Eastern & South Asian Single-line and Every-line (how all type is set, and the default) and a Standard Single-line and Every-line that set Indic, Arabic and Hebrew type glyph by glyph as the font maps it, for legacy fonts that keep a script on Latin character codes; PDF import: stroked type keeps the line cap, line join and miter limit the file strokes it with, a glyph stroked otherwise than the run it joins coming in as a run of its own, #7741; G5: Neon & Glow joins built-in graphic style libraries (Cyan Neon, Magenta Laser, Amber Tube, Electric Lime, Pulse Violet, Cobalt Phosphor); scores and estimates unchanged; previously: Pencil ignores Smart Guides and Snap to Point and shows no Smart Guides, #7252; previously: Pencil continuation, straight-line and closing cursors; scores and estimates unchanged; previously: G5: Weather Icons joins built-in symbol libraries (Sun, Moon, Cloud, Rain, Thunder, Snow); scores and estimates unchanged; previously: a closed Pencil stroke closes with a straight segment; previously: Snap to Point with Smart Guides off draws no Smart Guides labels or lines, #7250; previously: 3D: the seams of Extrude & Bevel, Inflate and Rotate under a white light, and of the faces of Extrude & Bevel (Classic), Revolve (Classic) and Rotate (Classic), went from miter to round joins, so white-light 3D output is expected to differ from the 2026-10-17 comparison at facet corners (not measured: the scenes were not exported again); previously: `.ai` and EPS import: in layers that don't draw as the page, art that differs away from an envelope of type no longer costs it its editable type; it keeps its drawn art where, in the pixels it and its drawn art ink, the layers with it differ from the page more than its own check allows, or past the envelopes' share of the page check, #7141; Character panel: the Set Font Height Reference dropdown shows an icon before each reference, #6304; scores and estimates unchanged; previously: Envelopes: a top object's side whose pieces are all one curve split at anchors follows that curve's parameter, so a top object saved with its sides' curves in pieces draws as its `.ai` drawn art, #7097; scores and estimates unchanged; previously: Graphic Styles list fills a taller panel, #2992; scores and estimates unchanged; previously: PDF import: glyphs in a span with an empty ActualText come in as outlines, #6971; scores and estimates unchanged; previously: library panels' lists fill a taller panel, #2992; scores and estimates unchanged; previously: Swatches list fills a taller panel, #1638; scores and estimates unchanged; previously minor: Object › Rasterize with the Grayscale or Bitmap colour model makes a grayscale image, #6969; scores and estimates unchanged; previously minor: `.ai` and EPS import: type in an envelope with Distort Appearance is also tried mapped from the box of what it paints, miter tips and moved strokes included, after its glyphs grown by half its strokes' weight (#6824; #6617: Swatches panel menu: Show Recent Colors; scores unchanged; previously minor: icon-strip flyouts also resize from the top edge and the canvas-side top corner, keeping the moved top in workspaces (storytold/craft-libs#1094); scores and estimates unchanged; previously: #6865: explicitly requested oversized editing artboard; macOS: the canvas cursor stays after the pointer moves, #6362; scores and estimates unchanged; previously minor: Type tool: kerning at a caret at the start of a line moves the character after it, #5111; scores and estimates unchanged; previously minor: Rulers: the zero point dragged out of the rulers' corner snaps as a drawn point does; previously minor: Live Paint Bucket fills faces crossed in one drag (#6373); previously: #6404: transform-aware Eyedropper character copying; scores and estimates unchanged; previously: Envelopes: with Distort Appearance, type's strokes paint along the bent glyph outlines at their own weight, as users' `.ai` files draw them, which changes how VectorCraft's own envelopes of stroked type draw (#6644; scores and estimates unchanged); previously minor: G5: Energy Beams brush library; bundled content ~44% → ~46%; previously minor: G5: Skill Icons symbol library; bundled content ~42% → ~44%; previously minor: `.ai` and EPS import: an envelope saved in Edit Contents whose mesh lies away from its drawn art by a move opens live on that art (#6570; scores and estimates unchanged); previously minor: ruler double-click adds a guide at the pointer, #5239; G5: Status Effects graphic style library; bundled content ~40% → ~42%; MCP symbol libraries list UI Frames and Map Markers; previously minor: G5: Inventory Icons built-in symbol library; bundled content ~38% → ~40%; previously minor: `.ai` and EPS import: stroked type in an envelope maps from its glyphs grown by half its stroke (#3179; scores and estimates unchanged); previously minor: `.ai` and EPS import: warps of type open as mesh envelopes on their saved grid where VectorCraft's warp doesn't draw as their drawn art (#3179; scores and estimates unchanged); G5: Game Trails brush library; bundled content ~36% → ~38%; previously minor: Edit › Edit Custom Dictionary…: its dialog adds, deletes and changes the custom dictionary's words, #4936; previously minor: `.ai` and EPS import: envelopes of type open live where they draw as their drawn art and the layers with them draw as the page (#3179; scores and estimates unchanged); G5: Game HUD graphic style library; bundled content ~34% → ~36%; previously minor: Line Arrow arrowhead (#5421; scores and estimates unchanged); G5: Map Markers built-in symbol library; bundled content ~32% → ~34%; previously minor: right-click on type: Spelling › Auto Spell Check, with its check mark, #4936; previously minor: right-click on a word Auto Spell Check underlined: its suggestions, Ignore All and Add to Dictionary, #4936; previously minor: Canvas: a 3D effect changed on type or a group redraws where its solid was; Fit to Artwork Bounds and per-artboard SVG export build each solid once for all artboards; previously minor: Effect Gallery: a thumbnail for each filter and a preview area inside the dialog, on an original drawing; Raster effects 52% → 55%, hours 1–2 → none; headline numbers unchanged; Auto Spell Check: `edit.autoSpellCheck` underlines the unknown words, #4936; previously minor: PDF editable import preserves authored ActualText once, including empty/nested spans and authored ordering (#6165); cross-line/style layout remains approximate; scores and estimates unchanged; PDF marked-text export (#6309): compatible glyphs stay on one layout line with per-glyph offsets; scores and estimates unchanged; G5: UI Frames built-in symbol library with default 9-slice; bundled content ~32%; previously minor: G5: dynamic symbol part on-canvas opacity/blend/gradient/pattern; strokes remaining no longer lists Overlap/auto corners; symbols ~88%; previously minor: interim macOS cursor delivery, #2292; native validation pending; scores and estimates unchanged; previously minor: harakat paint fallback clarified; previously minor: current Guides feature-area rows consolidated using existing ruler evidence; scores and estimates unchanged; previously minor: Control bar › Snapping includes the existing Snap to Glyph and Alignment Guides toggles (#6164); scores and estimates unchanged; previously minor: G5 docs: Art brush Overlap and Pattern brush auto corners removed from strokes remaining; symbols remaining lists dynamic on-canvas beyond solid and guides outside the art; previously minor: custom dictionary and Ignore All: `text.spelling.addWord`, `removeWord`, `changeWord`, `dictionary` and `ignoreAll`, #4936; previously minor: EPS import: embedded fonts (composite, Type 42, CID-keyed, Type 1, CFF FontSet) draw their glyphs; spell check engine: `text.spelling.check` and `text.spelling.suggest` on craft-proof, #4936; previously minor: floating tab groups collapse into the side icon rail and opened rail panels fold back into it, #5925 in part; `.ai`/EPS type keeps its tab stops, and right-aligned lines with tabs lay out as the file's page, #6147; `.ai`/EPS type from the text document lays its lines out closer to the file's page, within limits, #6137; `.ai` and EPS import: older Art brush objects read; numeric fields step on wheel hover without taking keyboard focus, and a panel wheel turn cannot seed a canvas zoom glide, #5949; Character Styles panel: a double-click on a style's row opens its Character Style Options; the dialog keeps a fixed width and scrolls its sections, so its buttons stay on screen; Tools stays beside the canvas with left-side panels; new gradients follow document color mode; Selection QoL: marquee modes and visible feedback, #5313; SVG CSS classes survive export and repeated import in all four styling modes (#2480); current-main integration retains event attributes and scripts; #3380 deletion-only review follow-up: independent survivors keep gradient placement, owned subpaths avoid discarded copies, and contracts/status/evidence are clarified; endpoint highlighting remains open; scores and estimates unchanged; the canvas keeps selection outlines and anchors between frames; Indian-language hyphenation review and license allowlist, #4947; Stroke gradients: an arrowhead aligned to the tip is painted to the corners of its base, #5964; Drop Shadow and glow dialogs: spinner arrows, #5367, #5368; Stroke Weight Up and Down shortcuts, #5797; Hindi catalog and contributor loanword preferences; full wording review in progress; Properties in Edit Artboards: a Transform section with the reference point above the Artboards section, #5219; the Control bar's Stroke: and Opacity: links scrub their fields, #4088; an image zoomed in on is separated, colorized or proofed only where it shows (#4155); a document's first frame renders on the render worker, so opening a heavy file no longer freezes the window, #4155; Control bar Paragraph section with type selected, #5372; translating unchanged type reuses its glyph and character-stroke outlines; scores and estimates unchanged) · **Target:** Adobe Illustrator 2026 (30.x; public release notes through 30.7, August 2026; Units › East Asian Type acts, with Q and Ha units; scores unchanged) > > Tech Circuit update (2026-11-14): three original procedural brushes; ten built-in brush libraries (G5). > @@ -61,6 +61,10 @@ Artboard Options forwards the active Artboard tool's Scale Artwork with Artboard | Date | Change | Summary | |---|---|---| +| 2026-11-17 | minor | Distort & Transform › Twist: handles follow the rotation's derivative, so a strongly twisted path is a smooth spiral instead of pieces meeting at kinks (#7069; `twist_joins_its_pieces_smoothly` in `crates/effects/src/tests.rs`). Scores and estimates unchanged. | +| 2026-11-17 | minor | PDF import (#8300): a glyph filled only (text rendering mode 0) right after one filled and stroked (mode 2) joined the stroked run and came in stroked too: `2 Tr (B) Tj 0 Tr (C) Tj` came in as `BC` stroked throughout. A glyph filled only now joins only a run drawn alike, so it starts a run of its own, filled only, in the same type object, and takes a stroke only when the file draws one over it (the #8015 matching); a word filled whole then stroked whole, and fill and stroke rendering glyph by glyph, still come in as one run filled and stroked. Tests: `a_glyph_filled_only_after_one_filled_and_stroked_is_not_stroked`, `glyphs_filled_and_stroked_one_by_one_stay_one_run`; scores and estimates unchanged. | +| 2026-11-17 | minor | PDF import (#8015 follow-up): type filled and stroked at less than full opacity is no longer joined into one type object, since the file composites the fill and the stroke apiece, darker where they overlap, while one object's opacity applies to both together; it stays a filled object and a stroked one, as a fill and stroke at different opacities already did. An upright glyph (vertical type) filled and stroked is no longer kept as an outline for a line that comes in as its outlines, as glyphs filled only weren't, so such a line can't lose them. The #8015 entries now say what is left: translucent type filled and stroked, and a `TJ` whose kerning starts a new line part way through, still come in as two objects. Tests: `translucent_fill_and_stroke_text_stays_two_objects`, `a_vertical_line_with_one_glyph_filled_and_stroked_keeps_every_glyph_filled`; scores and estimates unchanged. | +| 2026-11-16 | minor | PDF import: fill and stroke rendering (text rendering modes 2 and 6) draws all the glyphs of a text-showing operator (`Tj`, `TJ`, `'`, `"`) filled, then the same glyphs stroked, so a word shown at once came in as two type objects: a stroke-only copy over a fill-only one. Each stroke is now matched, in order, to the glyph filled with the same placement (where, how large, how wide, slanted and turned) in the same font with the same text on the line, and only that glyph takes the stroke, so the word comes in as one type object, filled and stroked; glyphs stroked with another join part way through still split into runs of their own, and stroked type over no filled glyph (modes 1 and 5) stays stroke only (#8015; `a_word_filled_then_stroked_imports_as_one_filled_and_stroked_type` in `crates/pdf/src/tests/textstroke.rs`, `a_vertical_column_filled_then_stroked_is_one_filled_and_stroked_type` in `crates/pdf/src/tests/text_placement.rs`). Scores and estimates unchanged. | | 2026-11-16 | minor | Recolor Artwork › Assign: native Lab entry in the Color Picker, swatch libraries access in the picker, and row context menu options (Pick from Swatches, Limit to Library) (#4028); scores and estimates unchanged. | | 2026-11-15 | minor | PDF import: stroked type (text rendering modes 1, 2, 5 and 6, and glyphs under `ActualText`) keeps the line cap, line join and miter limit of the graphics state it is stroked with, as paths do, instead of butt caps, miter joins and a miter limit of 10; a glyph filled and then stroked otherwise than the run its fill joined comes in as a run of its own, so the glyphs before it keep their stroke (#7741; `imported_stroked_type_keeps_the_files_cap_join_and_miter_limit` in `crates/pdf/src/tests/textstroke.rs`). Scores and estimates unchanged. | | 2026-11-15 | minor | G5: Neon & Glow joins Shadows and Glows, Outlines and Rules, Hand-Drawn, Textures, Painted and Sketched, Gradient Finishes, Shape Effects, Blends and Transparency, Game HUD and Status Effects as an eleventh built-in graphic style library (Cyan Neon, Magenta Laser, Amber Tube, Electric Lime, Pulse Violet, Cobalt Phosphor; original procedural styles generated in code); area score and estimate unchanged. | @@ -259,7 +263,7 @@ dominate; 3D, graphs and automation are specialist). They sum to 105. Feature de | Symbols, blends, envelopes, Repeat, perspective | 5 | 88% | remaining: dynamic symbols' `.ai` round trip, further built-in symbol libraries (Basic Shapes, UI Frames with default 9-slice, Map Markers, Inventory Icons, Skill Icons and Weather Icons are done), envelope Anti-Alias/Preserve Shape, 9-slice guides outside the art; Symbol Options › Registration, Export Type (Graphic / Movie Clip) and 9-slice guides (drawn and draggable during symbol editing, #5280) and Symbol Type (dynamic on-canvas fill/stroke including gradient/pattern, opacity and blend, #4938) are done | 4–7 | estimated; Blend panel Type and Ramp control step easing with a separate color Shift (#2539); Blend Options retains spacing and orientation; polynomial curves are original approximations; interactive selected mirror axis implemented; bounding-box handles take priority over the axis line (focused regression and native checks passed; full CI blocked by an unrelated text test); #2544 spine Anchor Point conversion and picking regression-tested | | Type advanced (CJK, spelling, Touch Type, Retype) | 4 | 50% | CJK vertical composition (ruby, mojikumi), tab leaders, Touch Type, Retype | 20–28 | estimated; upright fallback for fullwidth `!` / `?` regression-tested; score and hours unchanged | | Symbols, blends, envelopes, Repeat, perspective | 5 | 88% | remaining: dynamic symbols' `.ai` round trip, further built-in symbol libraries (Basic Shapes, UI Frames with default 9-slice, Map Markers, Inventory Icons, Skill Icons and Weather Icons are done), envelope Anti-Alias/Preserve Shape, 9-slice guides outside the art; Symbol Options › Registration, Export Type (Graphic / Movie Clip) and 9-slice guides (drawn and draggable during symbol editing, #5280) and Symbol Type (dynamic on-canvas fill/stroke including gradient/pattern, opacity and blend, #4938) are done | 4–7 | estimated; Blend panel Type and Ramp control step easing with a separate color Shift (#2539); Blend Options retains spacing and orientation; polynomial curves are original approximations; interactive selected mirror axis implemented; bounding-box handles take priority over the axis line (focused regression and native checks passed; full CI blocked by an unrelated text test); #2544 spine Anchor Point conversion and picking regression-tested | -| Image Trace, graphs, image tools | 3 | 75% | graph Column designs, Image Trace Create Strokes depth (Create Object Mosaic is done; junction-returning piece survival has source-generated regressions in `image-trace-quality.md`; simpler contour walk, identical output; an edge's sub-pixel shift is the same from either side; notches read only their own piece; collapsed loops keep few segments, so Paths is monotone on the code-drawn sweep) | 5–8 | estimated (raised from 72%); quick presets reveal adjustment controls, Properties reopens them; Live trace result bounds and selection highlights exclude the retained bitmap except in source-image views (scores/hours unchanged) | +| Image Trace, graphs, image tools | 3 | 75% | graph Column designs, Image Trace Create Strokes depth (Create Object Mosaic is done; junction-returning piece survival has source-generated regressions in `image-trace-quality.md`; simpler contour walk, identical output; an edge's sub-pixel shift is the same from either side; notches read only their own piece; collapsed loops keep few segments, so Paths is monotone on the code-drawn sweep) | 5–8 | estimated (raised from 72%); quick presets reveal adjustment controls, Properties reopens them; Live trace result bounds and selection highlights exclude the retained bitmap except in source-image views (scores/hours unchanged); High Fidelity Photo traces in Full Tone with abutting shapes, summed mean pixel difference over 19 test images 80.5 to 65.6 levels ([quality notes](image-trace-quality.md#high-fidelity-photo-in-full-tone)), score, gaps and hours unchanged | | Live vector effects | 5 | 85% | Outline Object, SVG Filters | 4–8 | measured count 49/50 (Pathfinder 13/13 with Trap), depth estimated; Warp Options controls verified by focused checks and original-image review | | 3D and Materials (and Turntable) | 4 | ~25% | live Revolve with automatic smooth vector shading and default-on continuous circular caps, Extrude & Bevel (twist, taper, caps, five bevel shapes), Inflate and Rotate with Position presets (colored Inflate uses smooth membrane lighting; white-light Inflate retains its existing shading; Extrude & Bevel and Rotate retain planar shading; one to ten colored lights, shared neutral ambient, original lighting presets, painter visibility), Revolve (Classic) with Angle, Cap, Offset and the Plastic, Diffuse, No Shading and Wireframe surfaces, the Quick Actions › Expand as Wireframes command (#6354), the Render Settings › Wireframe mode on Extrude & Bevel, Revolve, Inflate and Rotate; materials, shadows, ray tracing, the rest of 3D Classic (Map Art), Turntable views, textures, map art and shading in 3D export | 30–55 | estimated (Extrude & Bevel, Inflate and Rotate added 2026-10-12); Revolve (Classic) is covered by the `revolve::classic` tests and `dialogs::revolve::tests::classic_revolve_shows_its_options_and_applies_as_one_step`; Expand as Wireframes is covered by `crates/effects/src/solids/wireframe/tests.rs` and `crates/engine/src/cmd/wireframe/tests.rs`, and Render Settings › Wireframe by `crates/effects/src/solids/wireframe/tests.rs` and `crates/ui-egui/src/panels/tests_three_d.rs` (score, gaps and hours unchanged); every 3D seam has round joins (2026-11-12, [three-d.md](three-d.md#seams)), score, gaps and hours unchanged | | Type advanced (CJK, spelling, Touch Type, Retype) | 4 | 50% | CJK vertical composition (mojikumi), variable font axes, tab leaders, Touch Type, Retype | 20–28 | estimated; No Break keeps marked characters on one line; upright fallback for fullwidth `!` / `?` regression-tested; score and hours unchanged | @@ -269,16 +273,16 @@ dominate; 3D, graphs and automation are specialist). They sum to 105. Feature de | Image Trace, graphs, image tools | 3 | 75% | graph Column designs, Image Trace Create Strokes depth (Create Object Mosaic is done; junction-returning piece survival has source-generated regressions in `image-trace-quality.md`; large images trace with a warning; Auto Color keeps rare distinct colours) | 5–8 | estimated (raised from 72%); quick presets reveal adjustment controls, Properties reopens them | | Layers, artboards, document setup | 5 | 78% | Selected-artboard deletion is consistent across panel actions (all-selected retains artboard 1); history prunes removed indices while preserving valid multiselection; remaining: 30.0's artboard locking and colours and managing artboards from the canvas, Layers row menu commands beyond Collect for Export and menus on guide and blend spine rows (click-to-fit objects is done, #1227) | 5–8 | estimated (lowered from 82%: target moved); Artboard deletion keys keep artwork and the first of an all-selected set; Artboard Options' Show Center Mark and Show Cross Hairs draw on the canvas only (exports and print leave them out), regression-tested; Artboard Options' Show Video Safe Areas and Video Ruler Pixel Aspect Ratio (per artboard, native format) are done ([video display options](#evidence-what-ships-today-by-area)), score unchanged | | View & navigation | 3 | 70% | multiple windows and the rest of Arrange (Cascade, Float in Window, Float All in Windows) | 9–14 | estimated; Window › Arrange › Tile and Consolidate All Windows done (score/hours unchanged); document-tab artwork hover/copy and lossless transfer tested (2026-10-22; score/hours unchanged); cached canvas reprojection preserves scale during resize, rotation and DPI changes (regression and contributor original-file evidence below; scores/hours unchanged); cached canvas dimensions match the renderer limit before cache-key creation, view construction and worker submission (regression evidence below) | -| File formats | 6 | 75% | `.ai` files open with a flattened or wrong layer structure in real cases (#951), no writing of Illustrator's editing data (#868), FreeHand/CorelDRAW/DWG/HEIC import, 3D export; see [file-format-parity.md](file-format-parity.md); EPS legacy mesh/opacity-mask and raster comparison follow-up verified PDF marked-text batching covered by M4 evidence (#6309); cross-line/style ActualText layout (#6165) and styled-cluster limits remain.| 10–20 | estimated (lowered from 85%: open issues); DXF control-point SPLINE import closure regression-tested (#1299 follow-up after #1320); DXF export's Include Placed Images and Include Fill Hatches options, off in CNC / CAM (`images_and_hatches_are_left_out_independently_and_the_cnc_preset_leaves_out_both`; score, gaps and hours unchanged); PDF writer metadata, reader streaming and immutable backend checks in `crates/pdf/src/tests.rs`, `crates/pdf/src/tests/reader_streaming.rs` and `xtask/src/pdf_deps.rs`; PDF Place and clipboard paste retain live text (synthetic regressions); EPS ordinary Save retains the page frame and editable document (2026-10-26); `.ai`/EPS editing data checked against a user's files (2026-10-30): case setting (`ate::tests`, `tests_native::type_from_the_text_document_keeps_its_case_setting`), placed-file placements (`tests_native::a_small_placed_file_goes_where_it_draws_closer_to_the_page`), pages cropped to the art (`tests_native::type_on_the_copies_of_a_page_cropped_to_the_art_is_read_once`), mesh corner weights and state (`ai::mesh::tests::corners_with_handle_weights_of_zero_are_read`, `ai::tests::a_gradient_mesh_takes_the_transparency_written_after_it`), type on a path spacing (`tests_native::type_round_a_circle_is_spaced_as_the_file_lays_it_out`; the distance from the path under Align to Path is measured from the top of each character's em box, half the height of the top of its H or the bottom of its font's bounding box (`tests_native::aligned_type_lies_as_far_from_its_path_as_the_file_lays_it_out`), and the fit under Gravity does not reproduce the file's layout), blend state (`ai::tests::a_blends_transparency_follows_its_record`); scores and estimates unchanged. PDF ActualText preserved in editable import (#6165; bounded synthetic coverage below); score/hours unchanged. Legacy `.ai` type keeps its manual kerning pairs (`Tk`, `TK`), discretionary hyphens (`T+`, `T-`) and hyphenation language (`XL`) when it opens, and legacy `.ai` saves write manual kerning as `Tk` and soft hyphens as `T+` (`import::ai::tests::legacy_manual_pair_kerning_is_kept`, `legacy_ai::tests::manual_kerning_and_soft_hyphens_are_written_and_read_back`); score, gaps and hours unchanged. PDF import: stroked type (text rendering modes 1, 2, 5 and 6) keeps the file's line cap, line join and miter limit, as paths do (#7741, `imported_stroked_type_keeps_the_files_cap_join_and_miter_limit` in `crates/pdf/src/tests/textstroke.rs`); score, gaps and hours unchanged. | -| File formats | 6 | 75% | `.ai` files open with a flattened or wrong layer structure in real cases (#951), a saved `.ai`'s editing copy without live effects on objects other than paths, compound paths and groups that qualify (at most a fill and a stroke, a non-zero fill rule when filled, no large canvas) and whose appearance and effects the art-style writer supports, and with live objects other than grouped column, stacked column, line and area graphs the `.ai` reader reads back whole as their art (#868), FreeHand/CorelDRAW/DWG/HEIC import, textures, map art and shading in 3D export; see [file-format-parity.md](file-format-parity.md); EPS legacy mesh/opacity-mask and raster comparison follow-up verified PDF marked-text batching covered by M4 evidence (#6309); cross-line/style ActualText layout (#6165) and styled-cluster limits remain.| 10–20 | estimated (lowered from 85%: open issues); DXF control-point SPLINE import closure regression-tested (#1299 follow-up after #1320); PDF writer metadata, reader streaming and immutable backend checks in `crates/pdf/src/tests.rs`, `crates/pdf/src/tests/reader_streaming.rs` and `xtask/src/pdf_deps.rs`; PDF Place and clipboard paste retain live text (synthetic regressions); EPS ordinary Save retains the page frame and editable document (2026-10-26); `.ai`/EPS editing data checked against a user's files (2026-10-30): case setting (`ate::tests`, `tests_native::type_from_the_text_document_keeps_its_case_setting`), placed-file placements (`tests_native::a_small_placed_file_goes_where_it_draws_closer_to_the_page`), pages cropped to the art (`tests_native::type_on_the_copies_of_a_page_cropped_to_the_art_is_read_once`), mesh corner weights and state (`ai::mesh::tests::corners_with_handle_weights_of_zero_are_read`, `ai::tests::a_gradient_mesh_takes_the_transparency_written_after_it`), type on a path spacing (`tests_native::type_round_a_circle_is_spaced_as_the_file_lays_it_out`), blend state (`ai::tests::a_blends_transparency_follows_its_record`); scores and estimates unchanged. Graphs saved to `.ai` in either form open again as live graphs (`ai_editing::tests::graphs_are_written_with_their_records_and_open_live`, `legacy_ai::tests::graphs_are_written_with_their_records_and_open_live`, `cmd::graph::tests::a_drawn_graph_saved_as_ai_opens_as_a_graph_unless_the_save_warns`); other graphs are still written as their art (`graphs_the_records_cant_keep_are_written_as_their_art`); score and hours unchanged. PDF ActualText preserved in editable import (#6165; bounded synthetic coverage below); score/hours unchanged. Legacy `.ai` type keeps its manual kerning pairs (`Tk`, `TK`), discretionary hyphens (`T+`, `T-`) and hyphenation language (`XL`) when it opens, and legacy `.ai` saves write manual kerning as `Tk` and soft hyphens as `T+` (`import::ai::tests::legacy_manual_pair_kerning_is_kept`, `legacy_ai::tests::manual_kerning_and_soft_hyphens_are_written_and_read_back`); score, gaps and hours unchanged. PDF import: stroked type (text rendering modes 1, 2, 5 and 6) keeps the file's line cap, line join and miter limit, as paths do (#7741, `imported_stroked_type_keeps_the_files_cap_join_and_miter_limit` in `crates/pdf/src/tests/textstroke.rs`); score, gaps and hours unchanged. | -| File formats | 6 | 75% | `.ai` files open with a flattened or wrong layer structure in real cases (#951), a saved `.ai`'s editing copy without live effects on objects other than paths, compound paths and groups that qualify (at most a fill and a stroke, a non-zero fill rule when filled, no large canvas) and whose appearance and effects the art-style writer supports, and with live objects other than grouped column, stacked column, line and area graphs the `.ai` reader reads back whole as their art (#868), FreeHand/CorelDRAW/DWG/HEIC import, 3D export; see [file-format-parity.md](file-format-parity.md); EPS legacy mesh/opacity-mask and raster comparison follow-up verified PDF marked-text batching covered by M4 evidence (#6309); cross-line/style ActualText layout (#6165) and styled-cluster limits remain.| 10–20 | estimated (lowered from 85%: open issues); DXF control-point SPLINE import closure regression-tested (#1299 follow-up after #1320); PDF writer metadata, reader streaming and immutable backend checks in `crates/pdf/src/tests.rs`, `crates/pdf/src/tests/reader_streaming.rs` and `xtask/src/pdf_deps.rs`; PDF Place and clipboard paste retain live text (synthetic regressions); SVG CSS classes survive export and repeated import in all four styling modes (#2480); current-main integration retains event attributes and scripts; EPS ordinary Save retains the page frame and editable document (2026-10-26); `.ai`/EPS editing data checked against a user's files (2026-10-30): case setting (`ate::tests`, `tests_native::type_from_the_text_document_keeps_its_case_setting`), placed-file placements (`tests_native::a_small_placed_file_goes_where_it_draws_closer_to_the_page`), pages cropped to the art (`tests_native::type_on_the_copies_of_a_page_cropped_to_the_art_is_read_once`), mesh corner weights and state (`ai::mesh::tests::corners_with_handle_weights_of_zero_are_read`, `ai::tests::a_gradient_mesh_takes_the_transparency_written_after_it`), type on a path spacing (`tests_native::type_round_a_circle_is_spaced_as_the_file_lays_it_out`), blend state (`ai::tests::a_blends_transparency_follows_its_record`); scores and estimates unchanged. Graphs saved to `.ai` in either form open again as live graphs (`ai_editing::tests::graphs_are_written_with_their_records_and_open_live`, `legacy_ai::tests::graphs_are_written_with_their_records_and_open_live`, `cmd::graph::tests::a_drawn_graph_saved_as_ai_opens_as_a_graph_unless_the_save_warns`); other graphs are still written as their art (`graphs_the_records_cant_keep_are_written_as_their_art`); score and hours unchanged. PDF ActualText preserved in editable import (#6165; bounded synthetic coverage below); score/hours unchanged. Save refusal continuation (#6146): `READ_ONLY_LOCATION`, Save As on ordinary UI Save only; regression execution pending; score/hours unchanged. Legacy `.ai` type keeps its manual kerning pairs (`Tk`, `TK`), discretionary hyphens (`T+`, `T-`) and hyphenation language (`XL`) when it opens, and legacy `.ai` saves write manual kerning as `Tk` and soft hyphens as `T+` (`import::ai::tests::legacy_manual_pair_kerning_is_kept`, `legacy_ai::tests::manual_kerning_and_soft_hyphens_are_written_and_read_back`); score, gaps and hours unchanged. PDF import: stroked type (text rendering modes 1, 2, 5 and 6) keeps the file's line cap, line join and miter limit, as paths do (#7741, `imported_stroked_type_keeps_the_files_cap_join_and_miter_limit` in `crates/pdf/src/tests/textstroke.rs`); score, gaps and hours unchanged. | +| File formats | 6 | 75% | `.ai` files open with a flattened or wrong layer structure in real cases (#951), no writing of Illustrator's editing data (#868), FreeHand/CorelDRAW/DWG/HEIC import, 3D export; see [file-format-parity.md](file-format-parity.md); EPS legacy mesh/opacity-mask and raster comparison follow-up verified PDF marked-text batching covered by M4 evidence (#6309); cross-line/style ActualText layout (#6165) and styled-cluster limits remain.; PDF type filled and stroked at less than full opacity, or by a `TJ` whose kerning starts a new line part way through, comes in as a filled object and a stroked one (#8015) | 10–20 | estimated (lowered from 85%: open issues); DXF control-point SPLINE import closure regression-tested (#1299 follow-up after #1320); DXF export's Include Placed Images and Include Fill Hatches options, off in CNC / CAM (`images_and_hatches_are_left_out_independently_and_the_cnc_preset_leaves_out_both`; score, gaps and hours unchanged); PDF writer metadata, reader streaming and immutable backend checks in `crates/pdf/src/tests.rs`, `crates/pdf/src/tests/reader_streaming.rs` and `xtask/src/pdf_deps.rs`; PDF Place and clipboard paste retain live text (synthetic regressions); EPS ordinary Save retains the page frame and editable document (2026-10-26); `.ai`/EPS editing data checked against a user's files (2026-10-30): case setting (`ate::tests`, `tests_native::type_from_the_text_document_keeps_its_case_setting`), placed-file placements (`tests_native::a_small_placed_file_goes_where_it_draws_closer_to_the_page`), pages cropped to the art (`tests_native::type_on_the_copies_of_a_page_cropped_to_the_art_is_read_once`), mesh corner weights and state (`ai::mesh::tests::corners_with_handle_weights_of_zero_are_read`, `ai::tests::a_gradient_mesh_takes_the_transparency_written_after_it`), type on a path spacing (`tests_native::type_round_a_circle_is_spaced_as_the_file_lays_it_out`; the distance from the path under Align to Path is measured from the top of each character's em box, half the height of the top of its H or the bottom of its font's bounding box (`tests_native::aligned_type_lies_as_far_from_its_path_as_the_file_lays_it_out`), and the fit under Gravity does not reproduce the file's layout), blend state (`ai::tests::a_blends_transparency_follows_its_record`); scores and estimates unchanged. PDF ActualText preserved in editable import (#6165; bounded synthetic coverage below); score/hours unchanged. Legacy `.ai` type keeps its manual kerning pairs (`Tk`, `TK`), discretionary hyphens (`T+`, `T-`) and hyphenation language (`XL`) when it opens, and legacy `.ai` saves write manual kerning as `Tk` and soft hyphens as `T+` (`import::ai::tests::legacy_manual_pair_kerning_is_kept`, `legacy_ai::tests::manual_kerning_and_soft_hyphens_are_written_and_read_back`); score, gaps and hours unchanged. PDF import: stroked type (text rendering modes 1, 2, 5 and 6) keeps the file's line cap, line join and miter limit, as paths do (#7741, `imported_stroked_type_keeps_the_files_cap_join_and_miter_limit` in `crates/pdf/src/tests/textstroke.rs`); score, gaps and hours unchanged. PDF import: type filled and stroked by one text-showing operator (rendering modes 2 and 6) comes in as one type object, filled and stroked, not a stroked copy over a filled one (#8015, `a_word_filled_then_stroked_imports_as_one_filled_and_stroked_type` in `crates/pdf/src/tests/textstroke.rs`); not yet for type filled and stroked at less than full opacity, or a `TJ` whose kerning starts a new line part way through, which still come in as a filled object and a stroked one (`translucent_fill_and_stroke_text_stays_two_objects`); score and hours unchanged. PDF import: a glyph filled only after a glyph filled and stroked comes in filled only, not stroked (#8300, `a_glyph_filled_only_after_one_filled_and_stroked_is_not_stroked` in `crates/pdf/src/tests/textstroke.rs`); score and hours unchanged. | +| File formats | 6 | 75% | `.ai` files open with a flattened or wrong layer structure in real cases (#951), a saved `.ai`'s editing copy without live effects on objects other than paths, compound paths and groups that qualify (at most a fill and a stroke, a non-zero fill rule when filled, no large canvas) and whose appearance and effects the art-style writer supports, and with live objects other than grouped column, stacked column, line and area graphs the `.ai` reader reads back whole as their art (#868), FreeHand/CorelDRAW/DWG/HEIC import, textures, map art and shading in 3D export; see [file-format-parity.md](file-format-parity.md); EPS legacy mesh/opacity-mask and raster comparison follow-up verified PDF marked-text batching covered by M4 evidence (#6309); cross-line/style ActualText layout (#6165) and styled-cluster limits remain.; PDF type filled and stroked at less than full opacity, or by a `TJ` whose kerning starts a new line part way through, comes in as a filled object and a stroked one (#8015) | 10–20 | estimated (lowered from 85%: open issues); DXF control-point SPLINE import closure regression-tested (#1299 follow-up after #1320); PDF writer metadata, reader streaming and immutable backend checks in `crates/pdf/src/tests.rs`, `crates/pdf/src/tests/reader_streaming.rs` and `xtask/src/pdf_deps.rs`; PDF Place and clipboard paste retain live text (synthetic regressions); EPS ordinary Save retains the page frame and editable document (2026-10-26); `.ai`/EPS editing data checked against a user's files (2026-10-30): case setting (`ate::tests`, `tests_native::type_from_the_text_document_keeps_its_case_setting`), placed-file placements (`tests_native::a_small_placed_file_goes_where_it_draws_closer_to_the_page`), pages cropped to the art (`tests_native::type_on_the_copies_of_a_page_cropped_to_the_art_is_read_once`), mesh corner weights and state (`ai::mesh::tests::corners_with_handle_weights_of_zero_are_read`, `ai::tests::a_gradient_mesh_takes_the_transparency_written_after_it`), type on a path spacing (`tests_native::type_round_a_circle_is_spaced_as_the_file_lays_it_out`), blend state (`ai::tests::a_blends_transparency_follows_its_record`); scores and estimates unchanged. Graphs saved to `.ai` in either form open again as live graphs (`ai_editing::tests::graphs_are_written_with_their_records_and_open_live`, `legacy_ai::tests::graphs_are_written_with_their_records_and_open_live`, `cmd::graph::tests::a_drawn_graph_saved_as_ai_opens_as_a_graph_unless_the_save_warns`); other graphs are still written as their art (`graphs_the_records_cant_keep_are_written_as_their_art`); score and hours unchanged. PDF ActualText preserved in editable import (#6165; bounded synthetic coverage below); score/hours unchanged. Legacy `.ai` type keeps its manual kerning pairs (`Tk`, `TK`), discretionary hyphens (`T+`, `T-`) and hyphenation language (`XL`) when it opens, and legacy `.ai` saves write manual kerning as `Tk` and soft hyphens as `T+` (`import::ai::tests::legacy_manual_pair_kerning_is_kept`, `legacy_ai::tests::manual_kerning_and_soft_hyphens_are_written_and_read_back`); score, gaps and hours unchanged. PDF import: stroked type (text rendering modes 1, 2, 5 and 6) keeps the file's line cap, line join and miter limit, as paths do (#7741, `imported_stroked_type_keeps_the_files_cap_join_and_miter_limit` in `crates/pdf/src/tests/textstroke.rs`); score, gaps and hours unchanged. PDF import: type filled and stroked by one text-showing operator (rendering modes 2 and 6) comes in as one type object, filled and stroked, not a stroked copy over a filled one (#8015, `a_word_filled_then_stroked_imports_as_one_filled_and_stroked_type` in `crates/pdf/src/tests/textstroke.rs`); not yet for type filled and stroked at less than full opacity, or a `TJ` whose kerning starts a new line part way through, which still come in as a filled object and a stroked one (`translucent_fill_and_stroke_text_stays_two_objects`); score and hours unchanged. PDF import: a glyph filled only after a glyph filled and stroked comes in filled only, not stroked (#8300, `a_glyph_filled_only_after_one_filled_and_stroked_is_not_stroked` in `crates/pdf/src/tests/textstroke.rs`); score and hours unchanged. | +| File formats | 6 | 75% | `.ai` files open with a flattened or wrong layer structure in real cases (#951), a saved `.ai`'s editing copy without live effects on objects other than paths, compound paths and groups that qualify (at most a fill and a stroke, a non-zero fill rule when filled, no large canvas) and whose appearance and effects the art-style writer supports, and with live objects other than grouped column, stacked column, line and area graphs the `.ai` reader reads back whole as their art (#868), FreeHand/CorelDRAW/DWG/HEIC import, 3D export; see [file-format-parity.md](file-format-parity.md); EPS legacy mesh/opacity-mask and raster comparison follow-up verified PDF marked-text batching covered by M4 evidence (#6309); cross-line/style ActualText layout (#6165) and styled-cluster limits remain.; PDF type filled and stroked at less than full opacity, or by a `TJ` whose kerning starts a new line part way through, comes in as a filled object and a stroked one (#8015) | 10–20 | estimated (lowered from 85%: open issues); DXF control-point SPLINE import closure regression-tested (#1299 follow-up after #1320); PDF writer metadata, reader streaming and immutable backend checks in `crates/pdf/src/tests.rs`, `crates/pdf/src/tests/reader_streaming.rs` and `xtask/src/pdf_deps.rs`; PDF Place and clipboard paste retain live text (synthetic regressions); SVG CSS classes survive export and repeated import in all four styling modes (#2480); current-main integration retains event attributes and scripts; EPS ordinary Save retains the page frame and editable document (2026-10-26); `.ai`/EPS editing data checked against a user's files (2026-10-30): case setting (`ate::tests`, `tests_native::type_from_the_text_document_keeps_its_case_setting`), placed-file placements (`tests_native::a_small_placed_file_goes_where_it_draws_closer_to_the_page`), pages cropped to the art (`tests_native::type_on_the_copies_of_a_page_cropped_to_the_art_is_read_once`), mesh corner weights and state (`ai::mesh::tests::corners_with_handle_weights_of_zero_are_read`, `ai::tests::a_gradient_mesh_takes_the_transparency_written_after_it`), type on a path spacing (`tests_native::type_round_a_circle_is_spaced_as_the_file_lays_it_out`), blend state (`ai::tests::a_blends_transparency_follows_its_record`); scores and estimates unchanged. Graphs saved to `.ai` in either form open again as live graphs (`ai_editing::tests::graphs_are_written_with_their_records_and_open_live`, `legacy_ai::tests::graphs_are_written_with_their_records_and_open_live`, `cmd::graph::tests::a_drawn_graph_saved_as_ai_opens_as_a_graph_unless_the_save_warns`); other graphs are still written as their art (`graphs_the_records_cant_keep_are_written_as_their_art`); score and hours unchanged. PDF ActualText preserved in editable import (#6165; bounded synthetic coverage below); score/hours unchanged. Save refusal continuation (#6146): `READ_ONLY_LOCATION`, Save As on ordinary UI Save only; regression execution pending; score/hours unchanged. Legacy `.ai` type keeps its manual kerning pairs (`Tk`, `TK`), discretionary hyphens (`T+`, `T-`) and hyphenation language (`XL`) when it opens, and legacy `.ai` saves write manual kerning as `Tk` and soft hyphens as `T+` (`import::ai::tests::legacy_manual_pair_kerning_is_kept`, `legacy_ai::tests::manual_kerning_and_soft_hyphens_are_written_and_read_back`); score, gaps and hours unchanged. PDF import: stroked type (text rendering modes 1, 2, 5 and 6) keeps the file's line cap, line join and miter limit, as paths do (#7741, `imported_stroked_type_keeps_the_files_cap_join_and_miter_limit` in `crates/pdf/src/tests/textstroke.rs`); score, gaps and hours unchanged. PDF import: type filled and stroked by one text-showing operator (rendering modes 2 and 6) comes in as one type object, filled and stroked, not a stroked copy over a filled one (#8015, `a_word_filled_then_stroked_imports_as_one_filled_and_stroked_type` in `crates/pdf/src/tests/textstroke.rs`); not yet for type filled and stroked at less than full opacity, or a `TJ` whose kerning starts a new line part way through, which still come in as a filled object and a stroked one (`translucent_fill_and_stroke_text_stays_two_objects`); score and hours unchanged. PDF import: a glyph filled only after a glyph filled and stroked comes in filled only, not stroked (#8300, `a_glyph_filled_only_after_one_filled_and_stroked_is_not_stroked` in `crates/pdf/src/tests/textstroke.rs`); score and hours unchanged. | | View & navigation | 3 | 70% | multiple windows and the rest of Arrange (Cascade, Float in Window, Float All in Windows) | 9–14 | estimated; Window › Arrange › Tile and Consolidate All Windows done (score/hours unchanged); document-tab artwork hover/copy and lossless transfer tested (2026-10-22; score/hours unchanged); cached canvas reprojection preserves scale during resize, rotation and DPI changes (regression and contributor original-file evidence below; scores/hours unchanged) | | View & navigation | 3 | 70% | multiple windows and the rest of Arrange (Cascade, Float in Window, Float All in Windows) | 9–14 | estimated; Window › Arrange › Tile and Consolidate All Windows done (score/hours unchanged) | | Guides, grids, smart guides, snapping, rulers | 3 | 80% | "intersect" smart guides for a moved selection's anchors (drawn points and dragged anchors snap to intersections, #1658) | 4–7 | estimated (lowered from 85%: target moved); Control bar snapping quick access includes Snap to Glyph and Alignment Guides (#6164); new ruler-guide Alt orientation implemented; global/artboard ruler modes (`view.globalRulers`) and video rulers (View › Rulers › Show Video Rulers, #2849) done; status-bar X/Y uses the active ruler origin and General units; score unchanged | | Export for Screens, Asset Export, slices, Save for Web | 3 | 85% | anti-aliasing ghost borders (#983); TIFF choices and settings are implemented | 2–4 | estimated | | Print, colour management, separations, flattener | 3 | 80% | print preview fidelity | 2–4 | estimated | | Automation (Actions, Variables, scripting, batch) | 3 | 60% | a scripting surface (Illustrator: JavaScript/ExtendScript), Batch, image and graph variables, dataset import/export | 8–14 | estimated; MCP `add_text` exposes existing vertical type; score and hours unchanged | -| UI chrome (panels, Properties, workspaces, preferences) | 6 | 80% | Properties per context, 2 Preferences options stored but unused (#394, audited 2026-10-30: Scratch Disks, legacy vector clipboard), context menus in the panels that have none, accessibility | 13–20 | estimated; floating panels in OS windows of their own on the desktop (#4135), score and hours unchanged; macOS save Format menu implemented (#866), score and hours unchanged; Eyedropper cursor and precise setting checked (#1269), OS visual QA unverified; numeric-field focus and normal text drags regression-tested (#1326); a focus click released more than 1 pt from its press keeps the caret and a tap within 1 pt selects all (#6659); artboard navigation synchronizes the tool selection before destructive actions; status messages and readouts use stable responsive allocations sized for localized labels and ordinary coordinates (sample widths cached by language/unit/DPI; regression and contributor original-file evidence below; scores/hours unchanged); effect dialogs' colour fields show a swatch that opens the Color Picker (#5365), score and hours unchanged; icon-strip flyouts retain user sizes (#5713); floating tab groups collapse into the side icon rail and opened rail panels fold back into it (#5925, in part), scores and hours unchanged ; interim macOS cursor delivery (#2292), headless coverage only; native validation pending, score and hours unchanged; Swatches item context menus have focused regressions and rendered-layout evidence below; scores and estimates unchanged | +| UI chrome (panels, Properties, workspaces, preferences) | 6 | 80% | Properties per context, 2 Preferences options stored but unused (#394, audited 2026-10-30: Scratch Disks, legacy vector clipboard), context menus in the panels that have none, accessibility | 13–20 | estimated; floating panels in OS windows of their own on the desktop (#4135), score and hours unchanged; macOS save Format menu implemented (#866), score and hours unchanged; Eyedropper cursor and precise setting checked (#1269), OS visual QA unverified; the line under the Preferences fields describes each General, Selection & Anchor Display, Guides & Grid and Smart Guides setting on hover and keyboard focus (#8199, #8223, #8248), score and hours unchanged; numeric-field focus and normal text drags regression-tested (#1326); a focus click released more than 1 pt from its press keeps the caret and a tap within 1 pt selects all (#6659); artboard navigation synchronizes the tool selection before destructive actions; status messages and readouts use stable responsive allocations sized for localized labels and ordinary coordinates (sample widths cached by language/unit/DPI; regression and contributor original-file evidence below; scores/hours unchanged); effect dialogs' colour fields show a swatch that opens the Color Picker (#5365), score and hours unchanged; icon-strip flyouts retain user sizes (#5713); floating tab groups collapse into the side icon rail and opened rail panels fold back into it (#5925, in part), scores and hours unchanged ; interim macOS cursor delivery (#2292), headless coverage only; native validation pending, score and hours unchanged; Swatches item context menus have focused regressions and rendered-layout evidence below; scores and estimates unchanged | | Libraries, Links, Package | 2 | 82% | shared libraries, linked graphics, gradients and patterns as library items (no cloud by design) | 2–3 | estimated | | Generative AI (Text to Vector, Generative Recolor, Shape Fill, Concept to Vector, Prompt to Edit, Rewrite Text) | 2 | 0% | a pluggable provider and the panels; needs an owner decision on models | 30–60 | measured (absent) | | **Feature depth** | **105** | **~75%** | | **~250–420** | | @@ -534,7 +538,7 @@ about 1–1.5 agent-hours each, so the other rows (estimated on the older scale) | Layers, artboards, document setup | 5 | 82% | Layers panel: a confirmation before deleting layers that hold art, row menu commands beyond Collect for Export (now on every layer, sublayer, group and object row), menus on guide and blend spine rows, the Layer Options dialog for several rows with mixed values, Paste Remembers Layers for sublayers; artboard preset polish (artboard escape routing and document setup modal handoff done; Move Artwork for artboard X/Y edits, Rearrange All Artboards, Document Setup, New Document and the rest of the Layers panel are done) | 4–7 | | View & navigation | 3 | 70% | New View/Edit Views, multiple windows/arrange, Snap to Pixel/Glyph (print tiling is done) | 9–14 | | Guides, grids, smart guides, snapping, rulers | 3 | 85% | global/video rulers, Spacing Guides' distance readouts and spacing for resized or drawn art, Alt swapping a ruler guide's orientation, ruler guides selected together with art (marquee, Shift-click), ruler guides as Layers rows with their own lock and hide (#451: Lock Guides locks them all; Make Guides paths are Layers rows already) (dragging existing guides is done, #414; new guides snapping to side midpoints and artboards, and artboard guides, #451; the drawing tools snapping, with Construction Guides, #506; Spacing Guides for moves, #394; moves snapping to the grid, #740; ruler guides pulling drawn points with Smart Guides on, and "center" and "anchor" labels while hovering with the Selection tool, #812; distance and angle labels while drawing, #2983) | 2–4; status-bar X/Y uses the active ruler origin and General units | -| File formats | 6 | 85% | PDF import: stroked type keeps the file's line cap, line join and miter limit (#7741; scores and estimates unchanged); PDF import: glyphs inside a marked-content span with an empty `ActualText` come in as outlines in their fill and stroke, adding no text (#6971; scores and estimates unchanged); Explicit editing-data oversized single-artboard import fixed (#6865); scores and estimates unchanged. Legacy `.ai` files that name but omit their prolog open with their layers, or with their art on one layer when the format has no layers; graph data and settings in these files still come in only as drawn art. Affinity export, and the rest of Affinity import (adjustments, blur and bevel effects, brushes, live symbol instances, text threading), DWG (no open spec: DXF instead), PSD placement as layers (Photoshop Import Options; the merged image is done), EPS checked against more real files users send (Inkscape files open as vectors; other generators' constructs are tested with programs written from the PostScript Language Reference only; CID-keyed CJK type and `CCITTFaxDecode` images not read), the rest of Illustrator's editing data (appearances and live effects, symbols, pattern fills, brushes, placed files: #637), the remaining fidelity polish; EPS, DXF, EMF/WMF, TIFF, BMP, Targa, PSD export, SVGZ, PDF security, PDF/X, PDF layers, presets and Affinity import are done | 6–10 (existing scope; Affinity export unestimated) | +| File formats | 6 | 85% | PDF import: a glyph filled only after a glyph filled and stroked comes in filled only, not stroked (#8300; scores and estimates unchanged); PDF import: type filled and stroked by one text-showing operator comes in as one filled and stroked type object (#8015; not yet for type filled and stroked at less than full opacity, or a `TJ` whose kerning starts a new line part way through, which still come in as a filled object and a stroked one; scores and estimates unchanged); PDF import: stroked type keeps the file's line cap, line join and miter limit (#7741; scores and estimates unchanged); PDF import: glyphs inside a marked-content span with an empty `ActualText` come in as outlines in their fill and stroke, adding no text (#6971; scores and estimates unchanged); Explicit editing-data oversized single-artboard import fixed (#6865); scores and estimates unchanged. Legacy `.ai` files that name but omit their prolog open with their layers, or with their art on one layer when the format has no layers; graph data and settings in these files still come in only as drawn art. Affinity export, and the rest of Affinity import (adjustments, blur and bevel effects, brushes, live symbol instances, text threading), DWG (no open spec: DXF instead), PSD placement as layers (Photoshop Import Options; the merged image is done), EPS checked against more real files users send (Inkscape files open as vectors; other generators' constructs are tested with programs written from the PostScript Language Reference only; CID-keyed CJK type and `CCITTFaxDecode` images not read), the rest of Illustrator's editing data (appearances and live effects, symbols, pattern fills, brushes, placed files: #637), the remaining fidelity polish; EPS, DXF, EMF/WMF, TIFF, BMP, Targa, PSD export, SVGZ, PDF security, PDF/X, PDF layers, presets and Affinity import are done | 6–10 (existing scope; Affinity export unestimated) | | Export for Screens, Asset Export, slices, Save for Web | 3 | 85% | polish only (all four are done) | 2–4 | | Print, colour management, separations, flattener | 3 | 80% | print preview fidelity (flattener presets in PDF and print, overprint in PDF and composite print, Print dialog, presets, PostScript, marks, separations, Print Tiling, print overprint/flattener/bitmap options and printer profile are done, as are the Japanese papers in its Media list: JIS B4/B5/B6, はがき, 往復はがき, 封筒 長形3号/長形4号/角形2号/角形3号 and 四六判, beside the ISO B4/B5 that settings saved before them keep) | 1–2 | | Automation | 3 | 65% | scripting surface, batch (MCP drops malformed app replies without replay; Variables: text/visibility variables bound to objects, an object may carry several, dataset rows applied in one undo step, panel and Window › Variables with dialogs; image/graph kinds and dataset import/export open) | 6–10 | @@ -584,12 +588,16 @@ since 2026-10-01. ## Evidence: what ships today, by area +- `object.setBounds` uses the same reference point for whole-number integer and floating-point values, including `0` and `0.0`. It rejects negative and fractional indices without changing geometry, selection, or undo history. An omitted or null reference uses the center, and whole-number references above 8 use point 8. Object and direct-anchor selections follow these rules (`tests::bboxrotate::set_bounds_whole_number_references_match_integer_references`, `set_bounds_rejects_invalid_references_without_changes`). + - **Recolor picker follow-up (#8031/#4028):** native Lab numeric entry, document/loaded-library swatches in the Color Picker, and Assign-row Pick from Swatches / Limit to Library menus. #4090 provided the double-click picker and #5113 the Assign sliders. Regression tests `native_lab_entry_in_color_picker` and `row_context_menu_pick_from_swatches_and_limit_to_library` exercise the fields and menu callbacks rather than writing their result state. Area score and hours unchanged. - **Save refusal (#6146):** ordinary File > Save to its own location offers Save As after a terminal permission/read-only refusal, suggesting the original name and format, preserving options for the unchanged format and opening the chosen format’s Save options on a change. Cancel keeps the failed-save state. Busy pickers, recovery-copy errors, other failures, explicit destinations and Close/Quit keep the existing dialog. Engine, UI and MCP regression cases are in `cmd/fileio/tests_readonly.rs`, `io/tests_read_only_save.rs` and MCP `tests/fileio.rs`; focused UI regressions passed; engine regression execution and native panel acceptance pending. Scores and hours unchanged. - **PDF authored replacement text (#6165):** `crates/pdf/src/tests/actual_text.rs` covers replacement once with suffix placement, PDF text-string decoding, empty and nested owners, sibling spans, page reset, multiple text-show operations, style/line changes, fill-and-stroke, reader windows and bounded input. Authored logical-order stretches are protected while adjacent ordinary text still undergoes reconstruction. The replacement takes its first placed glyph's style and line; its characters are not redistributed over later lines/styles. Exact mixed-direction paragraph layout is not claimed. No export changes; scores and hours stay at 75% / 10–20 h. - **PDF stroked type (#7741):** `imported_stroked_type_keeps_the_files_cap_join_and_miter_limit` in `crates/pdf/src/tests/textstroke.rs` covers round, projecting and butt caps, round, bevel and miter joins and a miter limit of 3 on type stroked in rendering modes 1, 2, 5 and 6, shown as a word, a glyph at a time and under `ActualText`; glyphs stroked with another join as runs of their own; and a glyph filled and stroked after one stroked otherwise, which keeps the join of the glyph before it. Synthetic PDFs written in the test (standard Helvetica, not embedded); no fonts or fixtures added. The dash array is not yet carried to the characters. + +- **PDF type filled then stroked (#8015):** `a_word_filled_then_stroked_imports_as_one_filled_and_stroked_type` in `crates/pdf/src/tests/textstroke.rs` covers a word shown at once, a `TJ` array of two strings with kerning between them, a line over two `Tj` and a glyph at a time, also under `ActualText`, in text rendering modes 0, 1, 2, 4, 5 and 6: modes 2 and 6 come in as one type object `WAVE` filled #ffffcc with a 3 pt black stroke, round cap and join, modes 1 and 5 stroke only, 0 and 4 fill only; a Type 3 font is filled once in every mode (the reader paints Type 3 glyphs as their procedures draw them); a stroke join that changes between two operators keeps a run each; and filled type with stroked type of its own below it stays two objects. `a_vertical_column_filled_then_stroked_is_one_filled_and_stroked_type` in `crates/pdf/src/tests/text_placement.rs` covers a vertical column in modes 2 and 6. `a_stroke_at_another_size_does_not_go_over_the_filled_glyph` and `a_stroke_over_one_glyph_of_a_filled_word_strokes_only_that_glyph` (also in `textstroke.rs`) cover a word filled and then its first glyph stroked from the same origin: at another size it stays type of its own, and at the same size only that glyph is stroked. `translucent_fill_and_stroke_text_stays_two_objects` (in `textstroke.rs`) covers type filled and stroked at the same opacity: at 0.5 it stays a filled object and a stroked one, as the file composites them apiece, and opaque it is one. `a_vertical_line_with_one_glyph_filled_and_stroked_keeps_every_glyph_filled` in `crates/pdf/src/tests/reshaped.rs` covers a vertical line of Devanagari with one glyph filled and stroked: every glyph comes in filled. `a_glyph_filled_only_after_one_filled_and_stroked_is_not_stroked` (#8300, in `textstroke.rs`) covers a glyph filled only right after one filled and stroked, also after a glyph filled only and before another filled and stroked: it joins the same type object filled only, not stroked; `glyphs_filled_and_stroked_one_by_one_stay_one_run` covers fill and stroke rendering glyph by glyph and a word filled whole then stroked whole at the same place: one run, filled and stroked. Not covered: translucent type filled and stroked, and a `TJ` whose kerning starts a new line part way through, still come in as two objects. Synthetic PDFs written in the tests; no fonts or fixtures added. - **PDF Indic type (#5235, #6906):** `crates/pdf/src/tests/reshaped.rs` covers a vowel sign the file draws before its consonant (the line keeps the file's glyphs as outlines, with a note), text in reading order (stays type), a mark with no advance (stays on its line, not vertical type of its own), outlined glyphs stroked with different dashes and translucent outlined glyphs (each keeps its own path). Synthetic font only; one real Gujarati file checked by eye on page 1. Indic type in an uninstalled font keeps the file's glyphs as outlines; reordering signs so more lines stay editable is not done. Scores and hours stay at 75% / 10-20 h. @@ -678,13 +686,16 @@ since 2026-10-01. - **Placed gradients follow Transform and Free Distort effects:** a gradient placed with the Gradient tool moves, turns and scales with the object when the object's Transform effect moves its outline, and each copy of the Transform effect takes it as many times as it takes the transform. Under Free Distort it moves and scales from the path's bounds before the effect to its bounds after it. This holds on the canvas, in export, in Expand Appearance, in Pathfinder and compound shapes, and in Object › Expand of the fill, for an object's own effects, a group's (the own fills of the group, of the groups inside it, of a symbol's art, and of the images and symbol instances it moves, included) and a fill's or stroke's own. A gradient on a path inside a group with a Transform effect now moves with the path (#2214 moved only the gradients of type), and so does a gradient on an image's or symbol instance's own fill. When a path keeps its shape because the effect would pass the geometry budget, the group's own gradients stay in place; a hidden path in a layer, which the layer's bounds leave out, does not hold them. A freeform gradient whose points were edited moves its points in the same way. How gradients follow each effect is VectorCraft's own rule; what each effect does to the object is described in [Distort and transform effects](https://helpx.adobe.com/illustrator/desktop/manage-objects/reshape-transform-objects/distort-and-transform-effects-in-illustrator.html) (effects `bake::tests::a_baked_transform_moves_a_placed_gradient_with_the_path`, `bake::tests::a_strokes_own_transform_and_free_distort_move_its_placed_gradient`, `bake::tests::a_fills_gradient_follows_the_effects_around_its_transform_with_options`, `bake::tests::baked_free_distort_moves_placed_gradients_from_the_bounds_to_the_distorted_bounds`, `group::tests::a_groups_transform_and_free_distort_move_the_gradients_placed_on_its_paths`, `group::tests::a_groups_transform_moves_the_gradient_of_its_own_fill`, `group::tests::a_nested_groups_own_gradient_follows_the_outer_groups_transform_and_free_distort`, `group::tests::a_groups_transform_moves_the_gradients_placed_on_an_images_own_fills`, `group::tests::shape_art_moves_gradients_with_a_transform_effect`, `group::tests::shape_art_moves_the_gradient_of_a_symbol_instances_art_with_its_transform`, `tests::art_past_the_budget_keeps_its_own_gradients_in_place`, `tests::a_hidden_path_past_the_budget_leaves_a_layers_gradients_free_to_move`, `tests::edited_freeform_points_follow_a_transform_effect_and_free_distort`; render `objectfx::a_paths_gradient_moves_with_its_transform_and_free_distort`; engine `objexpand::a_placed_gradient_moved_by_a_transform_or_free_distort_expands_as_the_canvas_draws_it`). Scores and hours unchanged. - **Constrain Angle (#394):** General › Constrain Angle turns the arrow keys' axes (guides stay on the page's), holds Shift drags of the Selection, Direct Selection, Free Transform, Slice Selection, Reshape and Measure tools and the Pen's handles to the turned axes, and new rectangles, rounded rectangles, ellipses, grids, point and area type, Shift-drawn polygons and stars and the shape size dialogs are drawn along it with their bounding box turned; 0° and whole turns are exactly as before, quarter turns exact (<https://helpx.adobe.com/illustrator/desktop/manage-objects/arrange-objects/rotate-objects-by-specific-angles.html>). Tests: `tests_constrain_tools`, `tests_constrain_new` (engine), `geom` `constrain_axes` / `rotate_deg`, the shape, grid and type tool tests. - **Arcs along General › Constrain Angle:** with a Constrain Angle other than 0° or a whole turn, an arc dragged out with the Arc tool and an arc placed from the Arc Segment Tool Options click dialog are drawn along the turned x and y axes, with their bounding box turned. The drag's box and Shift's equal lengths are measured along those axes, the reference point stays at the drag's corner or at the click, and F, C and ↑/↓ keep the turn. `shape.arc` takes an optional `rotation` (degrees clockwise, about `x1`, `y1` or about the reference point `x`, `y`); a `rotation` that is not a number is an error. At 0° and whole turns arcs are drawn as before, and quarter turns are exact. The help page (<https://help.adobe.com/archive/en_US/illustrator/cs5/illustrator_cs5_help.pdf#page=226>) describes new objects being drawn along the turned axes; how the Arc tool's keys and reference point work with them is VectorCraft's own rule (tools `draw2::family::tests::arcs_follow_the_constrain_angle`; engine `constrain_angle_draws_a_dragged_arc_along_the_turned_axes`, `constrain_angle_turns_a_click_made_arc_about_its_reference_point`, `arc_rotation_turns_it_and_must_be_a_number`). Scores and hours unchanged. +- **Spirals turn as they are dragged, and along General › Constrain Angle:** a spiral dragged out with the Spiral tool turns about its center so that its outer end is at the pointer, so dragging around the center turns it, while Alt, Ctrl/Cmd, ↑/↓, Space and Escape work as before. A spiral placed from the Spiral dialog starts along the x axis turned by a Constrain Angle other than 0° or a whole turn, with its bounding box turned. `shape.spiral` takes an optional `rotation` (degrees clockwise about `cx`, `cy`); a `rotation` that is not a number is an error, and without one spirals are drawn as before. The help page (<https://help.adobe.com/archive/en_US/illustrator/cs5/illustrator_cs5_help.pdf#page=65>) says that moving the pointer around in a curve during the drag turns the new spiral, and the help page (<https://help.adobe.com/archive/en_US/illustrator/cs5/illustrator_cs5_help.pdf#page=226>) describes new objects being drawn along the turned axes. Putting the outer end exactly at the pointer, keeping the last direction while the pointer is within 0.01 pt of the center, and leaving a dragged spiral's direction to the pointer with Shift or a Constrain Angle are VectorCraft's own rules (tools `draw2::family::tests::spiral_drag_turns_the_spiral_to_the_pointer`; engine `a_dragged_spiral_turns_its_outer_end_to_the_pointer`, `constrain_angle_turns_a_click_made_spiral`, `spiral_rotation_turns_it_and_must_be_a_number`; UI `spiral_click_dialog_starts_along_the_constrain_angle`). Scores and hours unchanged. - **Shape commands refuse invalid options:** `shape.arc` refuses a `reference` that is not a whole number from 0 to 8, a `baseAlong` other than `x` or `y` (either case), null included for both, and a `slope` outside −100…100, in both of its forms; before, such a value drew the arc with reference point 0 or 8, the X axis or the nearest slope. `shape.rectangularGrid` and `shape.polarGrid` refuse a divider count that is not a whole number of at least 0; before, such a count was 5. Each error names the key, and nothing is drawn. Left-out values keep their defaults. These ranges are VectorCraft's own command rules (engine `draw2::shape_arc_rejects_an_invalid_reference_base_along_or_slope`, `draw2::shape_arc_takes_every_reference_point_and_either_base_axis`, `draw2::grid_divider_counts_reject_fractions_and_negatives`). Scores and hours unchanged. - **Roughen at Size 0 keeps the outline:** with Size 0 (relative or absolute), Effect › Distort & Transform › Roughen… moves no point: each segment is split at the Detail spacing (fewer points past the anchor limit) into pieces of equal length on the segment itself, so the path keeps its outline, with Smooth or Corner points alike. A straight segment gets corner points without handles, and a curve gets smooth points whose handles follow it. Before, the points were joined by straight lines (Corner) or a smoothed curve through them (Smooth), which changed curved outlines. Existing documents with a Roughen of Size 0 on a curved path, or with Smooth points, draw differently. This is VectorCraft's own rule; what Roughen does is described in [Distort and transform effects](https://helpx.adobe.com/illustrator/desktop/manage-objects/reshape-transform-objects/distort-and-transform-effects-in-illustrator.html) (effects `tests::roughen_at_size_0_keeps_the_outline_and_spaces_its_points_evenly`). Scores and hours unchanged. - **Clipping paths on their outline (G1):** the selection tools (Selection, Direct Selection, Group Selection), Object Highlighting and a right-click take a clipping path on its outline before the art it clips; Select Behind lists the same; the eyedropper, the tools that act on what is drawn and the selection tools' double-clicks, loaded text and guide release take the art. Doc and tool regression tests; score unchanged. +- **Link cursor for loaded text:** with text loaded from a port, the Selection tool's pointer adds a link badge over a closed path, area type or type on a path that a click threads the text into, and keeps the loaded text elsewhere; a click on a frame already in a thread or a path inside a compound path makes a new frame instead of a `text.thread.add` error (`select::tests::loaded_text_shows_the_link_cursor_where_a_click_threads_it_into_the_object`, `cursors::tests::loaded_text_link_cursor_is_the_loaded_text_with_a_link_badge`); score unchanged. - **Copy and Cut of anchors picked with a lent Direct Selection (#6123):** with the Pen or the Curvature tool, Cmd/Ctrl held lends Direct Selection for the gesture; the anchors and segments it picks are what Edit › Copy and Cut take once the key is let go, as with Direct Selection chosen, while the last anchor the Pen leaves selected as it draws still makes Copy take the whole path (#2122). A Cmd gesture that leaves the selection as it was (a Shift marquee over nothing) picks nothing. Regression test: `tests::draw2::pen_cmd_selected_anchors_are_what_copy_and_cut_take`. - **Cut of picked anchors (#6361):** Edit › Cut removes direct-selected anchors from their path and from a compound path's member, with the segments attached to them, as Clear does. Picked segments still lose only those segments. When a path also has a picked segment, Cut removes and copies only its picked segments and ignores its picked anchors, on every contour, as Clear does; an anchor left without a surviving segment is removed with them. Regression tests: `cut_*_anchors_*` and `cut_of_an_anchor_with_a_segment_on_another_contour_leaves_the_source_as_clear_does` in `crates/engine/tests/it/copy_direct_selection.rs`. - **Escape in Selection tool drags:** Escape during a Selection tool move or Alt-drag copy, a bounding-box scale or rotation, a marquee, or a corner widget, pie widget or bracket drag cancels it: the art returns to its state at the press, no copy is left, no undo step is added, the release does nothing, and the tool stays chosen. This is VectorCraft's own behavior. Regression tests: `escape_cancels_*` in `select/tests.rs` and `pie.rs`, and `escape_cancels_a_selection_tool_move_copy_scale_or_rotation` in `tests/selectescape.rs`. +- **Large Shift-marquee selections and Select › Inverse:** `select.toggle` and `select.add` with many ids (a Shift-drag marquee sends them together) go through the selection once instead of once per id, and Select › Inverse looks each object up in a set of the selected ones. The resulting selection, its order and the reply are the same as before. With 50,000 objects the selection step of toggling every object off took 528 to 655 ms before and 2.5 to 4.6 ms after in 7 runs, wall clock on a machine that was running other builds (`cargo run --release -p vectorcraft-engine --example selection_bench`). Regression tests: `add_all_does_what_adding_each_does` and `toggle_all_does_what_toggling_each_does` in `crates/doc/src/selection/tests.rs`, and `toggle_and_add_handle_each_listed_id_in_order` in `crates/engine/tests/it/selection_commands.rs`. - **Selection passes through raster effects:** clicks with the Selection, Direct Selection and Group Selection tools (Group Selection's repeated click included), the Selection tool's pointer and marquee, Direct Selection's marquee, pointer and anchor highlight, and Group Selection's marquee (E for enclosed objects included) leave out the area that a drop shadow, a glow, a blur or another raster effect paints beyond an object. A click on a shadow selects the object under it, or nothing over an empty canvas, a repeated Group Selection click there adds the groups of the object under it, and a press on the shadow of a selected object does not move it ([the help page](https://helpx.adobe.com/illustrator/using/selecting-objects.html)). Over a shadow, Direct Selection highlights only the anchors of the object under it, and Group Selection keeps its own pointer and highlights no anchor, as it does everywhere (VectorCraft's own rule). No setting changes this. This covers paths, groups, type, symbol instances and images. Regression tests: `crates/engine/src/tests/select_effects.rs`. - **Symbol instances are selected where their art draws past their box:** a click or a marquee selects a symbol instance where a clipping path in its art, moved or reshaped by its live geometry effects, shows the art past the instance's box, as it selects a group of the same art; a click also selects it where a stroke in its art paints past the box ([the help page](https://helpx.adobe.com/illustrator/desktop/manage-objects/select-objects/select-objects.html)). The rest is VectorCraft's own rule: inside the box the instance is selected as before; in Outline view and below a layer whose Preview is off only the box counts; hidden art and the area a raster effect paints are left out. This covers instances in groups, nested in other symbols' art, moved and scaled. Regression tests: `a_symbol_instance_is_hit_where_a_moved_clipping_path_in_its_art_shows_the_art` and `a_symbol_instance_is_hit_on_the_stroke_of_its_art_past_its_box` in `crates/doc/src/hit/tests.rs`. - **Selection follows geometry effects:** a click or a marquee with the selection tools selects a path or compound path where its live geometry effects (Transform, Offset Path, Roughen, Zig Zag and the other effects that reshape a path, on the object or on its fills and strokes) draw it, the copies a Transform effect makes included, and not where its own geometry no longer paints. The members of a group or layer whose own geometry effects move or reshape them are selected where they are drawn, at the depth each tool selects, and a locked member there lets the click through to what is below and is listed there in the Unlock submenu. A group's own fills and strokes are clicked where they paint its members, and a clipping path inside such a group is taken on its drawn outline before the art it clips. A compound path keeps its holes, Object Selection by Path Only takes the drawn outline and not its fill, and stacking order is kept. The selection tools select objects by clicking or by a marquee ([the help page](https://helpx.adobe.com/illustrator/desktop/manage-objects/select-objects/select-objects.html)), and the effects leave the art they reshape editable ([the help page](https://helpx.adobe.com/illustrator/desktop/special-effects-styles/apply-filter-effects/apply-and-modify-effects.html)); where clicks land on the reshaped art is VectorCraft's own rule. In Outline view clicks and marquees use the plain paths, and in a layer with Preview off they take outlines only. The area a raster effect paints is still left out. Regression tests: `a_*_shifted_art_*`, `a_click_hits_a_paths_copy_and_evaluates_its_art_once_until_it_changes`, `a_groups_own_effect_moves_where_its_members_are_hit`, `a_layers_own_effect_moves_where_its_art_is_hit`, `a_preview_off_sublayer_of_an_effected_layer_is_clicked_in_outline`, `a_painted_group_around_an_effected_symbols_instance_is_hit_where_its_art_is_drawn`, `an_intertwine_group_in_a_layers_drawn_art_is_hit_in_its_woven_order`, `a_click_in_a_plain_group_evaluates_only_its_member_with_effects`, `a_clip_groups_own_effect_moves_where_its_mask_outline_is_hit`, `an_isolated_clip_group_with_its_own_effect_is_marqueed_by_its_members_own_geometry` and `a_clip_groups_art_is_hit_when_its_drawn_art_holds_only_the_clipping_path` in `crates/doc/src/hit/tests.rs`, and `a_click_and_a_marquee_select_art_where_its_transform_effect_draws_it`, `a_click_selects_a_group_where_its_own_fill_paints_a_moved_member`, `a_marquee_takes_an_inner_groups_own_fill_inside_a_painted_group` and `a_marquee_takes_a_groups_own_fill_inside_a_painted_layer` in `crates/engine/src/tests/select_effects.rs`. @@ -792,6 +803,10 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur - **Preferences › User Interface › Open Documents As Tabs (G7, #394):** checked by default, documents open under tabs in one document window ([public source](https://helpx.adobe.com/illustrator/desktop/get-started/learn-the-basics/workspace-overview.html)). With the box cleared, each document opened or created afterwards opens in a floating window of its own, at the next cascade place, as Float in Window floats it; documents already open stay where they are, and checking the box again leaves floating documents in their windows. Tests: `crates/ui-egui/src/doc_windows/tests.rs`. - **Preferences search:** a Search Preferences field above the category list has the keyboard focus when the dialog opens, and Cmd/Ctrl+F gives it back; typing lists the settings it finds, and choosing one shows its category, as the [help page](https://helpx.adobe.com/illustrator/desktop/get-started/preferences-and-settings/set-app-preferences.html) describes. VectorCraft's own rules: the field matches a setting's label, section or category, ignoring case, in the interface language or in English; the list replaces the categories while the field has text and shows every match, or "No settings found"; the chosen setting's row is highlighted and scrolled into view; Escape in the field with text clears it, and Escape in the empty field closes the dialog. The dialog's `__search` field (`ui.dialog.set`) holds the text. Tests: `crates/ui-egui/src/prefs_dialog/tests.rs`. - **Reset Preferences asks first (#6435):** the Preferences dialog's Reset Preferences button opens a question over the dialog (`resetPreferences`). Cancel or Escape goes back to Preferences unchanged, with its category, search and edits kept; OK goes back with every preference at its default value, which OK in Preferences applies and Cancel there discards. The question and its wording are VectorCraft's own. Tests: `crates/ui-egui/src/prefs_dialog/tests.rs`. +- **Preferences › General describes its settings:** the line under the Preferences fields shows a sentence for each of the 32 General settings, Enable Contextual Task Bar included, when the pointer is over the setting's row or its control has the keyboard focus, and a screen reader gets the same sentence. The sentences are VectorCraft's own and state what the app does with each setting. Sentences: `crates/ui-egui/src/prefs_dialog/descriptions.rs`. Tests: `crates/ui-egui/src/prefs_dialog/tests.rs`. +- **Preferences › Selection & Anchor Display describes its settings:** the line under the Preferences fields shows a sentence for each of the 14 Selection & Anchor Display settings, from Tolerance to the Curvature Tool rubber band, on hover and on keyboard focus, and a screen reader gets the same sentence. The Snap to Point sentence states that the Smart Guides Snapping Tolerance applies while Smart Guides is on. Sentences: `crates/ui-egui/src/prefs_dialog/descriptions.rs`. Tests: `crates/ui-egui/src/prefs_dialog/tests.rs`. +- **Preferences › Guides & Grid describes its settings:** the line under the Preferences fields shows a sentence for each of the 12 Guides & Grid settings, from Snap to Grid to Pattern Editing's Tile Edge Color, on hover and on keyboard focus, and a screen reader gets the same sentence. The Show Pixel Grid sentence states that the pixel grid shows from 600% zoom. Sentences: `crates/ui-egui/src/prefs_dialog/descriptions.rs`. Tests: `crates/ui-egui/src/prefs_dialog/tests.rs`. +- **Preferences › Smart Guides describes its settings:** the line under the Preferences fields shows a sentence for the Smart Guides box and for each of the 14 Smart Guides settings, from Color to Snap to Perpendicular, on hover and on keyboard focus, and a screen reader gets the same sentence. The sentences state VectorCraft's own behavior: Pixel Preview turns Smart Guides off and Snap to Grid snaps instead; with Alignment Guides off, art still lines up without the line; Object Highlighting outlines only an unselected object while a selection tool is not dragging; Snapping Tolerance is a distance on screen at every zoom; Snap to Last Location does not return a copy. Units, General, Selection & Anchor Display, Guides & Grid and Smart Guides have sentences, and the other categories leave the line empty. Sentences: `crates/ui-egui/src/prefs_dialog/descriptions.rs`. Tests: `crates/ui-egui/src/prefs_dialog/tests.rs`. - **Window › New Window (G7, #4116):** New Window (`window.newWindow`) opens another view of the current document ([public source](https://helpx.adobe.com/illustrator/using/viewing-artwork.html) describes showing one document in several windows at once), with its own zoom, center, rotation, artboard and Outline or Preview, as a tab of its own; an edit in one view shows in every view. Tile, Cascade, Float in Window, Float All in Windows and Consolidate All Windows arrange each view as they arrange a document, and Next and Previous Document step through the views. Closing a view leaves the document open; closing its last view closes the document, asking to save it first. The view's number after the name in its tab ("Name:2", while the document has more than one view) is VectorCraft's own. Tests: `crates/ui-egui/src/doc_windows/tests.rs`. - **Document Setup modal handoff:** Document Setup → Edit Artboards applies valid settings, closes the dialog and activates the Artboard tool. Pointer-click tests cover successful handoff, invalid settings, OK, Cancel and Undo in `dialogs/document_setup.rs`. @@ -876,6 +891,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur - Export for Screens with Include Bleed: a PDF row's page keeps the artboard as its TrimBox and puts the bleed around it once as the BleedBox (a 100 pt artboard with a 9 pt document bleed gives a 100 pt TrimBox in a 118 pt BleedBox, in one file per artboard, a single file and the Full Document), so printer's marks line up with the artboard's edge. The bleed is the row's own (zero included, which a PDF/X row warns about), else the document's when the row sets none and its PDF preset gives none or a bleed of 0; raster, SVG and EPS rows still write the grown artboard. Tests: `fileio::tests_screens::include_bleed_pdf_pages_trim_at_the_artboard` and `include_bleed_pdfx_rows_do_not_warn_about_the_bleed`. - Export for Screens refuses `pdfs: "single"` with `assets`, `layers` or `selection: "each"`, whose files each hold one item's art, instead of writing the first item alone as one PDF named after the document; `pdfs: "multiple"` writes a PDF of each item, and the selection as one file writes one PDF either way. The rule is VectorCraft's own. Tests: `fileio::tests_screens::single_file_pdfs_are_refused_for_assets_layers_and_each_object`. - Save for Web: Preview in Browser writes each preview's page and images to a folder of its own inside `VectorCraft Save for Web` in the system's temporary folder. A later preview, from the same app or another one running, does not overwrite an earlier one. Each preview first removes the preview folders there that are an hour old or older and, on Linux, macOS and FreeBSD, belong to the current user; it leaves other files and folders alone. The folders a preview makes there are open to their owner only on those systems. When `VectorCraft Save for Web` is a link or is not a folder, or on those systems belongs to another user or can be written by other users, the preview goes to a new folder of its own in the temporary folder, which a later preview removes once it is an hour old (`file.saveForWeb.browser`). + - Save for Web: Optimize to File Size… opens rows for a desired file size in K, Start With (Current Settings, Auto Select GIF/JPEG) and, with slices, Use (Total of All Slices, Each Slice, Current Slice); OK takes the settings whose files fit and shows the size found, or says that no setting tried fits ([the help page](https://help.adobe.com/archive/en_US/illustrator/cs4/illustrator_cs4_help.pdf#page=395)). The search lowers JPEG quality or palette colors (GIF then lossy) and encodes at most 32 trial settings; Auto Select chooses GIF for transparent art or art of at most 256 colors and JPEG otherwise. The slices share one setting, so every Use choice changes all of them (`webExport.optimizeToFileSize`). Scores and estimates are unchanged. - Save for Web: while Alt (Option on macOS) is held, the dialog's Cancel button reads Reset, which puts the remembered settings back on the document's active artboard and leaves the dialog open (`ui.dialogReset`). - Export for Screens, Save for Web (slice images, and files named after the document's title) and the Libraries panel name files with the characters Windows does not allow written as `-` and with a `-` after a Windows device name such as `CON`, on every platform (`document.exportForScreens`, `document.exportForWeb`, `library.create`). - Variables (data merge): text, visibility and image variables bound to objects (an object may carry several), dataset rows applied in one undo step (`variable.*`, `dataset.*`) from a Variables panel and Window › Variables, with dialogs to define, bind and edit, Make Text/Visibility/Image Dynamic, Capture/Update Data Set, CSV import/export (`dataset.import` / `dataset.export`), and a row in italics when an edit leaves the art not matching it; an image dataset value is a file path and apply keeps the object's bounds; bindings let go of deleted art and locked art is left alone except by visibility values; every command, like the rest, is drivable over MCP and the CLI. @@ -971,6 +987,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur - Screen readers get the value of the color and channel sliders that panels and dialogs draw (the Color panel, the Color Picker, Swatch Options, the Navigator's Zoom, the Character panel's variable font axes, the Perspective Grid and flattener options, and the sliders of the effect, tool option and transform dialogs): the number and text of the field beside each one, such as 128 for G or 50% for an opacity, with the slider's range, which extends to include a number past the slider's end. The harmony wheel's Brightness slider, which has no field, reports its brightness in percent. - A layer whose Layer Options › Print is off shows its name italic in the Layers panel, and while its row is dragged, as the reference application shows non-printing layers (#5739); a printing layer stays upright and ticking Print again restores the upright name (`panels::layers` test `a_layer_that_does_not_print_has_its_name_italic`). - In the Layers panel only the primary mouse button drags. A drag with the right or middle button on a row, a guide row, the selection square, the eye or lock column or a target circle moves, copies, hides, locks and transfers nothing and records no undo step, and a right-click still opens the row's menu (`panels::layers` test `only_the_primary_button_drags_rows_guides_art_columns_and_appearances`). + - Rows or the selection square dragged over the Layers panel's list show the copy cursor while Alt is held, as the drop then copies, and the grabbing hand otherwise; the cursor follows Alt pressed or released mid-drag. The copy cursor is the panels' add cursor (#8241): on Windows and X11, which have no system copy cursor winit can show, the white arrow with a plus. Over the trash and New Layer, which delete or duplicate with or without Alt, the hand stays, and guide rows keep their own cursor (#8217; `panels::layers` tests `alt_shows_the_copy_cursor_while_rows_are_dragged` and `drag_cursor_shows_a_copy_only_where_the_drop_copies`). - Rows dragged in the Layers panel and held within 28 points of the list's top or bottom edge scroll a long list that way, faster nearer the edge (60 points a second at the band's inner side, 340 at the edge, at every frame rate), and keep scrolling while the pointer stays still, so a row out of view can take the drop (a move, or a copy with Alt); the Libraries panel's list scrolls by the same rule. In a list view shorter than 56 points each band is half the view, so a pointer in the top half scrolls up, one in the bottom half scrolls down, and a pointer just outside the view does not scroll it toward the far edge. A pointer beside the list, a drag of the eye or lock column and a release stop the scrolling, and scrolling changes nothing in the document. The band and speeds are VectorCraft's own (`panels::layers` tests `rows_held_near_the_bottom_or_top_edge_scroll_the_list_to_a_row_out_of_view`, `a_held_row_scrolls_the_list_as_far_in_the_same_time_at_any_frame_rate` and `the_list_scrolls_only_for_rows_held_over_it`; `panels` test `drag_scrolling_in_a_short_list_goes_toward_the_nearer_edge`). - The other panels' item drags start only with the primary mouse button too: swatches and color groups, brushes, symbols, graphic styles, library items and groups, character and paragraph styles, Appearance rows and its thumbnail, the Fill and Stroke squares, Recent Colors and the Gradient panel's thumbnail. A right or middle drag on one carries nothing, moves, copies, deletes and applies nothing and records no undo step; right-click menus and the Graphic Styles panel's held right-button preview stay as they were (`panels::swatches` test `only_a_primary_drag_moves_swatches_and_groups`, `panels::text_styles` test `only_a_primary_drag_carries_a_style_row`, `panels::tests_symbol_libraries` test `only_a_primary_drag_carries_a_library_symbol_out`, `panels::tests_effectedit` test `only_a_primary_drag_carries_the_thumbnail_or_a_row`). - Panels undock (#495): a dock tab, a panel icon or a popped-out panel's title dragged out of the dock floats that panel (in an OS window of its own on the desktop, #4135), and the strip right of the dock's tabs floats the whole tabbed group. A floating group moves by its title bar, a tab dragged out of it floats on its own, and dropped on another group's title bar or tabs it stacks with that group; dropped on a dock group's tabs, which light up under the pointer, its panels join that group, and on the group's upper or lower half they make a new group above or below it (`window.panel.dock {anchor, zone}`); dropped on the icon column they become icons there, the tabbed group's panels too (`window.panel.dock {icon: true}`); dropped anywhere else on the dock, which lights up, they go back where they live (the tabbed group or the icon column), as its × and the panel menus' Float Panel / Dock Panel do (`window.panel.float`, `window.panel.dock`). The Tools panel floats by its title bar and docks again on the window's left edge. Floating groups stack into sets: dropped on the upper or lower half of another group (a line shows where), a group joins it right above or below it, and the set's groups stack top to bottom, each showing one panel, moving together by the top group's title bar, whose × docks them all; a group dragged by its tab strip leaves the set (`window.panel.float {below, above}`). A double-click on a tab collapses a floating group to its tabs (`collapsed`), and a dock group too, a group below it moving up into the room; a second double-click, or a click on another of its tabs, expands it (`window.panel.collapse`, kept with the preferences and in saved workspaces). Sets dropped on the left edge of the icon column or of another dock column dock as dock columns (a multi-column dock, `window.panel.dock {column}`), whose groups stack, tab and tear out as a floating set's do, and whose top strip floats the column again. Floating panels, their sets and the Tools panel's position are kept with the preferences and in user workspaces, and clamped into a smaller window. Not done: panels in separate OS windows, reordering tabs by dragging, collapsing a set or dock column to icons, dock columns right of the default dock, resizing floating panels and the groups of a set. @@ -1054,6 +1071,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur - The errors of the parameter checks that many commands share show in the status bar in the interface language: a value that is not a number where a number goes (`object.move` with `"dx": "60 mm"`, and `object.rotate`, `object.setBounds` and the other commands that call `check_numbers`), a missing number or index, `ids` that are not a list of object ids, an object id that is not a non-negative integer or names no object, and a date that is not Unix seconds. Each has a row in every catalog that translates all status and error messages, and in Bulgarian, Danish, Indonesian and Dutch (`shared_param_check_errors_are_translated`). - File Info's (`file.info`) error for a value with control characters shows in the status bar in the interface language for every field: "description has control characters" for Description and Copyright Notice, which take line breaks and tabs, and "title has control characters or line breaks" for the other text fields and each keyword in a list. Each is its own message with a row in every catalog that translates all status and error messages, and the field's key stays as written (`file_info_control_character_refusals_translate_in_every_complete_catalog`, `control_characters_are_refused_with_the_field_rule`). - A parameter schema's errors show in the status bar with what the value must be in the interface language, for every type a schema has (a number with each kind of range and with a unit, an integer and its range, true or false, a string, a list of names, an object id, a list of object ids, a color, a point, an object and a list), in every catalog that translates all status and error messages; the path, the refused value, the bounds, the unit and the names stay as the English gives them. The error for a value that is not one of its names is also translated in Bulgarian, Bosnian, Danish, Indonesian and Dutch (`parameter_schema_expected_phrases_are_translated`, `bracketed_message_parts_translate_only_as_exact_messages`). + - The error for an unknown key inside an options object (`marks.ofset` in `document.exportPdf`, a format under `settings` in `document.exportForScreens`), a PDF or print setting outside its range (`marks.weight must be 0.05–2 pt (got 9)`), the raster effect resolution warning for a named object, the note that VectorCraft started again on another graphics processor and the status after a print job is sent show in the status bar in the interface language, in every catalog: each message is made with one value for the key path, the range with its unit or the object with its name, so a catalog row can match it, and the English stays as before (`messages_with_joined_values_translate_whole`). A message or catalog row with two placeholders in a row fails `message_templates_have_text_between_their_placeholders` or `bundled_catalogs_have_no_message_row_they_leave_out`, and the untranslated report counts a row the catalog cannot use as missing. - A script's error about answers in `answers` that it did not use, and Liquify's warning about the objects under the brush that it left as they were, show in the status bar in the interface language for one answer or object as well as for several, with the count's own form in each catalog that translates all status and error messages; the English the commands return stays as it was (`messages_with_one_or_several_items_translate_in_every_complete_catalog`, `unused_answers_are_counted_in_the_singular_and_the_plural`, `liquify_warns_about_one_or_several_skipped_objects`). - In that Liquify warning, the tool's name and each kind of object it left (graphs, type, symbols, images, meshes, envelopes, repeats, placed documents, blends) are shown in the interface language too, in the order the command lists them and joined as the language joins a list, in each catalog that translates all status and error messages (`liquify-tool`, `liquify-kind` and `liquify-list-*` rows); a kind that Liquify does not list leaves the tool and the list in English (`liquify_warning_translates_its_tool_and_kinds_in_every_complete_catalog`). - An effect a plug-in's output or an importer plug-in's objects carry that VectorCraft refuses (``[0] `id`: reason``) shows in the status bar with its reason in the interface language inside `plug-in output: …` and `can't open …`, in every catalog that translates all status and error messages; the index and the effect id stay as they are, and a JSON array in a message stays as it is (`nested_effect_refusals_translate_with_their_reason`, `bracketed_message_parts_translate_only_as_exact_messages`). @@ -1120,6 +1138,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur - While Alt (Option on macOS) is held, the Flare Tool Options' Cancel button reads Reset, which puts every option back to the Flare tool's default and leaves the dialog open (`ui.dialogReset`). - An Alt-click (Option-click on macOS) with the Flare tool draws a flare centered at the click at once, without opening the Flare Tool Options, as [the help page](https://help.adobe.com/archive/en_US/illustrator/cs3/illustrator_cs3_help.pdf) describes for a default flare. As VectorCraft's own rules, the flare takes the tool's current options (the defaults until they are changed), Alt counts when it is held as the button goes down, a drag with Alt still draws the flare in two stages, and on the active perspective plane the flare is the one the click dialog's OK draws there (`alt_click_draws_a_flare_with_the_options_at_once`, `alt_click_draws_on_the_active_perspective_plane`, `an_alt_click_with_the_flare_tool_draws_the_flare_the_click_dialog_draws`). - While a flare's center is dragged out, Ctrl (Command on macOS) keeps the center's size and the drag sizes the halo; while its rings' end point is placed, Up/Down Arrow add and remove rings and ~ places them anew (`shape.flare`'s `ringSeed`) ([Draw and edit flares](https://helpx.adobe.com/illustrator/desktop/draw-shapes-and-paths/draw-shapes/draw-and-edit-flares.html); `flare_arrows_change_the_rays_then_the_rings`, `flare_tilde_places_the_rings_anew`, `flare_ctrl_keeps_the_center_and_the_drag_sizes_the_halo`). + - Flare ring placement accepts small `ringSeed` values, including 0, without concentrating the first ring at the center; the same seed and parameters reproduce the same positions. This seed mapping is VectorCraft's own (`flare_small_ring_seeds_spread_the_first_ring_along_the_path`, `flare_ring_seed_moves_only_the_rings`). - A plain step of a number field (Up/Down or a wheel notch) goes to the next whole unit in its direction and a Ctrl/Cmd step goes to the next tenth, so 5.1 mm steps up to 6 mm and down to 5 mm (#2881). A Shift step adds or takes ten and keeps the fraction. - In the number, text and color fields of the panels and the Control bar, Shift+Enter (Shift+Return) applies the value and keeps the field active with its value selected; a text box of several lines takes it as a line break. In a dialog, Shift+Enter applies the value and confirms the dialog, as Enter does. - The Pattern Options panel's Name field and the name fields that a double-click opens in the Layers, Artboards and Asset Export panels take Shift+Enter (Shift+Return) the same way: it applies the name and keeps the field active with the name selected. @@ -1179,7 +1198,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur - **Shaper:** uneven squares and rectangles become live rectangles even when drawing begins mid-edge. Recognition uses uniformly spaced samples and closed-loop corners, fits rectangle edges/angles rather than requiring a nearly perfect bounding-box fill, and includes the pointer-release position. Rectangles/squares and ellipses snap to 45° steps, hexagons to 90°, and triangles point up or down; lines keep their free angle even with Shift. Shaper Groups retain the live originals, merge regions with the gesture-origin fill, punch fills independently from strokes, remove boundaries on exiting scribbles and trim protruding stroke pieces. Source moves/resizes re-evaluate the result in the same undo step; double-click enters construction editing, and with the Shaper or Selection tool a click on the arrow widget beside a Shaper Group's original shapes switches the group between Face Selection and Construction mode. Native save/reopen, face recoloring, Release and Expand are covered. Finer gesture heuristics remain. In Construction mode, a Selection-tool drag that drops an original shape wholly outside the bounds of the group's original shapes takes it out of the group in the move's undo step (Remove from Shaper Group, `shaper.releaseSource`): the shape becomes a path above the group and stays selected, and a group left with no shapes is removed. Engine tests drag a shape out of a two-shape group and back across the bounds, take the last shape out, undo, and save the result. With a Shaper Group or one of its faces selected, a Shaper click within 3 screen pixels of an original shape's outline enters Construction mode with that shape selected, even where the outline runs through a merged face (`shaper.select`'s `tolerance`; [help page](https://helpx.adobe.com/illustrator/desktop/draw-shapes-and-paths/draw-shapes/create-shapes-with-the-shaper-tool.html)). Test: `tests::shaper::shaper_click_on_an_original_outline_enters_construction_mode`. - - **Selection:** Selection, Direct/Group Selection, Magic Wand, Lasso. A Shift-drag marquee toggles what it reaches: objects with the Selection tool, anchors with Direct and Group Selection (#483); the Lasso adds with Shift and subtracts with Alt. Dragging a path segment with Direct Selection bends it when it's curved (its anchors stay) and moves its two anchors when it's straight, one undo step; the fill, Shift or Alt still pick the whole path (Alt-drag copies it). + - **Selection:** Selection, Direct/Group Selection, Magic Wand, Lasso. A Shift-drag marquee toggles what it reaches: objects with the Selection tool, anchors with Direct Selection (#483), and with Group Selection the objects it touches, whole (#8047); the Lasso adds with Shift and subtracts with Alt. Dragging a path segment with Direct Selection bends it when it's curved (its anchors stay) and moves its two anchors when it's straight, one undo step; the fill, Shift or Alt still pick the whole path (Alt-drag copies it). The search for the segment of a path nearest a point, which Direct Selection runs to pick the cursor over a segment, skips each segment whose anchors and handles lie in a box farther from the point than a segment already measured, starting with a segment at the anchor nearest the point. The segment found is the same as before. Over a segment of an open path of 200,000 anchors, the cursor takes 51 ms instead of 59 ms in a release build (`cargo run --release -p vectorcraft-engine --example anchor_bench`). A Direct Selection marquee over part of a segment, with neither of its anchors inside, selects that segment as a click on it does (Shift toggles it), as [Selecting objects](http://web.archive.org/web/20211230015528/https://helpx.adobe.com/illustrator/using/selecting-objects.html) describes (#4654). To find those segments, the marquee skips each segment whose anchors and handles all lie past one side of it and tests only the rest exactly, without building a path for each segment. It selects the same segments as before, and a marquee over a path of many anchors finishes sooner. @@ -1187,7 +1206,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur With the Selection or Group Selection tool, pressing E while dragging a marquee makes the marquee select only the objects that lie entirely inside it. Pressing E again switches the marquee back to its default selection. With members of a group selected whole (with Group Selection, for example), a Selection-tool press on one of them keeps the selection: the pointer shows Move, a drag moves only the selected members (Shift constrains it), a Shift-click takes the pressed member out of the selection, and Alt over it shows no Distance Guides. A press on a member that is not selected, or only partly selected, still selects the outermost group ([Select objects](https://helpx.adobe.com/illustrator/desktop/manage-objects/select-objects/select-objects.html)). Test: `select::tests::a_press_on_a_selected_member_of_a_group_moves_the_selected_members`. The Lasso picks anchor points only on art a click can pick, and the Add Anchor Point, Delete Anchor Point, Anchor Point and Scissors tools pick anchor points and segments only on the selected paths and on art a click can pick: not on a Shaper Group's original shapes outside Construction mode, and in isolation mode only inside the isolated group or object. Smart Guides and Snap to Point do not snap to a Shaper Group's original shapes, and the reference point of the transform tools snaps to one only when it is selected, or under the pointer in Construction mode. - Enclosing Lasso provides whole-object enclosure selection under Object › Plug-ins and its own heading in All Tools. It has no default shortcut or Basic toolbar slot. It follows path curves and keeps partially enclosed objects out, including objects crossing a concave part of the loop. Ordinary group members can be selected individually; compound paths remain whole. This is a VectorCraft addition; scores and estimates are unchanged. + Enclosing Lasso provides whole-object enclosure selection under Object › Plug-ins. Its tool is also in the Lasso tool's group in both shipped toolbars, after the Lasso, and All Tools lists it there, under Select; a toolbar edited before it joined keeps its saved layout until Reset Toolbar (tests `enclosing_lasso_is_in_the_lasso_flyout` and `a_saved_toolbar_without_enclosing_lasso_keeps_its_layout` in `edit_toolbar::tests`, `enclosing_lasso_is_in_the_lasso_group_once` in `addons::tests`, `headless_backend_methods` in `vectorcraft-mcp`). It has no default shortcut. It follows path curves and keeps partially enclosed objects out, including objects crossing a concave part of the loop. Ordinary group members can be selected individually; compound paths remain whole. This is a VectorCraft addition; scores and estimates are unchanged. Polygonal Lasso selects anchor points (and gradient mesh points) inside a straight-edged loop, with the Lasso's rule for which points are inside, and is listed under Object › Plug-ins and under its own heading in All Tools. It has no default shortcut or Basic toolbar slot. Each click sets a vertex. A double-click, Enter or a click on the first vertex closes the loop, Backspace or Delete removes the last vertex, Escape drops the loop, and Shift keeps the next segment to 45° steps. Shift or Alt held at the first click adds to or subtracts from the selection. This is a VectorCraft addition; scores and estimates are unchanged. Select by Artboards (Object › Plug-ins › Selection Tools, a VectorCraft addition: #5525, #5548, #5549) selects the objects overlapping, fully inside or fully outside one or more chosen artboards (`addon.select.byArtboards {artboards, relation}`). Overlapping is All on Active Artboard's test, shared as `select::on_artboard`; Fully inside means within one artboard, edges included; Fully outside means on none. It looks at what Select All takes, so hidden, locked and locked-artboard art stays out. Its dialog lists each artboard's number, name and size in the document's units, filters by name, chooses rows with click, Shift-click and Cmd/Ctrl-click, and fits a row's artboard in the window on double-click (`view.goToArtboard`). Tests: `crates/engine/src/cmd/addons/select/tests.rs`, `crates/ui-egui/src/addons/select/tests.rs`, `crates/engine/tests/command_sweep.rs`. Select by Link Status (Object › Plug-ins › Selection Tools and the Links panel menu, a VectorCraft addition: #5526) selects the image objects and placed documents whose link is linked (its file found unchanged), embedded, missing or modified, as `links.list` reports it (`addon.select.byLinkStatus {status, ids?, add?, zoom?}`); Select Linked, Embedded, Missing and Modified are off when no image has that status and add to the selection with Shift. Objects that are hidden or locked, inside a hidden or locked object or layer, on a template layer, on a locked artboard, or outside the isolated group are left out (the `select::is_selectable` test) and returned with the reason, and the status bar says how many, in plural forms of every catalog. Select by Link Status… lists each image and placed document with its name, status and format, searches by name, filters by status, picks rows with checkboxes and All / None, and zooms to the selection with the existing Zoom to Selection (`addon.arrange.zoomSelection`). Missing-link markers on the canvas are #5547. Tests: `crates/engine/src/cmd/addons/select/tests.rs` (`by_link_status`), `crates/ui-egui/src/addons/select/link_status/tests.rs`, `crates/engine/tests/command_sweep.rs`. @@ -1195,7 +1214,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur When a clip group, a layer with a clipping mask or a single object in one is isolated, the Selection, Direct Selection and Group Selection tools also select the art that the mask hides, by a click or a marquee, and a drag from that art moves it (#3748). In isolation mode the canvas Unlock submenu also lists that art when it is locked. Outside isolation mode a click selects clipped art only inside the mask. A marquee selects a Shaper Group only when it reaches the art the group shows, not the original shapes kept under it, and Direct Selection's clicks and marquee do not select those shapes' anchor points. In Construction mode a marquee selects the original shapes, and Direct Selection selects their anchor points. While an opacity mask or a pattern is edited, a Shaper double-click on a Shaper Group in the mask or pattern art selects the original shape under the pointer without entering Construction mode, the Shaper Group's mode widget does not show, and a Shaper scribble, Release and Expand keep the editing layer isolated. - A marquee selects an Intertwine group only when it reaches one of the group's members, as for a plain group, and it selects a repeat only when it reaches one of the copies the repeat draws. Direct and Group Selection's marquees select the anchor points of an Intertwine group's members, not the group, and Group Selection's E marquee selects the members inside it. + A marquee selects an Intertwine group only when it reaches one of the group's members, as for a plain group, and it selects a repeat only when it reaches one of the copies the repeat draws. Direct Selection's marquee selects the anchor points of an Intertwine group's members, not the group; Group Selection's marquee selects the members it touches, whole, and its E marquee selects the members inside it. A key object needs another selected object outside it. A Shift-click or any other change that leaves one object selected clears the key, and `select.key` sets none on one object or on a group selected with only its own members. With one object selected, the Align panel, the Control bar and the Properties panel align it to the artboard whatever Align To is set to. With two or more objects selected and no key object, Align to Key Object makes the topmost of them the key, whatever order they were selected in, and the Align panel, the Control bar and the Properties panel align to it. Align To keeps its Selection or Artboard choice and shows it again once the key is cleared. The Control bar has an Align To menu after its Align buttons. The public documentation offers Align to Selection, Align to Key Object and Align to Artboard in the Control panel (VectorCraft's Control bar) as well as in the Align panel ([Move, align, and distribute objects](https://web.archive.org/web/20250115013546/https://helpx.adobe.com/illustrator/using/moving-aligning-distributing-objects.html)). The menu shows the icon of the choice the Align panel's Align To shows, and a pick sets the same choice as the Align panel's buttons do. Align to Key Object is off while no key object can be made. When the bar runs short of room, it drops the Distribute buttons first, then the Align To menu, then the Align buttons. @@ -1245,6 +1264,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur While a spiral is dragged out, Alt adds or removes whole winds of four segments and Ctrl/Cmd changes the decay. The spiral's inner end keeps the distance from the center it had on the first modified drag event, while the outer end follows the pointer. The [default keyboard shortcuts](https://web.archive.org/web/20260726060015/https://helpx.adobe.com/illustrator/using/default-keyboard-shortcuts.html) (archived copy) list Alt-drag to add or subtract winds and Ctrl-drag to change the decay rate; [Draw spirals](https://helpx.adobe.com/illustrator/desktop/draw-shapes-and-paths/draw-shapes/draw-spirals.html) defines four segments per full wind and Decay as the amount each wind decreases. An 80% spiral has 80% of its outer radius after four segments; newly drawn spirals with the same settings wind more broadly than in earlier VectorCraft builds. Rounding the fitted count to whole winds from the count on the first Alt-only drag event, the held inner radius, the ranges (2…1000 segments, 5…99.99 % decay), Ctrl/Cmd taking precedence when both are held, and the new values staying as Spiral tool options are our own rules. Switching back to Alt uses the current count as its new base while keeping the held inner end. Escape while an arc, spiral or grid is dragged out cancels it and puts back the options its keys, Alt and Ctrl/Cmd changed (slope, open or closed, base axis, segments, decay, dividers and skews), so the next drag and the tool's options start from the values before the canceled drag; a drag that is let go keeps them, and an option set with `tool.setOption` during the drag stays. This is VectorCraft's own rule. VectorCraft's own Anchors field in the Ellipse dialog (a click with the Ellipse tool; `shape.ellipse {anchors}`, part of #7840) sets how many smooth anchors the ellipse has, 4 by default; 4 draws a live ellipse, and any other count from 2 to 1000 draws a plain path with the anchors spaced evenly by angle, fitted to the typed width and height. The count last confirmed stays as the Ellipse tool's `anchors` option, and the next Ellipse dialog opens on it (`ellipse_with_four_anchors_is_the_live_ellipse`, `ellipse_anchors_draw_that_many_anchors_on_the_ellipse`, `ellipse_refuses_a_bad_anchor_count`, `the_ellipse_dialog_draws_and_keeps_its_anchor_count`). + In the Ellipse dialog, a click on the word Height copies the Width value into the Height field, so OK draws a circle of that width, as [the help page](https://web.archive.org/web/20210601162814/https://helpx.adobe.com/pdf/illustrator_reference.pdf#page=140) describes for drawing ellipses. The Rectangle and Rounded Rectangle dialogs keep plain labels. VectorCraft's own rules: the word Height is a button that Space or Enter also presses, and that Enter does not press OK (nor does Enter on the Constrain Width and Height Proportions button); with the link on, the link stays on and keeps the circle when a side is typed next; a Width that is empty or not a distance, including one the field refuses as the click leaves it, leaves Height as it is; Cancel discards the copy. Evidence: `dialogs::shapes::tests::{clicking_height_in_the_ellipse_dialog_copies_width_into_height, the_ellipse_height_button_copies_width_from_the_keyboard_and_keeps_the_link_round, enter_on_the_link_button_turns_the_link_on_without_pressing_ok, only_the_ellipse_dialog_has_the_height_button, copying_width_takes_only_a_width_that_reads}`. - **Cutting:** Eraser, Scissors, Knife, Mirror & Cut, Line Cut and Rectangle Cut (real geometry, compound paths keep their holes). A Scissors cut (`path.split`) leaves one of the two new end points selected and the rest of the path unselected, as [Cut paths](https://helpx.adobe.com/illustrator/desktop/draw-shapes-and-paths/modify-paths/split-paths.html) and the "Split a path" section of the [CS3 user guide](https://help.adobe.com/archive/en_US/illustrator/cs3/illustrator_cs3_help.pdf) describe: the two end points lie on top of each other, and a Direct Selection drag from them moves the selected one with its handles and no other anchor. A closed path cut once stays one open path. The paths a Scissors cut (`path.split`) or Cut Path at Selected Anchor Points (`path.cutAtAnchors`) makes keep the source path's fill and stroke settings, and every stroke's alignment becomes Center in the same undo step, as [the help page](https://helpx.adobe.com/illustrator/desktop/draw-shapes-and-paths/modify-paths/split-paths.html) describes. Resetting hidden stroke rows too, centering the strokes of a path's other subpaths and of the compound path a cut member belongs to are VectorCraft's own rules (`scissors_cut_paths_have_their_strokes_centered`, `cut_at_anchors_paths_have_their_strokes_centered`). @@ -1347,6 +1367,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur The Blob Brush Tool Options also have Angle and Roundness, as the reference app's [Blob Brush options](https://web.archive.org/web/20261012042029/https://helpx.adobe.com/illustrator/desktop/paint-and-fill/learn-painting-basics/blob-brush-options-and-best-practices.html) list them: Angle from −180° to 180° (0° by default) and Roundness from 0% to 100% (100%, a round tip, by default). The elliptical tip keeps its angle on the page along a stroke, a 0% tip is drawn 0.1% as wide as it is long, and the dialog shows the tip and three dabs of it. The values are kept with the tool's options (`path.blob` `angle` and `roundness`). Not done: the Random and pen-driven variations of Angle and Roundness. The Blob Brush Tool Options' tip preview is the Angle slider for screen readers, with the Angle in degrees as its value: a click or a drag in it points the Angle at the pointer and gives it the keyboard focus, Tab reaches it after the Roundness field, and the arrow keys step the Angle by 1° (10° with Shift, Home and End to −180° and 180°). The Blob Brush Tool Options also have Fidelity, which the reference app's [Blob Brush options](https://web.archive.org/web/20261012042029/https://helpx.adobe.com/illustrator/desktop/paint-and-fill/learn-painting-basics/blob-brush-options-and-best-practices.html) list as setting how far the pointer moves before the path gets a new anchor point. The range and default are VectorCraft's own values: the Pencil's logarithmic slider from Accurate (0.01 pt) to Smooth (20 pt) and its field (up to 100 pt), 1.5 pt by default and kept with the tool's options. The brush follows the stroke fitted at the Fidelity, as a Pencil stroke is fitted: a low value follows the drag closely, jitter included, and a higher one gives smoother curves (`path.blob` `fidelity`). + `path.blob` rejects an Angle outside −180° to 180°, a Roundness outside 0% to 100% and a Fidelity outside 0.01 to 100 pt with an error and leaves the document unchanged; a key left out or null takes its default (0°, 100% and no fitting). A Blob Brush stroke merges with the topmost path of its fill color and no stroke that it touches, and with the other such paths it touches in the same group or layer that are next to that path in stacking order with no other kind of object between them; matching paths in other groups or layers are left alone, as the Blob Brush tool guidelines in [Paint with fills and strokes](https://web.archive.org/web/20241219085603/https://helpx.adobe.com/illustrator/using/painting-fills-strokes.html) describe (`path.blob`). - **Ruler guides as layer objects:** a guide goes on the current layer, shows, hides, locks and is deleted with it, is listed in the Layers panel (its row selects it) and moves to another layer (`guide.setLayer`, or its row dragged onto that layer's rows); guides on a hidden or locked layer can't be selected, moved or deleted, Duplicate copies a layer's guides and Merge Selected and Flatten Artwork keep them on the merged layer; guides from files saved before guides had layers go on the top visible, unlocked layer when the document opens. A guide's row has its own eye and lock, which hide or lock that guide alone in one undo step and take part in a drag down either column ([help page](https://helpx.adobe.com/in_hi/tutorial-builder/user-guide/illustrator-tutorial-builder/-ai--examples-of-common-coach-marks.html) lists a Guide among the Layers panel's items); a hidden guide is not drawn and does not snap, a locked one is drawn and snaps but can't be selected, moved or deleted, and its own state is kept through save and reopen and while its layer is hidden or locked (`layer.setProps` on its `guide.list` id). Object › Lock › Selection and Object › Hide › Selection lock or hide a selected guide with the selected art, and Unlock All and Show All unlock or show such guides and select them ([help page](https://help.adobe.com/archive/en_US/illustrator/cs3/illustrator_cs3_help.pdf) for Lock and Hide Selection). A guide row dropped on the panel's trash deletes its guide, the trash deletes a guide its row selected, and after a click on a guide row Delete deletes the guide rather than the rows highlighted before ([help page](https://helpx.adobe.com/illustrator/desktop/measure-and-align/grids-and-guides/align-graphic-objects-with-guides.html) for deleting a selected guide). A plain click on another row lets go of a guide its row selected, keeping the selected art, as a plain click on a row picks that row alone; a Ctrl/Cmd or Shift click keeps it (#7340, `panels::layers` test `a_plain_row_click_lets_go_of_the_selected_guide`). Not done: guides stacked among the art of their layer (they are listed above it). Lock Guides also locks the objects made into guides: they can't be selected, moved or deleted (#1543); they are drawn in the guide colour and style of Preferences, and a dragged selection snaps to ruler guides with Smart Guides on (#1583, fixes #1534). Preferences › Guides & Grid › Lock Guides by Default locks guides when the app starts; it is off by default, and new guides can still be dragged out of a ruler while guides are locked. The Transform panel shows a selected ruler guide's X or Y, and typing a value moves it (#1659, part of #1597). This is not established by the documentation we could find: the public help pages on guides, rulers and the Transform, Control and Properties panels (read again on 2026-10-14) describe selecting and dragging unlocked guides and the panels' X and Y for a selection, not a guide's position in a panel, and the one public statement of it is a user's [community answer](https://community.adobe.com/questions-652/adding-a-new-custom-guide-785586), which is not documentation. It is kept as a convenience pending the owner's decision, with no parity claim and nothing counted towards a score. - **Releasing ruler guides:** View › Guides › Release Guides turns the selected ruler guides into paths with no fill or stroke. An artboard guide becomes a line across its artboard, and a canvas guide becomes a line across the artboards (`view.guides.release {index?, ids?}`). A Cmd/Ctrl+Shift double-click with the Selection, Direct Selection or Group Selection tool releases the ruler guide or guide path under the pointer. @@ -1453,6 +1474,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur - Extrude & Bevel (both kinds) and Rotate keep the art's curves in the faces they draw, export and expand: caps and the edges of walls and bevels where they meet a cap are cubics with smooth anchors where the art's are, fitted within 0.001 pt in perspective and within the sampling tolerance on a bevel's inset. An edge of a twisted wall that is cut into pieces, a piece of curve that does not fit after 8 halvings, and the curves past 1,048,576 for one solid stay straight (VectorCraft's own values; [three-d.md](three-d.md#what-differs-from-the-public-documentation)). Tests `solid::tests::a_cap_keeps_the_curves_of_the_art`, `a_cap_in_perspective_fits_the_projected_curves`, `a_beveled_cap_and_its_walls_share_their_curves`, `twisted_beveled_tiny_and_degenerate_caps_keep_their_curves`. - Export 3D Object (Asset Export's menu): an object with Extrude & Bevel, Revolve, Inflate or Rotate becomes a 3D asset whose Format is USDA (the default), USDZ, glTF or OBJ, and Export writes each of its solids as a mesh with a material in its paint's color (`assets.add3D`, `assets.set3DFormat`, `assets.export3D`; [export 3D vector artwork](https://helpx.adobe.com/illustrator/desktop/special-effects-styles/create-3d-graphics/export-3d-vector-artwork.html)). - Export 3D Object builds each Extrude & Bevel (both kinds) and Inflate solid once: the same build gives the faces that count toward the object's limit and the faces of its mesh, and the meshes match those of a separate build bit for bit. Tests `mesh::tests::a_meshed_solid_is_built_once`, `an_extruded_solid_and_its_mesh_match_the_two_built_apart`, `inflated_solids_and_their_meshes_match_the_two_built_apart`, `solids::tests_mesh::one_build_exports_the_meshes_built_apart`, `a_stroke_past_the_limits_is_left_out_of_the_export`. + - Export 3D Object writes the graphics mapped onto a plane or onto Extrude & Bevel's front and back caps as a PNG texture of each face, the face's color with its graphics drawn flat and unlit over it, on a mesh of that face with texture coordinates, in all four formats (glTF embeds it, USDZ packs it after the layer, OBJ and USDA write `<name>-texture-1.png` beside them; `assets.export3D` `textureSize`, 128 to 4096 pixels, default 1024, VectorCraft's own values; [the help page](https://helpx.adobe.com/illustrator/desktop/special-effects-styles/create-3d-graphics/map-artwork-on-3d-objects.html)). Graphics on Revolve's side, materials and lighting are not exported. Tests `a_caps_mesh_corners_go_back_to_the_art_they_were_made_from`, `a_mesh_carries_its_caps_graphics_flat_in_the_arts_plane`, `each_format_carries_a_textured_part_with_its_coordinates_and_picture`, `export_3d_paints_mapped_graphics_on_their_caps_in_every_format`. - Checking an Extrude & Bevel (both kinds) or Inflate effect builds each solid the effect draws once, about the bounds the effect draws it about; a shape with no fill still has its profile built on its own. Tests `solids::tests::the_check_builds_each_drawn_solid_once`, `the_check_builds_the_profile_of_a_shape_with_no_fill`. - Initial live Revolve (#605, #846): a portable geometry and shading crate (`three-d`), editable path and compound profiles, compact options with artboard rotation and light gizmos, SVG/PDF vector output and Expand Appearance that can trim covered faces. Open ends have continuous caps by default, shading is smooth with one to ten colored lights, and intersecting surfaces' visibility is approximate ([revolve.md](revolve.md)). - Revolve takes graphics on its swept side, shaded with the object's light ([the archived reference, page 185](https://web.archive.org/web/20210601162814/https://helpx.adobe.com/pdf/illustrator_reference.pdf#page=185)). By VectorCraft's own rule a graphic wraps around the axis at its own size at every distance from it, narrows toward the silhouette, follows the profile along its length and is hidden where the side faces away (`threeD.mapGraphic`; `revolve::tests_graphics`, `tests::side_faces_lie_on_the_unrolled_surface_and_caps_do_not`, `map_graphic_puts_a_graphic_on_the_side_of_a_revolve`). @@ -1489,6 +1511,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur - **Vertical punctuation:** fullwidth `!` (U+FF01) and `?` (U+FF1F) use their nominal glyph upright when no vertical alternate is present, following the Tu fallback in [Unicode UAX #50 §3.1](https://www.unicode.org/reports/tr50/#vo). Code-built test fonts cover point and area type with and without `vert` alternates, retain the rotated fallback for a bracket and long vowel mark, and leave horizontal type unchanged. Tests: `crates/text/src/tests/vertical.rs`. - Free Distort's dialog (Effect › Distort & Transform › Free Distort…) shows a box in the proportions of the first selected object's bounds with a handle on each corner. Dragging a handle moves that corner. A handle focused by a click or Tab moves 1% of the box with each arrow key, and 10% with Shift. Reset puts the four corners back on the box. The preview and OK run `effect.apply`, or `effect.setParams` when the dialog edits an applied effect, and the Appearance panel's inline editor opens the dialog with Edit…. Behavior reference: Illustrator CC Help (2014, [PDF](https://help.adobe.com/archive/en/illustrator/cc/2014/illustrator_reference.pdf)), page 285 (PDF page 291). - **Kerning at the start of a line:** at the Type tool's caret before the first character of the text, of a paragraph, or after a forced line break, the Kerning field, Alt+←/→ (Alt+↓/↑ in vertical type) and Reset Tracking and Kerning set the space before the character after the caret (`kerningBefore`), as the reporter of #5111 describes the reference; the character moves along its line and the rest of the line follows, as one undo step (#5111). It used to do nothing there, or kern the invisible line break. Inside a line the caret still kerns the character before it. A line that wraps in area type takes no space before its first character, and Touch Type still moves a line's first character only up and down. SVG export starts the line where the character is drawn, and on a path writes the space as the first character's `dx`; vertical type moves the character down its column. A space on the first letter of a ligature keeps the ligature whole. Tests: `tests::caret_kerning` (engine), `tests::kerning_before` (text), `the_space_before_a_lines_first_character_moves_its_tspan` (SVG). +- **Forced Line Break:** Type › Insert Break Character › Forced Line Break starts a new line without starting a new paragraph, as [the help page](https://helpx.adobe.com/illustrator/desktop/design-with-text/special-characters-glyphs/insert-white-space-and-break-characters.html) describes: it inserts U+2028, the character Shift+Enter types, so the paragraph's Space Before does not come between the two lines (`type.insert {char: "forcedLineBreak"}`; `paragraphReturn` still inserts a line feed). Storing the break as U+2028 is VectorCraft's own choice. While the Type tool edits text, this item and the other Insert Special, Whitespace and Break Character items insert at its caret or replace its selection as one undo step, with the caret after them; without a Type tool edit they append to the selected type objects. Tests: `tests::menucmds::insert_forced_line_break_differs_from_paragraph_return`, `tests::menucmds::insert_character_goes_to_the_type_tool_caret`. - **Optical kerning:** Character and Properties offer Optical beside Auto for automatic pair spacing. The side-profile spacing method is VectorCraft's own: each pair moves part of the way toward the font's own stem spacing (the gap of `nn`, else `HH` or `oo`), keeps at least part of that gap where the outlines come closest, and changes by at most 0.12 em tighter or 0.06 em looser, so ordinary text keeps the font's spacing (#5336). Ideographs, kana, hangul, fullwidth and CJK punctuation forms and dashes keep the font's spacing. Optical keeps its mode across cosmetic style runs. Choosing Optical clears manual pair values, as Auto does, and leaves additive tracking intact; a manual value typed afterwards replaces that pair's correction ([Adjust kerning and tracking](https://helpx.adobe.com/illustrator/desktop/design-with-text/edit-format-text/adjust-kerning-and-tracking.html)). Native documents retain the mode and pair overrides; old documents use Auto. Behavior reference: [Line and character spacing](https://web.archive.org/web/20260916050333/https://helpx.adobe.com/illustrator/using/line-character-spacing.html) (public documentation). Tests: `crates/text/src/tests/typo.rs`, `crates/engine/src/tests/textedit.rs`. - **Kerning across style runs:** characters that differ only in fill, stroke, underline, strikethrough, overprint, character style name, leading, baseline shift, rotation, Character Alignment, kerning, or tracking that keeps or drops ligatures alike are shaped together, so restyling one character keeps the font's kerning pairs with its neighbors. A character with manual kerning that follows one with automatic kerning keeps the font's kerning with it (unless All Caps or Small Caps sets it as two letters, as ß becomes SS), and its value replaces the font's kerning after it. A ligature does not form across a change of style, and a change of font, size or OpenType features still shapes the characters apart. Behavior reference: [Line and character spacing](https://web.archive.org/web/20260916050333/https://helpx.adobe.com/illustrator/using/line-character-spacing.html) (public documentation). Tests: `crates/text/src/tests/typo.rs`, `crates/text/src/tests/bidi.rs`. - **Manual kerning in right-to-left text:** a manual kerning value on a Hebrew or Arabic character changes the space between it and the next character in reading order, the one drawn to its left, under Auto and Optical kerning. The character before it keeps its place, and the caret between the pair stays beside the next character. The side the space goes on is VectorCraft's own rule. Behavior reference: [Line and character spacing](https://web.archive.org/web/20260916050333/https://helpx.adobe.com/illustrator/using/line-character-spacing.html). Test: `rtl_manual_kerning_spaces_the_character_from_the_next_in_reading_order`. @@ -1565,6 +1588,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur The Paragraph panel menu's Korean Line Break Anywhere (`text.setFormat {koreanLineBreakAnywhere}`, with the East Asian options, and the East Asian Composition Settings section of Paragraph Style Options) sets for each paragraph whether a line may break between any two Hangul syllables. When it is off, a word that contains Hangul breaks only at its spaces and after punctuation, or where the word is wider than the line, and takes no hyphen. New type has it off; paragraphs saved before the option read as on, so their lines do not move. The Paragraph panel menu's Reset Panel (`text.setStyle`, `text.setFormat` and `text.tabs.clear`) gives the selected type's paragraphs, or the paragraphs the Type tool's selection touches, Auto alignment, no indents or paragraph spacing, Hyphenate off with the default Hyphenation and Justification options, Auto direction, Bottom-to-Bottom Leading, the Line-end Punctuation Half Width Mojikumi Set, Regular burasagari, the Hard kinsoku set, Push Out Only, the Every-line Composer, Bunri-Kinshi, Roman Hanging Punctuation and Korean Line Break Anywhere off, no kashidas and no tab stops, as one undo step. The Paragraph panel menu's Hyphenation… (`ui.hyphenation`, `text.setFormat {wordsLongerThan, afterFirst, beforeLast, hyphenLimit, hyphenationZone, hyphenateCapitalized}`) sets each paragraph's hyphenation limits: the shortest word that breaks, the fewest letters on each side of the hyphen, the most hyphenated lines in a row, a zone at the right edge where the Single-line Composer breaks before a word instead of hyphenating it, and whether capitalized words break. The defaults are words longer than 5 letters, 3 letters on each side, no limit or zone, and capitalized words hyphenated; paragraph styles and the native file keep the options. + Text whose Character panel Language is Bulgarian, Turkish or Russian hyphenates by that language's syllable rules, and German, Polish, Portuguese or Italian text by that language's hyph-utf8 patterns in builds that embed them, within the paragraph's Hyphenation options, in both composers ([Assign languages to text](https://helpx.adobe.com/illustrator/desktop/design-with-text/fonts-and-scripts/assign-languages-to-text.html)). A word written outside its language's script stays whole, and the Preferences exceptions still come first. PDF export with type as text writes the hyphen that ends a line broken inside a word as a hyphen character where the line draws it, and the file opens with the hyphen in the line's text; kashidas are drawn as paths. The Paragraph panel's Insert Kashidas (with the Indic options; `text.setFormat {kashida}`) lengthens each Arabic word of a justified horizontal area type line with a kashida, a tatweel between its last pair of joined letters, before the word spaces widen: Short, Medium and Long kashidas are at most a quarter, half and a whole em long, Stylistic ones are whole tatweels up to an em, and None (the default) leaves the line as before; paragraph styles and the native file keep the setting. The Character panel menu's Kashidas switch (with the Indic options; `text.setFormat` / `text.setRangeStyle {kashidas}`) allows Kashidas on selected characters, on by default for new and old text. A pair of joined letters receives one only when both characters allow it; turning one off leaves other eligible pairs in the word available. Character styles and the native file keep the switch. [Public help](https://helpx.adobe.com/illustrator/desktop/design-with-text/fonts-and-scripts/justify-text-using-kashida-and-hyphenation.html) documents the menu control and the separate paragraph length choices; the default and pair rule are VectorCraft choices. @@ -1645,6 +1669,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur - **Image Trace, cut-out edges choose no color:** in Color and Grayscale, the edge pixels that take the color beside them, and the semi-transparent pixels within two pixels of them whose color is also the opaque art's color blended with the background, do not count when the palette or the grays are chosen, so the edge of a cut-out image no longer adds a second shade of a color to Auto Color's palette, takes away an outline's color or takes a gray of its own; beside those pixels, the anti-aliasing between a color and an outline drawn along the edge is no color of Auto Color's own when it lies at least 0.45 of the way from the color to the outline and at least one in 32 of its pixels has both around it (edge pixels that choose no color count when they lie within 2.5 Oklab × 100 of the nearest of those colors): its pixels trace as the outline, so a thin outline stays a ring of few pieces, except beside an outline along the edge with a region of 8 pixels of its own, where each takes the nearer of the two, so a wider outline is not drawn wider; an outline over the edge in the color of other art traces in that color, while an opaque rim drawn along the edge keeps its color, also where other art reaches it; a thin semi-transparent outline of another color still counts, and opaque images trace as before; code-drawn cut-out outline, rim, opaque line and grayscale edge tests in `crates/trace`. - **Image Trace, blurred edges:** in Color with a Limited palette of at most 16 colors (3 Colors, 6 Colors, 16 Colors) and in Grayscale with at most 16 grays (Shades of Gray), by VectorCraft's own rule (RGB distances, 0 to 255 a channel), a blend pixel with no unblended pixel of its own color within 4 pixels takes the nearer side of the pair of colors within 8 pixels that it is best a blend of, of the 8 colors within 8 pixels nearest to its color, when that pair explains it twice as well as its own color, or when it lies between the two and off the line between them by less than 0.15 of their distance apart; it keeps its color when it is one of the pair. Grayscale compares lightness. The in-between tones of an edge blurred over several pixels no longer trace as rings around it. High Fidelity Photo, Low Fidelity Photo and Black and White trace as before, and so do Automatic, Full Tone and Document Library palettes. Noisy and textured images settle more of their pixels. By `crates/trace/tests/quality` (256 px variants), 16 Colors on blurred flat art went from 9.0 paths to 3.0, 158 anchors to 34 and 0.239 px off to 0.069, and 6 Colors from 6.0 paths to 3.0 and 0.226 px off to 0.071; askew shapes take up to 11 px more area in colors the art does not have, and with 16 Colors the largest distance from a thin line's outline to the trace goes from 23.5 px to 45.3 (see [quality notes](image-trace-quality.md#blurred-edges)). Code-drawn blurred-disc and grayscale ramp tests in `crates/trace`. - **Image Trace, preset Paths, Corners and Noise:** every built-in preset but Auto Color and Flat Logo traces at Paths 50, and so do their enhanced versions; among those presets, Corners is 100 in Technical Drawing, 75 in Default, Black and White Logo, Line Art and Outline and 50 in the other eight, and Noise is 1 to 90 px by preset. Palettes and color counts are unchanged. Figures for these presets in the other Image Trace entries were measured at the earlier values. By `crates/trace/tests/quality`, High Fidelity Photo goes from 5,494 anchors to 3,136 and Black and White Logo from 27 to 14, while 16 Colors on flat art goes from 0.100 px off to 0.123 (see [quality notes](image-trace-quality.md#preset-paths-corners-and-noise)). Test `presets_have_their_paths_corners_and_noise` in `crates/trace`. +- **Image Trace, High Fidelity Photo in Full Tone:** High Fidelity Photo traces with Palette › Full Tone at Color detail 85 and Method › Abutting (VectorCraft's own values; it was a Limited palette of 64 colors, Overlapping). Palette › Full Tone splits into at least one color per step of Color detail where the image has that many, and then merges the colors that look alike (less than 5 apart in Oklab × 100 and thoroughly mixed, or less than 1.5 and mixed in patches), which can leave far fewer; this applies to every Full Tone trace. On 19 test images the summed mean pixel difference fell from 80.5 to 65.6 levels, with 1.66 times the anchors and 1.7 times the trace time (see [quality notes](image-trace-quality.md#high-fidelity-photo-in-full-tone)). Tests in `crates/trace`. - **Image Trace, Noise joins the nearest color:** in Color and Grayscale, a region below Noise whose longest-border color is 10 or more apart from its own (Oklab × 100) joins the neighboring color nearest the average of its pixels (leaving out cut-edge pixels that are the color beside them blended with the transparent background), among those sharing at least a tenth of that border, so thin dark lines no longer break into dashes; a single pixel tied between colors joins by border (VectorCraft's own rule and values). 6 Colors and 16 Colors use Noise 8 and Black and White Logo Noise 5. On three illustrations with fine dark lines the mean difference falls 29% to 42% (16 Colors) with 72% to 99% more anchors (see [quality notes](image-trace-quality.md#noise-joins-the-nearest-color)). Tests in `crates/trace/src/quantize/denoise.rs`. Scores and hours unchanged. - **Image Trace, simpler contour walk:** `contour::trace_mask` works out each turn from the pixels during the walk, with no precomputed direction table and no assertion; identical loops to the previous walk on every 4 × 4 mask (see [quality notes](image-trace-quality.md#a-simpler-contour-walk)). - **Image Trace, measured:** `crates/trace/tests/quality` traces drawings made from known vector art with every preset and [`image-trace-quality.md`](image-trace-quality.md) records the numbers against the baseline. Black and White, Grayscale and Color place each edge by the blend of the pixels across it (to a fraction of a pixel on anti-aliased and blurred images; hard-edged images are read as staircases) and fit outlines as Flat Logo does. *Measured* on each preset's own inputs, all sizes and variants: Default's outlines went from 0.31 px off on average to 0.09 (largest 1.51 to 1.02), Black and White Logo's from 0.27 to 0.06 with 0.3 kinks per trace where it had 15, and the gaps between abutting paths from 64 px to 22. On clean curved shapes Black and White Logo is 0.02 px off (the open tracer measured beside it: 0.20). The palette is made of the picture's own colours (blends along edges take none of it, colours that noise made of one colour merge, a blend pixel goes to one of the two colours it lies between; #1504): 16 Colors on flat art, all variants, went from 70 paths to 4.2 and from 5.1 px off to 0.13, with no path left in a colour the art doesn't have (5.9 before). Photos are smoothed within their tones before they are quantised and stacked layers go by lightness (#1516): High Fidelity Photo went from 3,653 paths to 121 with its colour error down from 2.30 to 1.75, and a 16 megapixel photo-like image is traced in 3.5 s where 4 megapixels were refused. Since then, by the same harness: outlines are cut at their junctions and each shared piece is fitted once (#1535: gaps and overlaps between abutting paths 22 to 50 px of area down to under 2); layers are traced within the box of their pixels and a few at a time (#1546: a 16 megapixel photo 3.9 GB to 0.9 GB); black and white are read against the image's own black and the paper near each edge (#1563, for thin lines in blurred and scanned art); Ignore Color and the Auto Color and Outline presets (#1574); Snap Curves To Lines levels lines within 2.5 degrees of level or upright (#1593, the angle our choice); Create: Strokes puts centre lines in the middle of their ink and makes them as wide as it (#1595: Outline 0.295 to 0.052 px from the true centre line, 18.4 to 2.7 anchors a stroke); sharp corners whose pixel is mostly outside the shape stay corners (#1609: Default 69% to 76% kept). Three options, each off unless asked for as the legacy presets have them: Shapes (#1609: 57 to 62% of plain circles, ellipses, rectangles and regular polygons come out as live shapes, rounded rectangles rarely), Auto Grouping (#1618: paths grouped with what lies inside them, the same picture) and Gradients (#1627: linear gradients traced as one gradient-filled path; on gradient inputs 6 Colors' colour error 2.12 to 0.62 with 6.4 to 3.4 paths, none found in flat art). Snap Curves To Lines moves no end of a line by more than 1.6 px, so long lines a degree or two off stay as the image has them (#1647: Technical Drawing's largest distance 4.21 px to 1.46). Flat Logo takes the tones a scan's uneven paper makes of one colour for one colour (#1657: on scans 470 paths and 21 px off to 8.5 paths and 0.09 px). Shapes finds rounded rectangles and shapes in aliased, blurred and scanned art (#1845: 57 to 62% of the plain shapes up to 98 to 100%, no false shape but one line 2 px wide). Stroked lines get square caps where their ink is cut square, and a wide end that turned towards a corner goes back on its line (#1846: Outline's largest distance 2.94 px to 0.88, 14 anchors to 10). Each of the 14 documented presets has an enhanced version with Auto Grouping and, in all but High Fidelity Photo, Shapes (#1847), measured beside its preset: equal or better within 0.005 px and 1% of edge ΔE on every preset's own inputs (Default 0.091 to 0.083 px); Auto Grouping keeps traced order in its groups, which removed a light seam along the counters of letters. Gradients grows a gradient over the pixels noise and soft rims took off it (#1848: blurred and noisy linear gradients 3 to 11 paths beside the gradient down to 0.5 with 6 Colors, 24 to 56 down to 0.5 to 1.5 with High Fidelity Photo). Silhouettes is 0.52 px off because its threshold is 200 (0.11 px at 128). Still weak, by the same numbers: rounded rectangles and other line-and-arc outlines take 12 to 16 anchors (the fitter does not split lines from arcs), blurred and scanned polygons lose corners, hairlines under half a pixel are lost to the threshold, aliased art is about 0.25 px off, a scan's uneven paper splits into tones when more colours are asked for than the art has, stroke junctions stay at their skeleton pixels, a three-stop gradient in a small or scanned disc is not found, radial gradients stay bands (a draft, #1849, traces them; the documented option is for linear ones, so it waits for a decision), near-regular polygons a few dozen pixels across are made regular with Shapes (up to 0.5 px off), and aliased stroked lines are 0.8 px off at worst. @@ -1653,13 +1678,14 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur - **A point on a mesh's outline is on the mesh:** a point exactly on the outline of a gradient mesh (within a millionth of a point) locates on the edge it lies on, on all four sides alike and with no tolerance, as it already did on the top and left edges, so `object.mesh.addLine` and Create Gradient Mesh `at` a point on the bottom or right edge add their lines there instead of reporting the point outside, and the Eyedropper samples the mesh's color there; a point just outside still needs `tolerance`. Tests: `mesh_locate_takes_a_point_on_any_side_of_the_outline` in `crates/doc/src/live.rs`, `mesh_add_line_exactly_on_the_edge_needs_no_tolerance` in `crates/engine/src/tests/live.rs`. Scores and hours unchanged. - **Several mesh points at once (#4207, #4208, #4170):** the Mesh tool and Direct Selection pick several points of a gradient mesh or mesh envelope: Shift-click adds a point or takes a picked one away, Direct Selection's marquee picks the points inside it (Shift toggles them) and selects their meshes, and its click on a mesh line picks the line's two ends and one inside a patch the four points around it. The picked points show filled; dragging one moves them all as one undo step and the arrow keys nudge them (`object.mesh.movePoints {id, points, dx, dy}` or `{items, dx, dy}`), and a click on one of several picked points picks it alone. A solid fill colour (`paint.setFill`: Color panel, Swatches, Eyedropper) recolours every picked point, and the Transparency panel's Opacity fades them instead of the object, the panel showing their opacity (blank when it differs); `object.mesh.setPointColor` takes `points` or `items`. Public reference: [Edit mesh objects](https://helpx.adobe.com/illustrator/desktop/paint-and-fill/create-and-edit-meshes/edit-mesh-objects.html) (Shift selects multiple mesh points; a fill colour colours the selected point), [Macworld, gradient mesh](https://www.macworld.com/article/202693/gmesh2.html) (Direct Selection: a mesh line selects the points at both ends, a patch the points around it, Shift-click adds or removes points), [Peachpit](https://www.peachpit.com/articles/article.aspx?p=1638270) (each mesh point can have its own colour or transparency). Tests: `shift_clicks_pick_mesh_points_that_drag_and_nudge_together` and `direct_selection_picks_mesh_points_by_marquee_line_and_patch` in `crates/tools/src/meshedit.rs`, `picked_mesh_points_take_the_fill_opacity_and_drag_together` in `crates/engine/src/tests/editcolors.rs`, `mesh_points_move_and_colour_together` in `crates/engine/src/tests/live.rs`. Scores and hours unchanged. - **Picked mesh points in the panels** (VectorCraft's own rule): with points of a gradient mesh picked by the Mesh tool, Direct Selection or the Lasso, the Fill proxy, the Color panel and the Color Wheel show the first picked point's color, so their sliders keep the color a drag sets, and "?" shows when the picked points' colors differ. The Control bar shows the first picked point's opacity. Tests: `the_fill_proxy_shows_the_picked_mesh_points_color`, `the_fill_proxy_follows_where_the_fill_goes_with_an_appearance_row_active` and `the_fill_proxy_counts_picked_mesh_points_beside_other_objects` in `crates/engine/src/tests/xform.rs`, `picked_mesh_points_are_the_color_the_panel_shows_and_edits` in `crates/ui-egui/src/panels/color/tests.rs`, `picking_mesh_points_shows_their_opacity` in `crates/ui-egui/src/panels/transparency.rs`. Scores and hours unchanged. +- **The Eyedropper samples into picked mesh points (#8090):** mesh points picked with the Mesh tool, Direct Selection or the Lasso stay picked after switching to the Eyedropper and go back to one of those tools chosen next, and a click or Shift-click on an image or other art then samples the color under the pointer into every picked point as one undo step, leaving the mesh's other points and its appearance as they were. VectorCraft's own rules: a plain click on vector art samples its color into the points instead of copying its appearance, other selected objects keep their paint, and a click on a mesh with points picked works as before. Public references: [Edit mesh objects](https://helpx.adobe.com/illustrator/desktop/paint-and-fill/create-and-edit-meshes/edit-mesh-objects.html) (a mesh point is recolored by selecting it and choosing a fill color), [Appearance attributes](https://helpx.adobe.com/illustrator/using/appearance-attributes.html) (Shift-click samples the color from a part of a mesh object or a placed image and applies it to the selected fill). Tests: `picked_mesh_points_take_the_eyedropper_sample` in `crates/engine/src/tests/eyedropper.rs`, `picked_mesh_points_take_the_color_a_click_samples` in `crates/tools/src/xform/eyedropper.rs`, `mesh_point_tools_take_back_the_eyedroppers_picks` in `crates/tools/src/meshedit.rs`. Scores and hours unchanged. - **Image Trace Flat Logo mode:** a fourth mode beside Black and White, Grayscale and Color, for flat-colour logos. Each pixel is read as a blend of the logo's colours (found automatically or named), the blend is interpolated smoothly and every outline is placed where two colours are equally present, so edges are accurate to a fraction of a pixel. Outlines are then cleaned: corners the blur rounded are put back, near-straight runs and near-circular arcs become exact lines and arcs, the rest is fitted with as few Béziers as the tolerance allows, touching colours overlap by a hair so no gap opens, and an outline that strays from the raw contour is fitted plainly instead. Gradients and photos are refused with advice to use Color. Line art whose only solid area is white paper (strokes a pixel or two wide) takes its colours from the strokes' cores, with the lighter shades along a stroke's anti-aliased edge folded into its ink; a page whose ink (a channel at least 48 below white) covers under 1% of it traces to nothing, as blank paper does. *Measured* (a local experiment, not run in CI): a flat-colour logo's vector original was rendered down to a soft 199 × 100 px transparent PNG, traced, and the result compared with the original at 1600 px wide. The built-in colour presets (6 Colors, 16 Colors, High Fidelity Photo, Low Fidelity Photo) had a mean edge error of 2.5 to 3.4 px and region overlap of 0.88 to 0.91; Flat Logo had 0.78 px and 0.966 (0.48 px and 0.975 from a crisp source), in about 0.1 s. Limits: flat-colour art only; needle-thin sharp tips are shortened by about 1.7 source pixels because the blur erases them; it works at no more than 1024 px on the long side (larger images are averaged down first); only one logo family has been scored against a vector original. - **Image Trace, Flat Logo named colors only:** with `logoColors` named, `"logoWhite": false` traces those colors only, so white areas take the nearest of them and no white is added; a named white is kept, and enclosed transparent areas stay holes; code-drawn tests in `crates/trace` and `crates/engine`. - **Image Trace, Flat Logo flat-art check with named colors:** with `logoColors` named, whether the image is flat art is judged by its own colors, as many as are named, with white, or as the Colors setting gives, whichever is more. Named colors 20 levels off a flat badge's colors still trace it, a hatch on a light ground gives the same result with close and far named colors, a gradient's refusal score does not depend on how far the named colors are from it, and areas of colors that were not named are traced in the named colors instead of being refused; code-drawn tests in `crates/trace`. - **Image Trace, Flat Logo with a color between two others:** an anti-aliased edge pixel between black and white is read as a blend of black and white, not of black and a gray that lies between them, when the flat areas around it and the pixels beside it show that edge, so a black disc beside a gray square on white, with sharp edges or edges blurred by up to about half a pixel, traces with one gray path, the square, instead of the square plus 8 to 24 gray slivers around the disc with the colors found or named exactly; on edges blurred by 1 to 3 pixels, the pixel also counts as on that edge when paths of up to 5 steps through pixels that keep getting darker and lighter reach past the gray both ways, and black and white then lie as near as the steps to them, so the same disc and square trace with one gray path at blurs of 1 and 2 pixels and with at most 4 slivers of up to 3 pixels in a light gray at 1.5 pixels, where up to 33 gray paths were traced before (at a blur of 3 pixels with the colors named, a gray of 200 leaves 4 slivers with no area and a light gray of 230 leaves 8 small slivers, where 11 and 14 gray paths were traced before; pixel noise of a level or more can still leave gray slivers); when the first step toward black or white already comes to that color, the path the other way stops at a pixel of the gray, so with edges blurred by 0.6 pixels a gray band 3 to 8 pixels wide along black traces gray at no fewer than 4 of every 5 of its pixel centers; with sharp edges, gray strokes two and three pixels wide beside black stay gray (a soft-edged gray stroke about two pixels wide lying along black traces as black and white, and a short one about three pixels wide can lose most or all of its gray); on edges blurred by a pixel or more, a soft-edged gray band up to 4 pixels wide along black traces as black and white, with gray at no more than 1 of every 16 of its pixel centers, at blurs of 1.5 and 2 pixels, a light gray stroke 2 pixels wide and 2 pixels from black, blurred by 1.5 pixels, traces gray at about 10 of the 34 pixel centers along its middle and one 4 pixels away at about 25, and a soft-edged gray stroke running out of black, blurred by 1 or 1.5 pixels, loses 3 or 4 of the 16 pixel centers along its middle nearest black; a one-pixel gray line of at least 13 touching pixels between black and white stays gray (a shorter one, or one that falls between pixels or is blurred, traces as black and white); code-drawn tests in `crates/trace`. - **Image Trace, Flat Logo with a color beyond both colors of an edge:** an edge pixel between a gray panel and a charcoal disc on a paler gray ground is read as a blend of the panel and the disc, not of the ground and the disc, when the pixels beside it lie on each side of it, none lies past the panel toward the ground, and lighter pixels lead from it to the panel's color or to a flat area of the panel, so the disc traces with three paths, one per color, with the colors found or named, instead of with 28 slivers of the ground around it when its edges are sharp and one sliver when they are blurred by 0.7 pixel (an edge blurred by a pixel or more can still leave slivers of the ground); the pixels of a pale line on the disc, one pixel wide, blurred over three pixels or falling between two pixels, and the edge of a gap of the ground's color between the disc and the panel keep the ground in their blends; code-drawn tests in `crates/trace`. - **Image Trace, Keep Colors:** `"keepColors": ["#rrggbb", …]` traces only the palette colors near a listed color (Abutting: each with the paths the trace of every color gives it; Overlapping: not reaching under the colors left out), in Black and White, Grayscale and Color; code-drawn tests in `crates/trace` and `crates/engine`. -- **Advanced art:** live Blends (steps/distance/smooth colour, editable spine, anchor-targeted Blend tool, faithful interpolation, knockout), Envelope Distort (warp/mesh/top object, Reset, full Envelope Options, mesh handles, Edit Contents; type, images, symbols, gradients, patterns and appearance distorted everywhere), Liquify tools with options and pen pressure, Puppet Warp with rotating pins, Perspective Grid with presets, movable planes and projected type (choosing a perspective tool shows the grid; Hide Grid hides it with the tool still chosen), Gradient Mesh, Shape Builder (stroke-only open paths and lines cut the regions they cross and enclose regions of their own, and regions they bound merge without seams where the lines cross at rounded coordinates (#893); filled open paths count as closed; erase mode while Alt/Option is held: a minus pointer, red highlights of what will go, a click or drag deletes the regions touched, the pieces of open lines and the edges (outline pieces between the points where paths meet, opening their paths there) it passes over, one undo step, `shapeBuilder.merge {erase}` and `shapeBuilder.regions` edges over MCP), Live Paint (every path an edge, open lines included), Image Trace (12 presets, colour layers traced in parallel; a trace past two million anchor points is refused with advice rather than running out of memory, an image over 64 megapixels is traced scaled down to that size (aspect kept, paths at the image's own size) and one over 192 megapixels is refused, and a selection too large to outline shows its bounds (#525); Object › Image Trace › Make and Make and Expand trace at once with the Default preset, #543; with an image selected the Control bar and the Properties panel show Image Trace, whose arrow traces with any preset, Mask (`object.maskImage`: a clipping path on the image's outline, selected so its handles crop), Crop Image (a crop box on the image, starting on its part over the artboard, dragged by its handles or inside it, the outside dimmed, with X/Y/W/H, Apply and Cancel in the Control bar, Enter and Escape, #734; an image that isn't turned or skewed, isn't CMYK and can be read at its recorded size is cut from its own pixels when the crop edges fall on its pixel grid, copied as they are without resampling; any other image is drawn, #5534; `object.cropImage {rect}` for agents, `{trim: true}` cuts an image to its pixels that aren't fully transparent, pixel for pixel) and Embed or Unembed in place of Fill and Stroke; with an Image Trace object selected, its Preset (choosing another traces again), View, the Image Trace panel and Expand, plus Release in Properties; the five View modes (Tracing Result, with Outlines, Outlines, Outlines with Source Image, Source Image) redraw a trace on screen without tracing again, are saved with it and `imageTrace.setView` sets them, while exports and Expand keep the result; the panel's Advanced section is a header that stays open or closed as it was left (part of #641); Color mode's Palette: Limited, Full Tone (as many colours as the tones need, Less … More), Automatic (flat art with its own colours, else Full Tone; a heuristic) and Document Library (the most used colours of the document's swatches or a swatch library, filled with the swatch colours as they are), part of #641; Advanced › Create: Fills and/or Strokes, where lines up to the Stroke width trace as stroked centre lines (distance transform, thinning, a skeleton graph with spurs pruned, curve fitting; one width per line; without Fills, wider areas become stroked outlines), part of #641), pattern swatches with pattern editing mode, live Repeat (radial/grid/mirror). A single selected mirror repeat shows a prominent axis with a center move handle and two rotation handles. Drag the line or center to change spacing, or an end to change angle; Shift snaps rotation to 45°. The original artwork stays in place, the reflected copy previews live, Escape cancels and each drag takes one undo step through `object.repeat.options`. Controls follow zoom/view rotation and hide with edges or the bounding box. Engine and headless canvas regressions passed for gestures, history and visibility; native move, rotation and Escape screenshots were reviewed. [Public mirror-repeat reference](https://helpx.adobe.com/illustrator/desktop/paint-and-fill/create-and-edit-patterns/set-mirror-repeat-options.html). A single selected grid repeat shows a handle below the grid for rows, one right of it for columns and one past its bottom-right corner for both, and sliders between its first two columns and rows for the horizontal and vertical spacing; the source keeps its size, each drag is one undo step and Escape cancels it ([public grid-repeat reference](https://helpx.adobe.com/illustrator/desktop/paint-and-fill/create-and-edit-patterns/set-grid-repeat-options.html), #2691). Object › Expand turns radial, grid and mirror repeats into groups of their instances (#1765, #1756). +- **Advanced art:** live Blends (steps/distance/smooth colour, editable spine, anchor-targeted Blend tool, faithful interpolation, knockout), Envelope Distort (warp/mesh/top object, Reset, full Envelope Options, mesh handles, Edit Contents; type, images, symbols, gradients, patterns and appearance distorted everywhere), Liquify tools with options and pen pressure, Puppet Warp with rotating pins, Perspective Grid with presets, movable planes and projected type (choosing a perspective tool shows the grid; Hide Grid hides it with the tool still chosen), Gradient Mesh, Shape Builder (stroke-only open paths and lines cut the regions they cross and enclose regions of their own, and regions they bound merge without seams where the lines cross at rounded coordinates (#893); filled open paths count as closed; erase mode while Alt/Option is held: a minus pointer, red highlights of what will go, a click or drag deletes the regions touched, the pieces of open lines and the edges (outline pieces between the points where paths meet, opening their paths there) it passes over, one undo step, `shapeBuilder.merge {erase}` and `shapeBuilder.regions` edges over MCP), Live Paint (every path an edge, open lines included), Image Trace (12 presets, colour layers traced in parallel; a trace past two million anchor points is refused with advice rather than running out of memory, an image over 64 megapixels is traced scaled down to that size (aspect kept, paths at the image's own size) and one over 192 megapixels is refused, and a selection too large to outline shows its bounds (#525); Object › Image Trace › Make and Make and Expand trace at once with the Default preset, #543; with an image selected the Control bar and the Properties panel show Image Trace, whose arrow traces with any preset, Mask (`object.maskImage`: a clipping path on the image's outline, selected so its handles crop), Crop Image (a crop box on the image, starting on its part over the artboard, dragged by its handles or inside it, the outside dimmed, with X/Y/W/H, Apply and Cancel in the Control bar, Enter and Escape, #734; an image that isn't turned or skewed, isn't CMYK and can be read at its recorded size is cut from its own pixels when the crop edges fall on its pixel grid, copied as they are without resampling; any other image is drawn, #5534; `object.cropImage {rect}` for agents, `{trim: true}` cuts an image to its pixels that aren't fully transparent, pixel for pixel) and Embed or Unembed in place of Fill and Stroke; with an Image Trace object selected, its Preset (choosing another traces again), View, the Image Trace panel and Expand, plus Release in Properties; the five View modes (Tracing Result, with Outlines, Outlines, Outlines with Source Image, Source Image) redraw a trace on screen without tracing again, are saved with it and `imageTrace.setView` sets them, while exports and Expand keep the result; the panel's Advanced section is a header that stays open or closed as it was left (part of #641); Color mode's Palette: Limited, Full Tone (as many colours as the tones need, Less … More, split into at least one color per step of Color detail before colors that look alike merge), Automatic (flat art with its own colours, else as many as the tones need; a heuristic) and Document Library (the most used colours of the document's swatches or a swatch library, filled with the swatch colours as they are), part of #641; Advanced › Create: Fills and/or Strokes, where lines up to the Stroke width trace as stroked centre lines (distance transform, thinning, a skeleton graph with spurs pruned, curve fitting; one width per line; without Fills, wider areas become stroked outlines), part of #641), pattern swatches with pattern editing mode, live Repeat (radial/grid/mirror). A single selected mirror repeat shows a prominent axis with a center move handle and two rotation handles. Drag the line or center to change spacing, or an end to change angle; Shift snaps rotation to 45°. The original artwork stays in place, the reflected copy previews live, Escape cancels and each drag takes one undo step through `object.repeat.options`. Controls follow zoom/view rotation and hide with edges or the bounding box. Engine and headless canvas regressions passed for gestures, history and visibility; native move, rotation and Escape screenshots were reviewed. [Public mirror-repeat reference](https://helpx.adobe.com/illustrator/desktop/paint-and-fill/create-and-edit-patterns/set-mirror-repeat-options.html). A single selected grid repeat shows a handle below the grid for rows, one right of it for columns and one past its bottom-right corner for both, and sliders between its first two columns and rows for the horizontal and vertical spacing; the source keeps its size, each drag is one undo step and Escape cancels it ([public grid-repeat reference](https://helpx.adobe.com/illustrator/desktop/paint-and-fill/create-and-edit-patterns/set-grid-repeat-options.html), #2691). Object › Expand turns radial, grid and mirror repeats into groups of their instances (#1765, #1756). While Crop Image shows its box, the Control bar also sets the cropped image's resolution (PPI: a list of 72, 96, 150, 200 and 300 ppi with the ones above the image's own disabled, or a typed value; at most the image's own, or 300 ppi for a linked image ([Crop Image](https://web.archive.org/web/20210601162814/https://helpx.adobe.com/pdf/illustrator_reference.pdf#page=352))), a reference point that X and Y name and that W and H resize about, and a link that keeps W and H in proportion; `object.cropImage {ppi}` resamples the cut pixels and refuses a resolution above the limit, and `tool.setOption` sets `ppi`, `reference` and `linked` ([Crop images](https://helpx.adobe.com/illustrator/desktop/manage-objects/edit-objects/crop-images-in-illustrator.html)). The list's resolutions and the default (the image's own resolution, the center, unlinked) are VectorCraft's own. Choosing the Blend tool again while it is active (its toolbar button, W or `tool.select`) finishes the blend: the object clicked first is dropped and the next click no longer adds to the blend just made, so the click after it starts a new blend ([Blending objects](https://web.archive.org/web/20241217212108/https://helpx.adobe.com/illustrator/using/blending-objects.html)). Window › Blend exposes easing Type, Ramp and independent color Shift through `object.blend.options`. @@ -1677,6 +1703,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur - Create Strokes decides stroke or fill per feature, as the [help page](https://helpx.adobe.com/illustrator/desktop/manage-objects/traces-mockups-symbols/image-trace-panel-options.html) describes the Strokes width: the widest feature of the image that can become a stroke. A shape wider than Stroke somewhere keeps as its area every disc wider than Stroke that fits in it, and each piece outside those discs that reaches out of them at least one and a half times its own width (and 3 px) is traced as a stroked center line, its end at the area carried to the cut so the line's cap closes the join. Corners and edge slivers stay in the area. Which pieces count as features is VectorCraft's own rule. Each line still has one width; without Fills, the area is a 1 px outline as before. Tests: `thin_features_of_a_wide_shape_are_strokes_and_its_body_a_fill`, `wide_shapes_without_thin_features_stay_one_fill` and `distances_to_seeds_equal_brute_force` in `vectorcraft-trace`. The Image Trace score and estimates are unchanged. - The ignored centre-lines class measures that split on a mixed-width body scene: one disc with arms of 2, 3 and 5 px, at Stroke 6 px, traces as three stroked paths and one filled path in both the anti-aliased and hard input, with 100.0% of the arms' center samples found and 99.3% (anti-aliased) and 98.3% (hard) of the disc's pixels filled ([quality notes](image-trace-quality.md#centre-lines)). Test: `mixed_width_body_is_one_shape_traced_as_a_fill_and_strokes` in `vectorcraft-trace`. The Image Trace score and estimates are unchanged. Object › Live Paint › Merge adds the other selected paths and Live Paint groups to the bottom selected Live Paint group ([Live Paint groups](https://web.archive.org/web/20241230205225/https://helpx.adobe.com/illustrator/using/live-paint-groups.html)), which keeps its id, the paint of its faces and edges, and its name, lock, visibility, transparency, appearance, opacity mask and graphic style link. Object › Live Paint › Make with a Live Paint group selected, and a Live Paint Bucket click on a selected path beside a selected Live Paint group, add the paths to that group the same way. Make, Merge and the Live Paint Bucket take paths, compound paths and groups of them; with type, an image or another object among the selection they report that it has to be converted to paths first and change nothing, as type and raster images can't go into a Live Paint group directly ([Create Live Paint groups](https://helpx.adobe.com/illustrator/desktop/paint-and-fill/learn-painting-basics/create-live-paint-groups.html)); before, such an object went among the group's hidden sources and vanished from the canvas. Evidence: `tests_build::live_paint_refuses_type_and_images_and_changes_nothing`. + Paths drawn in an isolated Live Paint group join it when isolation mode ends, as the [help page](https://helpx.adobe.com/illustrator/desktop/paint-and-fill/learn-painting-basics/modify-live-paint-groups.html) describes: drawing paths in the isolated group and pressing Esc adds them. `object.exitIsolation` (Esc, the Control bar and isolation bar exits, a double-click outside, the Layers panel and the canvas context menu) adds the shown, unlocked paths, compound paths and groups of them drawn in the group as Merge does, in one undo step, and `object.isolate` on a level outside the group does the same. As VectorCraft's own rules, type, images, hidden and locked objects drawn there, and groups holding one, stay in the group as they are, and Gap Options, Merge and Release keep them; an exit with nothing drawn records no undo step. Evidence: `tests::build::{live_paint_isolation_adds_drawn_paths_on_exit, live_paint_isolation_adds_only_paths_it_takes, live_paint_isolation_leaves_a_group_holding_a_locked_path, live_paint_isolation_adds_drawn_paths_when_isolating_a_level_outside, live_paint_isolation_adds_a_drawn_group_isolated_inside_it, live_paint_isolation_keeps_art_named_like_its_parts, live_paint_keeps_type_drawn_in_it_through_gap_options_merge_and_release}`. With the Live Paint Bucket selected, Alt-click on vector art samples its fill, stroke and stroke weight into the paint defaults ([Paint with the Live Paint Bucket tool](https://helpx.adobe.com/illustrator/desktop/paint-and-fill/learn-painting-basics/paint-with-the-live-paint-bucket-tool.html)). On a placed image it samples the image pixel as a solid fill with no stroke. Alt+Shift-click samples only the color under the pointer, including an intermediate gradient color or image pixels, into the active fill or stroke ([Default keyboard shortcuts](https://helpx.adobe.com/illustrator/using/default-keyboard-shortcuts.html)). Neither click paints or changes the selection or selected art, and the next Bucket click paints with the sampled paint. Evidence: `tests_build::live_paint_bucket_alt_sample_paints_next_face_without_changing_selection`. Double-clicking the Live Paint Bucket opens Live Paint Bucket Options ([Paint with the Live Paint Bucket tool](https://helpx.adobe.com/illustrator/desktop/paint-and-fill/learn-painting-basics/paint-with-the-live-paint-bucket-tool.html)): Paint Fills (on) and Paint Strokes (off) set whether a click paints faces, edges or both, Highlight turns the outline of the face or edge under the pointer on or off, and Color and Width set it (red and 4 px by default). Faces are outlined at the Width and edges at half of it, as the page says faces are highlighted with a thick line and edges with a thin line. With both on, a click paints the edge within 4 px of the pointer, else the face, and Shift switches to Paint Fills only; with one on, Shift switches to the other. The options last across tool switches and are saved with the preferences (`tool.setOption {tool: "livePaintBucket"}`). Evidence: `builder::tests::{bucket_options_choose_what_a_click_paints, bucket_options_set_the_highlight, bucket_highlights_an_edge_thinner_than_a_face}`, `dialogs::live_paint_bucket::tests::double_clicking_the_tool_opens_its_options_and_ok_sets_them`. Live Paint Bucket double-click and triple-click, as [the help page](https://helpx.adobe.com/illustrator/desktop/paint-and-fill/learn-painting-basics/paint-with-the-live-paint-bucket-tool.html) describes them: a double-click on a face fills it and the faces reached across edges that draw no stroke, and on an edge it paints the edges joined to it with the same stroke; a triple-click fills every face of the group that has the face's fill, or paints every edge that draws with the edge's stroke paint, each with the bucket's paint (`livePaint.fill` and `livePaint.strokeEdge` `{scope: "connected" | "samePaint", match?}`; `pointer_gesture` and `ui.pointer` take `tripleclick`). Each click paints as it arrives, as its own undo step when it changes a paint, and the paint compared is the one the face or edge had before the first of its clicks that painted it, including a click whose drag or release crossed it; a first click that made the Live Paint group counts when the face it filled is the clicked face. With Space held for the view tools, a click, double-click or triple-click paints nothing and no face or edge is outlined, and with Cmd/Ctrl held a double-click or triple-click paints nothing. Which faces and edges join and which paints match are VectorCraft's own rules. Evidence: `tests_build::{live_paint_bucket_double_click_floods_across_unstroked_edges, live_paint_bucket_double_click_floods_curved_and_narrow_faces, live_paint_bucket_double_click_floods_across_hidden_edges_and_past_gaps, live_paint_bucket_triple_click_fills_every_face_of_the_same_fill, live_paint_bucket_triple_click_after_a_release_across_an_edge_matches_the_fill_before, live_paint_bucket_triple_click_released_from_another_face_matches_the_fill_before, live_paint_bucket_triple_click_after_making_the_group_across_an_edge_matches_the_made_fill, live_paint_bucket_triple_click_after_making_the_group_under_an_unfilled_path_matches_the_made_fill, live_paint_bucket_triple_click_after_merging_across_an_edge_matches_the_face_fill, live_paint_bucket_triple_click_after_merging_two_groups_matches_the_merged_fill, live_paint_bucket_triple_click_after_a_merge_splits_a_face_matches_the_part_fill, live_paint_bucket_triple_click_after_merging_matches_the_fixed_gradient, live_paint_bucket_triple_click_after_making_the_group_matches_the_made_fill, live_paint_bucket_double_and_triple_click_paint_joined_and_same_stroke_edges, live_paint_bucket_double_click_across_a_junction_paints_the_joined_edges, live_paint_bucket_double_click_released_back_on_the_first_edge_paints_the_joined_edges, live_paint_bucket_edge_double_click_after_filling_a_face_paints_the_joined_edges, live_paint_bucket_triple_click_with_a_cmd_press_between_matches_the_fill_before, live_paint_scope_and_match_are_checked}`, `builder::tests::{bucket_double_and_triple_click_widen_what_a_click_paints, bucket_triple_click_after_making_the_group_on_another_face_matches_its_own_face, bucket_triple_click_with_a_click_on_another_face_between_matches_the_first_fill, bucket_triple_click_with_a_view_tool_press_between_matches_the_first_fill, bucket_highlights_nothing_with_space_held}`, `canvas::tests::bucket_triple_click_with_a_view_tool_press_between_matches_the_fill_before`, `tests::build::{live_paint_scoped_fill_and_stroke_skip_parts_with_the_paint, live_paint_bucket_cmd_double_and_triple_click_paint_nothing}`, `tests::livepaint::{a_triple_click_fills_every_face_of_the_same_fill, clicks_with_space_held_paint_nothing}` (MCP). @@ -1712,6 +1739,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur - **Swatches:** names follow the colour model and are unique; Swatch Options (process/spot, Global, Gray/RGB/HSB/CMYK/Web, live preview); editing a global or spot swatch recolours every linked fill, stroke and text run in one undo step; multi-select and delete with confirmation; New Swatch and New Color Group dialogs (a group from the selected artwork's colours); swatches in colour groups convert, separate and count like any other. The Swatches panel selects ranges and whole groups, has a find field, and drags swatches to reorder, regroup or paint art; Add Used Colors, Select All Unused, Merge, Ungroup and Sort by Kind; a CMYK document keeps applied colours in CMYK. Swatch libraries: nine generated colour libraries, seven gradient libraries (among them Organic Fades, soft perceptually mixed multi-stop fades that thin out to transparent, and Holographic, seven opaque linear foils of narrow pastel and pearl bands and seven radial glows that fade out to a clear edge) and three pattern libraries (Geometric Patterns; Grit Textures with eight seamless grain, speckle, stipple, scratch and fleck tiles; and Optical Effects with eight of VectorCraft's own seamless wave, ring, warped-check, stripe, chevron and lens tiles; their swatches bring their patterns) in a library panel, saved as `.vcswatches`, `.gpl`, swatch exchange (`.ase`) or CSS, and loaded from `.vcswatches`, `.gpl` and `.ase` files (`.ase` both ways: RGB, CMYK, Lab and Gray; global, spot and process; groups) and from color books (`.acb`, read only: the RGB, CMYK or Lab colors of a book such as a Pantone book a user owns, named with its prefix and suffix, spot unless it says process, #831); `swatch.library.copyToUser` copies a loaded library into the User Defined folder without replacing a file, and a file with the same extension and bytes as a User Defined library opens as that library. Tints of global and spot colours ("Name 40%") stay linked and separate as a percentage of their plate. Spot colours can be defined in Lab (Spot Colors options). A built-in [Registration] swatch prints on every plate. Right-clicking a swatch in either list or thumbnail view selects it without applying paint and offers Swatch Options…, Duplicate Swatch and Delete Swatch for that item. None, [Registration] and missing swatches disable these actions. Existing active-item multiselection is retained; actions still target only the clicked item. Evidence: `panels::swatches::tests::context_menu` harness tests cover all five views, selection, dialog dispatch, duplicate/delete and Undo. All 39 Swatches tests pass; the regression fails with the menu hooks removed. Rendered headless list and thumbnail menus were inspected, and a fresh local deep CodeRabbit review reported zero findings. Full workspace CI passed on Linux/WSL on the merged branch (all 13 gates), including the test-helper correction for the upstream compile error tracked in #7727; native Windows full CI has two unchanged engine-test failures. Scores and estimates unchanged. Validation on 2026-11-15: native Windows formatting, workspace Clippy and all 39 focused Swatches tests passed. Windows full CI stopped at unchanged engine tests `tests::package::a_confined_package_names_files_outside_the_read_root_by_name` (slash-sensitive report assertion) and `tests::plugins::plugin_storage_behind_a_link_is_left_alone` (storage-link setup returned AlreadyExists). Both cases pass in the Linux/WSL full CI run, which passed all 13 gates. No engine or CI workflow changes are included. + Dragging swatches onto Delete Swatch deletes them ([the help page](https://help.adobe.com/archive/en_US/illustrator/cs5/illustrator_cs5_help.pdf#page=136), Replace, merge, or delete swatches section, lists this drag as one of the ways to delete the selected swatches): a swatch or color group dragged from the Swatches panel, in any view, and released on the Delete Swatch button is deleted through `swatch.delete`, even while nothing was selected and the button is disabled for clicks. A swatch that is part of the selection carries the other selected swatches of its kind with it. VectorCraft's own rules: the drop asks first as a plain click does, and Alt does not skip the question; Cancel keeps everything, and OK deletes them in one undo step; None and [Registration] are never taken; the button is enabled while swatches are selected or while a swatch or group of the active document is being dragged, and it is outlined only while such a swatch or group is held over it, so a paint from another panel, art and a swatch dragged from another document delete nothing. Tests: `panels::swatches::tests::swatches_dropped_on_delete_swatch_are_deleted_after_asking`, `delete_swatch_ignores_other_drags`. Editing, renaming, deleting or merging a global swatch also changes the colors linked to it in graph designs, the art of brushes and the tile that pattern editing's Cancel puts back, in the same undo step as the rest of the art; Default Swatches with replace unlinks them there too. A swatch step in `command.batch` (Delete, Swatch Options, Merge, Edit Color Group) changes the fill and stroke for new art as the command run on its own does, so art drawn later in the batch or after it takes the same paint; a batch that fails, and a canceled batch preview, put back the paints it started with, and a canceled Swatch Options preview leaves them as they were. These swatch commands also change the fills and strokes of the appearance new art takes, and Undo and Redo of the command or the batch put the paints for new art back with the swatches. Spot Colors options (`swatch.spotOptions`) and Default Swatches with replace (`swatch.resetDefaults {replace: true}`) as `command.batch` steps also change the fill and stroke for new art as each command run on its own does: a fill or stroke linked to a Lab spot swatch keeps its link and tint and takes the Lab values or their CMYK equivalent, and one linked to a swatch the replace removes keeps its color and loses the link. Evidence: `swatch_steps_in_a_batch_change_the_new_art_paints_as_commands_do`, `spot_colors_options_in_a_batch_change_the_new_art_paints_as_the_command_does`, `default_swatches_replace_in_a_batch_unlinks_the_new_art_paints_as_the_command_does`, `undo_and_redo_of_a_swatch_edit_put_back_the_new_art_paints`, `swatch_edits_reach_the_paints_of_the_new_art_template`, `a_failed_batch_puts_back_the_new_art_paints_a_swatch_step_changed` and `canceling_a_swatch_options_preview_keeps_the_new_art_paints` in `crates/engine/src/tests/swatches.rs`. Add Used Colors (`swatch.addUsedColors`) and Select All Unused (`swatch.unused`) look colors, swatch names, links, tints and gradients up in hash sets instead of searching every swatch and color for each color or linked paint (New Color Group from artwork too), and New Swatch with several colors (`swatch.new`), New Color Group (`swatch.newGroup`) and Edit Color Group (`swatch.editGroup`) name their new swatches from one set of the names already taken. The new swatches keep their names, order and links, and Select All Unused lists the same swatches. Evidence: `add_used_colors_adds_each_new_color_once_with_free_names`, `add_used_colors_global_links_every_paint_of_a_new_color`, `unused_matches_links_tints_colors_gradients_and_patterns_exactly`, `new_swatches_from_colors_are_numbered_after_names_already_taken`, `new_color_group_numbers_its_colors_after_the_group_and_its_moved_swatches`, `new_color_group_from_artwork_lists_each_color_once_with_free_names` and `edit_color_group_numbers_extra_colors_after_the_names_it_keeps` in `crates/engine/src/tests/swatchcmds.rs`; `free_swatch_names_match_naming_each_swatch_as_it_is_added` and `free_swatch_names_match_new_swatch_names_as_swatches_are_added` in `crates/doc/src/swatches.rs`. @@ -1756,11 +1784,13 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur - **Sample Color from Screen:** an eyedropper button in the Color Picker and `ui.sampleScreenColor` (which can be given a key in Keyboard Shortcuts) pick a color anywhere on the screen with the system's sampler: `NSColorSampler` on macOS, the XDG desktop portal's [PickColor](https://flatpak.github.io/xdg-desktop-portal/docs/doc-org.freedesktop.portal.Screenshot.html) on Linux, a still copy of every monitor under a crosshair on Windows, and the EyeDropper API in browsers that have it. The color becomes the fill or the stroke as one undo step, or the Color Picker's color, converted from display sRGB into the working RGB space. On Linux, a session without a portal that has PickColor, a portal that does not return from the call within 25 seconds (VectorCraft's own limit) or leaves the bus before it answers, and a portal that ends the request another way each show a status message and end the wait. On Windows, the copy is read as sRGB, so the colors of HDR and wide-gamut displays are not converted; Escape, a click of another mouse button or switching to another window cancels (VectorCraft's own rules). The BSDs and other browsers have no sampler yet; the button is gray there. - **Color Guide color groups:** with variation cells selected, the Color Guide's Save Color Group to Swatches button saves those cells as one swatch group, and with none selected it saves the harmony colors, as the [help page](https://help.adobe.com/archive/en_US/illustrator/cs5/illustrator_cs5_help.pdf) describes saving several selected variations together (printed page 135). The group takes the cells in grid order (row by row, left to right, each cell once), is named after the harmony rule and is one undo step; these are VectorCraft's own rules. A selection lasts until the base, the Color Guide Options, the variation mode, the harmony rule, the library limit or the colors the grid shows (for example after a new swatch while the guide is limited to the document's swatches) change. - **Color Guide colors dragged to Swatches:** a variation cell dragged from the Color Guide onto the Swatches panel's list becomes a swatch of that color, as the [help page](https://help.adobe.com/archive/en_US/illustrator/cs5/illustrator_cs5_help.pdf) describes for saving variations as individual swatches (printed page 135). In VectorCraft a harmony strip color drags the same way, a drag carries only the grabbed color (the selected cells stay selected and the selection is not saved), it carries the color the cell shows (snapped to the Limit to Library colors), keeps the color's model and does not paint the selected art; the swatch follows the panel's rules for a dropped color (`swatch.new`, one undo step, a color that is already a swatch is added again under another name, a drop on a color group joins it). These are VectorCraft's own rules. Tests: `a_dragged_guide_color_carries_its_color_and_applies_nothing` and `a_guide_color_dragged_onto_the_swatches_panel_becomes_a_swatch` in `crates/ui-egui/src/panels/color_guide.rs`. + - **Color Guide tints of a spot color:** when the Color Guide's base is a spot color, or a tint of one, chosen in the Swatches panel, with the Color panel's tint slider or with the base chip, the cells right of the center in the base row of Tints/Shades are tints of that spot color: a click paints the art with the tint, a drag carries it, and Save Colors as Swatches and Save Color Group to Swatches make tint swatches ("Ink 60%") linked to the spot color, so they follow an edit of it. The [help page](https://helpx.adobe.com/illustrator/desktop/manage-colors/learn-color-basics/color-guide-panel-overview.html) says spot colors are kept only on the right side of Tints/Shades and every other variation gives process colors. The tint percentages (the base's tint reduced by the share each cell goes toward white), the shades on the left staying process colors, a Limit to Library giving process colors, and a global process base keeping plain colors are VectorCraft's own rules. So are these: renaming the spot color in Swatch Options, also as a `command.batch` step, keeps it the base, and so do an Undo and a Redo of the rename; deleting it (or its color group), making it a process color or closing its document ends the link, so a later spot color of the same name does not become the base until it is chosen, and the base keeps the color it showed. A batch's steps in other documents leave the link alone. Running a script or a plug-in, also as a batch step, ends the link, and a spot color of the same name that appears while the link waits for an Undo does not give the base its color. `swatch.new {colors}` and `swatch.newGroup {colors}` take `{swatch, tint}` entries. Tests: `a_spot_color_base_gives_tints_of_that_spot_color`, `a_tinted_spot_base_gives_lighter_tints_and_a_lost_link_gives_process_colors`, `a_renamed_spot_color_stays_the_base`, `a_deleted_spot_color_ends_the_link`, `an_undone_rename_keeps_the_link`, `a_batch_follows_the_spot_color_across_documents`, `a_deleted_color_group_ends_the_link`, `a_resting_link_keeps_the_color_it_showed`, `a_script_run_ends_the_link`, `saved_spot_tints_are_tint_swatches_of_the_spot_color`, `a_dragged_spot_tint_becomes_a_tint_swatch`, `a_clicked_spot_color_swatch_becomes_a_linked_color_guide_base`, `colors_entries_naming_a_spot_color_save_tint_swatches`. - **Stroke visibility (#1253):** adding paint to a previously unpainted zero-width stroke restores the existing 1 pt default (`PaintDefaults::default`, `Appearance::set_stroke`), for the selected appearance item, the new-art defaults and Swap Fill/Stroke. Positive widths are kept; recoloring a painted zero-width stroke keeps its explicit zero. A real Eyedropper-to-new-shape sequence reproduces the zero-width inheritance. Five engine regressions cover creation, defaults, targeted items, preserved widths and one-step Undo/Redo (`crates/engine/tests/it/stroke_visibility.rs`). - **Gradients:** lossless, validated gradient params; gradients follow rotate, reflect, shear, non-uniform scale and distortions; the Gradient tool edits the fill or stroke of the active proxy, type included; an interactive on-canvas annotator (move, length/angle, rotate, add/move/delete/duplicate stops, midpoints, a stop popover, Delete and arrow keys). The Gradient panel has the Fill/Stroke proxy, a gradient-swatch dropdown with Save to Swatches, midpoint locations, Alt-drag to copy or swap stops, swatch drops on the ramp and a stop eyedropper; copied appearances and graphic styles place gradients on each target's own bounds; gradient handles, both ends of a vector drawn on the art and the start of a clicked one snap as other drawn points do (path segments, construction guides and View › Snap to Glyph's guides included) and honour Constrain Angle. Gradient stops stay linked to global and spot swatches. Freeform gradients (points and lines) are edited on the canvas; radial gradients have an extent ellipse, an aspect handle and an off-centre focal point (SVG `fx`/`fy`, PDF two-point radials). A stroke's gradient runs within, along or across it. Object ▸ Expand turns gradients into N objects or a gradient mesh. A gradient stop that loses its link to a spot swatch (the swatch deleted, a recolor or adjustment that unlinks it, a library gradient, or a library character style linked to a swatch the document lacks) keeps the color it shows at full tint and drops the process plates it printed with that ink, as a stop given a plain color does; this is VectorCraft's own rule. Evidence: `tests::mapping_links_drops_the_process_plates_of_unlinked_stops` in `crates/color`, `tests::linked_stops::deleting_a_spot_swatch_takes_the_process_plates_of_the_stops_it_unlinks` and `tests::library::library_stops_unlinked_from_their_swatch_keep_no_process_plates` in `crates/engine`. Merge Swatches (`swatch.merge`) also drops the process plates of the gradient stops linked to a swatch it merges, whether the kept swatch is spot, global process or process that isn't global, in the art, gradient swatches, graphic styles, the art of brushes and the fill and stroke for new art; a stop linked to another swatch keeps its plates, and Undo puts the links and plates back. This is VectorCraft's own rule. Evidence: `tests::linked_stops::merging_swatches_takes_the_process_plates_of_the_stops_it_relinks` in `crates/engine`. - The Gradient panel's Delete Stop sits at the right end of the ramp, level with it, so a panel too short to show the stop fields still shows it; it deletes the selected stop (never below two), as dragging a stop down off the ramp does (#5403). + - Over the strip under the Gradient panel's ramp, where a click adds a stop, the pointer is the white arrow with a plus that Group Selection shows for a click that adds. Windows has no system copy cursor (winit shows the plain arrow for it), so on Windows and X11 the panel hands the glyph to the OS as the canvas hands its tool cursors; macOS, Wayland and the web show the system copy cursor. Over the ramp itself, which adds nothing, the pointer stays the arrow (#8241; `panels::gradient` test `the_strip_under_the_ramp_shows_the_add_cursor`). - Conic gradients, VectorCraft's own gradient type: the stops sweep once around the center from the vector, clockwise on the page (a negative aspect, or a reflection, turns the sweep the other way), with a Conic button in the Gradient panel's Type row and the Gradient tool's extent ellipse and aspect handle; they follow transforms, Expand into wedges or a mesh, open from `.af` files, and export to PDF as a function-based shading that PDF import reads back as a conic gradient; SVG, EPS and legacy `.ai` files get solid wedges, and CSS a `conic-gradient`. - Diamond gradients, VectorCraft's own gradient type: the stops run from the center out to a square with a corner at the end of the vector (the aspect stretches it into a rhombus), with a Diamond button in the Gradient panel's Type row and the Gradient tool's square and aspect handle; they follow transforms, Expand into nested squares or a mesh, and export to PDF, SVG, EPS and legacy `.ai` as four linear gradients, one for each quarter of the square (an image in PDF and SVG for translucent stops, a dithered fill, the Perceptual method other than spot color shadings in PDF, or a square with no area), and on type characters in SVG as a radial gradient; PDF import reads a function-based shading whose color is the same along each square about its origin as a diamond gradient. - Hue Clockwise and Hue Counterclockwise, VectorCraft's own gradient methods, in the Gradient panel's Method menu and on `paint.editGradient` and `paint.setFill` (`method`: `hue-clockwise`, `hue-counterclockwise`): a linear, radial, conic or diamond gradient's colors mix around the hue wheel, with hue, saturation and brightness each changing evenly from one stop to the next and the hue angle keeping one direction, as the fixed-direction rules of [CSS Color 4](https://www.w3.org/TR/css-color-4/#hue-interpolation) do: falling with Hue Clockwise (red, magenta, blue), which is clockwise on the color wheels, and rising with Hue Counterclockwise (red, yellow, green). Hues less than half a color level apart count as one hue, so a color and its tint do not turn the wheel. A gray stop takes the hue of the stop it mixes with, and black its saturation too. The canvas and raster exports draw it through stops on that curve, within half a color level; Reverse Gradient turns the method the other way with the stops, so the ramp keeps its colors. SVG and PDF write it as an RGB image, EPS as a shading in process colors, and a legacy `.ai` file and the `.ai` editing data with the colors between its stops as stops of their own, with a warning. @@ -1924,7 +1954,9 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur A PDF-compatible `.ai` saved with Include Editing Data for Other Apps keeps envelopes made with a warp, a mesh or a top object editable: its editing copy holds each envelope's contents, shape, Fidelity, Envelope Options and Edit Contents state in the form VectorCraft's `.ai` envelope reader reads, beside its distorted art, so the file opens with the same live envelope, Edit Contents still switching between the contents and the envelope ([Edit the contents of envelopes](https://helpx.adobe.com/illustrator/desktop/manage-objects/reshape-transform-objects/edit-the-contents-of-envelopes.html)). Envelopes whose type is threaded, has text wrap options or is written as its outlines, envelopes in opacity masks, pattern tiles or another envelope's contents, and envelopes the reader would open with another shape or other settings (a Fidelity that isn't a whole number, bounds margins kept with Distort Appearance off), and envelopes after the first 256 envelopes and images with a Warp in a file are written as their distorted art, with a warning (`envelopes_are_read_back_live` and `envelopes_the_reader_cannot_open_live_are_written_as_their_art` in `crates/eps/src/ai_editing/tests.rs`). On a large canvas ([the help page](https://helpx.adobe.com/illustrator/desktop/add-and-import-files/start-a-new-file/large-canvas-faq.html); VectorCraft writes one when the artboards together are wider or taller than 16,381 points, its own limit), that `.ai` keeps warp, mesh and top object envelopes editable too: the editing copy writes them live at 1/10 of their size with the rest of the art, and VectorCraft's `.ai` reader opens them at their size, from the editing data alone or beside the PDF part. Read from the editing data alone, an envelope's saved box size is compared with its contents at the same scale, so a bounds margin kept with Distort Appearance comes back, and every path's stroke weight, dashes and dash offset come back at their size, not at 1/10 (`large_canvas_envelope_kinds_round_trip_on_both_ai_routes`, `large_canvas_envelope_stroke_margin_round_trips_on_both_ai_routes` and `a_large_canvas_path_keeps_its_stroke_weight_and_dashes_read_alone` in `crates/eps/src/ai_editing/tests.rs`). An envelope whose contents hold type keeps the type editable in that `.ai`: the editing copy writes the type as type in the envelope's contents, in the form the `.ai` reader opens as a live envelope of type (`TypedEnvelope` in `crates/eps/src/import/ai/envelope.rs`), so the file opens with the type shown and editable in the envelope's contents, with Edit Contents off or on. An envelope of type in a symbol's art, and one whose type is threaded, has text wrap options or is written as its outlines (mirrored type, for example), is written as its distorted art, as before (`an_envelope_of_type_is_read_back_live_with_its_type`, `an_envelope_of_type_written_as_its_art_leaves_no_story` and `an_envelope_of_type_in_a_symbol_or_a_thread_is_written_as_its_art` in `crates/eps/src/ai_editing/tests.rs`). + A PDF-compatible `.ai` saved with Include Editing Data for Other Apps keeps blends live: its editing copy holds each blend's key objects, its spine when it has one of its own, its drawn steps, and its spacing (Smooth Color, Specified Steps, Specified Distance) and orientation (Align to Page, Align to Path) ([Blend Options](https://helpx.adobe.com/illustrator/desktop/manage-colors/apply-transparency-and-blending/blend-options-overview.html), [blends and their spine](https://help.adobe.com/archive/en_US/illustrator/cs5/illustrator_cs5_help.pdf#page=260)), in the form VectorCraft's `.ai` blend reader reads (`crates/eps/src/import/ai/blend.rs`), so the file opens with the same live blend laying out the same steps. Each blend is checked with that reader before it is written; blends it wouldn't open with their settings or as they are drawn are written as their steps with a warning ([file-format-parity.md](file-format-parity.md) lists them) (`blends_are_read_back_live`, `blends_of_compound_paths_groups_and_62_keys_are_read_back_live` and `blends_the_reader_cant_read_are_written_as_their_steps` in `crates/eps/src/ai_editing/tests.rs`). A top object whose top and bottom sides, or left and right sides, have different numbers of segments is also saved live: the side with fewer segments is split into as many as the side across from it has (each segment into equal spans of its curve, a straight one at even steps), up to the 50 a side the grid holds, so the file opens with the same corners and the same mapping of the contents, its outline holding the added anchors. Where the split side would share out the contents another way, as a side of two curves that aren't one curve can, or a side has more than 50 segments, the envelope is written as its distorted art, with the warning (`a_top_object_with_uneven_sides_is_read_back_live`, `a_top_object_split_to_the_grids_limit_is_read_back_live` and `a_top_object_whose_split_side_would_map_another_way_is_written_as_its_art` in `crates/eps/src/ai_editing/tests.rs`). + A PDF-compatible `.ai` saved with Include Editing Data for Other Apps keeps gradient meshes editable ([gradient meshes](https://help.adobe.com/archive/en_US/illustrator/cs5/illustrator_cs5_help.pdf#page=200), [opacity of mesh points](https://help.adobe.com/archive/en_US/illustrator/cs5/illustrator_cs5_help.pdf#page=203)): its editing copy writes each mesh point's place, color (gray, RGB or CMYK), opacity and handles patch by patch, with the mesh's transparency, name and opacity mask, in the form VectorCraft's `.ai` mesh reader reads (`crates/eps/src/import/ai/mesh.rs`), so the file opens with the same mesh. A reflected mesh is written with its columns in reverse order. Meshes with a point in a Lab color, with more than 128 rows or columns, folded meshes, meshes the reader would open otherwise, meshes in pattern tiles and in art cut to a clipping object, and every mesh on a large canvas are written as their drawn look, with a warning (`meshes_are_read_back_as_they_are`, `meshes_in_masks_and_symbols_are_read_back`, `a_reflected_mesh_is_written_with_its_columns_reversed` and `meshes_the_reader_cant_read_are_written_as_their_drawn_look` in `crates/eps/src/ai_editing/tests.rs`). A PDF-compatible `.ai` saved with Include Editing Data for Other Apps writes eligible paths, compound paths and groups with live effects with an art style when the writer supports their appearance and effects (not a filled path that uses the even-odd rule, and none on a large canvas), which VectorCraft's `.ai` reader opens as the same appearance with its effects live (`objects_with_live_effects_are_read_back` and `every_effect_setting_written_on_an_object_is_read_back` in `crates/eps/src/ai_editing/tests.rs`; [file-format-parity.md](file-format-parity.md) lists the objects written without one and the effects they lose). The same holds for the objects of an opacity mask's art, a mask inside another mask's art and a hidden art root included, so a mask whose art has Offset Path opens drawing the image it masks as it did, with the effect live; geometry effects that no art style holds on a mask's art, such as Roughen, are written applied to the art, which opens drawing what it drew (`a_masked_image_with_live_offset_path_round_trips`, `hidden_and_nested_mask_art_keep_live_offset_path` and `a_masks_art_with_an_effect_no_style_holds_is_written_as_it_draws` in `crates/eps/src/ai_editing/tests.rs`). Opacity masks in a symbol's art and in a pattern's tile are written the same way, so a symbol or pattern whose mask art has Offset Path opens with the effect live in its definition, and its instances and pattern fills draw as they did; each definition's mask art keeps its own style, and mask art linked to a graphic style opens still linked to it (`a_symbols_mask_art_keeps_live_offset_path`, `a_pattern_tiles_mask_art_keeps_live_offset_path`, `mask_art_styles_stay_with_their_own_art` and `opacity_mask_art_keeps_its_graphic_style_link` in `crates/eps/src/ai_editing/tests.rs`). @@ -1964,8 +1996,9 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur A `.ai` or EPS whose editing data has brushes opens with the file's Calligraphic, Scatter, Art and Bristle brushes in the Brushes panel in place of the default ones, in the file's order: the Calligraphic size, roundness and angle with their variation, the Scatter size, spacing, scatter and rotation, the Bristle settings, and the Scatter and Art brushes' art (Art brushes in the older and newer forms of their objects). A brush library `.ai` (brushes and no layers) opens from its PDF part with its brushes, so Other Library lists them. An Art brush in None or Tints keeps that colorization, and one in the newer form also keeps its fixed width, Flip Along and Flip Across, and Scale Proportionately, Stretch to Fit Stroke Length or Stretch Between Guides with its guides ([Art brush options](https://web.archive.org/web/20220911143322/https://helpx.adobe.com/pdf/cs6/illustrator_reference.pdf), printed page 193). Pattern brushes and brushes that can't be read are left out with a note. Paths with a Calligraphic brush, and paths with an Art brush in the newer form that bends art of solid-filled paths with those options, open as the path with the brush on its stroke, except paths whose brush scales its art proportionately. Paths with an Art brush in the older form, and other brushed paths, still come in as their drawn look (part of #372 and #637; `crates/eps/src/import/ai/tests.rs`, `crates/eps/src/import/tests_native.rs`). In a `.ai` opened from its editing data, a path or type object with Offset Path, Outline Object or Outline Stroke on the whole object opens as itself with those effects live, in their order and shown or hidden; on a fill or stroke of type they stay on that fill or stroke. Offset Path keeps its Offset, Joins and Miter Limit, and Outline Stroke takes its width from the stroke. An Offset Path with a setting missing, out of range or not read keeps the drawn art, as does a path with a Path effect on one fill or stroke (`crates/eps/src/import/ai/style/tests.rs`, `crates/eps/src/import/ai/tests.rs`, `crates/eps/src/import/tests_native.rs`). In a `.ai` or EPS opened from its editing data, a Scatter brush whose last 15 numbers start with 1 comes into the Brushes panel in Tints, and each brush art section is read without its frame, an unnamed, unpainted rectangle with no settings of its own at the art's bounds (within 1/1000 pt). A wider frame stays in the art, and an art group with a state or look of its own (hidden, locked, isolated, knockout, an opacity, a blend mode, a name, a mask, a note or an appearance) stays a group (`crates/eps/src/import/ai/tests.rs`). + A PDF-compatible `.ai` saved with Include Editing Data for Other Apps writes a Scatter or Art brush whose art holds opacity masks to the Brushes panel of its editing copy. This is VectorCraft's own rule for brushes a document already holds. Each mask's art is written in the brush's art section in the form VectorCraft's `.ai` reader reads (`define_brush_art` in `crates/eps/src/import/ai/read/directives.rs`), with the mask's Clip and Invert Mask options, whether it is disabled and whether it moves with its object, for masks up to seven deep in one another's art. A brush whose mask art holds more than paths, compound paths and groups with one solid fill and one plain stroke each is left out with a warning, and a path with an Art brush whose art holds a mask is written as its drawn look. When the reader turns an Art brush's art over, it turns the art of a mask that doesn't move with its object over too (`scatter_and_art_brush_mask_art_round_trips` and `brushes_whose_mask_art_isnt_read_back_are_left_out` in `crates/eps/src/ai_editing/tests.rs`, `an_art_brushs_opacity_mask_art_turns_over_with_its_object` in `crates/eps/src/import/ai/tests.rs`). In a `.ai` opened from its editing data, type with Warp on the object or on one of its fills or strokes opens as type with the effect live when the live warp draws as the art saved with it. When it draws differently, or when the file's limit of checks has no check left for it, it opens as that art, and one note says how many did. Type stays live without a comparison when the saved art paints nothing or draws type of its own, in frames of threaded type, when a text variable binds it, and when its text object doesn't come in as one text object (`crates/eps/src/import/ai/envelope.rs`, `crates/eps/src/import/tests_native.rs`). - In a `.ai` opened from its editing data, an object with a Tweak that moves nothing or Pucker & Bloat at 0 opens as itself with the effect live. A path, compound path or group whose only effect is Transform without copies, or a Free Distort whose corners make a parallelogram, opens as itself with it live, and so does an object with nothing stroked whose only effect is Twist: a path or compound path with straight segments at up to 180° either way, unless it is a compound path with a guide member that reaches past its other members and the angle is not 0°, and another path, compound path or group with no guide in it at up to 90° either way (limits VectorCraft sets); one twisted further keeps the drawn art. A gradient or pattern, an image, type, a clipping group, an opacity mask or effects inside the object, or a stroke with a Transform that scales, rotates or reflects, keep the drawn art (`crates/eps/src/import/ai/style/tests.rs`, `crates/eps/src/import/ai/tests.rs`, `crates/eps/src/import/ai/read/ops.rs`). + In a `.ai` opened from its editing data, an object with a Tweak that moves nothing or Pucker & Bloat at 0 opens as itself with the effect live. A path, compound path or group whose only effect is Transform without copies, or a Free Distort whose corners make a parallelogram, opens as itself with it live (not when a guide in it reaches past the rest of its art, hidden members included, and the Transform scales, rotates or reflects the object with Transform Objects on, or the object is a group and the Free Distort moves a corner), and so does an object with nothing stroked whose only effect is Twist: a path or compound path with straight segments at up to 180° either way, unless it is a compound path with a guide member that reaches past its other members and the angle is not 0°, and another path, compound path or group with no guide in it at up to 90° either way (limits VectorCraft sets); one twisted further keeps the drawn art. A gradient or pattern, an image, type, a clipping group, an opacity mask or effects inside the object, or a stroke with a Transform that scales, rotates or reflects, keep the drawn art (`crates/eps/src/import/ai/style/tests.rs`, `crates/eps/src/import/ai/tests.rs`, `crates/eps/src/import/ai/read/ops.rs`). A PDF page whose `UserUnit` (PDF 1.6) is above 1 opens at its size in points, its numbers times the `UserUnit` (one above 75,000 counts as 75,000), and `document.pdfInfo` gives its size and boxes in points too. A `.ai` whose editing data has its artboards in the units of such a page opens from that data at the page's size, with its layers, and when the layers can't be read its pages still take the artboard layout of the data, scaled the same way (part of #1482). `document.open`, `file.place` and `document.pdfInfo` reject a `cropTo`, `crop`, `password`, `colorMode` or `textAs` that is not a string, such as `"textAs": true`, and `document.pdfInfo` rejects a `thumbnailSize` that is not a number; the error names the param, and nothing opens or is placed. A param left out or given as null keeps its default (`crates/engine/src/cmd/fileio/tests_pdfimport.rs`). When the PDF content of a `.ai` has a page for each artboard, the layers are compared with every page on its artboard (until the pages compared take 8,388,608 pixels at the comparison's scale, about 67 letter-size pages, or number 128): art that only the layers or only a later page draws is handled as art that differs on the first page is, and a text object that a later page doesn't draw is left out unless its layer doesn't print (`crates/eps/src/import/tests_native.rs`). @@ -1980,6 +2013,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur In a `.ai` opened from its editing data, Bas Relief in an art style takes its Detail, Smoothness and Light direction from the style's settings block, and an object other than type with it opens as itself with the live effect. A settings block that VectorCraft can't read (malformed, another effect's, a value out of range or a key it doesn't know) keeps the object's drawn look (part of #637; [raster effects reference](https://helpx.adobe.com/illustrator/desktop/special-effects-styles/apply-filter-effects/raster-effects-reference.html), [Photoshop File Formats Specification](https://www.adobe.com/devnet-apps/photoshop/fileformatashtml/), [scripting the filter gallery](https://community.adobe.com/questions-712/scripting-support-for-the-filter-gallery-1064646); `crates/eps/src/import/ai/style/tests.rs`, `crates/eps/src/import/ai/tests.rs`). PDF export and `.ai` saves write a page with a side longer than 14,400 pt with a `UserUnit` (PDF 1.6), its longer side divided by 14,400 and rounded up to the next thousandth, so that no side is longer than 14,400 units (ISO 32000-1, Annex C.2); a PDF 1.5 file with such a page is written as PDF 1.6 with PDF 1.5's encryption, PDF/X files and PDF 1.3 and 1.4 files write it in points (in PDF 1.3 and 1.4, a page past 32,767 pt that needs a real number past 32,767 is refused with an error naming it), a page whose short side is 3 pt or longer but would be under 3 units at that `UserUnit` gets a smaller one that keeps the short side at 3 units, and the export's warnings give each such page's size and how it is written (#6382). The Save PDF dialog's "Write pages longer than 200 in at full size in points" (`longPagesInPoints`, on by default; `.ai` saves leave it off) writes such pages in points without a `UserUnit` at every PDF version, in files without a PDF/X or PDF/A standard, so readers that ignore `UserUnit` show them at full size. Export As PDF with Use Artboards off also opens the Save PDF dialog, without its Artboards section, and writes one page of the visible art's bounds with the dialog's options (`document.exportPdf {useArtboards: false}`; `crates/ui-egui/src/dialogs/tests_export.rs`, `crates/engine/src/cmd/fileio/tests_pdf.rs`). + While Alt (Option on macOS) is held, the Save PDF dialog's Cancel button reads Reset, which puts every option back to the chosen preset's settings, passwords included, and leaves the dialog open; letting the key go shows Cancel again (`ui.dialogReset`). [The help page](https://help.adobe.com/archive/en_US/illustrator/cs3/illustrator_cs3_help.pdf#page=283) says that holding Alt or Option and clicking Reset returns the options to their defaults. Resetting to the chosen preset's settings, and keeping the preset, path, artboard range and section, are VectorCraft's own rules (`crates/ui-egui/src/dialogs/save_pdf/tests.rs`, `crates/ui-egui/src/dialogs/tests.rs`). `document.exportSelection` run without params (a shortcut) takes the same route after its save panel: a picked PDF opens the Save PDF dialog without its Artboards section, and SVG, the raster formats, EPS, DXF, text and exporter plug-ins with parameters open their options, whose OK writes the selection alone, cropped to it, with the chosen options (`crates/ui-egui/src/dialogs/tests_export_selection.rs`). A `.ai` export with Use Artboards off writes one page of the visible art's bounds without the native document or the editing copy for other apps, with a warning, so the file does not reopen with one artboard in place of the document's; without PDF content it is refused (`crates/engine/src/cmd/fileio/tests_pdfedit.rs`). That page, and an HP-GL plot of the art's bounds, are measured on the art the file draws: non-printing layers the PDF or `.ai` file leaves out do not make it larger, and nor do the non-printing layers, objects at 0% opacity, placed images, clear gradient meshes and unpainted paths a plot leaves out; Export As refuses an HP-GL plot of nothing it draws before the save dialog (`crates/engine/src/cmd/fileio/tests_pdf.rs`, `crates/engine/src/cmd/fileio/tests_hpgl.rs`, `crates/ui-egui/src/dialogs/tests_export.rs`). @@ -2000,6 +2034,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur A `.ai` saved without PDF compatibility (its PDF part only a placeholder page) is placed and pasted from its editing data, as it opens: File › Place places the art of the layers that show on the first artboard (`file.place`'s `page` places another one), and Paste of it as PDF data (`clipboard.importPdf`) takes every object. `document.open` with `pages` naming every page of such a file opens it the same way (`crates/engine/src/cmd/fileio/tests_aiimport.rs`). Explicitly requested editing data keeps the full single artboard when its PDF page is capped at 14,400 pt (#6865; `crates/eps/src/import/tests_native.rs`). Scores and estimates unchanged. A `.ai`, or a PDF saved with Illustrator's editing data, whose PDF part can't be read (a stream the import refuses) opens from its editing data, with the PDF part's error as its first warning; File › Place places its first artboard the same way, and Paste of it as PDF data with `editingData: true` takes every object (part of #4366; `crates/engine/src/cmd/fileio/tests_aiimport.rs`). + A PDF, or a `.ai` read through its PDF part, opens an image that decodes to up to 4 GiB with up to 2^30 pixels in a 64-bit desktop build (31404 × 31403 RGB pixels are 2.76 GiB), and up to 1 GiB with 2^28 pixels in 32-bit and web builds. A file with an image that would decode to more is refused with the size it would decode past, and an image with more pixels is left out with a warning (#4366). An opaque image is kept as RGB, without an alpha channel (`crates/pdf/src/streams.rs`). - EPS and DXF in and out, EMF/WMF in and out; PNG (with PNG-8), JPEG, WebP, GIF, TIFF, BMP, Targa and layered PSD export; grayscale TIFFs with an alpha channel or other extra channels place, relink and open, the alpha as the image's transparency (#1466 in part; CCITT Group 3 and planar files with extra channels are not read); PSD and PSB files open and place, linked or embedded, as their merged image in every colour mode and depth (#918). EPS import runs a PostScript Level 3 interpreter written from the PostScript Language Reference: resource categories and `resourceforall`, local and global VM (`currentglobal`/`setglobal`/`gcheck`), `clipsave`/`cliprestore`, subarrays and substrings that share storage, the standard dictionaries in `systemdict`, `dictstack`, `internaldict`, executable filters and strings, `load` by any key, `//name` immediate names, `token`, `execform`, user paths, `cshow`, `rootfont`, `cachestatus`, colour rendering and halftone queries, file `status` and data read with `flushfile`, and `pdfmark` marks dropped (Discord feedback, #466, #469, #474). Masked images (`ImageType 3` in its three interleavings) and reusable streams are read, and an image's several data sources are read in turn, as the reference defines (procedures that read one file get their own rows: such images came in banded, #498). `restore` puts dictionaries back as they were at the `save`, so programs that count their saves in a dictionary read to their end (part of #505). Tiling patterns come in as pattern swatches, uncoloured ones too; Type 3 fonts' glyphs as their outlines, spaced by `ashow`/`widthshow`/`xshow`/`kshow`; mesh and function-based shadings (types 1, 4–7) as gradient meshes; sampled functions (type 0) and Flate/LZW predictors are read. It is tested with programs written from the specification in the ways common generators use these features; Inkscape/cairo EPS files open as vectors. When a file's PostScript still can't be read, it opens as its TIFF preview, its Windows metafile preview (as vectors) or its EPSI preview, and the warning (in the status bar, `document.open`/`app.open`/MCP `open_file` replies and `vectorcraft-cli info`) names the error, the operator that raised it and the procedures it ran in. Legacy PostScript `.ai` files (Illustrator 3–8, written with the prolog that defines their operators) keep their groups and nested groups (`u` … `U`), between and inside clipping groups; EPS and EMF/WMF import nest clips (and groups) at most 128 deep, so a hostile file can't exhaust the stack. DXF TEXT justified Fit or Aligned spans its two points (stretched, or scaled as a whole). PDF export writes type as real, searchable text in embedded subset fonts by default, as Illustrator's PDF presets do (Convert Text to Outlines is an option; printer's marks stay shapes), so text-heavy PDFs stay small (#733). DXF export writes each fill as its outlines followed by its hatch, so laser and cutter software, which skips hatches, gets filled art and type too (#546). - JPEG XL (`.jxl`) images open and place, linked or embedded, as their first frame, decoded with jxl-oxide and stored as PNG: 16-bit and floating-point samples become 8 bits, alpha is kept, and an image past the pixel allowance is refused from its header (part of #2306; `crates/engine/src/cmd/fileio/tests_jxlread.rs`). - The Open and Place dialogs list PostScript `.ps` files and `.epsf` files. A `.ps` file opens and places through the EPS reader (its first page), also when its header is only `%!`, as the `ps` format, which exports don't write (Print to PostScript does); an `.epsf` file opens and places as EPS. Copied in a file manager, these files paste as EPS, and `clipboard.importEps` also reads PostScript whose header is only `%!` (`crates/engine/src/cmd/fileio/tests_epsimport.rs`). @@ -2022,8 +2057,10 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur - HEIC and HEIF images open and place from `.heic` and `.heif`, as the [supported file formats](https://helpx.adobe.com/illustrator/kb/supported-file-formats-illustrator.html) list High Efficiency Image under both Open and Place (and [Fix HEIF file import errors on Windows](https://helpx.adobe.com/illustrator/desktop/add-and-import-files/import-other-file-types/fix-heif-file-import-errors-on-windows.html) covers both ways of bringing HEIF files in): HEVC-coded single pictures and grids of tiles, 8 to 10 bits, with an alpha image, decoded by heic-rs in the engine's default `heif` feature. The container's rotation, mirror and crop are applied. Without an `nclx` box, the HEVC stream's video signal type gives the samples' matrix and range. An RGB ICC profile, or Display P3 with the sRGB curve named by an `nclx` box or, without a color box, by the stream, is converted to sRGB; the EXIF resolution tags size the image, or 72 ppi. Image sequences, other codings and grids of cropped tiles are refused with a message, and so is every HEIF file in a build without the feature. The decoder checks image size before allocating (`crates/engine/src/cmd/fileio/tests_heifread.rs`). - HP-GL/2 plot files (`.plt`, `.hpgl`, `.hgl`, `.hpg`, or a name no other format reads when the file starts with plotter instructions) open and place as paths on one layer, the artboard round the art: each line drawn with the pen down is a stroked path in its pen's color and width, line types become dash patterns, circles, arcs, wedges and Bézier curves are curves, filled and edged rectangles, wedges and polygons (polygon mode) are filled or stroked paths, and encoded polylines, scaling points, user units and rotation are read. Labels, symbol mode's symbols, raster images and hatching aren't drawn and are listed in the warnings (`crates/cad/src/hpgl/tests.rs`, `crates/engine/src/cmd/fileio/tests_hpgl.rs`). - PICT pictures (`.pct`, `.pic`, and `.pict` as VectorCraft's own name) open and place, as [the help page](https://helpx.adobe.com/archive/illustrator/illustrator-cs5-5-troubleshooting.pdf) lists Macintosh PICT under both opening and placing: versions 1 and 2, with or without the file's 512 bytes of application data, read by the opcodes of Apple's [Opcodes in Pictures](https://dev.os9.ca/techpubs/mac/QuickDraw/QuickDraw-461.html). Lines, rectangles, rounded rectangles, ovals, arcs, polygons and regions become paths in their pen and pattern colors, text becomes point type in the font the picture names, bitmaps, pixel maps and QuickTime JPEG images become images, and the clip region clips what follows it; File › Place places the picture as one group clipped to its frame. Inverted shapes, other transfer modes and other QuickTime formats come back as warnings, and a picture cut short keeps what came before it (`crates/metafile/src/tests/pict.rs`, `crates/engine/src/cmd/fileio/tests_pict.rs`). + - EMF and WMF type takes its size from the font's height, where a negative height is the em and a positive height is the character cell, and a font's average character width becomes Horizontal Scale against the face's own average width (OS/2 `xAvgCharWidth`) when the face gives one, as [LOGFONT](https://learn.microsoft.com/en-us/windows/win32/api/wingdi/ns-wingdi-logfontw) and [MS-EMF 2.2.13](https://learn.microsoft.com/en-us/openspecs/windows_protocols/ms-emf/1cd7cb7a-1a7c-48d2-b4a4-c218f9d12100) describe the two fields. VectorCraft's own rules are that the cell is the face's `usWinAscent` plus `usWinDescent` at a variable font's instance (its ascent plus descent without an OS/2 table), that a negative width is read as its absolute value, and that the width is ignored when the height is 0 (`a_font_width_becomes_horizontal_scale`, `a_positive_font_height_is_the_character_cell`, `a_font_the_system_lacks_is_measured_in_the_face_that_draws_it`, `wmf_font_width_becomes_horizontal_scale`). - EMF and WMF files are read by the shared `craft-metafile` reader and open, place and paste as editable paths, clipping groups, images and point type: an EMF drawn with EMF+ records (on their own, or beside plain records) is read from them instead of opening empty, and hatched and pattern brushes fill with their average color (`crates/metafile/src/tests/import.rs`). - EMF, WMF and EMF+ text keeps the character advances the file gives (ExtTextOut's `lpDx`, DrawDriverString positions) as tracking, with pair kerning off; on a single left to right line, an advance that tracking can't give (wider than its range, or a tab) starts a new point type object where the advance puts it, with an underline or strikethrough filled across the space between and on to the end of the last character's advance; type on more than one line is placed a line at a time, each line aligned by its own advances and split as a single line is (`text_is_spaced_by_its_advances`, `multiline_text_with_advances_aligns_each_line`, `wmf_text_is_spaced_by_its_advances`, `emf_plus_driver_strings_keep_their_positions`, `split_type_keeps_its_underline_and_right_to_left_order`). + - EMF and WMF import warns about what the reader leaves out or does not play as the file asks, with counts: a file, or a metafile image inside it, cut short by one of the reader's limits (items, bytes kept, saved states, clip paths), images and pattern brushes that are not read, clips that are not applied, and raster operations other than a plain copy (`a_file_cut_short_by_another_limit_says_so`, `images_the_reader_does_not_read_are_counted`, `clips_that_are_not_applied_are_counted`, `raster_operations_that_are_not_played_are_counted`, `a_wmf_reports_unread_pattern_brushes_and_raster_operations`). - Export As › HP-GL (`document.export {format: "hpgl"}`) writes a `.plt` plot of an artboard, each artboard or the art for pen plotters and cutters: each visible path once along its line in plotter units from the artboard's bottom-left corner or center, a pen per color or a pen table, curves flattened to a tolerance, type as outlines, clipping masks and the artboard's edges applied, and HP-GL or HP-GL/2 (pen colors and encoded polylines); plots read back by the HP-GL reader give the same lines (`crates/cad/src/hpgl/write/tests.rs`, `crates/engine/src/cmd/fileio/tests_hpgl.rs`). - HP-GL export's `insideFirst` cuts each pen's paths inside before outside: a path is drawn only after the pen's paths that lie inside it (a letter's counter, a part's holes, rings within rings), touching outlines counted as inside and crossing ones not, in paint order or nearest first with `sortPaths`, within the plot's work budget; these order rules are VectorCraft's own (`crates/cad/src/hpgl/write/nest.rs`, `crates/cad/src/hpgl/write/tests.rs`, `crates/engine/src/cmd/fileio/tests_hpgl.rs`). - EPS and DXF in and out, EMF/WMF in and out; PNG (with PNG-8), JPEG, WebP, GIF, TIFF, BMP, Targa and layered PSD export; grayscale TIFFs with an alpha channel or other extra channels place, relink and open, the alpha as the image's transparency (#1466 in part); PSD and PSB files open and place, linked or embedded, as their merged image in every colour mode and depth (#918). EPS import runs a PostScript Level 3 interpreter written from the PostScript Language Reference: resource categories and `resourceforall`, local and global VM (`currentglobal`/`setglobal`/`gcheck`), `clipsave`/`cliprestore`, subarrays and substrings that share storage, the standard dictionaries in `systemdict`, `dictstack`, `internaldict`, executable filters and strings, `load` by any key, `//name` immediate names, `token`, `execform`, user paths, `cshow`, `rootfont`, `cachestatus`, colour rendering and halftone queries, file `status` and data read with `flushfile`, and `pdfmark` marks dropped (Discord feedback, #466, #469, #474). Masked images (`ImageType 3` in its three interleavings) and reusable streams are read, and an image's several data sources are read in turn, as the reference defines (procedures that read one file get their own rows: such images came in banded, #498). `restore` puts dictionaries back as they were at the `save`, so programs that count their saves in a dictionary read to their end (part of #505). Tiling patterns come in as pattern swatches, uncoloured ones too; Type 3 fonts' glyphs as their outlines, spaced by `ashow`/`widthshow`/`xshow`/`kshow`; mesh and function-based shadings (types 1, 4–7) as gradient meshes; sampled functions (type 0) and Flate/LZW predictors are read. It is tested with programs written from the specification in the ways common generators use these features; Inkscape/cairo EPS files open as vectors. When a file's PostScript still can't be read, it opens as its TIFF preview, its Windows metafile preview (as vectors) or its EPSI preview, and the warning (in the status bar, `document.open`/`app.open`/MCP `open_file` replies and `vectorcraft-cli info`) names the error, the operator that raised it and the procedures it ran in. Legacy PostScript `.ai` files (Illustrator 3–8, written with the prolog that defines their operators) keep their groups and nested groups (`u` … `U`), between and inside clipping groups; EPS and EMF/WMF import nest clips (and groups) at most 128 deep, so a hostile file can't exhaust the stack. DXF TEXT justified Fit or Aligned spans its two points (stretched, or scaled as a whole). PDF export writes type as real, searchable text in embedded subset fonts by default, as Illustrator's PDF presets do (Convert Text to Outlines is an option; printer's marks stay shapes), so text-heavy PDFs stay small (#733). DXF export writes each fill as its outlines followed by its hatch, so laser and cutter software, which skips hatches, gets filled art and type too (#546). @@ -2048,7 +2085,8 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur - A Shift-click with the loaded place cursor opens the current file's import options (text, DXF, PDF page or embedded PSD) and OK places it at the click, with Show Import Options on or off and for a cursor loaded by `file.place.queue` ([Place multiple files](https://web.archive.org/web/20210601162814/https://helpx.adobe.com/pdf/illustrator_reference.pdf)). VectorCraft's own rules: a file without such a dialog places as a click does, Cancel leaves the file unplaced, a Shift-drag places at the dragged size, and headless the Shift-click places as a click (`crates/tools/src/place.rs`, `crates/engine/src/tests/place.rs`, `crates/ui-egui/src/tests/place.rs`). - Separations Preview shows placed and embedded raster images on the visible plates, as it shows vector art (#4153): an RGB image's pixels are separated into process inks with the proof setup's intent, a CMYK image shows its own inks, a hidden plate's ink leaves the image, and with one plate visible the image shows that plate's ink as a grey. Raster images carry no spot ink, so a spot plate shown alone shows them as paper; a colorized image shows its color's plates. Emoji and other bitmap glyphs follow the same rule. The plate-filtered pixels and their reduced-size copies are kept apart from the image's own pixels, for each set of visible plates, proof setup and color settings, and with the preview off nothing changes. Evidence: `tests::colorize::separations_preview_shows_an_rgb_images_process_inks`, `separations_preview_shows_a_cmyk_images_own_inks`, `separations_preview_keeps_an_images_pixels_per_plate_set`. Print preview fidelity remains the open gap, so scores and hours are unchanged. - Desktop print transport uses `craft-print` for CUPS and modern Windows. Sheet composition, copies, separations and colour management remain in VectorCraft. The Print dialog's Media list also carries the Japanese papers — JIS B4 257 × 364 mm, JIS B5 182 × 257 mm and JIS B6 128 × 182 mm beside the ISO B4/B5 (250 × 353 and 176 × 250 mm, kept so settings and presets saved before them keep their paper), and はがき 100 × 148 mm, 往復はがき 148 × 200 mm, 封筒 長形3号 120 × 235 mm, 長形4号 90 × 225 mm, 角形2号 240 × 332 mm, 角形3号 216 × 277 mm and 四六判 127 × 188 mm; the JSON id or the dialog label names a paper, any case and spacing (`B5 (JIS)` or `b5jis`) (`crates/pdf/src/print/settings.rs`, `crates/pdf/src/tests/print.rs`). The print-preview and physical-device fidelity gaps remain, so print scores and hours are unchanged. - - The Print dialog's Output section has Overprint Black under Convert All Spot Colors to Process, off by default and available with Separations ([Print color separations](https://helpx.adobe.com/illustrator/using/printing-color-separations.html) lists it among the separation options): black art then leaves the inks under it on the other plates (`print.setup {settings: {output: {overprintBlack: true}}}`, kept with the document and in print presets). Solid 100% K or 100% gray fills, strokes and characters (to within half a percent, as Edit › Edit Colors › Overprint Black counts them), and gradients whose every stop (every color point of a freeform gradient) is, overprint; rich, RGB, Lab, spot-linked and lighter blacks knock out, and only the printed copy is marked. These limits are VectorCraft's own rules. Characters set to overprint now also leave the inks below them on printed PDF plates, a type object's own fill in a PDF is drawn with its blending mode, and Edit › Edit Colors › Overprint Black counts a gradient with a stop linked to a spot swatch as a spot black, as it counts a solid one, and a freeform gradient by the color points it draws from. Evidence: `print::overprint_black_keeps_the_inks_under_solid_black_on_separations`, `print::overprint_black_keeps_the_cyan_under_near_and_freeform_blacks_on_postscript_plates`, `print::overprinting_type_leaves_the_inks_below_on_separations`, `print::a_type_objects_own_black_fill_overprints_on_separations`, `tests::print::overprint_black_is_saved_with_the_setup_and_in_presets`, `overprint::tests::a_gradient_with_a_spot_linked_stop_is_black_only_with_spot`, `overprint::tests::a_freeform_gradient_is_black_when_every_point_is`. Print scores and hours are unchanged. + - The Print dialog's Document Ink Options list shows an icon before each spot ink's name, and a click on it prints that one ink as process inks (on the Cyan, Magenta, Yellow and Black plates, with no plate of its own) or as a spot ink again, as [the help page](https://helpx.adobe.com/illustrator/using/printing-color-separations.html) describes for single spot colors. Other spot inks keep their plates, and spot gradient stops and DCS images' spot plates follow each ink's choice (`print.setup {settings: {output: {inks: [{name, convertToProcess: true}]}}}`, kept with the document and in print presets; `print.preview` lists every ink as `documentInks`). These are VectorCraft's own rules: Convert All Spot Colors to Process converts every spot ink and dims the icons while keeping each ink's own choice, a converted ink's Print, Frequency and Angle are dimmed and kept, and process inks and Registration have no icon. Evidence: `print::one_spot_ink_converts_to_process_and_the_others_keep_their_plates`, `print::converting_every_spot_ink_overrides_and_keeps_each_inks_own_choice`, `print::a_spot_gradient_stop_prints_its_process_plates`, `cmykimages::a_dcs_image_converts_only_the_spot_ink_chosen`, `tests::print::a_spot_ink_converted_to_process_is_saved_and_listed_without_a_plate`, `dialogs::tests_print::a_spot_inks_icon_converts_it_to_process_and_back`. Print scores and hours are unchanged. + - The Print dialog's Output section has Overprint Black under Convert All Spot Colors to Process, off by default and available with Separations ([Print color separations](https://helpx.adobe.com/illustrator/using/printing-color-separations.html) lists it among the separation options): black art then leaves the inks under it on the other plates (`print.setup {settings: {output: {overprintBlack: true}}}`, kept with the document and in print presets). Solid 100% K or 100% gray fills, strokes and characters (to within half a percent, as Edit › Edit Colors › Overprint Black counts them), and gradients whose every stop (every color point of a freeform gradient) is, overprint; rich, RGB, Lab, spot-linked and lighter blacks are not marked, paints already set to overprint keep that setting, and only the printed copy is marked. These limits are VectorCraft's own rules. Characters set to overprint now also leave the inks below them on printed PDF plates, a type object's own fill in a PDF is drawn with its blending mode, and Edit › Edit Colors › Overprint Black counts a gradient with a stop linked to a spot swatch as a spot black, as it counts a solid one, and a freeform gradient by the color points it draws from. On a plate, an overprinting paint that puts none of that plate's ink down is drawn as nothing; on PostScript plates so is up to half a percent of another ink in a color that counts as black, and any other faint ink stays on the plate. Evidence: `print::overprint_black_keeps_the_inks_under_solid_black_on_separations`, `print::overprint_black_keeps_the_cyan_under_near_and_freeform_blacks_on_postscript_plates`, `print::overprinting_paints_keep_their_faint_ink_on_postscript_plates`, `print::overprinting_type_leaves_the_inks_below_on_separations`, `print::a_type_objects_own_black_fill_overprints_on_separations`, `tests::print::overprint_black_is_saved_with_the_setup_and_in_presets`, `overprint::tests::a_gradient_with_a_spot_linked_stop_is_black_only_with_spot`, `overprint::tests::a_freeform_gradient_is_black_when_every_point_is`. Print scores and hours are unchanged. - The Print dialog's General section (and the print preset editor) has a link button after Scale W and H, as the Custom scale has one on [the help page](https://helpx.adobe.com/illustrator/desktop/save-and-export/export-files-to-different-formats/print-documents-in-illustrator.html), where turning it off scales the width and height apart. While it is on, typing either percentage sets the other, and turning it on sets H to W. It is on for new settings, dimmed with the fields unless Scaling is Custom or a tiling choice, toggled with a click, Space or Enter, and named with its on or off state for screen readers. W and H take 1–1000% in the fields. The link is kept with the document's print settings and in print presets (`print.setup {settings: {scale: {linked}}}`); settings saved without it read it as off, so they print as before. Its default, the tiling choices and the agent rules are VectorCraft's own. Evidence: `print::the_scale_link_is_on_for_new_settings_and_off_for_a_saved_scale_without_it`, `tests::print::the_scale_link_keeps_width_and_height_equal`, `tests::print::a_scale_saved_without_the_link_keeps_its_width_and_height`, `dialogs::tests_print::the_scale_link_keeps_scale_width_and_height_equal`, `dialogs::tests_print::a_print_preset_keeps_the_scale_link`. Print scores and hours are unchanged. - A PDF, PDF-compatible `.ai` or `.ait` opened from its pages or its editing copy opens with the File Info that its XMP packet and its document information dictionary give: the title (`dc:title`, its `x-default` item first, else Info `Title`), the author, description, keywords, copyright status, notice and URL, and the created and modified dates, the XMP packet's value where both give one (`crates/pdf/src/tests/file_info.rs`, `crates/engine/src/tests/fileinfo.rs`). An SVG opens with the title of its root `<title>`. The title is File Info's alone (`DocMetadata::title`): the document's name stays the file's name with its extension, a file that gives no title leaves File Info with that name, and exports (PDF, SVG, PNG, EPS, `.ai`) and native saves carry it; changing the title in File Info sets the document's name as before (#3626). - PDF export and PDF-compatible `.ai` and `.ait` saves write the document's File Info created date as the file's creation date, or the time of writing when the document has none, and the time of writing as its modification date; the page information mark still prints the time of writing (`crates/engine/src/tests/fileinfo.rs`, `crates/pdf/src/tests.rs`, `crates/pdf/src/tests/marks.rs`). @@ -2198,6 +2236,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur - **Raster-effect resolution in PDF:** when the 64 million pixel cap on an effect image renders an object's raster effects below the document's raster effects resolution, PDF export warns once per object with the requested and the lowest achieved ppi (`crates/engine/src/tests/pdfraster.rs`). - **Rasterize effect:** Effect › Rasterize… (`rasterize`) draws an object as an image of square pixels at its own resolution or the document's raster effects resolution, with Object › Rasterize's color model, background, anti-aliasing, clipping mask and room around the object, while its paths stay editable. Expand Appearance and PDF and SVG export of an object whose only raster effect is Rasterize give the image Object › Rasterize gives (`crates/engine/src/tests/rastersettings.rs`, `crates/render/src/tests/rasterize.rs`). Behavior reference: [How to save artwork in Illustrator](https://helpx.adobe.com/illustrator/using/saving-artwork.html), [Work with effects](https://helpx.adobe.com/illustrator/using/effects.html). - **Rasterize colour models:** Object › Rasterize with the Grayscale colour model makes a grayscale image (a gray PNG, with alpha over a transparent background), and with Bitmap a 1-bit image (a TIFF), or a black-and-white gray PNG with alpha over a transparent background; `image.info` and the Control bar say Grayscale, and a fill color colorizes the image, in RGB and CMYK documents (#6969). Expand Appearance and PDF export of a Rasterize effect make the same images. Regression coverage: `rasterize_to_grayscale_or_bitmap_makes_a_grayscale_image` (`crates/engine/src/tests/rastersettings.rs`) and `gray_and_bilevel_images_store_gray` (`crates/render/src/encode/tests.rs`). Scores and estimates unchanged. +- **Rasterize dialog choices:** Object › Rasterize… shows Anti Alias (None, Art Optimized, Type Optimized) and Background (White, Transparent) as dropdowns, where they were text fields holding the command's values. Object › Create Gradient Mesh… shows its Appearance (Flat, To Center, To Edge) and Repeat Options for a grid repeat its Grid Type the same way (#8020, #7991). A value the dialog does not list, such as a black background set through `ui.dialog.set`, shows as it is and is sent unchanged. Regression coverage: `rasterize_anti_alias_and_background_are_dropdowns`, `mesh_appearance_and_repeat_grid_type_are_dropdowns` and `choice_fields_list_the_values_their_commands_take` (`crates/ui-egui/src/dialogs/command.rs`). Scores and estimates unchanged. - **SVG filters:** Effect › SVG Filters lists 14 default SVG filters and then the document's own below Apply SVG Filter… and Import SVG Filter…, and choosing one applies it to the selection as a live effect in one undo step (`svgFilter.apply`). Apply SVG Filter applies the selected filter, New and Edit open its code, and Delete and Import… remove filters or add those of an SVG file (`svgFilter.define`, `svgFilter.delete`, `svgFilter.import`). The public page names no default set: the defaults (Soft Blur to Hue Shift, `crates/effects/src/svg_filter/defaults.rs`) are VectorCraft's own, written with SVG 1.1 primitives. A default is copied into the document when it is applied or edited, and Delete does not remove a default. The canvas, raster export and PDF draw the filter at the Document Raster Effects resolution; SVG export writes it as a `<filter>` element when it is the object's last effect and otherwise draws the object as an image; SVG import keeps filters the other live effects can't express as this effect instead of leaving them out; the native format keeps the filters (`crates/engine/src/tests/svgfilter.rs`, `crates/effects/src/svg_filter/tests.rs`). Behavior reference: [Apply SVG filter effects](https://helpx.adobe.com/illustrator/desktop/special-effects-styles/apply-filter-effects/apply-svg-filter-effects.html), [CS5 help, Apply SVG effects](https://help.adobe.com/archive/en_US/illustrator/cs5/illustrator_cs5_help.pdf#page=402), [SVG 1.1 Filter Effects](https://www.w3.org/TR/SVG11/filters.html). - **Pattern tiles:** the renderer keeps a tile of each pattern for each scale it rasterizes the pattern at, until the tiles fill the tile cache's budget, and then drops the least recently used tiles first. Objects that show one pattern at different scales, such as a pattern scaled to 25% with Transform Pattern Tiles next to the same pattern at 100%, draw from tiles kept between frames. @@ -2400,6 +2439,8 @@ PDF export writes a Perceptual linear or radial gradient whose stops are tints o In these Separation and DeviceN shadings, a white stop linked to a swatch that is not a spot color (a global White swatch, for example) is paper white, 0% of the ink, as an unlinked white stop is, so a gradient of one spot ink and such a stop stays a Separation shading; a stop linked to a white spot color stays a stop of that ink (VectorCraft's own rule). Test: `engine::tests::linked_stops::white_stops_linked_to_process_swatches_are_paper_in_spot_gradients`. +Legacy `.ai` export writes a Perceptual gradient as it writes a gradient mixed around the hue wheel: the colors on its curve become stops of their own, in process colors, at most 256, in a gradient definition of their own rather than the gradient swatch's, with a warning. In a legacy `.ai` gradient definition, each color stop holds only its color, midpoint and position (`colorSpec colorStyle midPoint rampPoint %_Bs`, [File Format Specification §3.5.2](https://web.archive.org/web/20050126105313/https://partners.adobe.com/public/developer/en/illustrator/sdk/AI7FileFormat.pdf#page=41)). VectorCraft's legacy `.ai` reader opens such a gradient as a Classic gradient and mixes the stop colors directly. Spot color stops lose their inks, as they do in EPS (VectorCraft's own rule). Test: `eps::legacy_ai::tests::perceptual_gradients_are_written_with_the_stops_on_their_curve`. + ## Artwork Cleanup add-on (2026-10-30) A VectorCraft addition, not a feature of the reference app, so no area score moves. Object › Plug-ins › Artwork Cleanup and its @@ -2764,6 +2805,8 @@ Edit › Copy and Cut put the selected ruler guides on the clipboard, with the s | Date | Change | Summary | |---|---|---| +| 2026-11-16 | minor | Layers panel: rows or the selected-art square dragged over the list show the copy cursor while Alt is held, as the drop then copies, and the grabbing hand otherwise (#8217). Scores and estimates unchanged. | +| 2026-11-16 | minor | Gradient panel: the strip under the ramp, where a click adds a stop, shows the white arrow with a plus on Windows and X11, where the system copy cursor showed as the plain arrow (#8241). Scores and estimates unchanged. | | 2026-11-16 | minor | Properties panel: while the Type tool edits text, the Character section shows the font family and style and the Variable Font button of the first selected character (or of the character before the caret), not those of the text object's first run (#8189). Evidence: `panels::properties::tests::character_section_shows_the_type_tool_selections_style`. Scores and estimates unchanged. | | 2026-11-16 | minor | Recolor Artwork follow-up (#8031, remaining #4028): native Lab input, picker swatch libraries and Assign-row menus; UI interaction regression coverage; scores and estimates unchanged. | | 2026-11-16 | minor | Color panel: the spectrum fills the vertical space of a resized panel, with options shown or hidden (#8005). Compact auto-fit flyouts and embedded mixers keep their existing size. Evidence: panels::color::tests::the_spectrum_grows_with_the_color_panel. Scores and estimates unchanged. | diff --git a/docs/type-parity.md b/docs/type-parity.md index 458788b1b6..5317d1e4cc 100644 --- a/docs/type-parity.md +++ b/docs/type-parity.md @@ -26,7 +26,7 @@ against Illustrator's public documentation; **estimated** unless noted. | Point, area and type-on-a-path type; vertical variants | done / partial | vertical point, area and path type have initial support; fullwidth `!` / `?` keep the nominal glyph upright when no vertical alternate exists (Unicode Tu); in a non-rectangular area a word too wide for the top lines moves down to the first line that holds it (#1615); Escape while typing ends the edit, keeps the type selected and switches back to the tool whose double-click on type chose the Type tool (kept until another tool is chosen or another document or window becomes active, so later edits with the Type tool return there too), or to the Selection tool when there is no such tool, as when the Type tool was chosen from the toolbar or after such a switch (#1802), and Cmd+Enter (Ctrl+Enter on Windows and Linux) does the same unless a command is bound to it; `text.create` and `text.createInPath` take `justify` (#1752); MCP `add_text` forwards `vertical` to both commands; Type › Type Orientation sets every frame of a thread, and a thread's frames share one writing direction; the Type and Vertical Type tools make area type when a closed path's outline is clicked and type on a path when an open one is, with pointers that say which, as the public help describes ([Create text](https://web.archive.org/web/20220127090642/https://helpx.adobe.com/illustrator/using/creating-text.html), [Create type on a path](https://web.archive.org/web/20220127090635/https://helpx.adobe.com/illustrator/using/creating-type-path.html)) | | Area Type Options (rows, columns, inset, first baseline, Text Flow by rows or by columns, Auto Size, Shrink Text to Fit) | done | Text Flow fills the cells down each column first (By Columns, the default, as files from before it open) or across each row first (By Rows), in the dialog and `text.areaOptions {flow}` (#4978); the commands that make or restyle type say when it does not fit its frame; MCP `add_text` takes Auto Size and Shrink Text to Fit (#1471) | | Threaded text, Fit Headline, Text Wrap | done | Fit Headline sees wrapping in a frame one line tall (#1444); a thread holds area type and type on a path in any mix, as Illustrator links type in an area or along a path ([help](https://helpx.adobe.com/illustrator/using/manage-text-area.html)); a frame's empty last paragraph keeps a format given to it when the story flows again | -| Threading from the ports: selected area type and type on a path show an in port and an out port, empty, with an arrow on a side where the frame is threaded, or with a red "+" in the out port when the text doesn't fit; a click on either port loads the text; a click on a closed path, area type or type on a path threads into it, a click on empty canvas makes a frame of the same kind, shape and size there, a drag draws a rectangular frame; the frame placed comes after the clicked one from its out port and before it from its in port (the story then starts there); Escape or another tool cancels; a double-click on a threaded port breaks the thread there | partial | #2572: the Selection tool, `text.thread.add {from, to?, rect?, at?, before?}`, as the reference app's help describes ports and threading ([archived help, Threading text between objects](https://web.archive.org/web/20210119051048/https://helpx.adobe.com/illustrator/using/creating-text.html), [create text threads](https://helpx.adobe.com/illustrator/desktop/design-with-text/add-manage-text/create-text-threads-between-objects.html)); area type's in port sits on the left side below the top-left corner, type on a path's just before its start bracket; Show Text Threads draws its lines between the same ports; with more than 1,000 such objects selected no ports are drawn. a double-click on a port where the frame is threaded breaks the thread there, the story flowing into the frames before the break and the frames after it left empty, still threaded with each other when two or more (`text.thread.break`, [archived help](https://web.archive.org/web/20220127090642/https://helpx.adobe.com/illustrator/using/creating-text.html)). Remaining: the ports only take clicks with the Selection tool, and the loaded cursor borrows the I-beam until it's drawn | +| Threading from the ports: selected area type and type on a path show an in port and an out port, empty, with an arrow on a side where the frame is threaded, or with a red "+" in the out port when the text doesn't fit; a click on either port loads the text; a click on a closed path, area type or type on a path threads into it, a click on empty canvas makes a frame of the same kind, shape and size there, a drag draws a rectangular frame; the frame placed comes after the clicked one from its out port and before it from its in port (the story then starts there); Escape or another tool cancels; a double-click on a threaded port breaks the thread there | partial | #2572: the Selection tool, `text.thread.add {from, to?, rect?, at?, before?}`, as the reference app's help describes ports and threading ([archived help, Threading text between objects](https://web.archive.org/web/20210119051048/https://helpx.adobe.com/illustrator/using/creating-text.html), [create text threads](https://helpx.adobe.com/illustrator/desktop/design-with-text/add-manage-text/create-text-threads-between-objects.html)); area type's in port sits on the left side below the top-left corner, type on a path's just before its start bracket; Show Text Threads draws its lines between the same ports; with more than 1,000 such objects selected no ports are drawn. a double-click on a port where the frame is threaded breaks the thread there, the story flowing into the frames before the break and the frames after it left empty, still threaded with each other when two or more (`text.thread.break`, [archived help](https://web.archive.org/web/20220127090642/https://helpx.adobe.com/illustrator/using/creating-text.html)). The loaded text has a cursor of its own; over a closed path, area type or type on a path that a click threads it into the pointer adds a link badge, as the [archived help on threading text between objects](https://web.archive.org/web/20210601162814/https://helpx.adobe.com/pdf/illustrator_reference.pdf#page=476) describes the pointer changing over the object's path. The frame the text came from, a frame already in a thread, a path inside a compound path and other art show no badge, and a click there makes a new frame (`select::tests::loaded_text_shows_the_link_cursor_where_a_click_threads_it_into_the_object`). Remaining: the ports only take clicks with the Selection tool | | Type on a Path effects and options; brackets | done | #429; Type on a Path Options has a Preview checkbox (#5360, as public tutorials of the dialog show); Direct Selection shows the anchors and direction handles of selected type on a path's path and drags both, the brackets keeping their fractions of the path and the text reflowing along it (#3980, #3565; `text.reshapePath`, `text.setPathHandle`), as the [Direct Selection page](https://helpx.adobe.com/illustrator/using/tool-techniques/direct-selection-tool.html) describes for a path; Type › Dynamic Text (`type.dynamicText`, also on the Contextual Task Bar) sizes type on a path to fill the span between its brackets and fits it again after each edit, as the [Dynamic Text overview](https://helpx.adobe.com/photoshop/desktop/text-typography/work-with-dynamic-text/dynamic-text-overview.html) describes; the 0.1 pt steps, the 0.1 to 1,296 pt range and keeping the drawn sizes when it is turned off or threaded are VectorCraft's own rules (`crates/text/src/tests/fit.rs`, `crates/engine/src/tests/dynamic_text.rs`) | | Character and Paragraph panels, styles with overrides | done | Character-style Auto-leading resets, partial definitions, local leading overrides, override markers, Undo/Redo and native serialization have regression coverage; differing paragraph alignments leave the shared alignment buttons unselected (headless regressions, full integration CI and visual review pass); mixed-value display for other paragraph fields remains missing. Double-clicking a user character style's row opens its Character Style Options, and the dialog keeps a fixed width while its sections scroll when the window is shorter, so its buttons stay on screen; a paragraph style's row opens the same Paragraph Style Options dialog as the panel menu, with General, Basic Paragraph Formats, Tabs, Composition, Hyphenation, Justification and East Asian Composition Settings. Evidence: `panels::text_styles::tests::double_clicking_a_character_style_row_opens_its_options`, `dialogs::char_style_options::tests::the_sections_scroll_in_a_window_shorter_than_the_general_list`, `dialogs::para_style_options::tests::every_section_draws_its_fields`, `dialogs::para_style_options::tests::tabs_section_edits_the_style_stops` | | Copy or Cut selected characters, then paste as separate text art | done | A Type-range copy keeps the selected characters' font family, size and color when pasted on the canvas after leaving text editing, in the same document or another. On desktop the clipboard offers plain text to text consumers and rich art for canvas Paste; Paste Without Formatting while editing uses the destination text's style. `tests::clipboard::type_range_copy_stays_styled_when_pasted_as_art` (#5636) | @@ -77,7 +77,7 @@ against Illustrator's public documentation; **estimated** unless noted. | CJK: warichu | done | Character panel menu › Warichu and Warichu Settings… (`text.setFormat` / `text.setRangeStyle {warichu, warichuLines, warichuGap, warichuScale, warichuAlign}`, `ui.warichuSettings`), with Show East Asian Options ([Format East Asian characters](https://helpx.adobe.com/illustrator/using/formatting-asian-characters.html)): marked characters set at a percentage of their size and stacked on 1 to 6 lines inside their line, one above the other in horizontal type and side by side in vertical type, with a line gap and eight alignments; a block stays whole on one line. Saved natively, carried by character styles, drawn on the canvas and in every export (SVG, PDF and `.ai` write such type as outlines). Type on a path sets the characters at their own size. Evidence: `tests::warichu`, `dialogs::warichu::tests`, `typecmd::area_tests::warichu_is_a_character_attribute_set_saved_and_exported` | | CJK: composite fonts | partial | Type › Composite Fonts… (`type.compositeFonts.set`), with Show East Asian Options: a font made of a font per class of character (Kanji, Kana, Punctuation, Symbols, Roman, Numerals), each with its own style, size and baseline in percent of the type's size, Kana, Roman and Numerals with horizontal and vertical scale, and Kana with Scale at Center; New, Delete Font, Import… and Export… (`.vccomposite`, `type.compositeFonts.import` and `.export`) ([Creating composite fonts](https://help.adobe.com/archive/en_US/illustrator/cs3/illustrator_cs3_help.pdf#page=347)); custom character sets (Custom: New, Delete Set, characters added by Direct Entry or Unicode code and deleted), each with its own font, style, size, baseline and scales, ahead of the classes, the later set winning a character two list (`custom` in `type.compositeFonts.set`) ([Customize characters in a composite font](https://web.archive.org/web/20220911143322/https://helpx.adobe.com/pdf/cs6/illustrator_reference.pdf#page=348)). Composite fonts are listed first in the font menus, saved with the document, and their type is laid out per set and class; SVG and legacy `.ai` write it as outlines. Show Sample draws the font picked with lines for its ICF box, em box, baseline, cap height, highest ascent and lowest descent, highest ascender and x-height, each shown or hidden by its button, at the Zoom picked ([Creating composite fonts](https://help.adobe.com/archive/en_US/illustrator/cs4/illustrator_cs4_help.pdf#page=352)). Not yet: the Units menu. Evidence: `text::composite::tests::characters_fall_in_their_classes`, `text::composite::tests::custom_sets_take_their_characters_before_the_classes`, `tests::composite::composite_type_draws_each_class_in_its_font`, `tests::composite::custom_character_sets_take_their_characters_first`, `compositefonts::tests`, `dialogs::composite_fonts::tests` | | CJK: ruby | partial | ruby (ふりがな) for live text (`type.ruby`): a reading over a byte range, above (right of the column in vertical type) or below, start/centre/end alignment, size, overhang or squeeze; saved natively, laid out with its line growing, drawn on the canvas, in SVG and PDF (as outlines where ruby is present), in EPS, EMF/WMF and legacy `.ai` (legacy `.ai` writes type with ruby as outlines), and kept by Create Outlines, Expand Appearance and flattening, each glyph where the layout puts it (`typecmd::ruby_tests::create_outlines_keeps_the_ruby_where_it_is_laid_out`) | #633 | -| Language per character (Character panel › Language, character styles), text shaped in it | done | `text.setFormat` / `text.setRangeStyle {language}` by name or BCP 47 tag, one of Document Setup's languages (Hindi, Marathi, Gujarati, Bengali, Punjabi, Tamil, Telugu, Kannada, Malayalam, Odia and Urdu added, #4943; Assamese and Sanskrit added, #4947; Nepali, Konkani and Sindhi added, #4943; Serbian: Cyrillic, Serbian: Latin and Croatian; Bulgarian, #5945); the shaper gets the tag, so the font's language forms apply (OpenType `locl`: Turkish keeps `fi` apart and the dot on its i, #4940); new type takes the document's language; saved as the tag only when set, carried by character styles (#4946). English and eleven Indian languages hyphenate by run language; Sanskrit automatic hyphenation awaits allowlisted patterns (#4947). Not yet: `.ai`/PDF import of a text's language, paragraph styles. Evidence: `features::tests::language_picks_the_fonts_forms`, `features::tests::serbian_gets_the_fonts_serbian_forms`, `typecmd::area_tests::language_is_a_character_attribute_saved_only_when_set`, `tests::typo::indic_language_runs_hyphenate_with_both_composers`, `hyphen::tests::sanskrit_without_allowlisted_patterns_uses_only_exceptions`, `tests::docsetup::the_further_indian_languages_are_document_and_text_languages`; spelling is checked in each run's Language (`text.spelling.check`, #4936) | +| Language per character (Character panel › Language, character styles), text shaped in it | done | `text.setFormat` / `text.setRangeStyle {language}` by name or BCP 47 tag, one of Document Setup's languages (Hindi, Marathi, Gujarati, Bengali, Punjabi, Tamil, Telugu, Kannada, Malayalam, Odia and Urdu added, #4943; Assamese and Sanskrit added, #4947; Nepali, Konkani and Sindhi added, #4943; Serbian: Cyrillic, Serbian: Latin and Croatian; Bulgarian, #5945); the shaper gets the tag, so the font's language forms apply (OpenType `locl`: Turkish keeps `fi` apart and the dot on its i, #4940); new type takes the document's language; saved as the tag only when set, carried by character styles (#4946). English, eleven Indian languages, Bulgarian, Turkish and Russian hyphenate by run language, and German, Polish, Portuguese and Italian do in builds that embed their patterns; a word outside its language's script stays whole; Sanskrit automatic hyphenation awaits allowlisted patterns (#4947). Not yet: `.ai`/PDF import of a text's language, paragraph styles. Evidence: `features::tests::language_picks_the_fonts_forms`, `features::tests::serbian_gets_the_fonts_serbian_forms`, `typecmd::area_tests::language_is_a_character_attribute_saved_only_when_set`, `tests::typo::indic_language_runs_hyphenate_with_both_composers`, `hyphen::tests::sanskrit_without_allowlisted_patterns_uses_only_exceptions`, `hyphen::tests::rule_languages_break_by_their_own_rules`, `hyphen::tests::pattern_languages_break_at_their_own_patterns`, `tests::typo::a_russian_run_hyphenates_at_russian_break_points`, `tests::docsetup::the_further_indian_languages_are_document_and_text_languages`; spelling is checked in each run's Language (`text.spelling.check`, #4936) | | No Break | done | Character panel menu (`text.setFormat` / `text.setRangeStyle {noBreak}`): the marked characters stay on one line, including across a space; a run that does not fit after earlier text moves together, and a run longer than the line stays together. Evidence: `layout::wrapping_tests::no_break_keeps_marked_characters_on_one_line`, `tests::no_break_keeps_marked_words_on_one_line`, `typecmd::no_break_is_a_character_attribute_saved_only_when_on` | | Inline symbols in text | beyond Illustrator | not scored | | Align Stroke (inside, outside) on live type's character stroke | beyond Illustrator | not scored; `stroke.set {align}` and `text.setRangeStyle {strokeOptions: {align}}`; saved natively, drawn around the glyphs on the canvas and in PDF, EPS and SVG (live text, stroke on the glyph outlines); visual bounds grow with it (#2294) | diff --git a/docs/ui-parity.md b/docs/ui-parity.md index 550da7c469..4182189c4a 100644 --- a/docs/ui-parity.md +++ b/docs/ui-parity.md @@ -1,6 +1,6 @@ # UI and interaction parity -> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-11-16 · **Change:** minor (Recolor Artwork follow-up (#8031, remaining #4028): native Lab input, picker swatch libraries and Assign-row menus; UI interaction regression coverage; scores and estimates unchanged; previously: #8005: the Color spectrum fills a resized panel; scores and estimates unchanged; previously: Pencil continuation, straight-line and closing cursors; scores and estimates unchanged; previously: Graphic Styles list fills a taller panel, #2992; scores and estimates unchanged; previously: library panels' lists fill a taller panel, #2992; scores and estimates unchanged; previously: Swatches list fills a taller panel, #1638; scores and estimates unchanged; previously: icon-strip flyouts also resize from the top edge and the canvas-side top corner, keeping the moved top in workspaces (storytold/craft-libs#1094); scores and estimates unchanged; previously: macOS: the canvas cursor stays after the pointer moves, #6362; scores and estimates unchanged; previously minor: Remove Background in the Contextual Task Bar, Properties › Quick Actions and the Control bar; previously minor: Ruler origin: the corner drag snaps as a drawn point does; previously minor: Live Paint Bucket fills faces crossed in one drag (#6373); previously: #6404: transform-aware Eyedropper character copying; scores and estimates unchanged; previously: Outline view: images and gradient meshes are picked on what Outline draws, so a click inside them reaches the path behind, #6437; previously minor: a middle-click on a document tab closes it, #6506; previously minor: Blob Brush: a round tip's preview is the outline of the area it adds, round at both ends, as the stroke it commits (#4343); scores and estimates unchanged; previously:; ruler double-click adds a guide at the pointer, #5239; G5: Inventory Icons built-in symbol library (four built-ins); previously minor: files that record no units open in Preferences › Units › General, #5820; previously minor: interim macOS cursor delivery, #2292; native validation pending; scores and estimates unchanged; Control bar › Snapping includes the existing Snap to Glyph and Alignment Guides toggles (#6164); scores and estimates unchanged; floating tab groups collapse into the side icon rail and opened rail panels fold back into it, #5925 in part; numeric fields step on wheel hover without taking keyboard focus, #5949; Character Styles panel: a double-click on a style's row opens its Character Style Options; the dialog keeps a fixed width and scrolls its sections, so its buttons stay on screen; Selection QoL: marquee modes and visible feedback, #5313; #3380 deletion-only review follow-up: independent survivors keep gradient placement, owned subpaths avoid discarded copies, and contracts/status/evidence are clarified; endpoint highlighting remains open; scores and estimates unchanged; Drop Shadow and glow dialogs: spinner arrows, #5367, #5368; Stroke Weight Up and Down shortcuts, #5797; Layers: Rename (`ui.rename`) opens the name field of the selected layer, group or object, #5324; Properties in Edit Artboards: Transform section above the Artboards section, #5219; scrubby labels: the Control bar's Stroke: and Opacity: links and the Properties panel's Stroke link scrub their fields, #4088; Properties: Quick Actions has Repeat Options for one selected repeat, #5181; Direct Selection: Shift-click picks several blend spine points, which drag together, #5285; Direct Selection: Cmd/Ctrl held lends the Selection tool and shows its bounding box, #3901; Join tool trims two crossing open paths and joins them at the crossing, #5844; Control bar: Paragraph: link and Align left/center/right while type is selected, #5372; shape tools: a press on the selection's centre point moves it and one in the rotate zone outside a box corner turns it, #5477; scores and estimates unchanged) · **Target:** Adobe Illustrator 2026 (30.x; Units › East Asian Type acts, with Q and Ha units; scores unchanged) +> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-11-16 · **Change:** minor (Layers panel: Alt over the list shows the copy cursor while rows or the selected-art square are dragged, #8217; scores and estimates unchanged; previously: Gradient panel: the add-stop strip under the ramp shows the white arrow with a plus on Windows and X11, #8241; scores and estimates unchanged; previously: Recolor Artwork follow-up (#8031, remaining #4028): native Lab input, picker swatch libraries and Assign-row menus; UI interaction regression coverage; scores and estimates unchanged; previously: #8005: the Color spectrum fills a resized panel; scores and estimates unchanged; previously: Pencil continuation, straight-line and closing cursors; scores and estimates unchanged; previously: Graphic Styles list fills a taller panel, #2992; scores and estimates unchanged; previously: library panels' lists fill a taller panel, #2992; scores and estimates unchanged; previously: Swatches list fills a taller panel, #1638; scores and estimates unchanged; previously: icon-strip flyouts also resize from the top edge and the canvas-side top corner, keeping the moved top in workspaces (storytold/craft-libs#1094); scores and estimates unchanged; previously: macOS: the canvas cursor stays after the pointer moves, #6362; scores and estimates unchanged; previously minor: Remove Background in the Contextual Task Bar, Properties › Quick Actions and the Control bar; previously minor: Ruler origin: the corner drag snaps as a drawn point does; previously minor: Live Paint Bucket fills faces crossed in one drag (#6373); previously: #6404: transform-aware Eyedropper character copying; scores and estimates unchanged; previously: Outline view: images and gradient meshes are picked on what Outline draws, so a click inside them reaches the path behind, #6437; previously minor: a middle-click on a document tab closes it, #6506; previously minor: Blob Brush: a round tip's preview is the outline of the area it adds, round at both ends, as the stroke it commits (#4343); scores and estimates unchanged; previously:; ruler double-click adds a guide at the pointer, #5239; G5: Inventory Icons built-in symbol library (four built-ins); previously minor: files that record no units open in Preferences › Units › General, #5820; previously minor: interim macOS cursor delivery, #2292; native validation pending; scores and estimates unchanged; Control bar › Snapping includes the existing Snap to Glyph and Alignment Guides toggles (#6164); scores and estimates unchanged; floating tab groups collapse into the side icon rail and opened rail panels fold back into it, #5925 in part; numeric fields step on wheel hover without taking keyboard focus, #5949; Character Styles panel: a double-click on a style's row opens its Character Style Options; the dialog keeps a fixed width and scrolls its sections, so its buttons stay on screen; Selection QoL: marquee modes and visible feedback, #5313; #3380 deletion-only review follow-up: independent survivors keep gradient placement, owned subpaths avoid discarded copies, and contracts/status/evidence are clarified; endpoint highlighting remains open; scores and estimates unchanged; Drop Shadow and glow dialogs: spinner arrows, #5367, #5368; Stroke Weight Up and Down shortcuts, #5797; Layers: Rename (`ui.rename`) opens the name field of the selected layer, group or object, #5324; Properties in Edit Artboards: Transform section above the Artboards section, #5219; scrubby labels: the Control bar's Stroke: and Opacity: links and the Properties panel's Stroke link scrub their fields, #4088; Properties: Quick Actions has Repeat Options for one selected repeat, #5181; Direct Selection: Shift-click picks several blend spine points, which drag together, #5285; Direct Selection: Cmd/Ctrl held lends the Selection tool and shows its bounding box, #3901; Join tool trims two crossing open paths and joins them at the crossing, #5844; Control bar: Paragraph: link and Align left/center/right while type is selected, #5372; shape tools: a press on the selection's centre point moves it and one in the rotate zone outside a box corner turns it, #5477; scores and estimates unchanged) · **Target:** Adobe Illustrator 2026 (30.x; Units › East Asian Type acts, with Q and Ha units; scores unchanged) > > Tech Circuit update (2026-11-14): three original procedural brushes; ten built-in brush libraries (G5). > @@ -31,8 +31,10 @@ Window → Help Bar toggles the bottom tool-help strip independently of the stat **Feature evidence last updated:** 2026-11-03. -Enclosing Lasso is an add-on under Object › Plug-ins with its own heading in All Tools. It has -no default shortcut or Basic toolbar slot. It selects whole objects only +Enclosing Lasso is an add-on under Object › Plug-ins. Its tool is also in the Lasso tool's group +in both shipped toolbars, after the Lasso, and All Tools lists it there, under Select. A toolbar +edited before it joined keeps its saved layout until Reset Toolbar. It has no default shortcut; +one can be set in Edit › Keyboard Shortcuts › Tools. It selects whole objects only when their geometry is fully enclosed by the freehand loop. Shift adds, Alt subtracts, and Escape cancels. Ordinary group members can be selected separately; compound paths stay whole. Path checks follow curves, excluding stroke width and effects; other objects use their geometric @@ -56,6 +58,8 @@ Artboard Options forwards the active Artboard tool's Scale Artwork with Artboard | 2026-11-09 | minor | Document Setup and Character panel Language lists: Nepali, Konkani and Sindhi complete #4943; Assamese and Sanskrit are already present from #5946. Names in all 27 catalogs come from [CLDR locale language-name data](https://github.com/unicode-org/cldr/tree/main/common/main). The public [language assignment documentation](https://helpx.adobe.com/illustrator/using/spelling-language-dictionaries.html) describes the Character panel Language menu, but does not establish that these five languages are listed there; inclusion and a single Sindhi entry remain maintainer decisions. Scores unchanged | | 2026-11-14 | minor | G5: Tech Circuit adds three original procedural brushes (Circuit Trace, Bus Lines, Terminal Nodes); ten built-in brush libraries. G5 remaining estimate 3–13 h (estimated); parity scores and headline totals unchanged. | | 2026-11-14 | minor | Layers panel: right-clicking a layer/group/object row shows a context menu with Options…, Duplicate, Delete, Lock/Hide Others, Locate Object, and Collect for Export — matching standard desktop layer panel conventions. Scores unchanged. | +| 2026-11-16 | minor | Layers panel: rows or the selected-art square dragged over the list show the copy cursor while Alt is held, as the drop then copies, and the grabbing hand otherwise (#8217). Scores and estimates unchanged. | +| 2026-11-16 | minor | Gradient panel: the strip under the ramp, where a click adds a stop, shows the white arrow with a plus on Windows and X11, where the system copy cursor showed as the plain arrow (#8241). Scores and estimates unchanged. | | 2026-11-13 | minor | Pencil cursors: the continuation cursor (a short rising line) shows over an open end of a selected path before any press, freehand too, and while a continuing stroke nears another selected path's open end it connects to; the straight-line cursor is a short level line; a continued path, a straight line too, shows the closing cursor and closes within Close Paths When Ends Are Within of its other end, and with Alt at the release. Scores and estimates unchanged. | | 2026-11-15 | minor | G12: Swatches item menus validated in all five views: 39 focused tests passed, regression fails without the menu hooks, rendered list/thumbnail layouts inspected, and fresh local deep CodeRabbit review found zero issues. Full workspace CI passed on Linux/WSL on the merged branch (all 13 gates), including the test-helper correction for the upstream compile error tracked in #7727; native Windows full CI has two unchanged engine-test failures. Scores and estimates unchanged. | | 2026-11-13 | minor | Graphic Styles: in a panel made taller the list fills the space above the footer instead of stopping at 220 pt (#2992; `the_list_fills_a_tall_panel_above_its_footer` in `crates/ui-egui/src/panels/graphic_styles.rs`). Scores and estimates unchanged. | @@ -183,6 +187,8 @@ tools, never checked side by side) isn't captured row by row. | Swatches list fills a taller panel (#1638) | done | Docked, floating or in a resized flyout, the swatch list takes the height above the panel's footer, as the Artboards list does; outside a sized panel it stays 150 pt (200 pt for large thumbnails); `the_list_fills_a_tall_panel_above_its_footer` in `panels/swatches/tests.rs` | | Layers panel lists a blend's spine (#4820) | done | an open blend shows a `<Path>` row below its key objects, where Release leaves the spine; a click selects the blend (Shift/Cmd toggles it) so Direct Selection edits the spine; a locked blend's row selects nothing; no row while searching or filtering (`a_blends_spine_is_a_row_below_its_keys_that_selects_the_blend`) | | Layers panel: a layer whose Layer Options › Print is off shows its name italic (#5739) | done | the panel row and its drag ghost; a printing layer stays upright, and Print on again restores it; `panels::layers` test `a_layer_that_does_not_print_has_its_name_italic` | +| Layers panel: Alt-drag shows the copy cursor (#8217) | done | rows and the selected-art square dragged over the list show the copy cursor while Alt is held and the grabbing hand otherwise, following Alt mid-drag; on Windows and X11 the copy cursor is the white arrow with a plus (the panels' add cursor, #8241); over the trash and New Layer, which ignore Alt, the hand stays; guide rows keep theirs; `alt_shows_the_copy_cursor_while_rows_are_dragged`, `drag_cursor_shows_a_copy_only_where_the_drop_copies` | +| Gradient panel: add-stop cursor under the ramp (#8241) | done | the white arrow with a plus (the Group Selection glyph) over the strip under the ramp, handed to the OS on Windows and X11 (winit shows the plain arrow for the system copy cursor there), the system copy cursor elsewhere; over the ramp itself the arrow stays; `panels::gradient` test `the_strip_under_the_ramp_shows_the_add_cursor` | | Blend spine Anchor Point conversion and handle editing (#2544) | implemented | symmetric handles, independent drag/retraction, visible-handle policy and selection/stacking covered by tool and engine regressions; Windows native canvas checks and screenshots reviewed in PR #2643 | | Several blend spine points picked and dragged together (#5285) | done | with Direct Selection, Shift-click picks more points of a selected blend's spine or takes one away, as on a path; dragging any picked point moves them all, and the key objects on them, in one undo step (`object.blend.spine.moveAnchor {with}`); a marquee picks the spine points inside it on the topmost selected blend, and with Shift adds or takes them away | | Add/Delete/Anchor Point tools; Anchor Point tool drags segments to reshape | done | #2267: a click on a handle end retracts that handle and leaves the anchor a corner with the other one; Shift held at the press on an anchor moves it, handles and all (Shift kept down: at 45° steps) instead of pulling out handles | @@ -324,6 +330,7 @@ tools, never checked side by side) isn't captured row by row. | Cmd/Ctrl: last-used selection tool; Cmd+Alt: Group Selection inside Direct Selection | done | Cmd+Alt lends Group Selection only while Direct Selection is active (Cmd borrow from the Pen keeps Direct Selection so Alt stays copy/subtract); Cmd alone lends Direct Selection the Selection tool: its bounding box shows while Cmd is held over objects selected whole and its handles scale and rotate them, and a Cmd drag moves the whole object while its direct-selected anchors stay selected (#3901; no box over a selection with anchors picked yet); engine pointer and canvas regressions | | Eyedropper copies effective character dimensions between transformed text objects | done | Point/area and grouped text, highlighted ranges, reverse/remembered sampling, opt-outs and atomic invalid-transform rejection; `scaled_type_pick_*` (#6404) | | Eyedropper styles highlighted characters only and preserves ranges across Type switches | done | Font/paint, Shift color-only, Unicode, Undo/Redo and stale-range regression tests; enabled non-neutral source or target object transparency is refused atomically; disable Transparency to sample supported attributes | +| Gradient mesh: a solid color dropped from the Color or Swatches panel or a Fill proxy on a selected mesh recolors the mesh point under the pointer, else the patch's four points; with the mesh selected, an Eyedropper click applies the fill color the same way | done | [Edit mesh objects](https://web.archive.org/web/20210601162814/https://helpx.adobe.com/pdf/illustrator_reference.pdf#page=312); `object.mesh.setPointColor`, one undo step, none when the color is unchanged. The 5-pixel reach for a point is VectorCraft's own. Tests `a_color_dropped_on_a_selected_mesh_recolors_the_point_or_patch_under_it`, `a_click_on_a_selected_mesh_gives_its_point_or_patch_the_fill_color`, `a_click_on_an_object_over_a_selected_mesh_copies_that_object` | | Eyedropper reads visible sources while their layer/object is locked or outside isolation | done | Ordinary/Shift/Shift+Alt and gradient-stop reads preserve the source and selection; Alt reverse remains editable-only; hidden art stays excluded (`eyedropper_sources.rs`, #1251) | | Add a visible stroke after drawing with inherited None/zero-width paint | done | Paint and Swap Fill/Stroke restore the existing 1 pt default; positive widths and painted zero widths stay as set; Undo/Redo and targeted appearance items tested (`stroke_visibility.rs`, #1253) | | Double-click a stroked segment to create a width point in Width Point Edit | done | Finite-arithmetic follow-up: engine regressions and full CI passed; [Validation evidence](target-app-parity.md#evidence-what-ships-today-by-area). Command and pointer regressions cover opening, sampled widths, adjoining adjustment on/off through checkbox/OK, compound paths, Cancel/Delete and Undo/Redo; dialog layout reviewed. [Validation evidence](target-app-parity.md#evidence-what-ships-today-by-area) | @@ -333,7 +340,7 @@ tools, never checked side by side) isn't captured row by row. | Document Setup → Edit Artboards applies valid settings, closes the dialog and activates the Artboard tool | done | Pointer-click tests cover successful handoff, invalid settings, OK, Cancel and Undo in `dialogs/document_setup.rs`. | | Escape leaves Artboard editing for Selection; during a drag it first cancels the gesture | done | Headless egui key events cover idle Escape, active-drag cancellation and a subsequent Escape in `tests/distortkeys.rs`. | | Escape while typing ends the edit, keeps the type selected and switches back to the tool whose double-click on type chose the Type tool (kept until another tool is chosen or another document or window becomes active, so later edits with the Type tool return there too), or to the Selection tool when there is no such tool, as when the Type tool was chosen from the toolbar or after such a switch | done | #1802 (#1686, #1656) | -| Selection tool: selected area type and type on a path show an in port and an out port (empty, an arrow where threaded, the red "+" of overflow); a click on either loads the text cursor; a click on a closed path, on empty canvas or a drag threads the text there, after the clicked frame from its out port, before it from its in port; Escape or another tool drops it; a double-click on a threaded port breaks the thread there | partial | #2572 (`text.thread.add`, `before` for the in port); the out port sits on the frame's right side above the bottom-right corner handle and the in port on its left side below the top-left one, so the handles can still be grabbed; a double-click on a threaded port breaks the thread (`text.thread.break`, [archived help](https://web.archive.org/web/20220127090642/https://helpx.adobe.com/illustrator/using/creating-text.html)); the loaded cursor borrows the I-beam | +| Selection tool: selected area type and type on a path show an in port and an out port (empty, an arrow where threaded, the red "+" of overflow); a click on either loads the text cursor; a click on a closed path, on empty canvas or a drag threads the text there, after the clicked frame from its out port, before it from its in port; Escape or another tool drops it; a double-click on a threaded port breaks the thread there | partial | #2572 (`text.thread.add`, `before` for the in port); the out port sits on the frame's right side above the bottom-right corner handle and the in port on its left side below the top-left one, so the handles can still be grabbed; a double-click on a threaded port breaks the thread (`text.thread.break`, [archived help](https://web.archive.org/web/20220127090642/https://helpx.adobe.com/illustrator/using/creating-text.html)); the loaded text has a cursor of its own, with a link badge over a closed path, area type or type on a path that a click threads it into | | Shift-click selects several artboards (Artboard tool, Artboards panel); they move, Alt-copy and delete together | done | `artboard.move`/`artboard.delete` `indices` (#1139); in the panel, Shift- and Ctrl/Cmd-click work with any tool by switching to the Artboard tool (#5698); panel menu, trash and Properties share selected-set deletion; all-selected retains artboard 1 and a single board cannot be deleted, with pointer-event and Undo/Redo coverage | | Artboards panel: drag a row above or below another to reorder the artboards (as Move Up / Move Down do) | done | #4687; a line shows where the row lands, `artboard.reorder` in one undo step, the moved artboard becomes active; public forum answers describe the drag | | Artboards panel › Delete Empty Artboards | done | `artboard.deleteEmpty`; one undo step, guides go too, locked artboards stay, and artboard 1 when every artboard is empty and none is locked; an artboard is empty when no object (hidden, locked and template art included; guides not) has visual bounds that meet or touch it, a group counting by its members and a clip group or clipping layer by its members inside the clip (our reading of "no artwork"; the pages give no finer rule); [spec](https://helpx.adobe.com/illustrator/desktop/create-manage-artboards/add-edit-artboards/delete-artboards.html) | @@ -471,7 +478,7 @@ next unit in the order a right-click on a ruler lists them, from Feet back to Po | DXF export/import preserves intended curve closure | done | #1299; R13–2018 closed SPLINE bit set/read; an open curve ending at its start stays open; knots and control points unchanged; circular cubic paths export as native CIRCLE/ARC where stroke semantics permit; DXF Options' Preset menu and `document.exportDxf`'s `dxfPreset: "cnc"` set the CNC / CAM options (#5500) | | macOS save sheet: choose the format from a menu | done | #866; the save panel is VectorCraft's own `NSSavePanel` with its Format menu set before the sheet opens (`apps/vectorcraft/src/mac_save_format.rs`); #1855 had withdrawn the menu that was added after the sheet began, which made Save As, Save a Copy and the first Save show no sheet | | Preferences: every option acts | partial | 2 stored but unused (#394, audited 2026-10-30): Scratch Disks, Legacy vector clipboard; the rest act (Units › East Asian Type since 2026-10-31; Open Documents As Tabs: cleared, new documents open in floating windows). General › Corner Radius drives the Rounded Rectangle tool and follows its ↑/↓ (2026-10-24) | -| Preferences › General › Constrain Angle | done | arrow keys and Shift drags along the turned axes; the Rectangle, Rounded Rectangle, Ellipse and grid tools, point and area type and the shape size dialogs draw along them with the bounding box turned; Shift-drawn polygons and stars keep the turned base orientation; the Line Segment tool's Shift steps count from it (#394, <https://helpx.adobe.com/illustrator/desktop/manage-objects/arrange-objects/rotate-objects-by-specific-angles.html>); spirals, flares and Pen paths are not turned | +| Preferences › General › Constrain Angle | done | arrow keys and Shift drags along the turned axes; the Rectangle, Rounded Rectangle, Ellipse and grid tools, point and area type and the shape size dialogs draw along them with the bounding box turned; Shift-drawn polygons and stars keep the turned base orientation; the Line Segment tool's Shift steps count from it (#394, <https://helpx.adobe.com/illustrator/desktop/manage-objects/arrange-objects/rotate-objects-by-specific-angles.html>); flares and Pen paths are not turned | | Tabs panel: a stop drags from where the press landed, a stop just added included | done | #1458 | | Outline view keeps template layers in Preview, dimmed | done | #1486; a picture placed to be traced stays visible under the outlines | | Outline view draws on a white canvas, the artboards as their edges | done | Outline shows only the paths ([Outline mode](https://helpx.adobe.com/illustrator/desktop/get-started/learn-the-basics/preview-artwork-as-outlines.html)). VectorCraft's own rule for the canvas: in every interface brightness and Canvas Color the whole canvas is white, pasteboard included; the artboards draw no paper (no Simulate Colored Paper or artboard color, and no paper with Hide Artboards); the artboard names and the ruler origin's crosshair are dark gray; split views and floating windows follow their own view. Tests `outline_draws_on_a_white_canvas_with_artboards_as_edges`, `outline_draws_no_colored_paper`, `a_pane_draws_its_own_views_outline`, `the_ruler_origin_crosshair_shows_on_the_outline_canvas` | diff --git a/xtask/src/pdf_deps.rs b/xtask/src/pdf_deps.rs index 1f42f2f72a..e0877302a9 100644 --- a/xtask/src/pdf_deps.rs +++ b/xtask/src/pdf_deps.rs @@ -5,7 +5,7 @@ use std::process::Command; use serde_json::Value; -const REV: &str = "0cca4ac66f9f4576b3acc5f84d7a2a2ae9fb943e"; +const REV: &str = "64b181977a0488e4d1e167bc5cc8cfededc2ed4b"; const PACKAGES: &[(&str, &str, &str)] = &[ ("craft-pdf", "0.1.0", REV), ("krilla", "0.8.2", REV),