EffectCraft: An open-source motion graphics and compositing tool written by scratch in pure Rust
fonts: extra font folders from EFFECTCRAFT_FONT_DIRS
Johnstockerb2d8abdd1cff
diff --git a/crates/text/src/fonts.rs b/crates/text/src/fonts.rsindex 2a2c08e8c..cb2b2ad29 100644--- a/crates/text/src/fonts.rs+++ b/crates/text/src/fonts.rs@@ -94,10 +94,17 @@ impl DirectorySource {dirs.push(h.join(".fonts"));}}+ dirs.extend(extra_dirs(std::env::var_os("EFFECTCRAFT_FONT_DIRS").as_deref()));Self { dirs }}}+/// Extra font folders from `EFFECTCRAFT_FONT_DIRS` (a path list, `:`-separated, `;` on Windows), so a+/// tool can hand EffectCraft its own font library without installing the fonts system-wide.+fn extra_dirs(var: Option<&std::ffi::OsStr>) -> Vec<PathBuf> {+ var.map(|v| std::env::split_paths(v).filter(|p| !p.as_os_str().is_empty()).collect()).unwrap_or_default()+}+fn walk(dir: &std::path::Path, depth: u32, out: &mut Vec<PathBuf>) {let Ok(rd) = std::fs::read_dir(dir) else { return };for e in rd.flatten() {@@ -824,6 +831,14 @@ fn system_fallback(c: char, style: &str) -> Option<FaceId> {mod tests {use super::*;+ #[test]+ fn extra_font_dirs_come_from_a_path_list() {+ assert!(extra_dirs(None).is_empty());+ let v = std::env::join_paths(["/a/fonts", "/b/more"]).unwrap_or_default();+ assert_eq!(extra_dirs(Some(&v)), vec![PathBuf::from("/a/fonts"), PathBuf::from("/b/more")]);+ assert!(extra_dirs(Some(std::ffi::OsStr::new(""))).is_empty());+ }+#[test]fn bundled_families_and_resolution() {let fams = families();diff --git a/docs/agents.md b/docs/agents.mdindex c631bc05b..6a3b9e85e 100644--- a/docs/agents.md+++ b/docs/agents.md@@ -495,6 +495,8 @@ styles, origin (`bundled`, `system`, `user`) and own-language name (`{"query":"gby name; `{"rescan":true}` first picks up fonts installed since launch). Pass a listed `family` andone of its `styles` to `layer.setText {"font", "style"}`; `text.fontFeatures` says which OpenTypeoptions a font draws with its own glyphs.+A tool with its own font library can hand it over without installing it: folders listed in+`EFFECTCRAFT_FONT_DIRS` (a path list, `:`-separated, `;` on Windows) are scanned like the system font folders.In expressions, `text.sourceText.style` / `getStyleAt(i, t)` read styles and the setters(`setFontSize(v, start?, count?)`, `setFillColor`, `setText`, `setJustification`…) return a