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

Jump to bottom

improvement: add CJK fonts and set them as fallback in the font resources #688

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

improvement: add CJK fonts and set them as fallback in the font resources #688

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
Binary file added ui/theme/fonts/NotoSerifJP-Bold.otf
View file
Open in desktop
Binary file not shown.
Binary file added ui/theme/fonts/NotoSerifJP-Regular.otf
View file
Open in desktop
Binary file not shown.
Binary file added ui/theme/fonts/NotoSerifKR-Bold.otf
View file
Open in desktop
Binary file not shown.
Binary file added ui/theme/fonts/NotoSerifKR-Regular.otf
View file
Open in desktop
Binary file not shown.
Binary file added ui/theme/fonts/NotoSerifTC-Bold.otf
View file
Open in desktop
Binary file not shown.
Binary file added ui/theme/fonts/NotoSerifTC-Regular.otf
View file
Open in desktop
Binary file not shown.
6 changes: 6 additions & 0 deletions ui/theme/fonts/font_button.tres
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
[gd_resource type="DynamicFont" load_steps=2 format=2]

[ext_resource path="res://ui/theme/fonts/Montserrat-Bold.ttf" type="DynamicFontData" id=1]
[ext_resource path="res://ui/theme/fonts/NotoSerifJP-Bold.otf" type="DynamicFontData" id=2]
[ext_resource path="res://ui/theme/fonts/NotoSerifTC-Bold.otf" type="DynamicFontData" id=3]
[ext_resource path="res://ui/theme/fonts/NotoSerifKR-Bold.otf" type="DynamicFontData" id=4]

[resource]
size = 24
use_mipmaps = true
use_filter = true
font_data = ExtResource( 1 )
fallback/0 = ExtResource( 3 )
fallback/1 = ExtResource( 2 )
fallback/2 = ExtResource( 4 )
6 changes: 6 additions & 0 deletions ui/theme/fonts/font_button_big_green.tres
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
[gd_resource type="DynamicFont" load_steps=2 format=2]

[ext_resource path="res://ui/theme/fonts/Montserrat-Bold.ttf" type="DynamicFontData" id=1]
[ext_resource path="res://ui/theme/fonts/NotoSerifJP-Bold.otf" type="DynamicFontData" id=2]
[ext_resource path="res://ui/theme/fonts/NotoSerifTC-Bold.otf" type="DynamicFontData" id=3]
[ext_resource path="res://ui/theme/fonts/NotoSerifKR-Bold.otf" type="DynamicFontData" id=4]

[resource]
size = 24
use_mipmaps = true
use_filter = true
extra_spacing_char = 1
font_data = ExtResource( 1 )
fallback/0 = ExtResource( 3 )
fallback/1 = ExtResource( 2 )
fallback/2 = ExtResource( 4 )
9 changes: 8 additions & 1 deletion ui/theme/fonts/font_button_small.tres
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
[gd_resource type="DynamicFont" load_steps=2 format=2]
[gd_resource type="DynamicFont" load_steps=3 format=2]

[ext_resource path="res://ui/theme/fonts/NotoSerifJP-Bold.otf" type="DynamicFontData" id=1]
[ext_resource path="res://ui/theme/fonts/NotoSerifTC-Bold.otf" type="DynamicFontData" id=2]
[ext_resource path="res://ui/theme/fonts/NotoSerifKR-Bold.otf" type="DynamicFontData" id=3]

[sub_resource type="DynamicFontData" id=1]
font_path = "res://ui/theme/fonts/Montserrat-Bold.ttf"
Expand All @@ -8,3 +12,6 @@ size = 18
use_mipmaps = true
use_filter = true
font_data = SubResource( 1 )
fallback/0 = ExtResource( 1 )
fallback/1 = ExtResource( 2 )
fallback/2 = ExtResource( 3 )
6 changes: 6 additions & 0 deletions ui/theme/fonts/font_code.tres
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
[gd_resource type="DynamicFont" load_steps=2 format=2]

[ext_resource path="res://ui/theme/fonts/SourceCodePro-Regular.otf" type="DynamicFontData" id=1]
[ext_resource path="res://ui/theme/fonts/NotoSerifJP-Regular.otf" type="DynamicFontData" id=2]
[ext_resource path="res://ui/theme/fonts/NotoSerifTC-Regular.otf" type="DynamicFontData" id=3]
[ext_resource path="res://ui/theme/fonts/NotoSerifKR-Regular.otf" type="DynamicFontData" id=4]

[resource]
size = 20
use_mipmaps = true
use_filter = true
font_data = ExtResource( 1 )
fallback/0 = ExtResource( 3 )
fallback/1 = ExtResource( 2 )
fallback/2 = ExtResource( 4 )
6 changes: 6 additions & 0 deletions ui/theme/fonts/font_code_small.tres
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
[gd_resource type="DynamicFont" load_steps=2 format=2]

[ext_resource path="res://ui/theme/fonts/SourceCodePro-Regular.otf" type="DynamicFontData" id=1]
[ext_resource path="res://ui/theme/fonts/NotoSerifJP-Regular.otf" type="DynamicFontData" id=2]
[ext_resource path="res://ui/theme/fonts/NotoSerifTC-Regular.otf" type="DynamicFontData" id=3]
[ext_resource path="res://ui/theme/fonts/NotoSerifKR-Regular.otf" type="DynamicFontData" id=4]

[resource]
use_mipmaps = true
use_filter = true
font_data = ExtResource( 1 )
fallback/0 = ExtResource( 3 )
fallback/1 = ExtResource( 2 )
fallback/2 = ExtResource( 4 )
8 changes: 7 additions & 1 deletion ui/theme/fonts/font_documentation_bold.tres
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
[gd_resource type="DynamicFont" load_steps=2 format=2]
[gd_resource type="DynamicFont" load_steps=5 format=2]

[ext_resource path="res://ui/theme/fonts/OpenSans-Bold.ttf" type="DynamicFontData" id=1]
[ext_resource path="res://ui/theme/fonts/NotoSerifJP-Bold.otf" type="DynamicFontData" id=2]
[ext_resource path="res://ui/theme/fonts/NotoSerifTC-Bold.otf" type="DynamicFontData" id=3]
[ext_resource path="res://ui/theme/fonts/NotoSerifKR-Bold.otf" type="DynamicFontData" id=4]

[resource]
size = 18
use_mipmaps = true
use_filter = true
font_data = ExtResource( 1 )
fallback/0 = ExtResource( 3 )
fallback/1 = ExtResource( 2 )
fallback/2 = ExtResource( 4 )
7 changes: 7 additions & 0 deletions ui/theme/fonts/font_documentation_mono.tres
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,16 @@
[gd_resource type="DynamicFont" load_steps=2 format=2]

[ext_resource path="res://ui/theme/fonts/SourceCodePro-Regular.otf" type="DynamicFontData" id=1]
[ext_resource path="res://ui/theme/fonts/NotoSerifJP-Regular.otf" type="DynamicFontData" id=2]
[ext_resource path="res://ui/theme/fonts/NotoSerifTC-Regular.otf" type="DynamicFontData" id=3]
[ext_resource path="res://ui/theme/fonts/NotoSerifKR-Regular.otf" type="DynamicFontData" id=4]


[resource]
size = 18
use_mipmaps = true
use_filter = true
font_data = ExtResource( 1 )
fallback/0 = ExtResource( 3 )
fallback/1 = ExtResource( 2 )
fallback/2 = ExtResource( 4 )
6 changes: 6 additions & 0 deletions ui/theme/fonts/font_documentation_normal.tres
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
[gd_resource type="DynamicFont" load_steps=2 format=2]

[ext_resource path="res://ui/theme/fonts/OpenSans-Regular.ttf" type="DynamicFontData" id=1]
[ext_resource path="res://ui/theme/fonts/NotoSerifJP-Regular.otf" type="DynamicFontData" id=2]
[ext_resource path="res://ui/theme/fonts/NotoSerifTC-Regular.otf" type="DynamicFontData" id=3]
[ext_resource path="res://ui/theme/fonts/NotoSerifKR-Regular.otf" type="DynamicFontData" id=4]

[resource]
size = 18
use_mipmaps = true
use_filter = true
font_data = ExtResource( 1 )
fallback/0 = ExtResource( 3 )
fallback/1 = ExtResource( 2 )
fallback/2 = ExtResource( 4 )
6 changes: 6 additions & 0 deletions ui/theme/fonts/font_lesson_heading.tres
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
[gd_resource type="DynamicFont" load_steps=2 format=2]

[ext_resource path="res://ui/theme/fonts/Montserrat-Bold.ttf" type="DynamicFontData" id=1]
[ext_resource path="res://ui/theme/fonts/NotoSerifJP-Bold.otf" type="DynamicFontData" id=2]
[ext_resource path="res://ui/theme/fonts/NotoSerifTC-Bold.otf" type="DynamicFontData" id=3]
[ext_resource path="res://ui/theme/fonts/NotoSerifKR-Bold.otf" type="DynamicFontData" id=4]

[resource]
size = 28
use_mipmaps = true
use_filter = true
extra_spacing_top = 8
font_data = ExtResource( 1 )
fallback/0 = ExtResource( 3 )
fallback/1 = ExtResource( 2 )
fallback/2 = ExtResource( 4 )
6 changes: 6 additions & 0 deletions ui/theme/fonts/font_main_menu_buttons.tres
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
[gd_resource type="DynamicFont" load_steps=2 format=2]

[ext_resource path="res://ui/theme/fonts/Montserrat-Bold.ttf" type="DynamicFontData" id=1]
[ext_resource path="res://ui/theme/fonts/NotoSerifJP-Bold.otf" type="DynamicFontData" id=2]
[ext_resource path="res://ui/theme/fonts/NotoSerifTC-Bold.otf" type="DynamicFontData" id=3]
[ext_resource path="res://ui/theme/fonts/NotoSerifKR-Bold.otf" type="DynamicFontData" id=4]

[resource]
size = 32
use_mipmaps = true
use_filter = true
font_data = ExtResource( 1 )
fallback/0 = ExtResource( 3 )
fallback/1 = ExtResource( 2 )
fallback/2 = ExtResource( 4 )
6 changes: 6 additions & 0 deletions ui/theme/fonts/font_percent.tres
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
[gd_resource type="DynamicFont" load_steps=2 format=2]

[ext_resource path="res://ui/theme/fonts/Montserrat-Bold.ttf" type="DynamicFontData" id=1]
[ext_resource path="res://ui/theme/fonts/NotoSerifJP-Bold.otf" type="DynamicFontData" id=2]
[ext_resource path="res://ui/theme/fonts/NotoSerifTC-Bold.otf" type="DynamicFontData" id=3]
[ext_resource path="res://ui/theme/fonts/NotoSerifKR-Bold.otf" type="DynamicFontData" id=4]

[resource]
size = 18
Expand All @@ -11,3 +14,6 @@ use_filter = true
extra_spacing_top = 2
extra_spacing_bottom = 2
font_data = ExtResource( 1 )
fallback/0 = ExtResource( 3 )
fallback/1 = ExtResource( 2 )
fallback/2 = ExtResource( 4 )
6 changes: 6 additions & 0 deletions ui/theme/fonts/font_practice_progress.tres
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
[gd_resource type="DynamicFont" load_steps=2 format=2]

[ext_resource path="res://ui/theme/fonts/OpenSans-Bold.ttf" type="DynamicFontData" id=1]
[ext_resource path="res://ui/theme/fonts/NotoSerifJP-Bold.otf" type="DynamicFontData" id=2]
[ext_resource path="res://ui/theme/fonts/NotoSerifTC-Bold.otf" type="DynamicFontData" id=3]
[ext_resource path="res://ui/theme/fonts/NotoSerifKR-Bold.otf" type="DynamicFontData" id=4]

[resource]
size = 22
use_mipmaps = true
use_filter = true
font_data = ExtResource( 1 )
fallback/0 = ExtResource( 3 )
fallback/1 = ExtResource( 2 )
fallback/2 = ExtResource( 4 )
6 changes: 6 additions & 0 deletions ui/theme/fonts/font_text.tres
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
[gd_resource type="DynamicFont" load_steps=2 format=2]

[ext_resource path="res://ui/theme/fonts/OpenSans-Regular.ttf" type="DynamicFontData" id=1]
[ext_resource path="res://ui/theme/fonts/NotoSerifJP-Regular.otf" type="DynamicFontData" id=2]
[ext_resource path="res://ui/theme/fonts/NotoSerifTC-Regular.otf" type="DynamicFontData" id=3]
[ext_resource path="res://ui/theme/fonts/NotoSerifKR-Regular.otf" type="DynamicFontData" id=4]

[resource]
size = 20
use_mipmaps = true
use_filter = true
font_data = ExtResource( 1 )
fallback/0 = ExtResource( 3 )
fallback/1 = ExtResource( 2 )
fallback/2 = ExtResource( 4 )
6 changes: 6 additions & 0 deletions ui/theme/fonts/font_text_bold.tres
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
[gd_resource type="DynamicFont" load_steps=2 format=2]

[ext_resource path="res://ui/theme/fonts/OpenSans-Bold.ttf" type="DynamicFontData" id=1]
[ext_resource path="res://ui/theme/fonts/NotoSerifJP-Bold.otf" type="DynamicFontData" id=2]
[ext_resource path="res://ui/theme/fonts/NotoSerifTC-Bold.otf" type="DynamicFontData" id=3]
[ext_resource path="res://ui/theme/fonts/NotoSerifKR-Bold.otf" type="DynamicFontData" id=4]

[resource]
size = 20
use_mipmaps = true
use_filter = true
font_data = ExtResource( 1 )
fallback/0 = ExtResource( 3 )
fallback/1 = ExtResource( 2 )
fallback/2 = ExtResource( 4 )
7 changes: 7 additions & 0 deletions ui/theme/fonts/font_title.tres
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,16 @@
[gd_resource type="DynamicFont" load_steps=2 format=2]

[ext_resource path="res://ui/theme/fonts/Montserrat-Bold.ttf" type="DynamicFontData" id=1]
[ext_resource path="res://ui/theme/fonts/NotoSerifJP-Bold.otf" type="DynamicFontData" id=2]
[ext_resource path="res://ui/theme/fonts/NotoSerifTC-Bold.otf" type="DynamicFontData" id=3]
[ext_resource path="res://ui/theme/fonts/NotoSerifKR-Bold.otf" type="DynamicFontData" id=4]


[resource]
size = 24
use_mipmaps = true
use_filter = true
font_data = ExtResource( 1 )
fallback/0 = ExtResource( 3 )
fallback/1 = ExtResource( 2 )
fallback/2 = ExtResource( 4 )
6 changes: 6 additions & 0 deletions ui/theme/fonts/font_title_big.tres
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
[gd_resource type="DynamicFont" load_steps=2 format=2]

[ext_resource path="res://ui/theme/fonts/Montserrat-Bold.ttf" type="DynamicFontData" id=1]
[ext_resource path="res://ui/theme/fonts/NotoSerifJP-Bold.otf" type="DynamicFontData" id=2]
[ext_resource path="res://ui/theme/fonts/NotoSerifTC-Bold.otf" type="DynamicFontData" id=3]
[ext_resource path="res://ui/theme/fonts/NotoSerifKR-Bold.otf" type="DynamicFontData" id=4]

[resource]
size = 32
use_mipmaps = true
use_filter = true
font_data = ExtResource( 1 )
fallback/0 = ExtResource( 3 )
fallback/1 = ExtResource( 2 )
fallback/2 = ExtResource( 4 )
6 changes: 6 additions & 0 deletions ui/theme/fonts/font_title_slim.tres
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
[gd_resource type="DynamicFont" load_steps=2 format=2]

[ext_resource path="res://ui/theme/fonts/Montserrat-Regular.ttf" type="DynamicFontData" id=1]
[ext_resource path="res://ui/theme/fonts/NotoSerifJP-Regular.otf" type="DynamicFontData" id=2]
[ext_resource path="res://ui/theme/fonts/NotoSerifTC-Regular.otf" type="DynamicFontData" id=3]
[ext_resource path="res://ui/theme/fonts/NotoSerifKR-Regular.otf" type="DynamicFontData" id=4]

[resource]
size = 24
use_mipmaps = true
use_filter = true
font_data = ExtResource( 1 )
fallback/0 = ExtResource( 3 )
fallback/1 = ExtResource( 2 )
fallback/2 = ExtResource( 4 )
7 changes: 7 additions & 0 deletions ui/theme/fonts/font_title_small.tres
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
[gd_resource type="DynamicFont" load_steps=2 format=2]

[ext_resource path="res://ui/theme/fonts/NotoSerifJP-Bold.otf" type="DynamicFontData" id=1]
[ext_resource path="res://ui/theme/fonts/NotoSerifTC-Bold.otf" type="DynamicFontData" id=2]
[ext_resource path="res://ui/theme/fonts/NotoSerifKR-Bold.otf" type="DynamicFontData" id=3]

[sub_resource type="DynamicFontData" id=1]
font_path = "res://ui/theme/fonts/Montserrat-Bold.ttf"

Expand All @@ -8,3 +12,6 @@ size = 20
use_mipmaps = true
use_filter = true
font_data = SubResource( 1 )
fallback/0 = ExtResource( 1 )
fallback/1 = ExtResource( 2 )
fallback/2 = ExtResource( 3 )
6 changes: 6 additions & 0 deletions ui/theme/fonts/font_version.tres
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
[gd_resource type="DynamicFont" load_steps=2 format=2]

[ext_resource path="res://ui/theme/fonts/OpenSans-Regular.ttf" type="DynamicFontData" id=1]
[ext_resource path="res://ui/theme/fonts/NotoSerifJP-Regular.otf" type="DynamicFontData" id=2]
[ext_resource path="res://ui/theme/fonts/NotoSerifTC-Regular.otf" type="DynamicFontData" id=3]
[ext_resource path="res://ui/theme/fonts/NotoSerifKR-Regular.otf" type="DynamicFontData" id=4]

[resource]
size = 14
use_mipmaps = true
use_filter = true
font_data = ExtResource( 1 )
fallback/0 = ExtResource( 3 )
fallback/1 = ExtResource( 2 )
fallback/2 = ExtResource( 4 )
6 changes: 6 additions & 0 deletions ui/theme/fonts/font_well_done_bold.tres
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
[gd_resource type="DynamicFont" load_steps=2 format=2]

[ext_resource path="res://ui/theme/fonts/OpenSans-Bold.ttf" type="DynamicFontData" id=1]
[ext_resource path="res://ui/theme/fonts/NotoSerifJP-Bold.otf" type="DynamicFontData" id=2]
[ext_resource path="res://ui/theme/fonts/NotoSerifTC-Bold.otf" type="DynamicFontData" id=3]
[ext_resource path="res://ui/theme/fonts/NotoSerifKR-Bold.otf" type="DynamicFontData" id=4]

[resource]
size = 26
use_mipmaps = true
use_filter = true
font_data = ExtResource( 1 )
fallback/0 = ExtResource( 3 )
fallback/1 = ExtResource( 2 )
fallback/2 = ExtResource( 4 )
6 changes: 6 additions & 0 deletions ui/theme/fonts/font_well_done_normal.tres
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
[gd_resource type="DynamicFont" load_steps=2 format=2]

[ext_resource path="res://ui/theme/fonts/OpenSans-Regular.ttf" type="DynamicFontData" id=1]
[ext_resource path="res://ui/theme/fonts/NotoSerifJP-Regular.otf" type="DynamicFontData" id=2]
[ext_resource path="res://ui/theme/fonts/NotoSerifTC-Regular.otf" type="DynamicFontData" id=3]
[ext_resource path="res://ui/theme/fonts/NotoSerifKR-Regular.otf" type="DynamicFontData" id=4]

[resource]
size = 26
use_mipmaps = true
use_filter = true
font_data = ExtResource( 1 )
fallback/0 = ExtResource( 3 )
fallback/1 = ExtResource( 2 )
fallback/2 = ExtResource( 4 )
6 changes: 6 additions & 0 deletions ui/theme/fonts/font_well_done_title.tres
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
[gd_resource type="DynamicFont" load_steps=2 format=2]

[ext_resource path="res://ui/theme/fonts/Montserrat-Bold.ttf" type="DynamicFontData" id=1]
[ext_resource path="res://ui/theme/fonts/NotoSerifJP-Bold.otf" type="DynamicFontData" id=2]
[ext_resource path="res://ui/theme/fonts/NotoSerifTC-Bold.otf" type="DynamicFontData" id=3]
[ext_resource path="res://ui/theme/fonts/NotoSerifKR-Bold.otf" type="DynamicFontData" id=4]

[resource]
size = 42
use_mipmaps = true
use_filter = true
font_data = ExtResource( 1 )
fallback/0 = ExtResource( 3 )
fallback/1 = ExtResource( 2 )
fallback/2 = ExtResource( 4 )