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

Sort languages when writing XMP metadata for reproducible builds (#3469)

Browse Source
This commit is contained in:
Ilia 2024-02-23 17:14:07 +03:00 committed by GitHub
parent 0fe03bae6e
commit ffd57bf56b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -85,7 +85,8 @@ struct PdfContext<'a> {
glyph_sets: HashMap<Font, BTreeMap<u16, EcoString>>, glyph_sets: HashMap<Font, BTreeMap<u16, EcoString>>,
/// The number of glyphs for all referenced languages in the document. /// The number of glyphs for all referenced languages in the document.
/// We keep track of this to determine the main document language. /// We keep track of this to determine the main document language.
languages: HashMap<Lang, usize>, /// BTreeMap is used to write sorted list of languages to metadata.
languages: BTreeMap<Lang, usize>,
/// Allocator for indirect reference IDs. /// Allocator for indirect reference IDs.
alloc: Ref, alloc: Ref,
@ -134,7 +135,7 @@ impl<'a> PdfContext<'a> {
pdf: Pdf::new(), pdf: Pdf::new(),
pages: vec![], pages: vec![],
glyph_sets: HashMap::new(), glyph_sets: HashMap::new(),
languages: HashMap::new(), languages: BTreeMap::new(),
alloc, alloc,
page_tree_ref, page_tree_ref,
page_refs: vec![], page_refs: vec![],
@ -158,11 +159,7 @@ impl<'a> PdfContext<'a> {
/// Write the document catalog. /// Write the document catalog.
fn write_catalog(ctx: &mut PdfContext, ident: Option<&str>, timestamp: Option<Datetime>) { fn write_catalog(ctx: &mut PdfContext, ident: Option<&str>, timestamp: Option<Datetime>) {
let lang = ctx let lang = ctx.languages.iter().max_by_key(|(_, &count)| count).map(|(&l, _)| l);
.languages
.iter()
.max_by_key(|(&lang, &count)| (count, lang))
.map(|(&k, _)| k);
let dir = if lang.map(Lang::dir) == Some(Dir::RTL) { let dir = if lang.map(Lang::dir) == Some(Dir::RTL) {
Direction::R2L Direction::R2L