konevsa/typst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enable font fallback for hyphen (#2233)

Browse Source
This commit is contained in:
LU Jialin 2023-09-28 23:01:21 +08:00 committed by GitHub
parent 13fe7b4549
commit ca2312deec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
crates/typst-library/src/text/shaping.rs
View File

@ -430,12 +430,15 @@ impl<'a> ShapedText<'a> {
/// Push a hyphen to end of the text.
pub fn push_hyphen(&mut self, vt: &Vt) {
families(self.styles).find_map(|family| {
let world = vt.world;
let font = world
.book()
.select(family.as_str(), self.variant)
.and_then(|id| world.font(id))?;
let world = vt.world;
let book = world.book();
let mut chain = families(self.styles)
.map(|family| book.select(family.as_str(), self.variant))
.chain(std::iter::once_with(|| book.select_fallback(None, self.variant, "-")))
.flatten();
chain.find_map(|id| {
let font = world.font(id)?;
let ttf = font.ttf();
let glyph_id = ttf.glyph_index('-')?;
let x_advance = font.to_em(ttf.glyph_hor_advance(glyph_id)?);