From e16d3f5a67a31154797b4d56cdc6ed142ee2a7cf Mon Sep 17 00:00:00 2001
From: Laurenz <laurmaedje@gmail.com>
Date: Wed, 28 Feb 2024 11:06:54 +0100
Subject: Externalize assets (#3515)

---
 crates/typst-docs/src/lib.rs | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'crates/typst-docs/src/lib.rs')

diff --git a/crates/typst-docs/src/lib.rs b/crates/typst-docs/src/lib.rs
index 0a69523e..5439ad1b 100644
--- a/crates/typst-docs/src/lib.rs
+++ b/crates/typst-docs/src/lib.rs
@@ -20,6 +20,7 @@ use serde::de::DeserializeOwned;
 use serde::Deserialize;
 use serde_yaml as yaml;
 use typst::diag::{bail, StrResult};
+use typst::foundations::Bytes;
 use typst::foundations::{
     CastInfo, Category, Func, Module, ParamInfo, Repr, Scope, Smart, Type, Value,
     FOUNDATIONS,
@@ -36,8 +37,6 @@ use typst::visualize::VISUALIZE;
 use typst::Library;
 
 static DOCS_DIR: Dir<'_> = include_dir!("$CARGO_MANIFEST_DIR/../../docs");
-static FILE_DIR: Dir<'_> = include_dir!("$CARGO_MANIFEST_DIR/../../assets/files");
-static FONT_DIR: Dir<'_> = include_dir!("$CARGO_MANIFEST_DIR/../../assets/fonts");
 
 static GROUPS: Lazy<Vec<GroupData>> = Lazy::new(|| {
     let mut groups: Vec<GroupData> = yaml("reference/groups.yml");
@@ -67,9 +66,9 @@ static LIBRARY: Lazy<Prehashed<Library>> = Lazy::new(|| {
 });
 
 static FONTS: Lazy<(Prehashed<FontBook>, Vec<Font>)> = Lazy::new(|| {
-    let fonts: Vec<_> = FONT_DIR
-        .files()
-        .flat_map(|file| Font::iter(file.contents().into()))
+    let fonts: Vec<_> = typst_assets::fonts()
+        .chain(typst_dev_assets::fonts())
+        .flat_map(|data| Font::iter(Bytes::from_static(data)))
         .collect();
     let book = FontBook::from_fonts(&fonts);
     (Prehashed::new(book), fonts)
-- 
cgit v1.2.3