diff options
| author | Laurenz <laurmaedje@gmail.com> | 2022-04-02 21:55:25 +0200 |
|---|---|---|
| committer | Laurenz <laurmaedje@gmail.com> | 2022-04-03 13:55:58 +0200 |
| commit | 23d108c8e099798dc4d35ce9cbcd3e37fb50f3b2 (patch) | |
| tree | aa068b11b9ac0a4795fb6e86bb8283b1d4718e95 /src/loading/fs.rs | |
| parent | beca01c826ee51c9ee6d5eadd7e5ef10f7fb9f58 (diff) | |
Font fallback
Diffstat (limited to 'src/loading/fs.rs')
| -rw-r--r-- | src/loading/fs.rs | 33 |
1 files changed, 1 insertions, 32 deletions
diff --git a/src/loading/fs.rs b/src/loading/fs.rs index 58f2b1e2..3398ebd3 100644 --- a/src/loading/fs.rs +++ b/src/loading/fs.rs @@ -116,7 +116,7 @@ impl FsLoader { let path = path.strip_prefix(".").unwrap_or(path); if let Ok(file) = File::open(path) { if let Ok(mmap) = unsafe { Mmap::map(&file) } { - self.faces.extend(FaceInfo::parse(path, &mmap)); + self.faces.extend(FaceInfo::from_data(path, &mmap)); } } } @@ -142,34 +142,3 @@ impl Loader for FsLoader { fs::read(path) } } - -#[cfg(test)] -mod tests { - use super::*; - - #[test] - fn test_index_font_dir() { - let faces = FsLoader::new().with_path("fonts").faces; - let mut paths: Vec<_> = faces.into_iter().map(|info| info.path).collect(); - paths.sort(); - - assert_eq!(paths, [ - Path::new("fonts/CMU-Serif-Bold.ttf"), - Path::new("fonts/CMU-Serif-Regular.ttf"), - Path::new("fonts/IBMPlexMono-Regular.ttf"), - Path::new("fonts/IBMPlexSans-Bold.ttf"), - Path::new("fonts/IBMPlexSans-BoldItalic.ttf"), - Path::new("fonts/IBMPlexSans-Italic.ttf"), - Path::new("fonts/IBMPlexSans-Regular.ttf"), - Path::new("fonts/IBMPlexSerif-Regular.ttf"), - Path::new("fonts/LatinModernMath.otf"), - Path::new("fonts/NotoSansArabic-Regular.ttf"), - Path::new("fonts/NotoSerifCJKsc-Regular.otf"), - Path::new("fonts/NotoSerifHebrew-Bold.ttf"), - Path::new("fonts/NotoSerifHebrew-Regular.ttf"), - Path::new("fonts/PTSans-Regular.ttf"), - Path::new("fonts/Roboto-Regular.ttf"), - Path::new("fonts/TwitterColorEmoji.ttf"), - ]); - } -} |
