diff --git a/.gitignore b/.gitignore index 09314bb24..c57b41113 100644 --- a/.gitignore +++ b/.gitignore @@ -34,4 +34,5 @@ res/docpdf/manual.html res/docpdf/manual.pdf res/docpdf/.venv res/docpdf/htmldoc/ +res/fonts/compressed/ res/furnace.appdata.xml diff --git a/res/fonts/Exo-Medium.ttf b/res/fonts/Exo-Medium.ttf new file mode 100644 index 000000000..ec43315b8 Binary files /dev/null and b/res/fonts/Exo-Medium.ttf differ diff --git a/res/fonts/FontAwesome.otf b/res/fonts/FontAwesome.otf new file mode 100644 index 000000000..401ec0f36 Binary files /dev/null and b/res/fonts/FontAwesome.otf differ diff --git a/res/fonts/IBMPlexMono-Regular.ttf b/res/fonts/IBMPlexMono-Regular.ttf new file mode 100644 index 000000000..f99c8e989 Binary files /dev/null and b/res/fonts/IBMPlexMono-Regular.ttf differ diff --git a/res/fonts/IBMPlexSans-Regular.ttf b/res/fonts/IBMPlexSans-Regular.ttf new file mode 100644 index 000000000..2e892ab57 Binary files /dev/null and b/res/fonts/IBMPlexSans-Regular.ttf differ diff --git a/res/fonts/LiberationSans-Regular.ttf b/res/fonts/LiberationSans-Regular.ttf new file mode 100644 index 000000000..6574dbcb6 Binary files /dev/null and b/res/fonts/LiberationSans-Regular.ttf differ diff --git a/res/fonts/PTMono.ttf b/res/fonts/PTMono.ttf new file mode 100644 index 000000000..f58012361 Binary files /dev/null and b/res/fonts/PTMono.ttf differ diff --git a/res/fonts/ProggyClean.ttf b/res/fonts/ProggyClean.ttf new file mode 100644 index 000000000..0270cdfe3 Binary files /dev/null and b/res/fonts/ProggyClean.ttf differ diff --git a/res/fonts/bake.sh b/res/fonts/bake.sh new file mode 100755 index 000000000..af93247d7 --- /dev/null +++ b/res/fonts/bake.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +mkdir -p compressed +for i in *.ttf *.otf; do + echo "$i" + cat "$i" | zlib-flate -compress=9 > compressed/"$i".zl +done diff --git a/res/fonts/mononoki-Regular.ttf b/res/fonts/mononoki-Regular.ttf new file mode 100644 index 000000000..9510ac85d Binary files /dev/null and b/res/fonts/mononoki-Regular.ttf differ diff --git a/src/gui/settings.cpp b/src/gui/settings.cpp index 841b6def5..d4444cc22 100644 --- a/src/gui/settings.cpp +++ b/src/gui/settings.cpp @@ -5704,7 +5704,9 @@ void FurnaceGUI::applyUISettings(bool updateFonts) { // two fallback fonts mainFont=ImGui::GetIO().Fonts->AddFontFromMemoryCompressedTTF(font_liberationSans_compressed_data,font_liberationSans_compressed_size,MAX(1,e->getConfInt("mainFontSize",18)*dpiScale),&fc1,fontRange); - mainFont=ImGui::GetIO().Fonts->AddFontFromMemoryCompressedTTF(font_unifont_compressed_data,font_unifont_compressed_size,MAX(1,e->getConfInt("mainFontSize",18)*dpiScale),&fc1,fontRange); + if (settings.loadJapanese || settings.loadChinese || settings.loadChineseTraditional || settings.loadKorean) { + mainFont=ImGui::GetIO().Fonts->AddFontFromMemoryCompressedTTF(font_unifont_compressed_data,font_unifont_compressed_size,MAX(1,e->getConfInt("mainFontSize",18)*dpiScale),&fc1,fontRange); + } ImFontConfig fc; fc.MergeMode=true;