Garmelon/showbits
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Load unifont fonts into typst

Browse source
This commit is contained in:
Joscha 2025-02-28 23:47:43 +01:00
parent 428b825e43
commit 49d6a2c022
3 changed files with 23 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Cargo.lock generated
View file

@ -2527,6 +2527,7 @@ dependencies = [
"image",
"serde",
"serde_json",
"showbits-assets",
"typst",
"typst-assets",
"typst-render",

1
showbits-typst/Cargo.toml
View file

@ -8,6 +8,7 @@ anyhow = { workspace = true }
image = { workspace = true }
serde = { workspace = true }
serde_json = "1.0.139"
showbits-assets = { workspace = true }
typst = { workspace = true }
typst-assets = { workspace = true }
typst-render = { workspace = true }

30
showbits-typst/src/lib.rs
View file

@ -53,20 +53,31 @@ impl FontLoader {
}
}
fn load_font_file(&mut self, data: &'static [u8]) {
// https://github.com/typst/typst/blob/be12762d942e978ddf2e0ac5c34125264ab483b7/crates/typst-cli/src/fonts.rs#L107-L121
let font_data = Bytes::new(data);
for (i, font) in Font::iter(font_data).enumerate() {
self.book.push(font.info().clone());
self.fonts.push(FontSlot {
path: PathBuf::new(),
index: i as u32,
font: OnceLock::from(Some(font)),
});
}
}
fn load_embedded_fonts(&mut self) {
// https://github.com/typst/typst/blob/be12762d942e978ddf2e0ac5c34125264ab483b7/crates/typst-cli/src/fonts.rs#L107-L121
for font_file in typst_assets::fonts() {
let font_data = Bytes::new(font_file);
for (i, font) in Font::iter(font_data).enumerate() {
self.book.push(font.info().clone());
self.fonts.push(FontSlot {
path: PathBuf::new(),
index: i as u32,
font: OnceLock::from(Some(font)),
});
}
self.load_font_file(font_file);
}
}
fn load_unifonts(&mut self) {
self.load_font_file(showbits_assets::UNIFONT);
self.load_font_file(showbits_assets::UNIFONT_JP);
self.load_font_file(showbits_assets::UNIFONT_UPPER);
}
}
pub struct Typst {
@ -82,6 +93,7 @@ impl Typst {
pub fn new() -> Self {
let mut loader = FontLoader::new();
loader.load_embedded_fonts();
loader.load_unifonts();
Self {
library: LazyHash::new(Library::default()),