aleleba/vectorcraft
1
0
Fork 0
mirror of https://github.com/storytold/vectorcraft.git synced 2026-11-01 05:37:23 -06:00
Code Issues Packages Projects Releases Wiki Activity

Optical kerning: shaped advances are read with get()

Browse Source
This commit is contained in:
bflatastic
2026-11-01 01:22:04 +07:00
parent 9896f633da
commit 2f1404af22
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/text/src/shape.rs
+4 -3
View File
@@ -580,7 +580,7 @@ fn optical_pairs(db: &FontDb, text: &str, glyphs: &mut [SGlyph], runs: &[(Range<
continue;
}
let mut start = i;
while start > 0 && glyphs[start - 1].byte == a.byte {
while start > 0 && glyphs.get(start - 1).is_some_and(|g| g.byte == a.byte) {
start -= 1;
}
let mut end = i + 1;
@@ -588,15 +588,16 @@ fn optical_pairs(db: &FontDb, text: &str, glyphs: &mut [SGlyph], runs: &[(Range<
end += 1;
}
// A mark may precede its base inside either direction's shaped cluster.
let advance = |k: usize| shaped_advances.get(k).copied().unwrap_or(0.0);
let first_base = glyphs[start..=i]
.iter()
.enumerate()
.max_by(|(a, _), (b, _)| shaped_advances[start + *a].total_cmp(&shaped_advances[start + *b]))
.max_by(|(a, _), (b, _)| advance(start + *a).total_cmp(&advance(start + *b)))
.map_or(start, |(offset, _)| start + offset);
let second_base = glyphs[i + 1..=end]
.iter()
.enumerate()
.max_by(|(a, _), (b, _)| shaped_advances[i + 1 + *a].total_cmp(&shaped_advances[i + 1 + *b]))
.max_by(|(a, _), (b, _)| advance(i + 1 + *a).total_cmp(&advance(i + 1 + *b)))
.map_or(i + 1, |(offset, _)| i + 1 + offset);
let (left_index, right_index, target, cluster_start, cluster_end) =
if a.level.is_rtl() { (second_base, first_base, end, i + 1, end) } else { (first_base, second_base, i, start, i) };