diff options
32 files changed, 61 insertions, 18 deletions
diff --git a/editor/editor_fonts.cpp b/editor/editor_fonts.cpp index bc8bcb1134..b7b57a5f1f 100644 --- a/editor/editor_fonts.cpp +++ b/editor/editor_fonts.cpp @@ -157,11 +157,11 @@ void editor_register_fonts(Ref<Theme> p_theme) { Ref<FontFile> georgian_font = load_internal_font(_font_NotoSansGeorgian_Regular, _font_NotoSansGeorgian_Regular_size, font_hinting, font_antialiasing, true, font_subpixel_positioning, false, &fallbacks); Ref<FontFile> hebrew_font = load_internal_font(_font_NotoSansHebrew_Regular, _font_NotoSansHebrew_Regular_size, font_hinting, font_antialiasing, true, font_subpixel_positioning, false, &fallbacks); Ref<FontFile> malayalam_font = load_internal_font(_font_NotoSansMalayalamUI_Regular, _font_NotoSansMalayalamUI_Regular_size, font_hinting, font_antialiasing, true, font_subpixel_positioning, false, &fallbacks); - Ref<FontFile> oriya_font = load_internal_font(_font_NotoSansOriyaUI_Regular, _font_NotoSansOriyaUI_Regular_size, font_hinting, font_antialiasing, true, font_subpixel_positioning, false, &fallbacks); + Ref<FontFile> oriya_font = load_internal_font(_font_NotoSansOriya_Regular, _font_NotoSansOriya_Regular_size, font_hinting, font_antialiasing, true, font_subpixel_positioning, false, &fallbacks); Ref<FontFile> sinhala_font = load_internal_font(_font_NotoSansSinhalaUI_Regular, _font_NotoSansSinhalaUI_Regular_size, font_hinting, font_antialiasing, true, font_subpixel_positioning, false, &fallbacks); Ref<FontFile> tamil_font = load_internal_font(_font_NotoSansTamilUI_Regular, _font_NotoSansTamilUI_Regular_size, font_hinting, font_antialiasing, true, font_subpixel_positioning, false, &fallbacks); Ref<FontFile> telugu_font = load_internal_font(_font_NotoSansTeluguUI_Regular, _font_NotoSansTeluguUI_Regular_size, font_hinting, font_antialiasing, true, font_subpixel_positioning, false, &fallbacks); - Ref<FontFile> thai_font = load_internal_font(_font_NotoSansThaiUI_Regular, _font_NotoSansThaiUI_Regular_size, font_hinting, font_antialiasing, true, font_subpixel_positioning, false, &fallbacks); + Ref<FontFile> thai_font = load_internal_font(_font_NotoSansThai_Regular, _font_NotoSansThai_Regular_size, font_hinting, font_antialiasing, true, font_subpixel_positioning, false, &fallbacks); Ref<FontFile> fallback_font = load_internal_font(_font_DroidSansFallback, _font_DroidSansFallback_size, font_hinting, font_antialiasing, true, font_subpixel_positioning, false, &fallbacks); Ref<FontFile> japanese_font = load_internal_font(_font_DroidSansJapanese, _font_DroidSansJapanese_size, font_hinting, font_antialiasing, true, font_subpixel_positioning, false, &fallbacks); default_font->set_fallbacks(fallbacks); @@ -177,11 +177,11 @@ void editor_register_fonts(Ref<Theme> p_theme) { Ref<FontFile> georgian_font_bold = load_internal_font(_font_NotoSansGeorgian_Bold, _font_NotoSansGeorgian_Bold_size, font_hinting, font_antialiasing, true, font_subpixel_positioning, false, &fallbacks_bold); Ref<FontFile> hebrew_font_bold = load_internal_font(_font_NotoSansHebrew_Bold, _font_NotoSansHebrew_Bold_size, font_hinting, font_antialiasing, true, font_subpixel_positioning, false, &fallbacks_bold); Ref<FontFile> malayalam_font_bold = load_internal_font(_font_NotoSansMalayalamUI_Bold, _font_NotoSansMalayalamUI_Bold_size, font_hinting, font_antialiasing, true, font_subpixel_positioning, false, &fallbacks_bold); - Ref<FontFile> oriya_font_bold = load_internal_font(_font_NotoSansOriyaUI_Bold, _font_NotoSansOriyaUI_Bold_size, font_hinting, font_antialiasing, true, font_subpixel_positioning, false, &fallbacks_bold); + Ref<FontFile> oriya_font_bold = load_internal_font(_font_NotoSansOriya_Bold, _font_NotoSansOriya_Bold_size, font_hinting, font_antialiasing, true, font_subpixel_positioning, false, &fallbacks_bold); Ref<FontFile> sinhala_font_bold = load_internal_font(_font_NotoSansSinhalaUI_Bold, _font_NotoSansSinhalaUI_Bold_size, font_hinting, font_antialiasing, true, font_subpixel_positioning, false, &fallbacks_bold); Ref<FontFile> tamil_font_bold = load_internal_font(_font_NotoSansTamilUI_Bold, _font_NotoSansTamilUI_Bold_size, font_hinting, font_antialiasing, true, font_subpixel_positioning, false, &fallbacks_bold); Ref<FontFile> telugu_font_bold = load_internal_font(_font_NotoSansTeluguUI_Bold, _font_NotoSansTeluguUI_Bold_size, font_hinting, font_antialiasing, true, font_subpixel_positioning, false, &fallbacks_bold); - Ref<FontFile> thai_font_bold = load_internal_font(_font_NotoSansThaiUI_Bold, _font_NotoSansThaiUI_Bold_size, font_hinting, font_antialiasing, true, font_subpixel_positioning, false, &fallbacks_bold); + Ref<FontFile> thai_font_bold = load_internal_font(_font_NotoSansThai_Bold, _font_NotoSansThai_Bold_size, font_hinting, font_antialiasing, true, font_subpixel_positioning, false, &fallbacks_bold); Ref<FontVariation> fallback_font_bold = make_bold_font(fallback_font, embolden_strength, &fallbacks_bold); Ref<FontVariation> japanese_font_bold = make_bold_font(japanese_font, embolden_strength, &fallbacks_bold); diff --git a/tests/servers/test_text_server.h b/tests/servers/test_text_server.h index eef5b850ca..0f23929e1e 100644 --- a/tests/servers/test_text_server.h +++ b/tests/servers/test_text_server.h @@ -70,7 +70,7 @@ TEST_SUITE("[TextServer]") { ts->font_set_data_ptr(font1, _font_NotoSans_Regular, _font_NotoSans_Regular_size); ts->font_set_allow_system_fallback(font1, false); RID font2 = ts->create_font(); - ts->font_set_data_ptr(font2, _font_NotoSansThaiUI_Regular, _font_NotoSansThaiUI_Regular_size); + ts->font_set_data_ptr(font2, _font_NotoSansThai_Regular, _font_NotoSansThai_Regular_size); ts->font_set_allow_system_fallback(font2, false); Array font; @@ -177,7 +177,7 @@ TEST_SUITE("[TextServer]") { ts->font_set_data_ptr(font1, _font_NotoSans_Regular, _font_NotoSans_Regular_size); ts->font_set_allow_system_fallback(font1, false); RID font2 = ts->create_font(); - ts->font_set_data_ptr(font2, _font_NotoSansThaiUI_Regular, _font_NotoSansThaiUI_Regular_size); + ts->font_set_data_ptr(font2, _font_NotoSansThai_Regular, _font_NotoSansThai_Regular_size); ts->font_set_allow_system_fallback(font2, false); RID font3 = ts->create_font(); ts->font_set_data_ptr(font3, _font_NotoNaskhArabicUI_Regular, _font_NotoNaskhArabicUI_Regular_size); @@ -511,7 +511,7 @@ TEST_SUITE("[TextServer]") { RID font1 = ts->create_font(); ts->font_set_data_ptr(font1, _font_NotoSans_Regular, _font_NotoSans_Regular_size); RID font2 = ts->create_font(); - ts->font_set_data_ptr(font2, _font_NotoSansThaiUI_Regular, _font_NotoSansThaiUI_Regular_size); + ts->font_set_data_ptr(font2, _font_NotoSansThai_Regular, _font_NotoSansThai_Regular_size); Array font; font.push_back(font1); diff --git a/thirdparty/README.md b/thirdparty/README.md index ff8f1d5591..256edbe7d6 100644 --- a/thirdparty/README.md +++ b/thirdparty/README.md @@ -154,25 +154,68 @@ Files extracted from upstream source: ## fonts -- `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.woff2`: - * Upstream: https://github.com/JetBrains/JetBrainsMono - * Version: 2.242 - * License: OFL-1.1 - `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 +- `JetBrainsMono_Regular.woff2`: + * Upstream: https://github.com/JetBrains/JetBrainsMono + * Version: 2.304 (cd5227bd1f61dff3bbd6c814ceaf7ffd95e947d9, 2023) + * License: OFL-1.1 +- `NotoNaskhArabicUI*.woff2`: + * Upstream: https://github.com/notofonts/arabic + * Version: 2.014 (133ccaebf922ca080a7eef22998611ac3c242df9, 2022) + * License: OFL-1.1 +- `NotoSans*.woff2`: + * Upstream: https://github.com/notofonts/latin-greek-cyrillic + * Version: 2.012 (9ea0c8d37bff0c0067b03777f40aa04f2bf78f99, 2023) + * License: OFL-1.1 +- `NotoSansBengali*.woff2`: + * Upstream: https://github.com/notofonts/bengali + * Version: 2.003 (020a5701f6fc6a363d5eccbae45e37714c0ad686, 2022) + * License: OFL-1.1 +- `NotoSansDevanagari*.woff2`: + * Upstream: https://github.com/notofonts/devanagari + * Version: 2.004 (f8f27e49da0ec9e5e38ecf3628671f05b24dd955, 2023) + * License: OFL-1.1 +- `NotoSansGeorgian*.woff2`: + * Upstream: https://github.com/notofonts/georgian + * Version: 2.002 (243ec9aa1d4ec58cc42120d30faac1a102fbfeb9, 2022) + * License: OFL-1.1 +- `NotoSansHebrew*.woff2`: + * Upstream: https://github.com/notofonts/hebrew + * Version: 2.003 (caa7ab0614fb5b37cc003d9bf3d7d3e765331110, 2022) + * License: OFL-1.1 +- `NotoSansMalayalam*.woff2`: + * Upstream: https://github.com/notofonts/malayalam + * Version: 2.104 (0fd65e553a6af3dc1c09ed39dfe8933e01c17b32, 2023) + * License: OFL-1.1 +- `NotoSansOriya*.woff2`: + * Upstream: https://github.com/notofonts/oriya + * Version: 2.005 (9377f242b247df12d0bf4cecd93b9c4b18036fbd, 2023) + * License: OFL-1.1 +- `NotoSansSinhala*.woff2`: + * Upstream: https://github.com/notofonts/sinhala + * Version: 2.006 (66e5a2ed9797e575222d6e7c5b3710c7bf68be79, 2022) + * License: OFL-1.1 +- `NotoSansTamil*.woff2`: + * Upstream: https://github.com/notofonts/tamil + * Version: 2.004 (f34a08d1ae3fa810581f63410296d971bdcd62dc, 2023) + * License: OFL-1.1 +- `NotoSansTelugu*.woff2`: + * Upstream: https://github.com/notofonts/telugu + * Version: 2.004 (68a6a8170cba5b2e9b45029ef36994961e8f614c, 2023) + * License: OFL-1.1 +- `NotoSansThai*.woff2`: + * Upstream: https://github.com/notofonts/thai + * Version: 2.001 (09af528011390f35abf15cf86068dae208f512c4, 2022) + * License: OFL-1.1 - `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. +- All fonts are converted from the unhinted `.ttf` sources using `https://github.com/google/woff2` tool. +- Comment: Use UI font variant if available, because it has tight vertical metrics and good for UI. ## freetype diff --git a/thirdparty/fonts/JetBrainsMono_Regular.woff2 b/thirdparty/fonts/JetBrainsMono_Regular.woff2 Binary files differindex 490104645b..dc698ffb83 100644 --- a/thirdparty/fonts/JetBrainsMono_Regular.woff2 +++ b/thirdparty/fonts/JetBrainsMono_Regular.woff2 diff --git a/thirdparty/fonts/NotoNaskhArabicUI_Bold.woff2 b/thirdparty/fonts/NotoNaskhArabicUI_Bold.woff2 Binary files differindex 72358d6eb1..e9a834ac69 100644 --- a/thirdparty/fonts/NotoNaskhArabicUI_Bold.woff2 +++ b/thirdparty/fonts/NotoNaskhArabicUI_Bold.woff2 diff --git a/thirdparty/fonts/NotoNaskhArabicUI_Regular.woff2 b/thirdparty/fonts/NotoNaskhArabicUI_Regular.woff2 Binary files differindex 1195d4174e..b0c0aaf766 100644 --- a/thirdparty/fonts/NotoNaskhArabicUI_Regular.woff2 +++ b/thirdparty/fonts/NotoNaskhArabicUI_Regular.woff2 diff --git a/thirdparty/fonts/NotoSansBengaliUI_Bold.woff2 b/thirdparty/fonts/NotoSansBengaliUI_Bold.woff2 Binary files differindex 03adf85fdc..c0087a2453 100644 --- a/thirdparty/fonts/NotoSansBengaliUI_Bold.woff2 +++ b/thirdparty/fonts/NotoSansBengaliUI_Bold.woff2 diff --git a/thirdparty/fonts/NotoSansBengaliUI_Regular.woff2 b/thirdparty/fonts/NotoSansBengaliUI_Regular.woff2 Binary files differindex a6a3ffa3a7..219792295a 100644 --- a/thirdparty/fonts/NotoSansBengaliUI_Regular.woff2 +++ b/thirdparty/fonts/NotoSansBengaliUI_Regular.woff2 diff --git a/thirdparty/fonts/NotoSansDevanagariUI_Bold.woff2 b/thirdparty/fonts/NotoSansDevanagariUI_Bold.woff2 Binary files differindex 6c835712cb..d3d34ff8e1 100644 --- a/thirdparty/fonts/NotoSansDevanagariUI_Bold.woff2 +++ b/thirdparty/fonts/NotoSansDevanagariUI_Bold.woff2 diff --git a/thirdparty/fonts/NotoSansDevanagariUI_Regular.woff2 b/thirdparty/fonts/NotoSansDevanagariUI_Regular.woff2 Binary files differindex 486896e6e9..333562f449 100644 --- a/thirdparty/fonts/NotoSansDevanagariUI_Regular.woff2 +++ b/thirdparty/fonts/NotoSansDevanagariUI_Regular.woff2 diff --git a/thirdparty/fonts/NotoSansGeorgian_Bold.woff2 b/thirdparty/fonts/NotoSansGeorgian_Bold.woff2 Binary files differindex 104afa150c..c5e25ffe22 100644 --- a/thirdparty/fonts/NotoSansGeorgian_Bold.woff2 +++ b/thirdparty/fonts/NotoSansGeorgian_Bold.woff2 diff --git a/thirdparty/fonts/NotoSansGeorgian_Regular.woff2 b/thirdparty/fonts/NotoSansGeorgian_Regular.woff2 Binary files differindex 0a7b9e878b..64ff0e84d8 100644 --- a/thirdparty/fonts/NotoSansGeorgian_Regular.woff2 +++ b/thirdparty/fonts/NotoSansGeorgian_Regular.woff2 diff --git a/thirdparty/fonts/NotoSansHebrew_Bold.woff2 b/thirdparty/fonts/NotoSansHebrew_Bold.woff2 Binary files differindex 96c5ae1349..01768b6416 100644 --- a/thirdparty/fonts/NotoSansHebrew_Bold.woff2 +++ b/thirdparty/fonts/NotoSansHebrew_Bold.woff2 diff --git a/thirdparty/fonts/NotoSansHebrew_Regular.woff2 b/thirdparty/fonts/NotoSansHebrew_Regular.woff2 Binary files differindex 17eadedc6f..980b7d3bf8 100644 --- a/thirdparty/fonts/NotoSansHebrew_Regular.woff2 +++ b/thirdparty/fonts/NotoSansHebrew_Regular.woff2 diff --git a/thirdparty/fonts/NotoSansMalayalamUI_Bold.woff2 b/thirdparty/fonts/NotoSansMalayalamUI_Bold.woff2 Binary files differindex 5f6bacb0c3..8757bf3584 100644 --- a/thirdparty/fonts/NotoSansMalayalamUI_Bold.woff2 +++ b/thirdparty/fonts/NotoSansMalayalamUI_Bold.woff2 diff --git a/thirdparty/fonts/NotoSansMalayalamUI_Regular.woff2 b/thirdparty/fonts/NotoSansMalayalamUI_Regular.woff2 Binary files differindex c54a82a874..cd266fafd3 100644 --- a/thirdparty/fonts/NotoSansMalayalamUI_Regular.woff2 +++ b/thirdparty/fonts/NotoSansMalayalamUI_Regular.woff2 diff --git a/thirdparty/fonts/NotoSansOriyaUI_Bold.woff2 b/thirdparty/fonts/NotoSansOriyaUI_Bold.woff2 Binary files differdeleted file mode 100644 index b7e34302e2..0000000000 --- a/thirdparty/fonts/NotoSansOriyaUI_Bold.woff2 +++ /dev/null diff --git a/thirdparty/fonts/NotoSansOriyaUI_Regular.woff2 b/thirdparty/fonts/NotoSansOriyaUI_Regular.woff2 Binary files differdeleted file mode 100644 index e64090cd77..0000000000 --- a/thirdparty/fonts/NotoSansOriyaUI_Regular.woff2 +++ /dev/null diff --git a/thirdparty/fonts/NotoSansOriya_Bold.woff2 b/thirdparty/fonts/NotoSansOriya_Bold.woff2 Binary files differnew file mode 100644 index 0000000000..333abfaae0 --- /dev/null +++ b/thirdparty/fonts/NotoSansOriya_Bold.woff2 diff --git a/thirdparty/fonts/NotoSansOriya_Regular.woff2 b/thirdparty/fonts/NotoSansOriya_Regular.woff2 Binary files differnew file mode 100644 index 0000000000..c9b7c4a74e --- /dev/null +++ b/thirdparty/fonts/NotoSansOriya_Regular.woff2 diff --git a/thirdparty/fonts/NotoSansSinhalaUI_Bold.woff2 b/thirdparty/fonts/NotoSansSinhalaUI_Bold.woff2 Binary files differindex 01dbd1bc8f..7facb291bd 100644 --- a/thirdparty/fonts/NotoSansSinhalaUI_Bold.woff2 +++ b/thirdparty/fonts/NotoSansSinhalaUI_Bold.woff2 diff --git a/thirdparty/fonts/NotoSansSinhalaUI_Regular.woff2 b/thirdparty/fonts/NotoSansSinhalaUI_Regular.woff2 Binary files differindex 504c9d0809..8059db385f 100644 --- a/thirdparty/fonts/NotoSansSinhalaUI_Regular.woff2 +++ b/thirdparty/fonts/NotoSansSinhalaUI_Regular.woff2 diff --git a/thirdparty/fonts/NotoSansTamilUI_Bold.woff2 b/thirdparty/fonts/NotoSansTamilUI_Bold.woff2 Binary files differindex 96967b0cce..ed428dedbd 100644 --- a/thirdparty/fonts/NotoSansTamilUI_Bold.woff2 +++ b/thirdparty/fonts/NotoSansTamilUI_Bold.woff2 diff --git a/thirdparty/fonts/NotoSansTamilUI_Regular.woff2 b/thirdparty/fonts/NotoSansTamilUI_Regular.woff2 Binary files differindex e9b2bee582..d32dc96ae6 100644 --- a/thirdparty/fonts/NotoSansTamilUI_Regular.woff2 +++ b/thirdparty/fonts/NotoSansTamilUI_Regular.woff2 diff --git a/thirdparty/fonts/NotoSansTeluguUI_Bold.woff2 b/thirdparty/fonts/NotoSansTeluguUI_Bold.woff2 Binary files differindex 2885bf991d..4de7b9f28d 100644 --- a/thirdparty/fonts/NotoSansTeluguUI_Bold.woff2 +++ b/thirdparty/fonts/NotoSansTeluguUI_Bold.woff2 diff --git a/thirdparty/fonts/NotoSansTeluguUI_Regular.woff2 b/thirdparty/fonts/NotoSansTeluguUI_Regular.woff2 Binary files differindex ac5e66d8f6..0d9fe71d3a 100644 --- a/thirdparty/fonts/NotoSansTeluguUI_Regular.woff2 +++ b/thirdparty/fonts/NotoSansTeluguUI_Regular.woff2 diff --git a/thirdparty/fonts/NotoSansThaiUI_Bold.woff2 b/thirdparty/fonts/NotoSansThaiUI_Bold.woff2 Binary files differdeleted file mode 100644 index 202995c066..0000000000 --- a/thirdparty/fonts/NotoSansThaiUI_Bold.woff2 +++ /dev/null diff --git a/thirdparty/fonts/NotoSansThaiUI_Regular.woff2 b/thirdparty/fonts/NotoSansThaiUI_Regular.woff2 Binary files differdeleted file mode 100644 index 2fb284f21f..0000000000 --- a/thirdparty/fonts/NotoSansThaiUI_Regular.woff2 +++ /dev/null diff --git a/thirdparty/fonts/NotoSansThai_Bold.woff2 b/thirdparty/fonts/NotoSansThai_Bold.woff2 Binary files differnew file mode 100644 index 0000000000..68dc6c1392 --- /dev/null +++ b/thirdparty/fonts/NotoSansThai_Bold.woff2 diff --git a/thirdparty/fonts/NotoSansThai_Regular.woff2 b/thirdparty/fonts/NotoSansThai_Regular.woff2 Binary files differnew file mode 100644 index 0000000000..ae29cbdb10 --- /dev/null +++ b/thirdparty/fonts/NotoSansThai_Regular.woff2 diff --git a/thirdparty/fonts/NotoSans_Bold.woff2 b/thirdparty/fonts/NotoSans_Bold.woff2 Binary files differindex 36a5b89999..09a3297a6a 100644 --- a/thirdparty/fonts/NotoSans_Bold.woff2 +++ b/thirdparty/fonts/NotoSans_Bold.woff2 diff --git a/thirdparty/fonts/NotoSans_Regular.woff2 b/thirdparty/fonts/NotoSans_Regular.woff2 Binary files differindex d449eed8d7..59c252ede1 100644 --- a/thirdparty/fonts/NotoSans_Regular.woff2 +++ b/thirdparty/fonts/NotoSans_Regular.woff2 |