aleleba/cadcraft
1
0
Fork 0
mirror of https://github.com/storytold/cadcraft.git synced 2026-11-10 04:19:59 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fonts: a font's family name falls back to the family when the typographic one is blank (CodeRabbit on #2803)

Browse Source
This commit is contained in:
Tanish Manku
2026-11-04 19:34:32 -07:00
parent f7fbf41e61
commit 5b2c7bb0fb
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/fonts/src/ttf.rs
+6 -6
View File
@@ -83,14 +83,14 @@ impl Face {
pub fn has_glyph(&self, c: char) -> bool {
self.font().is_some_and(|f| f.charmap().map(c).is_some())
}
/// The family name, as the font gives it.
/// The family name, as the font gives it (the typographic family, else the family when that
/// is missing or blank).
pub fn family_name(&self) -> Option<String> {
let f = self.font()?;
[skrifa::string::StringId::TYPOGRAPHIC_FAMILY_NAME, skrifa::string::StringId::FAMILY_NAME]
.into_iter()
.find_map(|id| f.localized_strings(id).next().map(|s| s.to_string()))
.map(|s| s.chars().filter(|c| !c.is_control()).take(80).collect::<String>())
.filter(|s| !s.trim().is_empty())
[skrifa::string::StringId::TYPOGRAPHIC_FAMILY_NAME, skrifa::string::StringId::FAMILY_NAME].into_iter().find_map(|id| {
let s = f.localized_strings(id).next()?.to_string();
Some(s.chars().filter(|c| !c.is_control()).take(80).collect::<String>()).filter(|s| !s.trim().is_empty())
})
}
/// The glyph ids the face's character map gives `chars` (`None` for an unmapped one).