Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update and properly list versions of the built-in fonts. #81326

Merged
merged 1 commit into from
Sep 5, 2023
Merged

Update and properly list versions of the built-in fonts. #81326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions editor/editor_fonts.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);

Expand Down
6 changes: 3 additions & 3 deletions tests/servers/test_text_server.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down
65 changes: 54 additions & 11 deletions thirdparty/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Binary file modified thirdparty/fonts/JetBrainsMono_Regular.woff2
View file
Open in desktop
Binary file not shown.
Binary file modified thirdparty/fonts/NotoNaskhArabicUI_Bold.woff2
View file
Open in desktop
Binary file not shown.
Binary file modified thirdparty/fonts/NotoNaskhArabicUI_Regular.woff2
View file
Open in desktop
Binary file not shown.
Binary file modified thirdparty/fonts/NotoSansBengaliUI_Bold.woff2
View file
Open in desktop
Binary file not shown.
Binary file modified thirdparty/fonts/NotoSansBengaliUI_Regular.woff2
View file
Open in desktop
Binary file not shown.
Binary file modified thirdparty/fonts/NotoSansDevanagariUI_Bold.woff2
View file
Open in desktop
Binary file not shown.
Binary file modified thirdparty/fonts/NotoSansDevanagariUI_Regular.woff2
View file
Open in desktop
Binary file not shown.
Binary file modified thirdparty/fonts/NotoSansGeorgian_Bold.woff2
View file
Open in desktop
Binary file not shown.
Binary file modified thirdparty/fonts/NotoSansGeorgian_Regular.woff2
View file
Open in desktop
Binary file not shown.
Binary file modified thirdparty/fonts/NotoSansHebrew_Bold.woff2
View file
Open in desktop
Binary file not shown.
Binary file modified thirdparty/fonts/NotoSansHebrew_Regular.woff2
View file
Open in desktop
Binary file not shown.
Binary file modified thirdparty/fonts/NotoSansMalayalamUI_Bold.woff2
View file
Open in desktop
Binary file not shown.
Binary file modified thirdparty/fonts/NotoSansMalayalamUI_Regular.woff2
View file
Open in desktop
Binary file not shown.
Binary file removed thirdparty/fonts/NotoSansOriyaUI_Bold.woff2
View file
Open in desktop
Binary file not shown.
Binary file removed thirdparty/fonts/NotoSansOriyaUI_Regular.woff2
View file
Open in desktop
Binary file not shown.
Binary file added thirdparty/fonts/NotoSansOriya_Bold.woff2
View file
Open in desktop
Binary file not shown.
Binary file added thirdparty/fonts/NotoSansOriya_Regular.woff2
View file
Open in desktop
Binary file not shown.
Binary file modified thirdparty/fonts/NotoSansSinhalaUI_Bold.woff2
View file
Open in desktop
Binary file not shown.
Binary file modified thirdparty/fonts/NotoSansSinhalaUI_Regular.woff2
View file
Open in desktop
Binary file not shown.
Binary file modified thirdparty/fonts/NotoSansTamilUI_Bold.woff2
View file
Open in desktop
Binary file not shown.
Binary file modified thirdparty/fonts/NotoSansTamilUI_Regular.woff2
View file
Open in desktop
Binary file not shown.
Binary file modified thirdparty/fonts/NotoSansTeluguUI_Bold.woff2
View file
Open in desktop
Binary file not shown.
Binary file modified thirdparty/fonts/NotoSansTeluguUI_Regular.woff2
View file
Open in desktop
Binary file not shown.
Binary file removed thirdparty/fonts/NotoSansThaiUI_Bold.woff2
View file
Open in desktop
Binary file not shown.
Binary file removed thirdparty/fonts/NotoSansThaiUI_Regular.woff2
View file
Open in desktop
Binary file not shown.
Binary file added thirdparty/fonts/NotoSansThai_Bold.woff2
View file
Open in desktop
Binary file not shown.
Binary file added thirdparty/fonts/NotoSansThai_Regular.woff2
View file
Open in desktop
Binary file not shown.
Binary file modified thirdparty/fonts/NotoSans_Bold.woff2
View file
Open in desktop
Binary file not shown.
Binary file modified thirdparty/fonts/NotoSans_Regular.woff2
View file
Open in desktop
Binary file not shown.