aleleba/figcraft
1
0
Fork 0
mirror of https://github.com/storytold/figcraft.git synced 2026-10-29 12:56:47 -06:00
Code Issues Packages Projects Releases Wiki Activity

#813: Bengali in script detection (cjk::ALL), restore the あ漢한 assert, doc comments, rustfmt

Browse Source
This commit is contained in:
bflatastic
2026-10-20 00:05:51 +07:00
parent 997444cdb6
commit e358c695cc
2 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/ui-egui/src/cjk.rs
+12 -16
View File
@@ -1,8 +1,9 @@
//! Chinese, Japanese, Korean and Bengali text in the UI. egui's own fonts and Inter have no CJK or non-Latin glyphs, so
//! the UI adds a face per script it needs: the UI language's, the scripts in the open file's names
//! Chinese, Japanese, Korean and Bengali text in the UI. egui's own fonts and Inter have no glyphs
//! for them, so the UI adds a face per script it needs: the UI language's, the scripts in the open file's names
//! and comments, the language picker's and typed text. Desktop finds them among the installed
//! fonts (the system font scan), only once one is needed, so English users load none; the web
//! build has only the CJK and non-Latin faces built in from craft-fonts (`FIGCRAFT_EMBED_CJK`), else none.
//! build has only the CJK faces built in from craft-fonts (`FIGCRAFT_EMBED_CJK`), else none (no
//! Bengali face is built in, so the web leaves Bengali out).
use std::sync::Arc;
@@ -12,15 +13,14 @@ pub const KANA: u8 = 1;
pub const HANGUL: u8 = 2;
/// Han characters (and CJK punctuation and full-width forms).
pub const HAN: u8 = 4;
/// Bengali script.
pub const BENGALI: u8 = 8;
/// Every script bit: nothing more to look for once all have a face.
pub const ALL: u8 = KANA | HANGUL | HAN | BENGALI;
/// Bengali faces: cross-platform, Windows, macOS, then Linux names.
const BENGALI_FONTS: &[&str] = &["Noto Sans Bengali", "Nirmala UI", "Bangla Sangam MN", "Kalpurush", "SolaimanLipi"];
const BENGALI_FONTS: &[&str] = &[
"Noto Sans Bengali",
"Nirmala UI",
"Bangla Sangam MN",
"Kalpurush",
"SolaimanLipi",
];
/// Japanese faces, the built-in one first: Windows, macOS, then Linux names.
const JAPANESE: &[&str] = &[
"BIZ UDPGothic",
@@ -108,12 +108,7 @@ fn samples(need: u8, ui: u8) -> Vec<(char, Vec<&'static str>)> {
(false, HANGUL) => ('漢', [KOREAN, JAPANESE, CHINESE].concat()),
(false, _) => ('漢', [JAPANESE, KOREAN, CHINESE].concat()),
};
let mut v = vec![
(KANA, ('あ', JAPANESE.to_vec())),
(HAN, han),
(HANGUL, ('한', KOREAN.to_vec())),
(BENGALI, ('অ', BENGALI_FONTS.to_vec())),
];
let mut v = vec![(KANA, ('あ', JAPANESE.to_vec())), (HAN, han), (HANGUL, ('한', KOREAN.to_vec())), (BENGALI, ('অ', BENGALI_FONTS.to_vec()))];
match ui {
HANGUL => v.reverse(),
HAN => v.swap(0, 1),
@@ -178,6 +173,7 @@ mod tests {
fn the_ui_language_script_comes_first() {
let order = |need, ui| samples(need, ui).into_iter().map(|(c, _)| c).collect::<String>();
let first_face = |need, ui| samples(need, ui).first().and_then(|(_, f)| f.first()).copied();
assert_eq!(order(KANA | HAN | HANGUL, 0), "あ漢한");
assert_eq!(order(KANA | HAN | HANGUL | BENGALI, language("bn")), "অあ漢한");
assert_eq!(order(KANA | HAN | HANGUL, KANA | HAN), "あ漢한");
assert_eq!(order(KANA | HAN | HANGUL, HANGUL), "한漢あ");
crates/ui-egui/src/lib.rs
+2 -2
View File
@@ -1288,11 +1288,11 @@ impl FigApp {
self.session.prefs.reduce_motion || self.services.reduce_motion()
}
/// The CJK scripts the UI shows: the language's, the language picker's (Preferences open),
/// The CJK and Bengali scripts the UI shows: the language's, the language picker's (Preferences open),
/// typed text's, and those in the open file's names and comments (read when it changes, not
/// mid-drag). Nothing is checked once every script has a face.
fn cjk_needed(&mut self, ctx: &egui::Context, installed: u8) -> u8 {
if installed == cjk::KANA | cjk::HANGUL | cjk::HAN {
if installed == cjk::ALL {
return installed;
}
let mut need = i18n::current().map_or(0, |l| cjk::language(l.code));