EffectCraft: An open-source motion graphics and compositing tool written by scratch in pure Rust
Text: a variable face's own style needs no instance axis values (#1563)
Gert Pellinc4dcefb65b1d
diff --git a/crates/text/src/fonts.rs b/crates/text/src/fonts.rsindex 4dad3f22e..9ebf92e29 100644--- a/crates/text/src/fonts.rs+++ b/crates/text/src/fonts.rs@@ -527,8 +527,9 @@ fn resolve_in(family: &str, style: &str) -> Option<Resolved> {return None;}let instance_named = |f: &Face, name: &str| f.info.instances.iter().position(|i| i.style.eq_ignore_ascii_case(name)).and_then(|i| u16::try_from(i).ok());+ // A face's own style (a variable face's is its default instance) needs no axis values.if let Some(f) = fam.iter().find(|f| f.info.style.eq_ignore_ascii_case(style)) {- return Some(Resolved { face: f.id, synth_bold: false, synth_italic: false, missing: false, instance: instance_named(f, style) });+ return Some(Resolved { face: f.id, synth_bold: false, synth_italic: false, missing: false, instance: None });}// A named instance of a variable face (`Figtree` `Black`): that face at the instance's axis// values, not the nearest static weight made bold synthetically.@@ -574,8 +575,7 @@ fn resolve_by_name(name: &str) -> Option<Resolved> {.or_else(|| faces.iter().find(|f| f.info.full_name.eq_ignore_ascii_case(name))){// A variable face's own name is its default instance's (`Figtree-Light`).- let instance = f.info.instances.iter().position(|i| i.style.eq_ignore_ascii_case(&f.info.style));- return Some(found(f, instance));+ return Some(found(f, None));}// A named instance of a variable face, by its PostScript name (`Figtree-Black`, what After// Effects scripts use) or its full name (`Figtree Black`).@@ -1051,8 +1051,9 @@ mod tests {assert!(!black.missing && !black.synth_bold && !black.synth_italic, "{black:?}");assert_eq!(wght(&black), vec![("wght".to_string(), 900.0)]);assert_eq!(wght(&resolve(FAMILY, "regular")), vec![("wght".to_string(), 400.0)]);- // The face's own style is the default instance.- assert_eq!(wght(&resolve(FAMILY, "Light")), vec![("wght".to_string(), 300.0)]);+ // The face's own style is its default instance: no axis values to set.+ let light = resolve(FAMILY, "Light");+ assert_eq!((light.face, light.instance), (black.face, None));// A style the family lacks takes the nearest instance's weight, no synthetic bold.let bold = resolve(FAMILY, "Bold");assert!(!bold.synth_bold, "{bold:?}");diff --git a/docs/agents.md b/docs/agents.mdindex ed0073d45..3b0d14bba 100644--- a/docs/agents.md+++ b/docs/agents.md@@ -549,8 +549,10 @@ Fonts: `text.fonts` (MCP `list_fonts`) lists every family a text layer can use,styles, origin (`bundled`, `system`, `user`), `variable` (it has variation axes) and own-language name(`{"query":"gothic"}` filters by name, `{"variable":true}` keeps only variable fonts, like the fontmenu's Variable Fonts filter; `{"rescan":true}` first picks up fonts installed since launch). Pass a listed `family` and-one of its `styles` to `layer.setText {"font", "style"}`; `text.fontFeatures` says which OpenType-options a font draws with its own glyphs.+one of its `styles` to `layer.setText {"font", "style"}`. A variable font's named instances (`Light` …+`Black`) are styles of its family; a style or an instance's PostScript name (`"font": "Figtree-Black"`)+sets the instance's axis values, and `variations` set on the text override them axis by axis.+`text.fontFeatures` says which OpenType options 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.On Linux and the BSDs the system font folders are `/usr/share/fonts`, `/usr/local/share/fonts`,