EffectCraft: An open-source motion graphics and compositing tool written by scratch in pure Rust
Merge pull request #1696
Brandon Thomas7c99ba6eeb46
diff --cc contributors/people.tomlindex 3f4dc1d1f,5ab4793de..625fcdb73--- a/contributors/people.toml+++ b/contributors/people.toml@@@ -88,6 -88,6 +88,10 @@@ real_name = "Marco Arnulfodisplay_name = "Marco Arnulfo"sync_github_name = false+[people.krinry]+display_name = "krinry"+sync_github_name = true+++ [people.Silvertree2010]+ display_name = "Netter"+ sync_github_name = falsediff --cc crates/text/src/fonts.rsindex 9ebf92e29,32d1f2928..aeabf1872--- a/crates/text/src/fonts.rs+++ b/crates/text/src/fonts.rs@@@ -514,8 -485,11 +514,11 @@@ pub fn resolve(family: &str, style: &streturn r;}}+ if let Some(r) = resolve_alias(family, style) {+ return r;+ }// Inter is bundled; face 0 (the first bundled face) is the last resort.- let mut r = resolve_in(DEFAULT_FAMILY, style).unwrap_or(Resolved { face: 0, synth_bold: false, synth_italic: false, missing: true });+ let mut r = resolve_in(DEFAULT_FAMILY, style).unwrap_or(Resolved { face: 0, synth_bold: false, synth_italic: false, missing: true, instance: None });r.missing = !family.is_empty() && !family.eq_ignore_ascii_case(DEFAULT_FAMILY);r}