otomatalabs/furnace
7
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

add IBM Plex Sans Japanese/Korean

Browse source
This commit is contained in:
tildearrow 2024-06-12 17:15:54 -05:00
parent 40fdb004ec
commit c9669f32ad
14 changed files with 190307 additions and 10724 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -826,6 +826,8 @@ src/gui/font_liberationSans.cpp
src/gui/font_mononoki.cpp
src/gui/font_plexMono.cpp
src/gui/font_plexSans.cpp
src/gui/font_plexSansJP.cpp
src/gui/font_plexSansKR.cpp
src/gui/font_proggyClean.cpp
src/gui/font_ptMono.cpp
src/gui/font_unifont.cpp

BIN
res/fonts/IBMPlexMono-Regular.otf Normal file
View file

Binary file not shown.

BIN
res/fonts/IBMPlexMono-Regular.ttf
View file

Binary file not shown.

BIN
res/fonts/IBMPlexSans-Regular.otf Normal file
View file

Binary file not shown.

BIN
res/fonts/IBMPlexSans-Regular.ttf
View file

Binary file not shown.

BIN
res/fonts/IBMPlexSansJP-Regular.otf Normal file
View file

Binary file not shown.

BIN
res/fonts/IBMPlexSansKR-Regular.otf Normal file
View file

Binary file not shown.

6
res/fonts/bake.sh
View file

@ -4,8 +4,10 @@
fonts=(
"Exo-Medium.ttf" "font_exo" "papers/exo-license.txt" "font_exo.cpp"
"FontAwesome.otf" "iconFont" "Font Awesome by Dave Gandy - http://fontawesome.io" "font_icon.cpp"
"IBMPlexMono-Regular.ttf" "font_plexMono" "papers/ibm-plex-license.txt" "font_plexMono.cpp"
"IBMPlexSans-Regular.ttf" "font_plexSans" "papers/ibm-plex-license.txt" "font_plexSans.cpp"
"IBMPlexMono-Regular.otf" "font_plexMono" "papers/ibm-plex-license.txt" "font_plexMono.cpp"
"IBMPlexSans-Regular.otf" "font_plexSans" "papers/ibm-plex-license.txt" "font_plexSans.cpp"
"IBMPlexSansJP-Regular.otf" "font_plexSansJP" "papers/ibm-plex-license.txt" "font_plexSansJP.cpp"
"IBMPlexSansKR-Regular.otf" "font_plexSansKR" "papers/ibm-plex-license.txt" "font_plexSansKR.cpp"
"LiberationSans-Regular.ttf" "font_liberationSans" "papers/liberation-license.txt" "font_liberationSans.cpp"
"mononoki-Regular.ttf" "font_mononoki" "papers/mononoki-license.txt" "font_mononoki.cpp"
"ProggyClean.ttf" "font_proggyClean" "papers/proggy-license.txt" "font_proggyClean.cpp"

8748
src/gui/font_plexMono.cpp
View file

File diff suppressed because it is too large Load diff

12815
src/gui/font_plexSans.cpp
View file

File diff suppressed because it is too large Load diff

128045
src/gui/font_plexSansJP.cpp Normal file
View file

File diff suppressed because it is too large Load diff

51400
src/gui/font_plexSansKR.cpp Normal file
View file

File diff suppressed because it is too large Load diff

4
src/gui/fonts.h
View file

@ -30,6 +30,10 @@ extern const unsigned int font_mononoki_compressed_size;
extern const unsigned char font_mononoki_compressed_data[];
extern const unsigned int font_plexSans_compressed_size;
extern const unsigned char font_plexSans_compressed_data[];
extern const unsigned int font_plexSansJP_compressed_size;
extern const unsigned char font_plexSansJP_compressed_data[];
extern const unsigned int font_plexSansKR_compressed_size;
extern const unsigned char font_plexSansKR_compressed_data[];
extern const unsigned int font_plexMono_compressed_size;
extern const unsigned char font_plexMono_compressed_data[];
extern const unsigned int font_proggyClean_compressed_size;

11
src/gui/settings.cpp
View file

@ -6546,10 +6546,7 @@ void FurnaceGUI::applyUISettings(bool updateFonts) {
}
}
// two fallback fonts
if (settings.loadFallback) {
mainFont=addFontZlib(font_liberationSans_compressed_data,font_liberationSans_compressed_size,MAX(1,e->getConfInt("mainFontSize",18)*dpiScale),&fc1,fontRange);
}
// four fallback fonts
if (settings.loadJapanese ||
settings.loadChinese ||
settings.loadChineseTraditional ||
@ -6557,7 +6554,11 @@ void FurnaceGUI::applyUISettings(bool updateFonts) {
localeRequiresJapanese ||
localeRequiresChinese ||
localeRequiresChineseTrad ||
localeRequiresKorean) {
localeRequiresKorean ||
settings.loadFallback) {
mainFont=addFontZlib(font_plexSans_compressed_data,font_plexSans_compressed_size,MAX(1,e->getConfInt("mainFontSize",18)*dpiScale),&fc1,fontRange);
mainFont=addFontZlib(font_plexSansJP_compressed_data,font_plexSansJP_compressed_size,MAX(1,e->getConfInt("mainFontSize",18)*dpiScale),&fc1,fontRange);
mainFont=addFontZlib(font_plexSansKR_compressed_data,font_plexSansKR_compressed_size,MAX(1,e->getConfInt("mainFontSize",18)*dpiScale),&fc1,fontRange);
mainFont=addFontZlib(font_unifont_compressed_data,font_unifont_compressed_size,MAX(1,e->getConfInt("mainFontSize",18)*dpiScale),&fc1,fontRange);
}