From 662884432e2aa558ca452973feb4eabd380f9bbd Mon Sep 17 00:00:00 2001 From: NaitLee Date: Sun, 16 Feb 2025 19:10:01 +0800 Subject: [PATCH] fix(noto-cjk-font): add underscore to temp cvars, more clean up Signed-off-by: NaitLee --- data/font-notosanscjk.pk3dir/font-cjk.cfg | 40 ++++++++++++--------- data/font-xolonium.pk3dir/font-xolonium.cfg | 25 ++++++------- 2 files changed, 36 insertions(+), 29 deletions(-) diff --git a/data/font-notosanscjk.pk3dir/font-cjk.cfg b/data/font-notosanscjk.pk3dir/font-cjk.cfg index 61497dab..ad00f40e 100644 --- a/data/font-notosanscjk.pk3dir/font-cjk.cfg +++ b/data/font-notosanscjk.pk3dir/font-cjk.cfg @@ -1,30 +1,36 @@ // run before execing font cfg files (e.g. font-xolonium.cfg) and after switching language -// pick a correct cjk font variant by locale as a cvar $font_cjk +// pick a correct cjk font variant by locale as a cvar $_font_cjk // medium weight fits the game well -set font_cjk_weight Medium +set _font_cjk_weight Medium // jp as default variant for non-cjk languages -set font_cjk_variant jp +set _font_cjk_variant jp -set font_cjk_variant_ja_JP "set font_cjk_variant jp" -set font_cjk_variant_zh_CN "set font_cjk_variant sc" -set font_cjk_variant_zh_HK "set font_cjk_variant hk" -set font_cjk_variant_zh_TW "set font_cjk_variant tc" -set font_cjk_variant_ko "set font_cjk_variant kr" +set _font_cjk_variant_ja_JP "set _font_cjk_variant jp" +set _font_cjk_variant_zh_CN "set _font_cjk_variant sc" +set _font_cjk_variant_zh_HK "set _font_cjk_variant hk" +set _font_cjk_variant_zh_TW "set _font_cjk_variant tc" +set _font_cjk_variant_ko "set _font_cjk_variant kr" // https://gitlab.com/xonotic/xonotic/-/merge_requests/119#note_2349746024 -// font_cjk_pickvariant executes the command defined in font_cjk_variant_${prvm_language} -// it doesn't error if font_cjk_variant_${prvm_language} doesn't exist -"alias" font_cjk_pickvariant "$${font_cjk_variant_${prvm_language} ?}" -font_cjk_pickvariant +// _font_cjk_pickvariant executes the command defined in _font_cjk_variant_${prvm_language} +// it doesn't error if _font_cjk_variant_${prvm_language} doesn't exist +"alias" _font_cjk_pickvariant "$${_font_cjk_variant_${prvm_language} ?}" +_font_cjk_pickvariant // use this cvar in loadfont commands -set font_cjk fonts/NotoSansCJK${font_cjk_variant}-${font_cjk_weight}.otf +set _font_cjk fonts/NotoSansCJK${_font_cjk_variant}-${_font_cjk_weight}.otf // clean up -// you may manually unset font_cjk after use -unalias font_cjk_pickvariant -unset font_cjk_variant -unset font_cjk_weight +// you may manually unset _font_cjk after use +unalias _font_cjk_pickvariant +unset _font_cjk_variant +unset _font_cjk_weight + +unset _font_cjk_variant_ja_JP +unset _font_cjk_variant_zh_CN +unset _font_cjk_variant_zh_HK +unset _font_cjk_variant_zh_TW +unset _font_cjk_variant_ko diff --git a/data/font-xolonium.pk3dir/font-xolonium.cfg b/data/font-xolonium.pk3dir/font-xolonium.cfg index 91a9eff9..80eb70e2 100644 --- a/data/font-xolonium.pk3dir/font-xolonium.cfg +++ b/data/font-xolonium.pk3dir/font-xolonium.cfg @@ -1,23 +1,24 @@ // must be loaded AFTER config.cfg set menu_font_cfg font-xolonium.cfg -// pick a cjk font corresponding to prvm_language, we have $font_cjk +// pick a cjk font corresponding to prvm_language, we have $_font_cjk exec font-cjk.cfg // font for misc Unicode glyphs -set font_unicode fonts/unifont +set _font_unicode fonts/unifont loadfont console fonts/unifont,fonts/xolonium-regular.otf,gfx/vera-sans $con_textsize -loadfont notify fonts/xolonium-regular.otf,$font_cjk,$font_unicode,gfx/vera-sans $con_notifysize -loadfont chat fonts/xolonium-regular.otf,$font_cjk,$font_unicode,gfx/vera-sans $con_chatsize -loadfont centerprint fonts/xolonium-regular.otf,$font_cjk,$font_unicode,gfx/vera-sans 9 -loadfont infobar fonts/xolonium-regular.otf,$font_cjk,$font_unicode,gfx/vera-sans 8 12 $scr_loadingscreen_barheight $scr_infobar_height -loadfont user0 fonts/xolonium-regular.otf,$font_cjk,$font_unicode,gfx/vera-sans 12 // menu font -loadfont user1 fonts/xolonium-regular.otf,$font_cjk,$font_unicode,gfx/vera-sans 4 6 8 10 12 14 16 20 24 28 32 $hud_fontsize // csqc font -loadfont user2 fonts/xolonium-bold.otf,$font_cjk,$font_unicode,gfx/vera-sans 4 6 8 10 12 14 16 20 24 28 32 $hud_fontsize // csqc bold font -loadfont user3 fonts/xolonium-bold.otf,$font_cjk,$font_unicode,gfx/vera-sans 12 16 // menu boldfont +loadfont notify fonts/xolonium-regular.otf,$_font_cjk,$_font_unicode,gfx/vera-sans $con_notifysize +loadfont chat fonts/xolonium-regular.otf,$_font_cjk,$_font_unicode,gfx/vera-sans $con_chatsize +loadfont centerprint fonts/xolonium-regular.otf,$_font_cjk,$_font_unicode,gfx/vera-sans 9 +loadfont infobar fonts/xolonium-regular.otf,$_font_cjk,$_font_unicode,gfx/vera-sans 8 12 $scr_loadingscreen_barheight $scr_infobar_height +loadfont user0 fonts/xolonium-regular.otf,$_font_cjk,$_font_unicode,gfx/vera-sans 12 // menu font +loadfont user1 fonts/xolonium-regular.otf,$_font_cjk,$_font_unicode,gfx/vera-sans 4 6 8 10 12 14 16 20 24 28 32 $hud_fontsize // csqc font +loadfont user2 fonts/xolonium-bold.otf,$_font_cjk,$_font_unicode,gfx/vera-sans 4 6 8 10 12 14 16 20 24 28 32 $hud_fontsize // csqc bold font +loadfont user3 fonts/xolonium-bold.otf,$_font_cjk,$_font_unicode,gfx/vera-sans 12 16 // menu boldfont scoreboard_columns_set -// clean up this cvar -unset font_cjk +// clean up +unset _font_unicode +unset _font_cjk -- 2.39.5