DesignCraft: An open-source page and layout design editor written by scratch in pure Rust
Print color: drop shadows multiply over what's beneath them in X-1a
aiongg7473fcac7880
diff --git a/crates/engine/src/cmd/export.rs b/crates/engine/src/cmd/export.rsindex 3ed4f73ea..b644eebc6 100644--- a/crates/engine/src/cmd/export.rs+++ b/crates/engine/src/cmd/export.rs@@ -1099,6 +1099,30 @@ mod text_tests {.collect()}+ /// The (Black, Gold) samples of every flattened DeviceN image that has both colorants.+ fn black_and_gold(pdf: &[u8]) -> Vec<(u8, u8)> {+ use hayro_syntax::object::{Array, Name, Object};+ let file = hayro_syntax::Pdf::new(pdf.to_vec()).unwrap();+ let mut out = Vec::new();+ for st in file.objects().into_iter().filter_map(|o| o.into_stream()) {+ let d = st.dict();+ if !d.get::<Name<'_>>(b"Subtype").is_some_and(|n| n.as_ref() == b"Image") || d.get::<i32>(b"BitsPerComponent") != Some(8) {+ continue;+ }+ let Some(cs) = d.get::<Array<'_>>(b"ColorSpace") else { continue };+ let mut it = cs.iter::<Object<'_>>();+ if !it.next().and_then(|o| o.into_name()).is_some_and(|n| n.as_ref() == b"DeviceN") {+ continue;+ }+ let Some(Object::Array(names)) = it.next() else { continue };+ let names: Vec<String> = names.iter::<Name<'_>>().map(|n| n.as_str().to_string()).collect();+ let (Some(k), Some(g)) = (names.iter().position(|n| n == "Black"), names.iter().position(|n| n == "Gold")) else { continue };+ let data = st.decoded().unwrap();+ out.extend(data.chunks(names.len()).filter(|px| px.len() == names.len()).map(|px| (px[k], px[g])));+ }+ out+ }+/// PDF/X-1a through craft-prepress: a soft drop shadow over a spot, a 50% object and a/// knockout group leave no transparency and no RGB; the shadow is flattened in the page's/// inks (Black over the spot), not exported as an RGB image of the object; text stays text and@@ -1141,6 +1165,10 @@ mod text_tests {spaces.iter().any(|cs| cs.starts_with("DeviceN") && cs.contains("Black") && cs.contains("Gold")),"the shadow over the spot: {spaces:?}");+ // The shadow multiplies: the spot stays at 100% where the shadow's black is.+ let shadowed: Vec<(u8, u8)> = black_and_gold(&pdf).into_iter().filter(|(k, _)| *k > 100).collect();+ assert!(!shadowed.is_empty(), "no shadow pixels");+ assert!(shadowed.iter().all(|(_, gold)| *gold >= 250), "the spot under the shadow: {:?}", &shadowed[..shadowed.len().min(8)]);assert!(text.contains("/op true") && text.contains("/OPM 1"), "overprint");assert!(text.contains("/FontFile"), "the text is still text");// The default resolution.diff --git a/crates/pdf/src/export.rs b/crates/pdf/src/export.rsindex 445aa20cb..9287ba325 100644--- a/crates/pdf/src/export.rs+++ b/crates/pdf/src/export.rs@@ -1618,7 +1618,9 @@ impl Exporter<'_> {}/// `paint` through `mask`'s coverage, a luminosity mask: the color's own inks (spot, process),-/// never an RGB raster.+/// never an RGB raster. The shadow multiplies with what is beneath it, as InDesign's drop shadow+/// does by default (the shadow model has no blend mode of its own), so a spot under a black+/// shadow keeps its full ink.fn draw_coverage(s: &mut Surface, mask: &crate::ShadowMask, paint: krilla::color::Color) {let r = mask.rect;let (Some(size), Some(rect), Some(image)) = (@@ -1636,12 +1638,14 @@ fn draw_coverage(s: &mut Surface, mask: &crate::ShadowMask, paint: krilla::colorms.pop();ms.finish();let stream = sb.finish();+ s.push_blend_mode(krilla::blend::BlendMode::Multiply);s.push_mask(krilla::mask::Mask::new(stream, krilla::mask::MaskType::Luminosity));s.set_stroke(None);s.set_fill(Some(Fill { paint: paint.into(), ..Default::default() }));s.draw_path(&rect);s.set_fill(None);s.pop();+ s.pop();}/// The ink coverage of a greyscale or bitmap image (255 = black, 0 = white or transparent) as a