caisin/typst
1
0
Fork 0
mirror of https://github.com/typst/typst synced 2025-05-13 12:36:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix more bad font names

Browse Source
This commit is contained in:
Laurenz 2023-02-24 15:08:00 +01:00
parent 151765bb3e
commit 09077d6382
2 changed files with 44 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/font/book.rs
View File

@ -199,7 +199,10 @@ impl FontInfo {
// up. // up.
let family = { let family = {
let mut family = find_name(ttf, name_id::FAMILY)?; let mut family = find_name(ttf, name_id::FAMILY)?;
if family.starts_with("Noto") || family.starts_with("NewComputerModern") { if family.starts_with("Noto")
|| family.starts_with("NewCM")
|| family.starts_with("NewComputerModern")
{
family = find_name(ttf, name_id::FULL_NAME)?; family = find_name(ttf, name_id::FULL_NAME)?;
} }
typographic_family(&family).to_string() typographic_family(&family).to_string()
@ -221,9 +224,18 @@ impl FontInfo {
(_, true) => FontStyle::Oblique, (_, true) => FontStyle::Oblique,
}; };
let weight = FontWeight::from_number(ttf.weight().to_number()); let weight = {
let stretch = FontStretch::from_number(ttf.width().to_number()); let mut number = ttf.weight().to_number();
if (family.starts_with("NewCM")
|| family.starts_with("New Computer Modern"))
&& full.contains("book")
{
number += 50;
}
FontWeight::from_number(number)
};
let stretch = FontStretch::from_number(ttf.width().to_number());
FontVariant { style, weight, stretch } FontVariant { style, weight, stretch }
}; };
@ -318,6 +330,12 @@ fn typographic_family(mut family: &str) -> &str {
"narrow", "condensed", "cond", "cn", "cd", "compressed", "expanded", "exp" "narrow", "condensed", "cond", "cn", "cd", "compressed", "expanded", "exp"
]; ];
let mut extra = [].as_slice();
let newcm = family.starts_with("NewCM") || family.starts_with("NewComputerModern");
if newcm {
extra = &["book"];
}
// Trim spacing and weird leading dots in Apple fonts. // Trim spacing and weird leading dots in Apple fonts.
family = family.trim().trim_start_matches('.'); family = family.trim().trim_start_matches('.');
@ -331,9 +349,16 @@ fn typographic_family(mut family: &str) -> &str {
len = trimmed.len(); len = trimmed.len();
// Find style suffix. // Find style suffix.
let Some(mut t) = SUFFIXES.iter().find_map(|s| trimmed.strip_suffix(s)) else { let mut t = trimmed;
let mut shortened = false;
while let Some(s) = SUFFIXES.iter().chain(extra).find_map(|s| t.strip_suffix(s)) {
shortened = true;
t = s;
}
if !shortened {
break; break;
}; }
// Strip optional separator. // Strip optional separator.
if let Some(s) = t.strip_suffix(SEPARATORS) { if let Some(s) = t.strip_suffix(SEPARATORS) {
@ -350,10 +375,21 @@ fn typographic_family(mut family: &str) -> &str {
} }
} }
// Apply style suffix trimming.
family = &family[..len];
if newcm {
family = family.trim_end_matches("10");
}
// Fix bad names. // Fix bad names.
match &family[..len] { match family {
"Noto Sans Symbols2" => "Noto Sans Symbols 2",
"NewComputerModern" => "New Computer Modern",
"NewComputerModernMono" => "New Computer Modern Mono",
"NewComputerModernSans" => "New Computer Modern Sans",
"NewComputerModernMath" => "New Computer Modern Math", "NewComputerModernMath" => "New Computer Modern Math",
"NewComputerModernMath-Book" => "New Computer Modern Math Book", "NewCMUncial" | "NewComputerModernUncial" => "New Computer Modern Uncial",
other => other, other => other,
} }
} }

1
tests/src/tests.rs
View File

@ -220,6 +220,7 @@ impl TestWorld {
// Search for fonts. // Search for fonts.
let mut fonts = vec![]; let mut fonts = vec![];
for entry in WalkDir::new(FONT_DIR) for entry in WalkDir::new(FONT_DIR)
.sort_by_file_name()
.into_iter() .into_iter()
.filter_map(|e| e.ok()) .filter_map(|e| e.ok())
.filter(|entry| entry.file_type().is_file()) .filter(|entry| entry.file_type().is_file())