fix: clarify comments for cjk font enhancements

Signed-off-by: NaitLee <naitlee@disroot.org>

diff --git a/data/font-notosanscjk.pk3dir/fetch-fonts.sh b/data/font-notosanscjk.pk3dir/fetch-fonts.sh
index e24f47c3a84534b9db099321dbd570f5462d7bee..4eeb997d807a63e6f904b5969b5a5c074a9cd15b 100755 (executable)
--- a/data/font-notosanscjk.pk3dir/fetch-fonts.sh
+++ b/data/font-notosanscjk.pk3dir/fetch-fonts.sh
@@ -1,10 +1,14 @@
 #!/bin/env bash
 weight=Medium
+
 mkdir -vp fonts
+
 # fetch from the newest github resources
 for v in SimplifiedChinese,sc TraditionalChinese,tc TraditionalChineseHK,hk Jananese,jp Korean,kr; do
-    curl -o "fonts/NotoSansCJK${v#*,}-${weight}.otf" "https://raw.githubusercontent.com/notofonts/noto-cjk/main/Sans/OTF/${v%,*}/NotoSansCJK${v#*,}-${weight}.otf"
+    curl -o "fonts/NotoSansCJK${v#*,}-${weight}.otf" \
+        "https://raw.githubusercontent.com/notofonts/noto-cjk/main/Sans/OTF/${v%,*}/NotoSansCJK${v#*,}-${weight}.otf"
 done
+
 # move jp variant as the default
 mv "fonts/NotoSansCJKjp-${weight}.otf" "fonts/NotoSansCJK-${weight}.otf"
 

diff --git a/data/font-notosanscjk.pk3dir/font-cjk.cfg b/data/font-notosanscjk.pk3dir/font-cjk.cfg
index 82dc7e11fdbadd4eab0f99f5ced0e232d1cffe15..617ea39072eadaf5e94121debbfd498f2593951c 100644 (file)
--- a/data/font-notosanscjk.pk3dir/font-cjk.cfg
+++ b/data/font-notosanscjk.pk3dir/font-cjk.cfg
@@ -1,23 +1,23 @@
-// run before setfont cfg files, e.g. font-xolonium.cfg, and after switching language
+// run before execing font cfg files (e.g. font-xolonium.cfg) and after switching language
 // pick a correct cjk font variant by locale
 
-// jp variant by default
+// jp variant by default (for non-cjk languages)
 set font_cjk_variant ""
 
 // medium weight fits the game well
 set font_cjk_weight Medium
 
-// font variants by locale
+// font variants mapped by locale
 set font_cjk_variant_zh_CN sc
 set font_cjk_variant_zh_HK hk
 set font_cjk_variant_zh_TW tc
 set font_cjk_variant_ja_JP ""
 set font_cjk_variant_ko kr
 
-// won't error expanding unset cvar for non-cjk locale
+// this won't error expanding unset cvar for non-cjk locale, keeping default for non-cjk languages
 alias font_cjk_pickvariant rpn /font_cjk_variant /font_cjk_variant_${prvm_language} load =
 font_cjk_pickvariant
 
-// use this cvar in setfont commands
+// use this cvar in loadfont commands
 set font_cjk fonts/NotoSansCJK${font_cjk_variant}-${font_cjk_weight}.otf
 

diff --git a/data/font-xolonium.pk3dir/font-xolonium.cfg b/data/font-xolonium.pk3dir/font-xolonium.cfg
index 4c55013bad8eac8c5ef3ee737915a976c7b4bba8..f333c9410048b0d5d56470d5fa1e34f98a08010c 100644 (file)
--- a/data/font-xolonium.pk3dir/font-xolonium.cfg
+++ b/data/font-xolonium.pk3dir/font-xolonium.cfg
@@ -1,8 +1,12 @@
 // must be loaded AFTER config.cfg
 set menu_font_cfg font-xolonium.cfg
-set font_unicode fonts/unifont
+
+// pick a cjk font corresponding to prvm_language, we have $font_cjk
 exec font-cjk.cfg
 
+// ultimate fallback font & console font
+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