From a9d53efbb50c518c97cfafcbe18b81879a881bb6 Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Mon, 16 Nov 2026 19:51:35 -0500 Subject: [PATCH] svg: route paint colours through shared floating-point compatibility parser --- Cargo.lock | 138 +++------------------ Cargo.toml | 2 +- crates/svg/src/color.rs | 262 +++------------------------------------- 3 files changed, 32 insertions(+), 370 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 73d74ecb5..ca7ef766d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -147,21 +147,6 @@ dependencies = [ "equator", ] -[[package]] -name = "alloc-no-stdlib" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2fb6cfd47bf496ff64095c20eaba0c201404ee38714d4142fcfa1dc334fcc7a" - -[[package]] -name = "alloc-stdlib" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b5c1865780388bfa186411ab5f247819487fc4864c6e9c3106611fa347586e1" -dependencies = [ - "alloc-no-stdlib", -] - [[package]] name = "allocator-api2" version = "0.2.21" @@ -796,16 +781,6 @@ dependencies = [ "syn 3.0.6", ] -[[package]] -name = "brotli-decompressor" -version = "6.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc031cd87c6529082b0b65c604e86af0ed7744841b17ccfe60b1e31fa606179e" -dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", -] - [[package]] name = "built" version = "0.8.1" @@ -1376,39 +1351,6 @@ dependencies = [ "writeable", ] -[[package]] -name = "craft-image-codecs" -version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87#5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87" -dependencies = [ - "craft-jpeg 0.1.0 (git+https://github.com/storytold/craft-libs?rev=5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87)", - "craft-metadata", - "crc32fast", - "exr", - "flate2", - "half", - "hayro-jpeg2000", - "image", - "image-webp", - "jpeg-encoder", - "png", - "rayon", - "serde_json", - "thiserror 2.0.21", - "tiff", - "zune-core", - "zune-jpeg", - "zune-jpegxl", -] - -[[package]] -name = "craft-jpeg" -version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87#5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87" -dependencies = [ - "thiserror 2.0.21", -] - [[package]] name = "craft-jpeg" version = "0.1.0" @@ -1461,18 +1403,6 @@ dependencies = [ "serde_json", ] -[[package]] -name = "craft-metadata" -version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87#5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87" -dependencies = [ - "brotli-decompressor", - "chrono", - "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87)", - "quick-xml 0.41.0", - "serde", -] - [[package]] name = "craft-mime" version = "0.1.0" @@ -1543,7 +1473,7 @@ name = "craft-raw" version = "0.1.0" source = "git+https://github.com/storytold/craft-libs?rev=bea91b1861eea3889bec9d26338076f2ff31c4ac#bea91b1861eea3889bec9d26338076f2ff31c4ac" dependencies = [ - "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=bea91b1861eea3889bec9d26338076f2ff31c4ac)", + "craft-tiff", "miniz_oxide 0.9.1", "rayon", "serde", @@ -1555,10 +1485,9 @@ dependencies = [ [[package]] name = "craft-svg" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87#5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87" +source = "git+https://github.com/storytold/craft-libs?rev=c4e930536c8cf30928024902199b07f721642914#c4e930536c8cf30928024902199b07f721642914" dependencies = [ - "craft-image-codecs", - "craft-xml 0.1.0 (git+https://github.com/storytold/craft-libs?rev=5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87)", + "craft-xml 0.1.0 (git+https://github.com/storytold/craft-libs?rev=c4e930536c8cf30928024902199b07f721642914)", "flate2", "kurbo", "quick-xml 0.41.0", @@ -1576,15 +1505,6 @@ dependencies = [ "thiserror 2.0.21", ] -[[package]] -name = "craft-tiff" -version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87#5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87" -dependencies = [ - "serde", - "thiserror 2.0.21", -] - [[package]] name = "craft-tiff" version = "0.1.0" @@ -1747,16 +1667,6 @@ dependencies = [ "thiserror 2.0.21", ] -[[package]] -name = "craft-xml" -version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87#5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87" -dependencies = [ - "quick-xml 0.41.0", - "serde", - "thiserror 2.0.21", -] - [[package]] name = "craft-xml" version = "0.1.0" @@ -1777,6 +1687,16 @@ dependencies = [ "thiserror 2.0.21", ] +[[package]] +name = "craft-xml" +version = "0.1.0" +source = "git+https://github.com/storytold/craft-libs?rev=c4e930536c8cf30928024902199b07f721642914#c4e930536c8cf30928024902199b07f721642914" +dependencies = [ + "quick-xml 0.41.0", + "serde", + "thiserror 2.0.21", +] + [[package]] name = "craft-y4m" version = "0.1.0" @@ -3039,7 +2959,7 @@ version = "0.20.1" source = "git+https://github.com/storytold/filmcraft?rev=3f137a7ed420cac79b32145f5243b7f98b31f71c#3f137a7ed420cac79b32145f5243b7f98b31f71c" dependencies = [ "craft-audio 0.1.0 (git+https://github.com/storytold/craft-libs?rev=82062077bba679ba5236e2d1a391f02d1533cbab)", - "craft-jpeg 0.1.0 (git+https://github.com/storytold/craft-libs?rev=937ac93c5cf3cd4b6a81e195b078fe161eb081b9)", + "craft-jpeg", "craft-media 0.1.0 (git+https://github.com/storytold/craft-libs?rev=82062077bba679ba5236e2d1a391f02d1533cbab)", "craft-video 0.1.0 (git+https://github.com/storytold/craft-libs?rev=82062077bba679ba5236e2d1a391f02d1533cbab)", "craft-y4m", @@ -3071,7 +2991,7 @@ version = "0.20.1" source = "git+https://github.com/storytold/filmcraft?rev=3f137a7ed420cac79b32145f5243b7f98b31f71c#3f137a7ed420cac79b32145f5243b7f98b31f71c" dependencies = [ "craft-raw", - "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=bea91b1861eea3889bec9d26338076f2ff31c4ac)", + "craft-tiff", "image", "rayon", "thiserror 2.0.21", @@ -3760,9 +3680,6 @@ name = "hayro-jpeg2000" version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c75ab947623ef4ccaa7acf0579edf7cbb5a73838e3839a7be73335e522f433a1" -dependencies = [ - "fearless_simd", -] [[package]] name = "hayro-syntax" @@ -4024,7 +3941,6 @@ dependencies = [ "moxcms", "num-traits", "png", - "qoi", "tiff", "zune-core", "zune-jpeg", @@ -4175,12 +4091,6 @@ dependencies = [ "libc", ] -[[package]] -name = "jpeg-encoder" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b454d911ac55068f53495488d8ccd0646eaa540c033a28ee15b07838afafb01f" - [[package]] name = "js-sys" version = "0.3.106" @@ -5573,15 +5483,6 @@ version = "0.1.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d55d956fa96f5ec02be2e13af0e20391a5aa83d6a074e3ad368959d0fab299ea" -[[package]] -name = "qoi" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" -dependencies = [ - "bytemuck", -] - [[package]] name = "quick-error" version = "1.2.3" @@ -9001,15 +8902,6 @@ dependencies = [ "zune-core", ] -[[package]] -name = "zune-jpegxl" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cba11ecd07cc23351500e840ae03841b7e4997923ec8e4832ee3ae199ea0b6b4" -dependencies = [ - "zune-core", -] - [[package]] name = "zvariant" version = "5.15.0" diff --git a/Cargo.toml b/Cargo.toml index 2889bdc34..c09e994e4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,7 +22,7 @@ craft-ps = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", craft-exr = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87" } craft-gif = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87" } craft-psd = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "ce2ec507c2e6a6a078a5f450f641487f8931816d" } -craft-svg = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87" } +craft-svg = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "c4e930536c8cf30928024902199b07f721642914" } craft-webp = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87" } craft-lottie = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87" } craft-mesh = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87", default-features = false, features = ["stl", "obj", "gltf", "fbx"] } diff --git a/crates/svg/src/color.rs b/crates/svg/src/color.rs index 28cb37f83..6cef52096 100644 --- a/crates/svg/src/color.rs +++ b/crates/svg/src/color.rs @@ -1,250 +1,7 @@ -//! CSS colour values (CSS Color Module Level 3): keywords, `#rgb[a]`, `#rrggbb[aa]`, `rgb[a]()`, -//! `hsl[a]()`. +//! SVG paint colours use the shared precision-preserving compatibility parser. +//! Paint references (`none`, `currentColor`, `url`) remain app policy. -/// The CSS colour keywords (CSS Color Module Level 3, §4.3 extended colour keywords). -const NAMED: &[(&str, u32)] = &[ - ("aliceblue", 0xF0F8FF), - ("antiquewhite", 0xFAEBD7), - ("aqua", 0x00FFFF), - ("aquamarine", 0x7FFFD4), - ("azure", 0xF0FFFF), - ("beige", 0xF5F5DC), - ("bisque", 0xFFE4C4), - ("black", 0x000000), - ("blanchedalmond", 0xFFEBCD), - ("blue", 0x0000FF), - ("blueviolet", 0x8A2BE2), - ("brown", 0xA52A2A), - ("burlywood", 0xDEB887), - ("cadetblue", 0x5F9EA0), - ("chartreuse", 0x7FFF00), - ("chocolate", 0xD2691E), - ("coral", 0xFF7F50), - ("cornflowerblue", 0x6495ED), - ("cornsilk", 0xFFF8DC), - ("crimson", 0xDC143C), - ("cyan", 0x00FFFF), - ("darkblue", 0x00008B), - ("darkcyan", 0x008B8B), - ("darkgoldenrod", 0xB8860B), - ("darkgray", 0xA9A9A9), - ("darkgreen", 0x006400), - ("darkgrey", 0xA9A9A9), - ("darkkhaki", 0xBDB76B), - ("darkmagenta", 0x8B008B), - ("darkolivegreen", 0x556B2F), - ("darkorange", 0xFF8C00), - ("darkorchid", 0x9932CC), - ("darkred", 0x8B0000), - ("darksalmon", 0xE9967A), - ("darkseagreen", 0x8FBC8F), - ("darkslateblue", 0x483D8B), - ("darkslategray", 0x2F4F4F), - ("darkslategrey", 0x2F4F4F), - ("darkturquoise", 0x00CED1), - ("darkviolet", 0x9400D3), - ("deeppink", 0xFF1493), - ("deepskyblue", 0x00BFFF), - ("dimgray", 0x696969), - ("dimgrey", 0x696969), - ("dodgerblue", 0x1E90FF), - ("firebrick", 0xB22222), - ("floralwhite", 0xFFFAF0), - ("forestgreen", 0x228B22), - ("fuchsia", 0xFF00FF), - ("gainsboro", 0xDCDCDC), - ("ghostwhite", 0xF8F8FF), - ("gold", 0xFFD700), - ("goldenrod", 0xDAA520), - ("gray", 0x808080), - ("grey", 0x808080), - ("green", 0x008000), - ("greenyellow", 0xADFF2F), - ("honeydew", 0xF0FFF0), - ("hotpink", 0xFF69B4), - ("indianred", 0xCD5C5C), - ("indigo", 0x4B0082), - ("ivory", 0xFFFFF0), - ("khaki", 0xF0E68C), - ("lavender", 0xE6E6FA), - ("lavenderblush", 0xFFF0F5), - ("lawngreen", 0x7CFC00), - ("lemonchiffon", 0xFFFACD), - ("lightblue", 0xADD8E6), - ("lightcoral", 0xF08080), - ("lightcyan", 0xE0FFFF), - ("lightgoldenrodyellow", 0xFAFAD2), - ("lightgray", 0xD3D3D3), - ("lightgreen", 0x90EE90), - ("lightgrey", 0xD3D3D3), - ("lightpink", 0xFFB6C1), - ("lightsalmon", 0xFFA07A), - ("lightseagreen", 0x20B2AA), - ("lightskyblue", 0x87CEFA), - ("lightslategray", 0x778899), - ("lightslategrey", 0x778899), - ("lightsteelblue", 0xB0C4DE), - ("lightyellow", 0xFFFFE0), - ("lime", 0x00FF00), - ("limegreen", 0x32CD32), - ("linen", 0xFAF0E6), - ("magenta", 0xFF00FF), - ("maroon", 0x800000), - ("mediumaquamarine", 0x66CDAA), - ("mediumblue", 0x0000CD), - ("mediumorchid", 0xBA55D3), - ("mediumpurple", 0x9370DB), - ("mediumseagreen", 0x3CB371), - ("mediumslateblue", 0x7B68EE), - ("mediumspringgreen", 0x00FA9A), - ("mediumturquoise", 0x48D1CC), - ("mediumvioletred", 0xC71585), - ("midnightblue", 0x191970), - ("mintcream", 0xF5FFFA), - ("mistyrose", 0xFFE4E1), - ("moccasin", 0xFFE4B5), - ("navajowhite", 0xFFDEAD), - ("navy", 0x000080), - ("oldlace", 0xFDF5E6), - ("olive", 0x808000), - ("olivedrab", 0x6B8E23), - ("orange", 0xFFA500), - ("orangered", 0xFF4500), - ("orchid", 0xDA70D6), - ("palegoldenrod", 0xEEE8AA), - ("palegreen", 0x98FB98), - ("paleturquoise", 0xAFEEEE), - ("palevioletred", 0xDB7093), - ("papayawhip", 0xFFEFD5), - ("peachpuff", 0xFFDAB9), - ("peru", 0xCD853F), - ("pink", 0xFFC0CB), - ("plum", 0xDDA0DD), - ("powderblue", 0xB0E0E6), - ("purple", 0x800080), - ("rebeccapurple", 0x663399), - ("red", 0xFF0000), - ("rosybrown", 0xBC8F8F), - ("royalblue", 0x4169E1), - ("saddlebrown", 0x8B4513), - ("salmon", 0xFA8072), - ("sandybrown", 0xF4A460), - ("seagreen", 0x2E8B57), - ("seashell", 0xFFF5EE), - ("sienna", 0xA0522D), - ("silver", 0xC0C0C0), - ("skyblue", 0x87CEEB), - ("slateblue", 0x6A5ACD), - ("slategray", 0x708090), - ("slategrey", 0x708090), - ("snow", 0xFFFAFA), - ("springgreen", 0x00FF7F), - ("steelblue", 0x4682B4), - ("tan", 0xD2B48C), - ("teal", 0x008080), - ("thistle", 0xD8BFD8), - ("tomato", 0xFF6347), - ("turquoise", 0x40E0D0), - ("violet", 0xEE82EE), - ("wheat", 0xF5DEB3), - ("white", 0xFFFFFF), - ("whitesmoke", 0xF5F5F5), - ("yellow", 0xFFFF00), - ("yellowgreen", 0x9ACD32), -]; - -/// Parse a CSS colour into RGBA 0..1 (`transparent` is RGBA 0). `None` for anything else -/// (`none`, `currentColor` and `url()` are handled by the caller). -pub fn parse_color(s: &str) -> Option<[f64; 4]> { - let s = s.trim(); - let lower = s.to_ascii_lowercase(); - if lower == "transparent" { - return Some([0.0; 4]); - } - if let Some(h) = lower.strip_prefix('#') { - let d: Vec = h.chars().map(|c| c.to_digit(16)).collect::>()?; - let v = |i: usize| d[i] as f64 / 15.0; - let w = |i: usize| (d[i] * 16 + d[i + 1]) as f64 / 255.0; - return Some(match d.len() { - 3 => [v(0), v(1), v(2), 1.0], - 4 => [v(0), v(1), v(2), v(3)], - 6 => [w(0), w(2), w(4), 1.0], - 8 => [w(0), w(2), w(4), w(6)], - _ => return None, - }); - } - if let Some(args) = func(&lower, "rgba").or_else(|| func(&lower, "rgb")) { - let a: Vec<&str> = split_args(args); - if a.len() < 3 { - return None; - } - let comp = |t: &str| -> Option { - Some(if let Some(p) = t.strip_suffix('%') { - p.trim().parse::().ok().filter(|v| v.is_finite())? / 100.0 - } else { - t.parse::().ok().filter(|v| v.is_finite())? / 255.0 - }) - }; - let alpha = a.get(3).map_or(Some(1.0), |t| alpha(t))?; - return Some([comp(a[0])?.clamp(0.0, 1.0), comp(a[1])?.clamp(0.0, 1.0), comp(a[2])?.clamp(0.0, 1.0), alpha]); - } - if let Some(args) = func(&lower, "hsla").or_else(|| func(&lower, "hsl")) { - let a: Vec<&str> = split_args(args); - if a.len() < 3 { - return None; - } - let h = a[0].trim_end_matches("deg").parse::().ok().filter(|v| v.is_finite())?.rem_euclid(360.0) / 360.0; - let s = a[1].trim_end_matches('%').parse::().ok().filter(|v| v.is_finite())?.clamp(0.0, 100.0) / 100.0; - let l = a[2].trim_end_matches('%').parse::().ok().filter(|v| v.is_finite())?.clamp(0.0, 100.0) / 100.0; - let al = a.get(3).map_or(Some(1.0), |t| alpha(t))?; - let [r, g, b] = hsl(h, s, l); - return Some([r, g, b, al]); - } - NAMED.iter().find(|(n, _)| *n == lower).map(|(_, v)| [((v >> 16) & 255) as f64 / 255.0, ((v >> 8) & 255) as f64 / 255.0, (v & 255) as f64 / 255.0, 1.0]) -} - -fn func<'a>(s: &'a str, name: &str) -> Option<&'a str> { - s.strip_prefix(name)?.trim_start().strip_prefix('(')?.strip_suffix(')') -} - -fn split_args(s: &str) -> Vec<&str> { - s.split(|c: char| c == ',' || c == '/' || c.is_whitespace()).filter(|t| !t.is_empty()).collect() -} - -fn alpha(t: &str) -> Option { - Some( - if let Some(p) = t.strip_suffix('%') { - p.parse::().ok().filter(|v| v.is_finite())? / 100.0 - } else { - t.parse::().ok().filter(|v| v.is_finite())? - } - .clamp(0.0, 1.0), - ) -} - -/// CSS HSL → RGB (CSS Color 3 §4.2.4). -fn hsl(h: f64, s: f64, l: f64) -> [f64; 3] { - let m2 = if l <= 0.5 { l * (s + 1.0) } else { l + s - l * s }; - let m1 = l * 2.0 - m2; - let hue = |mut h: f64| { - if h < 0.0 { - h += 1.0; - } - if h > 1.0 { - h -= 1.0; - } - if h * 6.0 < 1.0 { - m1 + (m2 - m1) * h * 6.0 - } else if h * 2.0 < 1.0 { - m2 - } else if h * 3.0 < 2.0 { - m1 + (m2 - m1) * (2.0 / 3.0 - h) * 6.0 - } else { - m1 - } - }; - [hue(h + 1.0 / 3.0), hue(h), hue(h - 1.0 / 3.0)] -} +pub use craft_svg::color::parse_rgba_compat as parse_color; #[cfg(test)] mod tests { @@ -280,3 +37,16 @@ mod tests { assert_eq!(parse_color("nonsense"), None); } } + +#[cfg(test)] +mod shared_precision_tests { + use super::parse_color; + + #[test] + fn shared_parser_keeps_float_channels_and_legacy_clamping() { + assert_eq!(parse_color("rgb(100%,50%,0%)"), Some([1.0, 0.5, 0.0, 1.0])); + assert_eq!(parse_color("rgba(0,0,255,0.123456789123)"), Some([0.0, 0.0, 1.0, 0.123456789123])); + assert_eq!(parse_color("rgb(300,-1,0)"), Some([1.0, 0.0, 0.0, 1.0])); + assert_eq!(parse_color("# fff"), None); + } +}