From 808730f49b9637b7909fe2ae56f9d63fdb100cae Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Sun, 15 Nov 2026 14:57:56 -0500 Subject: [PATCH] ps: preserve reencoded glyph names in fallback fonts --- crates/ps/src/read/font.rs | 67 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 65 insertions(+), 2 deletions(-) diff --git a/crates/ps/src/read/font.rs b/crates/ps/src/read/font.rs index 9a1af3fb6..af0c6e3c2 100644 --- a/crates/ps/src/read/font.rs +++ b/crates/ps/src/read/font.rs @@ -43,9 +43,27 @@ fn substitute_type42(ip: &mut Interp, font_name: &[u8], bytes: &[u8]) -> R Option { b"oslash" => 'ø', b"oe" => 'œ', b"germandbls" => 'ß', - _ => return None, + _ => { + return crate::read::encodings::iso_latin1() + .iter() + .enumerate() + .skip(160) + .find(|(_, glyph)| glyph.as_bytes() == name) + .and_then(|(code, _)| char::from_u32(code as u32)); + } }) } @@ -747,5 +772,43 @@ mod tests { assert_eq!(standard_glyph_char(b"quoteleft"), Some('‘')); assert_eq!(standard_glyph_char(b"quoteright"), Some('’')); assert_eq!(standard_glyph_char(b"unmapped.custom"), None); + assert_eq!(standard_glyph_char(b"eacute"), Some('é')); + assert_eq!(standard_glyph_char(b"Adieresis"), Some('Ä')); + assert_eq!(standard_glyph_char(b"space"), Some(' ')); + } + /// A tiny generated SFNT directory with named glyphs, not a copied font asset. + fn named_font() -> Vec { + let maxp = [0, 0, 0x50, 0, 0, 3]; + let mut post = vec![0u8; 32]; + post[..4].copy_from_slice(&[0, 2, 0, 0]); + post.extend_from_slice(&[0, 3, 0, 0, 1, 2, 1, 3]); + for n in [b"eacute".as_slice(), b"custom.accent"] { + post.push(n.len() as u8); + post.extend_from_slice(n); + } + let mut data = vec![0, 1, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0]; + for (tag, offset, len) in [(b"maxp", 44u32, maxp.len()), (b"post", 52u32, post.len())] { + data.extend_from_slice(tag); + data.extend_from_slice(&0u32.to_be_bytes()); + data.extend_from_slice(&offset.to_be_bytes()); + data.extend_from_slice(&(len as u32).to_be_bytes()); + } + data.extend_from_slice(&maxp); + data.resize(52, 0); + data.extend_from_slice(&post); + data + } + + #[test] + fn substitute_resolves_reencoded_names_and_charges_budget() -> Result<(), String> { + let bytes = named_font(); + let mut ip = Interp::new(vec![], (0.0, 0.0), Default::default()); + let font = substitute_type42(&mut ip, b"Fallback", &bytes).map_err(|e| format!("{e:?}"))?.ok_or("fixture font rejected")?; + assert_eq!(crate::read::type42::glyph_index(&font, b"eacute"), 1); + assert_eq!(crate::read::type42::glyph_index(&font, b"custom.accent"), 2); + assert_eq!(crate::read::type42::glyph_index(&font, b"unknown"), 0); + let mut limited = Interp::new(vec![], (0.0, 0.0), crate::read::Limits { steps: 0, ..Default::default() }); + assert!(substitute_type42(&mut limited, b"Fallback", &bytes).is_err()); + Ok(()) } }