From d606f4e577ff022196448980832b625d21044016 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D7=99=2E=D7=9E=2E=20=D7=9E=D7=90=D7=95=D7=90=D7=A1?= Date: Tue, 17 Nov 2026 00:23:42 +0200 Subject: [PATCH 1/2] fix(pdf): keep neutrals on K and within ink limit in ICC Lab->CMYK table --- crates/tok-pdf/assets/icc/b2a.bin | Bin 5912 -> 5912 bytes crates/tok-pdf/assets/icc/gen_icc_luts.py | 24 ++++++++---- crates/tok-pdf/src/color.rs | 45 ++++++++++++++++++++++ 3 files changed, 62 insertions(+), 7 deletions(-) diff --git a/crates/tok-pdf/assets/icc/b2a.bin b/crates/tok-pdf/assets/icc/b2a.bin index 3f4e5aa1ff4f4710d9444ba18c42360c74c20b85..3dda06767755b93010548fc4b059e5c97e2cd5aa 100644 GIT binary patch literal 5912 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 Cu7d0U literal 5912 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 1 - 1e-9: + top = max(r, g, b) + # Near-black (including values pushed slightly off-neutral by the 16-bit Lab encoding) + # would otherwise blow tiny colour differences up into full-strength inks. + if top <= 1e-3: return 0.0, 0.0, 0.0, 1.0 - d = 1 - k - return (1 - r - k) / d, (1 - g - k) / d, (1 - b - k) / d, k + k = 1 - top + return (top - r) / top, (top - g) / top, (top - b) / top, k def u16(v): @@ -133,12 +141,14 @@ def build_a2b(): def build_b2a(): clut = [] n = B2A_GRID - 1 + # The input tables are the identity over 0..65535, so grid node i sits at the 16-bit + # input value i / n * 65535 on every channel (L, a and b alike). for li in range(B2A_GRID): for ai in range(B2A_GRID): for bi in range(B2A_GRID): - l = dec_l(li / n * 65280) - a = dec_ab(ai / n * 65280) - b = dec_ab(bi / n * 65280) + l = dec_l(li / n * 65535) + a = dec_ab(ai / n * 65535) + b = dec_ab(bi / n * 65535) r, g, bl = xyz_d50_to_rgb(*lab_to_xyz(l, a, b)) c, m, y, k = rgb_to_cmyk(r, g, bl) clut += [u16(c * 65535), u16(m * 65535), u16(y * 65535), u16(k * 65535)] diff --git a/crates/tok-pdf/src/color.rs b/crates/tok-pdf/src/color.rs index ecb8e0f..3c37aba 100644 --- a/crates/tok-pdf/src/color.rs +++ b/crates/tok-pdf/src/color.rs @@ -421,6 +421,51 @@ mod tests { ); } + /// Regression: the Lab -> CMYK table used to put 100% cyan and 64% magenta under pure black + /// (about 364% total ink) and tinted every dark neutral with coloured inks. + #[test] + fn icc_b2a_table_keeps_neutrals_on_black_and_within_ink_limit() { + let icc = ColorManagementEngine::generate_icc_profile_bytes(IccProfileId::Fogra39); + let be32 = |at: usize| u32::from_be_bytes(icc[at..at + 4].try_into().unwrap()); + let tag_count = be32(128) as usize; + let b2a_offset = (0..tag_count) + .map(|i| 132 + i * 12) + .find(|&entry| icc[entry..entry + 4] == *b"B2A0") + .map(|entry| be32(entry + 4) as usize) + .expect("B2A0 tag"); + assert_eq!(&icc[b2a_offset..b2a_offset + 4], b"mft2"); + assert_eq!(icc[b2a_offset + 8], 3, "B2A0 has 3 input channels (Lab)"); + assert_eq!(icc[b2a_offset + 9], 4, "B2A0 has 4 output channels (CMYK)"); + let grid = icc[b2a_offset + 10] as usize; + // 52-byte header, then three input tables of two 16-bit entries, then the grid. + let clut = b2a_offset + 52 + 3 * 2 * 2; + let node = |l: usize, a: usize, b: usize| -> [f32; 4] { + let at = clut + ((l * grid + a) * grid + b) * 4 * 2; + let mut ink = [0.0f32; 4]; + for (i, value) in ink.iter_mut().enumerate() { + let hi = icc[at + i * 2]; + let lo = icc[at + i * 2 + 1]; + *value = f32::from(u16::from_be_bytes([hi, lo])) / 65535.0; + } + ink + }; + let neutral = grid / 2; + for l in 0..grid { + let [c, m, y, _] = node(l, neutral, neutral); + assert!( + c < 0.01 && m < 0.01 && y < 0.01, + "neutral node {l} must use the black channel only, got c={c} m={m} y={y}" + ); + for a in 0..grid { + for b in 0..grid { + let total: f32 = node(l, a, b).iter().sum(); + assert!(total <= 3.0 + 1e-3, "node ({l},{a},{b}) has {total} ink"); + } + } + } + assert_eq!(node(0, neutral, neutral)[3], 1.0, "L=0 is pure 100% K"); + } + #[test] fn color_management_engine_enforces_tac_and_preserves_pure_black() { // Pure RGB black -> pure 100% K (0, 0, 0, 1) From cd8300c7839975dd286c0d10b333d76d3fb91e72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D7=99=2E=D7=9E=2E=20=D7=9E=D7=90=D7=95=D7=90=D7=A1?= Date: Tue, 17 Nov 2026 07:46:47 +0200 Subject: [PATCH 2/2] feat(pdf): add XMP for PDF/X-4, gamt tag, and a custom output condition for the generic ICC profile --- crates/tok-pdf/assets/icc/gamt.bin | Bin 0 -> 9894 bytes crates/tok-pdf/assets/icc/gen_icc_luts.py | 27 +++ crates/tok-pdf/src/color.rs | 20 +- crates/tok-pdf/src/pdf_engine.rs | 214 ++++++++++++++++++++-- 4 files changed, 242 insertions(+), 19 deletions(-) create mode 100644 crates/tok-pdf/assets/icc/gamt.bin diff --git a/crates/tok-pdf/assets/icc/gamt.bin b/crates/tok-pdf/assets/icc/gamt.bin new file mode 100644 index 0000000000000000000000000000000000000000..c32e5c9367572bdd9ca45c8d16d39016f43eac00 GIT binary patch literal 9894 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 1 channel): 0 inside the model's gamut, rising with the overshoot outside. + + The model reaches every sRGB colour and nothing beyond it, so "outside" means a linear + sRGB component below 0 or above 1. + """ + clut = [] + n = GAMT_GRID - 1 + for li in range(GAMT_GRID): + for ai in range(GAMT_GRID): + for bi in range(GAMT_GRID): + l = dec_l(li / n * 65535) + a = dec_ab(ai / n * 65535) + b = dec_ab(bi / n * 65535) + x, y, z = lab_to_xyz(l, a, b) + rl = 3.1338561 * x - 1.6168667 * y - 0.4906146 * z + gl = -0.9787684 * x + 1.9161415 * y + 0.0334540 * z + bl = 0.0719453 * x - 0.2289914 * y + 1.4052427 * z + over = max(0.0, max(rl, gl, bl) - 1.0, -min(rl, gl, bl)) + if over < 1e-4: + over = 0.0 + clut.append(u16(min(over * 4.0, 1.0) * 65535)) + return lut16(3, 1, GAMT_GRID, clut) + + if __name__ == "__main__": out_dir = Path(sys.argv[1] if len(sys.argv) > 1 else ".") out_dir.mkdir(parents=True, exist_ok=True) (out_dir / "a2b.bin").write_bytes(build_a2b()) (out_dir / "b2a.bin").write_bytes(build_b2a()) + (out_dir / "gamt.bin").write_bytes(build_gamt()) diff --git a/crates/tok-pdf/src/color.rs b/crates/tok-pdf/src/color.rs index 3c37aba..720f4d6 100644 --- a/crates/tok-pdf/src/color.rs +++ b/crates/tok-pdf/src/color.rs @@ -127,7 +127,10 @@ impl IccProfileId { } } - /// Official PDF/X `OutputConditionIdentifier` registered at `http://www.color.org`. + /// Identifier of the registered press condition this profile approximates. + /// + /// Informational (CLI output, UI): the PDF itself declares a custom output condition, + /// because the embedded profile is a generic approximation and not that characterisation. pub fn output_condition_identifier(&self) -> &'static str { match self { Self::Fogra39 => "FOGRA39", @@ -149,7 +152,8 @@ impl IccProfileId { } } - /// Registry URL for PDF/X OutputIntent. + /// Registry that lists the condition named by `output_condition_identifier`. + /// Not written to the PDF, which declares a custom (unregistered) output condition. pub fn registry_name(&self) -> &'static str { "http://www.color.org" } @@ -273,6 +277,8 @@ impl ColorManagementEngine { // CMYK -> Lab and Lab -> CMYK `lut16Type` tag data. const A2B_LUT: &[u8] = include_bytes!("../assets/icc/a2b.bin"); const B2A_LUT: &[u8] = include_bytes!("../assets/icc/b2a.bin"); + // Lab -> gamut distance (0 inside the gamut); ICC v2 requires it for LUT-based output. + const GAMT: &[u8] = include_bytes!("../assets/icc/gamt.bin"); let desc_str = format!("TypesetOK approximation of {}", profile.info()); let cprt_str = "Copyright TypesetOK Pre-Press Color Engine (ISO 15076-1)"; @@ -305,10 +311,10 @@ impl ColorManagementEngine { wtpt_tag.extend_from_slice(&0x0000_D32Du32.to_be_bytes()); // 0.8249 in s15Fixed16 // Distinct data blocks, stored in this order. Every block starts on a 4-byte boundary. - let blocks: [&[u8]; 5] = [&desc_tag, &cprt_tag, &wtpt_tag, A2B_LUT, B2A_LUT]; + let blocks: [&[u8]; 6] = [&desc_tag, &cprt_tag, &wtpt_tag, A2B_LUT, B2A_LUT, GAMT]; // Tag table: signature and the block it points at. The three rendering intents of each // transform share one block. - let tags: [(&[u8; 4], usize); 9] = [ + let tags: [(&[u8; 4], usize); 10] = [ (b"desc", 0), (b"cprt", 1), (b"wtpt", 2), @@ -318,12 +324,13 @@ impl ColorManagementEngine { (b"B2A0", 4), (b"B2A1", 4), (b"B2A2", 4), + (b"gamt", 5), ]; let header_size = 128u32; let tag_count = tags.len() as u32; let tag_table_size = 4 + tag_count * 12; - let mut offsets = [0u32; 5]; + let mut offsets = [0u32; 6]; let mut cursor = header_size + tag_table_size; for (offset, block) in offsets.iter_mut().zip(blocks.iter()) { *offset = cursor; @@ -504,7 +511,7 @@ mod tests { let be32 = |at: usize| u32::from_be_bytes(icc_bytes[at..at + 4].try_into().unwrap()); assert_eq!(be32(0) as usize, icc_bytes.len(), "profile size field"); let tag_count = be32(128) as usize; - assert_eq!(tag_count, 9); + assert_eq!(tag_count, 10); let mut signatures = Vec::new(); for i in 0..tag_count { let entry = 132 + i * 12; @@ -523,5 +530,6 @@ mod tests { } assert!(signatures.iter().any(|s| s == b"A2B0")); assert!(signatures.iter().any(|s| s == b"B2A0")); + assert!(signatures.iter().any(|s| s == b"gamt")); } } diff --git a/crates/tok-pdf/src/pdf_engine.rs b/crates/tok-pdf/src/pdf_engine.rs index 8c26ae1..c7d8a44 100644 --- a/crates/tok-pdf/src/pdf_engine.rs +++ b/crates/tok-pdf/src/pdf_engine.rs @@ -236,6 +236,109 @@ impl LineTextWriter { } } +/// Producing application, written to both the Info dictionary and the XMP packet. +const CREATOR_TOOL: &str = "TypesetOK Native Pre-Press Engine 2026"; + +/// Escapes text for use inside an XML element (characters XML 1.0 forbids are dropped). +fn xml_escape(s: &str) -> String { + let mut out = String::with_capacity(s.len()); + for ch in s.chars() { + match ch { + '&' => out.push_str("&"), + '<' => out.push_str("<"), + '>' => out.push_str(">"), + '"' => out.push_str("""), + '\'' => out.push_str("'"), + c if u32::from(c) < 0x20 && !matches!(c, '\t' | '\n' | '\r') => {} + c => out.push(c), + } + } + out +} + +/// Date for the XMP packet: ISO 8601 with a time zone, matching what `parse_pdf_date` reads for +/// the Info dictionary. Unrecognised input falls back to the deterministic default date. +fn xmp_date(s: &str) -> String { + const FALLBACK: &str = "2026-01-01T00:00:00Z"; + let s = s.trim(); + let s = s.strip_prefix("D:").unwrap_or(s); + let bytes = s.as_bytes(); + if bytes.len() >= 10 && bytes[4] == b'-' && bytes[7] == b'-' { + return match bytes.len() { + 10 => format!("{s}T00:00:00Z"), + 19 => format!("{}Z", s.replacen(' ', "T", 1)), + _ => s.replacen(' ', "T", 1), + }; + } + if bytes.len() >= 14 && bytes[..14].iter().all(u8::is_ascii_digit) { + return format!( + "{}-{}-{}T{}:{}:{}Z", + &s[0..4], + &s[4..6], + &s[6..8], + &s[8..10], + &s[10..12], + &s[12..14] + ); + } + FALLBACK.to_string() +} + +/// `uuid:` URN built from the first 16 bytes of the file identifier. +fn uuid_urn(id: &[u8]) -> String { + let hex: String = id.iter().take(16).map(|b| format!("{b:02x}")).collect(); + format!( + "uuid:{}-{}-{}-{}-{}", + &hex[0..8], + &hex[8..12], + &hex[12..16], + &hex[16..20], + &hex[20..32] + ) +} + +/// XMP packet required by PDF/X-4 (ISO 15930-7): it repeats the Info dictionary values and adds +/// the PDF/X version and the document identity. +fn build_xmp( + title: &str, + author: &str, + created: &str, + modified: &str, + document_id: &str, +) -> String { + format!( + r#" + + + + application/pdf + {title} + {author} + {tool} + {created} + {modified} + {modified} + False + PDF/X-4 + {document_id} + 1 + default + + + +"#, + bom = '\u{feff}', + title = xml_escape(title), + author = xml_escape(author), + tool = xml_escape(CREATOR_TOOL), + ) +} + /// Parses an RFC 3339 / ISO 8601 or PDF formatted date string into a [`pdf_writer::Date`]. pub fn parse_pdf_date(s: &str) -> Option { let s = s.trim(); @@ -470,7 +573,7 @@ impl PdfPrePressEngine { let mut info = pdf.document_info(info_id); info.title(TextStr(&options.title)); info.author(TextStr(&options.author)); - info.creator(TextStr("TypesetOK Native Pre-Press Engine 2026")); + info.creator(TextStr(CREATOR_TOOL)); info.trapped(TrappingStatus::NotTrapped); if let Some(cdate) = parse_pdf_date(creation_str) { @@ -570,6 +673,8 @@ impl PdfPrePressEngine { // 7. Embedded ICC DestOutputProfile Stream (N = 4 CMYK components) & Catalog OutputIntent let icc_profile_id = alloc(); + let profile_info = options.color_profile.info(); + let intent_info = format!("TypesetOK approximation of {profile_info}"); let icc_raw = ColorManagementEngine::generate_icc_profile_bytes(options.color_profile); if options.compress_streams { let compressed_icc = miniz_oxide::deflate::compress_to_vec_zlib(&icc_raw, 6); @@ -583,26 +688,50 @@ impl PdfPrePressEngine { icc_stream.finish(); } + // 8. Deterministic file identifier (required by PDF/X); also the XMP DocumentID. + id_hash = fnv1a(id_hash, options.title.as_bytes()); + id_hash = fnv1a(id_hash, creation_str.as_bytes()); + id_hash = fnv1a(id_hash, mod_str.as_bytes()); + let file_id = [id_hash.to_be_bytes(), fnv1a(id_hash, b"tok").to_be_bytes()].concat(); + + // XMP metadata: required by PDF/X-4; PDF 1.3 (PDF/X-1a) has no /Metadata entry. + let xmp_id = if matches!(options.standard, PdfXStandard::PdfX4) { + let id = alloc(); + let xmp = build_xmp( + &options.title, + &options.author, + &xmp_date(creation_str), + &xmp_date(mod_str), + &uuid_urn(&file_id), + ); + let mut xmp_stream = pdf.stream(id, xmp.as_bytes()); + xmp_stream.pair(Name(b"Type"), Name(b"Metadata")); + xmp_stream.pair(Name(b"Subtype"), Name(b"XML")); + xmp_stream.finish(); + Some(id) + } else { + None + }; + let mut catalog = pdf.catalog(catalog_id); catalog.pages(pages_id); + if let Some(id) = xmp_id { + catalog.pair(Name(b"Metadata"), id); + } let mut catalog_intents = catalog.output_intents(); let mut intent = catalog_intents.push(); intent.subtype(OutputIntentSubtype::PDFX); - intent.output_condition_identifier(TextStr( - options.color_profile.output_condition_identifier(), - )); - intent.info(TextStr(options.color_profile.info())); - intent.registry_name(TextStr(options.color_profile.registry_name())); + // The embedded profile is a generic approximation, not the characterisation of the + // registered press condition it is modelled on. PDF/X allows a custom output condition + // when the profile is embedded, so declare one instead of a registered identifier. + intent.output_condition_identifier(TextStr("Custom")); + intent.info(TextStr(&intent_info)); intent.dest_output_profile(icc_profile_id); intent.finish(); catalog_intents.finish(); catalog.finish(); - // 8. Deterministic file identifier (required by PDF/X). - id_hash = fnv1a(id_hash, options.title.as_bytes()); - id_hash = fnv1a(id_hash, creation_str.as_bytes()); - id_hash = fnv1a(id_hash, mod_str.as_bytes()); - let file_id = [id_hash.to_be_bytes(), fnv1a(id_hash, b"tok").to_be_bytes()].concat(); + // 9. File identifier (computed earlier, it is also the XMP DocumentID). pdf.set_file_id((file_id.clone(), file_id)); Ok(pdf.finish()) @@ -1308,8 +1437,16 @@ mod tests { "Must embed GRACoL 2013 OutputIntent info" ); assert!( - s.contains("CGATS TR 016"), - "Must embed CGATS TR 016 OutputConditionIdentifier" + s.contains("(Custom)") && !s.contains("CGATS TR 016") && !s.contains("color.org"), + "The approximation profile must declare a custom, not a registered, condition" + ); + assert!( + s.contains("/Metadata") && s.contains("PDF/X-4<"), + "PDF/X-4 must carry an XMP packet with the PDF/X version" + ); + assert!( + s.contains("uuid:"), + "PDF/X-4 XMP must carry a DocumentID" ); // Both separator line widths (0.5 w for primary apparatus, 0.35 w for secondary apparatus) assert!( @@ -1371,4 +1508,55 @@ mod tests { "Must contain crop mark vector paths" ); } + + #[test] + fn xmp_helpers_escape_text_and_normalise_dates_and_ids() { + assert_eq!( + xml_escape("a & b \"d\" 'e'"), + "a & b <c> "d" 'e'" + ); + assert_eq!(xml_escape("a\u{1}b"), "ab"); + assert_eq!(xmp_date("2026-03-04"), "2026-03-04T00:00:00Z"); + assert_eq!(xmp_date("2026-03-04T05:06:07Z"), "2026-03-04T05:06:07Z"); + assert_eq!(xmp_date("2026-03-04 05:06:07"), "2026-03-04T05:06:07Z"); + assert_eq!( + xmp_date("2026-03-04T05:06:07+02:00"), + "2026-03-04T05:06:07+02:00" + ); + assert_eq!(xmp_date("D:20260304050607"), "2026-03-04T05:06:07Z"); + assert_eq!(xmp_date("not a date"), "2026-01-01T00:00:00Z"); + let id: Vec = (0u8..16).collect(); + assert_eq!(uuid_urn(&id), "uuid:00010203-0405-0607-0809-0a0b0c0d0e0f"); + } + + #[test] + fn pdf_x4_xmp_matches_the_info_dictionary_and_escapes_the_title() { + let options = PdfExportOptions { + standard: PdfXStandard::PdfX4, + title: "A & B <ספר>".to_string(), + compress_streams: false, + creation_date: Some("2026-05-06T07:08:09Z".to_string()), + ..Default::default() + }; + let bytes = PdfPrePressEngine::export_pdf(&[], &options).unwrap(); + let s = String::from_utf8_lossy(&bytes); + let title_xml = "A & B <ספר>"; + let created_xml = "2026-05-06T07:08:09Z"; + assert!(s.contains(title_xml)); + assert!(s.contains(created_xml)); + assert!(s.contains("False")); + assert!(s.contains("/Subtype /XML")); + } + + #[test] + fn pdf_x1a_has_no_xmp_metadata() { + let options = PdfExportOptions { + standard: PdfXStandard::PdfX1a2001, + compress_streams: false, + ..Default::default() + }; + let bytes = PdfPrePressEngine::export_pdf(&[], &options).unwrap(); + let s = String::from_utf8_lossy(&bytes); + assert!(!s.contains("xpacket") && !s.contains("/Metadata")); + } }