Share ligature caret mapping

This commit is contained in:
Dylan M. Taylor committed 2026-11-15 17:25:04 +00:00
1 parent 3d1b0b5edf
commit 70cfdb2817
4 files changed
+37

No files matched your search

Generated
+1
View File
@@ -1766,6 +1766,7 @@ dependencies = [
"skrifa 0.47.0",
"thiserror 2.0.21",
"unicode-bidi",
"unicode-segmentation",
"windows-registry",
"write-fonts 0.54.1",
]
+1
View File
@@ -20,6 +20,7 @@ kurbo = { workspace = true }
skrifa = { version = "0.47", default-features = false, features = ["std"] }
thiserror = { workspace = true }
unicode-bidi = "0.3.18"
unicode-segmentation = "1.13"
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
fontique = { version = "0.11.1", default-features = false, features = ["system", "fontconfig-dlopen"], optional = true }
+2
View File
@@ -24,6 +24,7 @@ mod catalog;
mod env;
mod fallback;
mod fontconfig;
mod ligature;
mod line_break;
mod outline;
mod registry;
@@ -38,6 +39,7 @@ pub use catalog::{Catalog, FontData, FontFileError, Limits, Lister, LoadedFace,
pub use env::{FontEnv, Os, font_dirs, font_store_dir, office_font_dirs};
pub use fallback::{cluster_face, drawable_characters};
pub use fontconfig::fontconfig_dirs;
pub use ligature::ligature_caret_stops;
pub use line_break::settle_line_break;
pub use outline::{FontOutline, GlyphPen, OutlineError};
pub use scan::{FaceInfo, LocalizedName, Source, is_font_file, style_italic, style_weight, style_width};
+33
View File
@@ -0,0 +1,33 @@
//! Map ligature caret fractions to grapheme boundaries.
use unicode_segmentation::UnicodeSegmentation;
/// Return logical source-byte caret stops inside a shaped cluster. `font_carets` receives the
/// number of stops and may return their normalized positions along the glyph's logical width.
/// Missing or incorrectly sized font data falls back to equal divisions of the width.
pub fn ligature_caret_stops(text: &str, byte: usize, len: usize, font_carets: impl FnOnce(usize) -> Option<Vec<f64>>) -> Vec<(usize, f64)> {
let Some(s) = byte.checked_add(len).and_then(|end| text.get(byte..end)).filter(|_| len > 1) else { return Vec::new() };
let starts: Vec<usize> = s.grapheme_indices(true).skip(1).map(|(i, _)| byte + i).collect();
if starts.is_empty() {
return Vec::new();
}
let parts = starts.len() + 1;
let mut at =
font_carets(starts.len()).filter(|c| c.len() == starts.len()).unwrap_or_else(|| (1..parts).map(|j| j as f64 / parts as f64).collect());
at.sort_by(f64::total_cmp);
starts.into_iter().zip(at).collect()
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn maps_graphemes_and_sorts_font_positions() {
assert_eq!(ligature_caret_stops("ábc", 0, 5, |_| Some(vec![0.8, 0.3])), vec![(3, 0.3), (4, 0.8)]);
}
#[test]
fn falls_back_and_rejects_invalid_ranges() {
assert_eq!(ligature_caret_stops("abc", 0, 3, |_| Some(vec![0.5])), vec![(1, 1.0 / 3.0), (2, 2.0 / 3.0)]);
assert!(ligature_caret_stops("abc", usize::MAX, 2, |_| None).is_empty());
assert!(ligature_caret_stops("é", 1, 1, |_| None).is_empty());
}
}