caisin/typst
1
0
Fork 0
mirror of https://github.com/typst/typst synced 2025-05-14 17:15:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Compress CMaps (#4406)

Browse Source
This commit is contained in:
Laurenz 2024-06-16 12:05:13 +02:00 committed by GitHub
parent feedfe80cb
commit 0d93ccd4bf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
crates/typst-pdf/src/font.rs
View File

@ -117,7 +117,7 @@ pub fn write_fonts(context: &WithGlobalRefs) -> (PdfChunk, HashMap<Font, Ref>) {
// Write the /ToUnicode character map, which maps glyph ids back to // Write the /ToUnicode character map, which maps glyph ids back to
// unicode codepoints to enable copying out of the PDF. // unicode codepoints to enable copying out of the PDF.
let cmap = create_cmap(glyph_set, glyph_remapper); let cmap = create_cmap(glyph_set, glyph_remapper);
chunk.cmap(cmap_ref, &cmap.finish()); chunk.cmap(cmap_ref, &cmap).filter(Filter::FlateDecode);
let subset = subset_font(font, glyph_remapper); let subset = subset_font(font, glyph_remapper);
let mut stream = chunk.stream(data_ref, &subset); let mut stream = chunk.stream(data_ref, &subset);
@ -258,11 +258,13 @@ pub fn improve_glyph_sets(glyph_sets: &mut HashMap<Font, BTreeMap<u16, EcoString
} }
} }
/// Create a /ToUnicode CMap. /// Create a compressed `/ToUnicode` CMap.
#[comemo::memoize]
#[typst_macros::time(name = "create cmap")]
fn create_cmap( fn create_cmap(
glyph_set: &BTreeMap<u16, EcoString>, glyph_set: &BTreeMap<u16, EcoString>,
glyph_remapper: &GlyphRemapper, glyph_remapper: &GlyphRemapper,
) -> UnicodeCmap { ) -> Arc<Vec<u8>> {
// Produce a reverse mapping from glyphs' CIDs to unicode strings. // Produce a reverse mapping from glyphs' CIDs to unicode strings.
let mut cmap = UnicodeCmap::new(CMAP_NAME, SYSTEM_INFO); let mut cmap = UnicodeCmap::new(CMAP_NAME, SYSTEM_INFO);
for (&g, text) in glyph_set.iter() { for (&g, text) in glyph_set.iter() {
@ -272,6 +274,5 @@ fn create_cmap(
cmap.pair_with_multiple(cid, text.chars()); cmap.pair_with_multiple(cid, text.chars());
} }
} }
Arc::new(deflate(&cmap.finish()))
cmap
} }