diff options
61 files changed, 15 insertions, 13 deletions
diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt index 45ddffc6ee..763f7a4440 100644 --- a/COPYRIGHT.txt +++ b/COPYRIGHT.txt @@ -166,17 +166,17 @@ Comment: etcpak Copyright: 2013-2021, Bartosz Taudul License: BSD-3-clause -Files: ./thirdparty/fonts/DroidSans*.ttf +Files: ./thirdparty/fonts/DroidSans*.woff2 Comment: DroidSans font Copyright: 2008, The Android Open Source Project License: Apache-2.0 -Files: ./thirdparty/fonts/JetBrainsMono_Regular.ttf +Files: ./thirdparty/fonts/JetBrainsMono_Regular.woff2 Comment: JetBrains Mono font Copyright: 2020, JetBrains s.r.o. License: OFL-1.1 -Files: ./thirdparty/fonts/NotoSans*.ttf +Files: ./thirdparty/fonts/NotoSans*.woff2 Comment: Noto Sans font Copyright: 2012, Google Inc. License: OFL-1.1 diff --git a/editor/SCsub b/editor/SCsub index 35c215b663..5dcc253e8b 100644 --- a/editor/SCsub +++ b/editor/SCsub @@ -99,6 +99,8 @@ if env["tools"]: # Fonts flist = glob.glob(env.Dir("#thirdparty").abspath + "/fonts/*.ttf") flist.extend(glob.glob(env.Dir("#thirdparty").abspath + "/fonts/*.otf")) + flist.extend(glob.glob(env.Dir("#thirdparty").abspath + "/fonts/*.woff")) + flist.extend(glob.glob(env.Dir("#thirdparty").abspath + "/fonts/*.woff2")) flist.sort() env.Depends("#editor/builtin_fonts.gen.h", flist) env.CommandNoCache( diff --git a/editor/editor_settings.cpp b/editor/editor_settings.cpp index 08cc957ec7..5057fc7531 100644 --- a/editor/editor_settings.cpp +++ b/editor/editor_settings.cpp @@ -422,9 +422,9 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) { #endif EDITOR_SETTING(Variant::INT, PROPERTY_HINT_ENUM, "interface/editor/font_subpixel_positioning", 1, "Disabled,Auto,One half of a pixel,One quarter of a pixel") - EDITOR_SETTING(Variant::STRING, PROPERTY_HINT_GLOBAL_FILE, "interface/editor/main_font", "", "*.ttf,*.otf") - EDITOR_SETTING(Variant::STRING, PROPERTY_HINT_GLOBAL_FILE, "interface/editor/main_font_bold", "", "*.ttf,*.otf") - EDITOR_SETTING(Variant::STRING, PROPERTY_HINT_GLOBAL_FILE, "interface/editor/code_font", "", "*.ttf,*.otf") + EDITOR_SETTING(Variant::STRING, PROPERTY_HINT_GLOBAL_FILE, "interface/editor/main_font", "", "*.ttf,*.otf,*.woff,*.woff2,*.pfb,*.pfm") + EDITOR_SETTING(Variant::STRING, PROPERTY_HINT_GLOBAL_FILE, "interface/editor/main_font_bold", "", "*.ttf,*.otf,*.woff,*.woff2,*.pfb,*.pfm") + EDITOR_SETTING(Variant::STRING, PROPERTY_HINT_GLOBAL_FILE, "interface/editor/code_font", "", "*.ttf,*.otf,*.woff,*.woff2,*.pfb,*.pfm") EDITOR_SETTING_USAGE(Variant::FLOAT, PROPERTY_HINT_RANGE, "interface/editor/low_processor_mode_sleep_usec", 6900, "1,100000,1", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED) // Default unfocused usec sleep is for 10 FPS. Allow an unfocused FPS limit // as low as 1 FPS for those who really need low power usage (but don't need diff --git a/scene/resources/default_theme/SCsub b/scene/resources/default_theme/SCsub index f27bd9144e..5bef7e5a6c 100644 --- a/scene/resources/default_theme/SCsub +++ b/scene/resources/default_theme/SCsub @@ -8,10 +8,10 @@ import default_theme_icons_builders env.add_source_files(env.scene_sources, "*.cpp") -env.Depends("#scene/resources/default_theme/default_font.gen.h", "#thirdparty/fonts/OpenSans_SemiBold.ttf") +env.Depends("#scene/resources/default_theme/default_font.gen.h", "#thirdparty/fonts/OpenSans_SemiBold.woff2") env.CommandNoCache( "#scene/resources/default_theme/default_font.gen.h", - "#thirdparty/fonts/OpenSans_SemiBold.ttf", + "#thirdparty/fonts/OpenSans_SemiBold.woff2", run_in_subprocess(default_theme_builders.make_fonts_header), ) diff --git a/thirdparty/README.md b/thirdparty/README.md index d7d724d0fe..ced1165d69 100644 --- a/thirdparty/README.md +++ b/thirdparty/README.md @@ -130,25 +130,25 @@ Files extracted from upstream source: ## fonts -- `NotoSans*.ttf`, `NotoNaskhArabicUI_*.ttf`: +- `NotoSans*.woff2`, `NotoNaskhArabicUI_*.woff2`: * Upstream: https://github.com/googlefonts/noto-fonts * Version: v2017-10-24-phase3-second-cleanup * License: OFL-1.1 * Comment: Use UI font variant if available, because it has tight vertical metrics and good for UI. -- `JetBrainsMono_Regular.ttf`: +- `JetBrainsMono_Regular.woff2`: * Upstream: https://github.com/JetBrains/JetBrainsMono * Version: 2.242 * License: OFL-1.1 -- `DroidSans*.ttf`: +- `DroidSans*.woff2`: * Upstream: https://android.googlesource.com/platform/frameworks/base/+/master/data/fonts/ * Version: ? (pre-2014 commit when DroidSansJapanese.ttf was obsoleted) * License: Apache 2.0 -- `OpenSans_SemiBold.ttf`: +- `OpenSans_SemiBold.woff2`: * Upstream: https://fonts.google.com/specimen/Open+Sans * Version: 1.10 (downloaded from Google Fonts in February 2021) * License: Apache 2.0 - +- All fonts are converted from the `.ttf` sources using `https://github.com/google/woff2` tool. ## freetype diff --git a/thirdparty/fonts/DroidSansFallback.ttf b/thirdparty/fonts/DroidSansFallback.ttf Binary files differdeleted file mode 100644 index 206621fc6c..0000000000 --- a/thirdparty/fonts/DroidSansFallback.ttf +++ /dev/null diff --git a/thirdparty/fonts/DroidSansFallback.woff2 b/thirdparty/fonts/DroidSansFallback.woff2 Binary files differnew file mode 100644 index 0000000000..9dd49d6281 --- /dev/null +++ b/thirdparty/fonts/DroidSansFallback.woff2 diff --git a/thirdparty/fonts/DroidSansJapanese.ttf b/thirdparty/fonts/DroidSansJapanese.ttf Binary files differdeleted file mode 100644 index 412fa3de05..0000000000 --- a/thirdparty/fonts/DroidSansJapanese.ttf +++ /dev/null diff --git a/thirdparty/fonts/DroidSansJapanese.woff2 b/thirdparty/fonts/DroidSansJapanese.woff2 Binary files differnew file mode 100644 index 0000000000..96eaf5ce72 --- /dev/null +++ b/thirdparty/fonts/DroidSansJapanese.woff2 diff --git a/thirdparty/fonts/JetBrainsMono_Regular.ttf b/thirdparty/fonts/JetBrainsMono_Regular.ttf Binary files differdeleted file mode 100644 index 8da8aa4051..0000000000 --- a/thirdparty/fonts/JetBrainsMono_Regular.ttf +++ /dev/null diff --git a/thirdparty/fonts/JetBrainsMono_Regular.woff2 b/thirdparty/fonts/JetBrainsMono_Regular.woff2 Binary files differnew file mode 100644 index 0000000000..490104645b --- /dev/null +++ b/thirdparty/fonts/JetBrainsMono_Regular.woff2 diff --git a/thirdparty/fonts/NotoNaskhArabicUI_Bold.ttf b/thirdparty/fonts/NotoNaskhArabicUI_Bold.ttf Binary files differdeleted file mode 100644 index 5576af7fee..0000000000 --- a/thirdparty/fonts/NotoNaskhArabicUI_Bold.ttf +++ /dev/null diff --git a/thirdparty/fonts/NotoNaskhArabicUI_Bold.woff2 b/thirdparty/fonts/NotoNaskhArabicUI_Bold.woff2 Binary files differnew file mode 100644 index 0000000000..72358d6eb1 --- /dev/null +++ b/thirdparty/fonts/NotoNaskhArabicUI_Bold.woff2 diff --git a/thirdparty/fonts/NotoNaskhArabicUI_Regular.ttf b/thirdparty/fonts/NotoNaskhArabicUI_Regular.ttf Binary files differdeleted file mode 100644 index 9b7a93d136..0000000000 --- a/thirdparty/fonts/NotoNaskhArabicUI_Regular.ttf +++ /dev/null diff --git a/thirdparty/fonts/NotoNaskhArabicUI_Regular.woff2 b/thirdparty/fonts/NotoNaskhArabicUI_Regular.woff2 Binary files differnew file mode 100644 index 0000000000..1195d4174e --- /dev/null +++ b/thirdparty/fonts/NotoNaskhArabicUI_Regular.woff2 diff --git a/thirdparty/fonts/NotoSansBengaliUI_Bold.ttf b/thirdparty/fonts/NotoSansBengaliUI_Bold.ttf Binary files differdeleted file mode 100644 index dc61efefd5..0000000000 --- a/thirdparty/fonts/NotoSansBengaliUI_Bold.ttf +++ /dev/null diff --git a/thirdparty/fonts/NotoSansBengaliUI_Bold.woff2 b/thirdparty/fonts/NotoSansBengaliUI_Bold.woff2 Binary files differnew file mode 100644 index 0000000000..03adf85fdc --- /dev/null +++ b/thirdparty/fonts/NotoSansBengaliUI_Bold.woff2 diff --git a/thirdparty/fonts/NotoSansBengaliUI_Regular.ttf b/thirdparty/fonts/NotoSansBengaliUI_Regular.ttf Binary files differdeleted file mode 100644 index d43c292ad6..0000000000 --- a/thirdparty/fonts/NotoSansBengaliUI_Regular.ttf +++ /dev/null diff --git a/thirdparty/fonts/NotoSansBengaliUI_Regular.woff2 b/thirdparty/fonts/NotoSansBengaliUI_Regular.woff2 Binary files differnew file mode 100644 index 0000000000..a6a3ffa3a7 --- /dev/null +++ b/thirdparty/fonts/NotoSansBengaliUI_Regular.woff2 diff --git a/thirdparty/fonts/NotoSansDevanagariUI_Bold.ttf b/thirdparty/fonts/NotoSansDevanagariUI_Bold.ttf Binary files differdeleted file mode 100644 index 74791aa469..0000000000 --- a/thirdparty/fonts/NotoSansDevanagariUI_Bold.ttf +++ /dev/null diff --git a/thirdparty/fonts/NotoSansDevanagariUI_Bold.woff2 b/thirdparty/fonts/NotoSansDevanagariUI_Bold.woff2 Binary files differnew file mode 100644 index 0000000000..6c835712cb --- /dev/null +++ b/thirdparty/fonts/NotoSansDevanagariUI_Bold.woff2 diff --git a/thirdparty/fonts/NotoSansDevanagariUI_Regular.ttf b/thirdparty/fonts/NotoSansDevanagariUI_Regular.ttf Binary files differdeleted file mode 100644 index e48dced0c9..0000000000 --- a/thirdparty/fonts/NotoSansDevanagariUI_Regular.ttf +++ /dev/null diff --git a/thirdparty/fonts/NotoSansDevanagariUI_Regular.woff2 b/thirdparty/fonts/NotoSansDevanagariUI_Regular.woff2 Binary files differnew file mode 100644 index 0000000000..486896e6e9 --- /dev/null +++ b/thirdparty/fonts/NotoSansDevanagariUI_Regular.woff2 diff --git a/thirdparty/fonts/NotoSansGeorgian_Bold.ttf b/thirdparty/fonts/NotoSansGeorgian_Bold.ttf Binary files differdeleted file mode 100644 index 5443d04cfa..0000000000 --- a/thirdparty/fonts/NotoSansGeorgian_Bold.ttf +++ /dev/null diff --git a/thirdparty/fonts/NotoSansGeorgian_Bold.woff2 b/thirdparty/fonts/NotoSansGeorgian_Bold.woff2 Binary files differnew file mode 100644 index 0000000000..104afa150c --- /dev/null +++ b/thirdparty/fonts/NotoSansGeorgian_Bold.woff2 diff --git a/thirdparty/fonts/NotoSansGeorgian_Regular.ttf b/thirdparty/fonts/NotoSansGeorgian_Regular.ttf Binary files differdeleted file mode 100644 index 9bfc8d9675..0000000000 --- a/thirdparty/fonts/NotoSansGeorgian_Regular.ttf +++ /dev/null diff --git a/thirdparty/fonts/NotoSansGeorgian_Regular.woff2 b/thirdparty/fonts/NotoSansGeorgian_Regular.woff2 Binary files differnew file mode 100644 index 0000000000..0a7b9e878b --- /dev/null +++ b/thirdparty/fonts/NotoSansGeorgian_Regular.woff2 diff --git a/thirdparty/fonts/NotoSansHebrew_Bold.ttf b/thirdparty/fonts/NotoSansHebrew_Bold.ttf Binary files differdeleted file mode 100644 index 08ef5dc749..0000000000 --- a/thirdparty/fonts/NotoSansHebrew_Bold.ttf +++ /dev/null diff --git a/thirdparty/fonts/NotoSansHebrew_Bold.woff2 b/thirdparty/fonts/NotoSansHebrew_Bold.woff2 Binary files differnew file mode 100644 index 0000000000..96c5ae1349 --- /dev/null +++ b/thirdparty/fonts/NotoSansHebrew_Bold.woff2 diff --git a/thirdparty/fonts/NotoSansHebrew_Regular.ttf b/thirdparty/fonts/NotoSansHebrew_Regular.ttf Binary files differdeleted file mode 100644 index 0a89e9d21f..0000000000 --- a/thirdparty/fonts/NotoSansHebrew_Regular.ttf +++ /dev/null diff --git a/thirdparty/fonts/NotoSansHebrew_Regular.woff2 b/thirdparty/fonts/NotoSansHebrew_Regular.woff2 Binary files differnew file mode 100644 index 0000000000..17eadedc6f --- /dev/null +++ b/thirdparty/fonts/NotoSansHebrew_Regular.woff2 diff --git a/thirdparty/fonts/NotoSansMalayalamUI_Bold.ttf b/thirdparty/fonts/NotoSansMalayalamUI_Bold.ttf Binary files differdeleted file mode 100644 index 42e5d56f3f..0000000000 --- a/thirdparty/fonts/NotoSansMalayalamUI_Bold.ttf +++ /dev/null diff --git a/thirdparty/fonts/NotoSansMalayalamUI_Bold.woff2 b/thirdparty/fonts/NotoSansMalayalamUI_Bold.woff2 Binary files differnew file mode 100644 index 0000000000..5f6bacb0c3 --- /dev/null +++ b/thirdparty/fonts/NotoSansMalayalamUI_Bold.woff2 diff --git a/thirdparty/fonts/NotoSansMalayalamUI_Regular.ttf b/thirdparty/fonts/NotoSansMalayalamUI_Regular.ttf Binary files differdeleted file mode 100644 index 37f3591706..0000000000 --- a/thirdparty/fonts/NotoSansMalayalamUI_Regular.ttf +++ /dev/null diff --git a/thirdparty/fonts/NotoSansMalayalamUI_Regular.woff2 b/thirdparty/fonts/NotoSansMalayalamUI_Regular.woff2 Binary files differnew file mode 100644 index 0000000000..c54a82a874 --- /dev/null +++ b/thirdparty/fonts/NotoSansMalayalamUI_Regular.woff2 diff --git a/thirdparty/fonts/NotoSansOriyaUI_Bold.ttf b/thirdparty/fonts/NotoSansOriyaUI_Bold.ttf Binary files differdeleted file mode 100644 index 36323f79ef..0000000000 --- a/thirdparty/fonts/NotoSansOriyaUI_Bold.ttf +++ /dev/null diff --git a/thirdparty/fonts/NotoSansOriyaUI_Bold.woff2 b/thirdparty/fonts/NotoSansOriyaUI_Bold.woff2 Binary files differnew file mode 100644 index 0000000000..b7e34302e2 --- /dev/null +++ b/thirdparty/fonts/NotoSansOriyaUI_Bold.woff2 diff --git a/thirdparty/fonts/NotoSansOriyaUI_Regular.ttf b/thirdparty/fonts/NotoSansOriyaUI_Regular.ttf Binary files differdeleted file mode 100644 index 7b50a71620..0000000000 --- a/thirdparty/fonts/NotoSansOriyaUI_Regular.ttf +++ /dev/null diff --git a/thirdparty/fonts/NotoSansOriyaUI_Regular.woff2 b/thirdparty/fonts/NotoSansOriyaUI_Regular.woff2 Binary files differnew file mode 100644 index 0000000000..e64090cd77 --- /dev/null +++ b/thirdparty/fonts/NotoSansOriyaUI_Regular.woff2 diff --git a/thirdparty/fonts/NotoSansSinhalaUI_Bold.ttf b/thirdparty/fonts/NotoSansSinhalaUI_Bold.ttf Binary files differdeleted file mode 100644 index ecfff97e05..0000000000 --- a/thirdparty/fonts/NotoSansSinhalaUI_Bold.ttf +++ /dev/null diff --git a/thirdparty/fonts/NotoSansSinhalaUI_Bold.woff2 b/thirdparty/fonts/NotoSansSinhalaUI_Bold.woff2 Binary files differnew file mode 100644 index 0000000000..01dbd1bc8f --- /dev/null +++ b/thirdparty/fonts/NotoSansSinhalaUI_Bold.woff2 diff --git a/thirdparty/fonts/NotoSansSinhalaUI_Regular.ttf b/thirdparty/fonts/NotoSansSinhalaUI_Regular.ttf Binary files differdeleted file mode 100644 index a4b297d691..0000000000 --- a/thirdparty/fonts/NotoSansSinhalaUI_Regular.ttf +++ /dev/null diff --git a/thirdparty/fonts/NotoSansSinhalaUI_Regular.woff2 b/thirdparty/fonts/NotoSansSinhalaUI_Regular.woff2 Binary files differnew file mode 100644 index 0000000000..504c9d0809 --- /dev/null +++ b/thirdparty/fonts/NotoSansSinhalaUI_Regular.woff2 diff --git a/thirdparty/fonts/NotoSansTamilUI_Bold.ttf b/thirdparty/fonts/NotoSansTamilUI_Bold.ttf Binary files differdeleted file mode 100644 index 16bcd57081..0000000000 --- a/thirdparty/fonts/NotoSansTamilUI_Bold.ttf +++ /dev/null diff --git a/thirdparty/fonts/NotoSansTamilUI_Bold.woff2 b/thirdparty/fonts/NotoSansTamilUI_Bold.woff2 Binary files differnew file mode 100644 index 0000000000..96967b0cce --- /dev/null +++ b/thirdparty/fonts/NotoSansTamilUI_Bold.woff2 diff --git a/thirdparty/fonts/NotoSansTamilUI_Regular.ttf b/thirdparty/fonts/NotoSansTamilUI_Regular.ttf Binary files differdeleted file mode 100644 index e65aeb8d0b..0000000000 --- a/thirdparty/fonts/NotoSansTamilUI_Regular.ttf +++ /dev/null diff --git a/thirdparty/fonts/NotoSansTamilUI_Regular.woff2 b/thirdparty/fonts/NotoSansTamilUI_Regular.woff2 Binary files differnew file mode 100644 index 0000000000..e9b2bee582 --- /dev/null +++ b/thirdparty/fonts/NotoSansTamilUI_Regular.woff2 diff --git a/thirdparty/fonts/NotoSansTeluguUI_Bold.ttf b/thirdparty/fonts/NotoSansTeluguUI_Bold.ttf Binary files differdeleted file mode 100644 index 16ac368795..0000000000 --- a/thirdparty/fonts/NotoSansTeluguUI_Bold.ttf +++ /dev/null diff --git a/thirdparty/fonts/NotoSansTeluguUI_Bold.woff2 b/thirdparty/fonts/NotoSansTeluguUI_Bold.woff2 Binary files differnew file mode 100644 index 0000000000..2885bf991d --- /dev/null +++ b/thirdparty/fonts/NotoSansTeluguUI_Bold.woff2 diff --git a/thirdparty/fonts/NotoSansTeluguUI_Regular.ttf b/thirdparty/fonts/NotoSansTeluguUI_Regular.ttf Binary files differdeleted file mode 100644 index 5394a28cfe..0000000000 --- a/thirdparty/fonts/NotoSansTeluguUI_Regular.ttf +++ /dev/null diff --git a/thirdparty/fonts/NotoSansTeluguUI_Regular.woff2 b/thirdparty/fonts/NotoSansTeluguUI_Regular.woff2 Binary files differnew file mode 100644 index 0000000000..ac5e66d8f6 --- /dev/null +++ b/thirdparty/fonts/NotoSansTeluguUI_Regular.woff2 diff --git a/thirdparty/fonts/NotoSansThaiUI_Bold.ttf b/thirdparty/fonts/NotoSansThaiUI_Bold.ttf Binary files differdeleted file mode 100644 index 5d998f9215..0000000000 --- a/thirdparty/fonts/NotoSansThaiUI_Bold.ttf +++ /dev/null diff --git a/thirdparty/fonts/NotoSansThaiUI_Bold.woff2 b/thirdparty/fonts/NotoSansThaiUI_Bold.woff2 Binary files differnew file mode 100644 index 0000000000..202995c066 --- /dev/null +++ b/thirdparty/fonts/NotoSansThaiUI_Bold.woff2 diff --git a/thirdparty/fonts/NotoSansThaiUI_Regular.ttf b/thirdparty/fonts/NotoSansThaiUI_Regular.ttf Binary files differdeleted file mode 100644 index 8e317961d1..0000000000 --- a/thirdparty/fonts/NotoSansThaiUI_Regular.ttf +++ /dev/null diff --git a/thirdparty/fonts/NotoSansThaiUI_Regular.woff2 b/thirdparty/fonts/NotoSansThaiUI_Regular.woff2 Binary files differnew file mode 100644 index 0000000000..2fb284f21f --- /dev/null +++ b/thirdparty/fonts/NotoSansThaiUI_Regular.woff2 diff --git a/thirdparty/fonts/NotoSans_Bold.ttf b/thirdparty/fonts/NotoSans_Bold.ttf Binary files differdeleted file mode 100644 index 1db7886e94..0000000000 --- a/thirdparty/fonts/NotoSans_Bold.ttf +++ /dev/null diff --git a/thirdparty/fonts/NotoSans_Bold.woff2 b/thirdparty/fonts/NotoSans_Bold.woff2 Binary files differnew file mode 100644 index 0000000000..36a5b89999 --- /dev/null +++ b/thirdparty/fonts/NotoSans_Bold.woff2 diff --git a/thirdparty/fonts/NotoSans_Regular.ttf b/thirdparty/fonts/NotoSans_Regular.ttf Binary files differdeleted file mode 100644 index 0a01a062f0..0000000000 --- a/thirdparty/fonts/NotoSans_Regular.ttf +++ /dev/null diff --git a/thirdparty/fonts/NotoSans_Regular.woff2 b/thirdparty/fonts/NotoSans_Regular.woff2 Binary files differnew file mode 100644 index 0000000000..d449eed8d7 --- /dev/null +++ b/thirdparty/fonts/NotoSans_Regular.woff2 diff --git a/thirdparty/fonts/OpenSans_SemiBold.ttf b/thirdparty/fonts/OpenSans_SemiBold.ttf Binary files differdeleted file mode 100644 index 54e7059cf3..0000000000 --- a/thirdparty/fonts/OpenSans_SemiBold.ttf +++ /dev/null diff --git a/thirdparty/fonts/OpenSans_SemiBold.woff2 b/thirdparty/fonts/OpenSans_SemiBold.woff2 Binary files differnew file mode 100644 index 0000000000..5d14a36656 --- /dev/null +++ b/thirdparty/fonts/OpenSans_SemiBold.woff2 |