From ce835d7014ebb826f3cdf9b782e90ef872df9aa9 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Fri, 14 Oct 2022 09:30:40 -0600 Subject: [PATCH] Add Noto fallback fonts that are also on macOS --- examples/text/src/font/fallback/macos.rs | 27 +++++++++++++++++++++++- examples/text/src/font/fallback/unix.rs | 4 ++-- 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/examples/text/src/font/fallback/macos.rs b/examples/text/src/font/fallback/macos.rs index e1a0f418..a4b7947b 100644 --- a/examples/text/src/font/fallback/macos.rs +++ b/examples/text/src/font/fallback/macos.rs @@ -10,5 +10,30 @@ pub fn common_fallback() -> &'static [&'static str] { // Fallbacks to use per script pub fn script_fallback(script: &Script, locale: &str) -> &'static [&'static str] { - &[] + //TODO: abstract style (sans/serif/monospaced) + match script { + Script::Adlam => &["Noto Sans Adlam"], + Script::Armenian => &["Noto Sans Armenian"], + Script::Buhid => &["Noto Sans Buhid"], + Script::Chakma => &["Noto Sans Chakma"], + Script::Gothic => &["Noto Sans Gothic"], + Script::Hanunoo => &["Noto Sans Hanunoo"], + Script::Javanese => &["Noto Sans Javanese"], + Script::Kannada => &["Noto Sans Kannada"], + Script::Mongolian => &["Noto Sans Mongolian"], + Script::Myanmar => &["Noto Sans Myanmar"], + Script::Oriya => &["Noto Sans Oriya"], + Script::Syriac => &["Noto Sans Syriac"], + Script::Tagalog => &["Noto Sans Tagalog"], + Script::Tagbanwa => &["Noto Sans Tagbanwa"], + Script::Tai_Le => &["Noto Sans Tai Le"], + Script::Tai_Tham => &["Noto Sans Tai Tham"], + Script::Tai_Viet => &["Noto Sans Tai Viet"], + Script::Thaana => &["Noto Sans Thaana"], + Script::Tifinagh => &["Noto Sans Tifinagh"], + Script::Vai => &["Noto Sans Vai"], + //TODO: Use han_unification? + Script::Yi => &["Noto Sans Yi"], + _ => &[], + } } diff --git a/examples/text/src/font/fallback/unix.rs b/examples/text/src/font/fallback/unix.rs index 5362c90d..03ffd034 100644 --- a/examples/text/src/font/fallback/unix.rs +++ b/examples/text/src/font/fallback/unix.rs @@ -67,11 +67,11 @@ pub fn script_fallback(script: &Script, locale: &str) -> &'static [&'static str] Script::Runic => &["Noto Sans Runic"], Script::Sinhala => &["Noto Sans Sinhala"], Script::Syriac => &["Noto Sans Syriac"], + Script::Tagalog => &["Noto Sans Tagalog"], + Script::Tagbanwa => &["Noto Sans Tagbanwa"], Script::Tai_Le => &["Noto Sans Tai Le"], Script::Tai_Tham => &["Noto Sans Tai Tham"], Script::Tai_Viet => &["Noto Sans Tai Viet"], - Script::Tagalog => &["Noto Sans Tagalog"], - Script::Tagbanwa => &["Noto Sans Tagbanwa"], Script::Tamil => &["Noto Sans Tamil"], Script::Telugu => &["Noto Sans Telugu"], Script::Thaana => &["Noto Sans Thaana"],