Merge pull request #51908 from bruvzg/msdf_fonts2

Make FontData importable resource. Add multi-channel SDF font rendering.

5 files changed, 1197 insertions, 688 deletions

diff --git a/scene/resources/default_theme/default_theme.cpp b/scene/resources/default_theme/default_theme.cpp
index dd7b348498..4845c556c6 100644
--- a/scene/resources/default_theme/default_theme.cpp
+++ b/scene/resources/default_theme/default_theme.cpp
@@ -1020,8 +1020,9 @@ void make_default_theme(bool p_hidpi, Ref<Font> p_font) {
 
 		Ref<FontData> dynamic_font_data;
 		dynamic_font_data.instantiate();
-		dynamic_font_data->load_memory(_font_OpenSans_SemiBold, _font_OpenSans_SemiBold_size, "ttf", default_font_size);
+		dynamic_font_data->set_data_ptr(_font_OpenSans_SemiBold, _font_OpenSans_SemiBold_size);
 		dynamic_font->add_data(dynamic_font_data);
+		dynamic_font->set_base_size(default_font_size);
 
 		default_font = dynamic_font;
 	}
diff --git a/scene/resources/font.cpp b/scene/resources/font.cpp
index 032171847d..7af8e900fd 100644
--- a/scene/resources/font.cpp
+++ b/scene/resources/font.cpp
@@ -36,54 +36,129 @@
 #include "scene/resources/text_line.h"
 #include "scene/resources/text_paragraph.h"
 
-void FontData::_bind_methods() {
-	ClassDB::bind_method(D_METHOD("load_resource", "filename", "base_size"), &FontData::load_resource, DEFVAL(16));
-	ClassDB::bind_method(D_METHOD("load_memory", "data", "type", "base_size"), &FontData::_load_memory, DEFVAL(16));
-	ClassDB::bind_method(D_METHOD("new_bitmap", "height", "ascent", "base_size"), &FontData::new_bitmap);
-
-	ClassDB::bind_method(D_METHOD("bitmap_add_texture", "texture"), &FontData::bitmap_add_texture);
-	ClassDB::bind_method(D_METHOD("bitmap_add_char", "char", "texture_idx", "rect", "align", "advance"), &FontData::bitmap_add_char);
-	ClassDB::bind_method(D_METHOD("bitmap_add_kerning_pair", "A", "B", "kerning"), &FontData::bitmap_add_kerning_pair);
+_FORCE_INLINE_ void FontData::_clear_cache() {
+	for (int i = 0; i < cache.size(); i++) {
+		if (cache[i].is_valid()) {
+			TS->free(cache[i]);
+			cache.write[i] = RID();
+		}
+	}
+}
 
-	ClassDB::bind_method(D_METHOD("set_data_path", "path"), &FontData::set_data_path);
-	ClassDB::bind_method(D_METHOD("get_data_path"), &FontData::get_data_path);
+_FORCE_INLINE_ void FontData::_ensure_rid(int p_cache_index) const {
+	if (unlikely(p_cache_index >= cache.size())) {
+		cache.resize(p_cache_index + 1);
+	}
+	if (unlikely(!cache[p_cache_index].is_valid())) {
+		cache.write[p_cache_index] = TS->create_font();
+		TS->font_set_data_ptr(cache[p_cache_index], data_ptr, data_size);
+		TS->font_set_antialiased(cache[p_cache_index], antialiased);
+		TS->font_set_multichannel_signed_distance_field(cache[p_cache_index], msdf);
+		TS->font_set_msdf_pixel_range(cache[p_cache_index], msdf_pixel_range);
+		TS->font_set_msdf_size(cache[p_cache_index], msdf_size);
+		TS->font_set_fixed_size(cache[p_cache_index], fixed_size);
+		TS->font_set_force_autohinter(cache[p_cache_index], force_autohinter);
+		TS->font_set_hinting(cache[p_cache_index], hinting);
+		TS->font_set_oversampling(cache[p_cache_index], oversampling);
+	}
+}
 
-	ClassDB::bind_method(D_METHOD("get_height", "size"), &FontData::get_height);
-	ClassDB::bind_method(D_METHOD("get_ascent", "size"), &FontData::get_ascent);
-	ClassDB::bind_method(D_METHOD("get_descent", "size"), &FontData::get_descent);
+void FontData::_bind_methods() {
+	ClassDB::bind_method(D_METHOD("set_data", "data"), &FontData::set_data);
+	ClassDB::bind_method(D_METHOD("get_data"), &FontData::get_data);
 
-	ClassDB::bind_method(D_METHOD("get_underline_position", "size"), &FontData::get_underline_position);
-	ClassDB::bind_method(D_METHOD("get_underline_thickness", "size"), &FontData::get_underline_thickness);
+	ClassDB::bind_method(D_METHOD("set_antialiased", "antialiased"), &FontData::set_antialiased);
+	ClassDB::bind_method(D_METHOD("is_antialiased"), &FontData::is_antialiased);
 
-	ClassDB::bind_method(D_METHOD("get_spacing", "type"), &FontData::get_spacing);
-	ClassDB::bind_method(D_METHOD("set_spacing", "type", "value"), &FontData::set_spacing);
+	ClassDB::bind_method(D_METHOD("set_multichannel_signed_distance_field", "msdf"), &FontData::set_multichannel_signed_distance_field);
+	ClassDB::bind_method(D_METHOD("is_multichannel_signed_distance_field"), &FontData::is_multichannel_signed_distance_field);
 
-	ClassDB::bind_method(D_METHOD("set_antialiased", "antialiased"), &FontData::set_antialiased);
-	ClassDB::bind_method(D_METHOD("get_antialiased"), &FontData::get_antialiased);
+	ClassDB::bind_method(D_METHOD("set_msdf_pixel_range", "msdf_pixel_range"), &FontData::set_msdf_pixel_range);
+	ClassDB::bind_method(D_METHOD("get_msdf_pixel_range"), &FontData::get_msdf_pixel_range);
 
-	ClassDB::bind_method(D_METHOD("get_variation_list"), &FontData::get_variation_list);
+	ClassDB::bind_method(D_METHOD("set_msdf_size", "msdf_size"), &FontData::set_msdf_size);
+	ClassDB::bind_method(D_METHOD("get_msdf_size"), &FontData::get_msdf_size);
 
-	ClassDB::bind_method(D_METHOD("set_variation", "tag", "value"), &FontData::set_variation);
-	ClassDB::bind_method(D_METHOD("get_variation", "tag"), &FontData::get_variation);
+	ClassDB::bind_method(D_METHOD("set_force_autohinter", "force_autohinter"), &FontData::set_force_autohinter);
+	ClassDB::bind_method(D_METHOD("is_force_autohinter"), &FontData::is_force_autohinter);
 
 	ClassDB::bind_method(D_METHOD("set_hinting", "hinting"), &FontData::set_hinting);
 	ClassDB::bind_method(D_METHOD("get_hinting"), &FontData::get_hinting);
 
-	ClassDB::bind_method(D_METHOD("set_force_autohinter", "enabled"), &FontData::set_force_autohinter);
-	ClassDB::bind_method(D_METHOD("get_force_autohinter"), &FontData::get_force_autohinter);
+	ClassDB::bind_method(D_METHOD("set_oversampling", "oversampling"), &FontData::set_oversampling);
+	ClassDB::bind_method(D_METHOD("get_oversampling"), &FontData::get_oversampling);
 
-	ClassDB::bind_method(D_METHOD("set_distance_field_hint", "distance_field"), &FontData::set_distance_field_hint);
-	ClassDB::bind_method(D_METHOD("get_distance_field_hint"), &FontData::get_distance_field_hint);
+	ClassDB::bind_method(D_METHOD("find_cache", "variation_coordinates"), &FontData::find_cache);
 
-	ClassDB::bind_method(D_METHOD("has_char", "char"), &FontData::has_char);
-	ClassDB::bind_method(D_METHOD("get_supported_chars"), &FontData::get_supported_chars);
+	ClassDB::bind_method(D_METHOD("get_cache_count"), &FontData::get_cache_count);
+	ClassDB::bind_method(D_METHOD("clear_cache"), &FontData::clear_cache);
+	ClassDB::bind_method(D_METHOD("remove_cache", "cache_index"), &FontData::remove_cache);
+
+	ClassDB::bind_method(D_METHOD("get_size_cache_list", "cache_index"), &FontData::get_size_cache_list);
+	ClassDB::bind_method(D_METHOD("clear_size_cache", "cache_index"), &FontData::clear_size_cache);
+	ClassDB::bind_method(D_METHOD("remove_size_cache", "cache_index", "size"), &FontData::remove_size_cache);
+
+	ClassDB::bind_method(D_METHOD("set_variation_coordinates", "cache_index", "variation_coordinates"), &FontData::set_variation_coordinates);
+	ClassDB::bind_method(D_METHOD("get_variation_coordinates", "cache_index"), &FontData::get_variation_coordinates);
+
+	ClassDB::bind_method(D_METHOD("set_ascent", "cache_index", "size", "ascent"), &FontData::set_ascent);
+	ClassDB::bind_method(D_METHOD("get_ascent", "cache_index", "size"), &FontData::get_ascent);
+
+	ClassDB::bind_method(D_METHOD("set_descent", "cache_index", "size", "descent"), &FontData::set_descent);
+	ClassDB::bind_method(D_METHOD("get_descent", "cache_index", "size"), &FontData::get_descent);
+
+	ClassDB::bind_method(D_METHOD("set_underline_position", "cache_index", "size", "underline_position"), &FontData::set_underline_position);
+	ClassDB::bind_method(D_METHOD("get_underline_position", "cache_index", "size"), &FontData::get_underline_position);
+
+	ClassDB::bind_method(D_METHOD("set_underline_thickness", "cache_index", "size", "underline_thickness"), &FontData::set_underline_thickness);
+	ClassDB::bind_method(D_METHOD("get_underline_thickness", "cache_index", "size"), &FontData::get_underline_thickness);
+
+	ClassDB::bind_method(D_METHOD("set_scale", "cache_index", "size", "scale"), &FontData::set_scale);
+	ClassDB::bind_method(D_METHOD("get_scale", "cache_index", "size"), &FontData::get_scale);
+
+	ClassDB::bind_method(D_METHOD("set_spacing", "cache_index", "size", "spacing"), &FontData::set_spacing);
+	ClassDB::bind_method(D_METHOD("get_spacing", "cache_index", "size"), &FontData::get_spacing);
+
+	ClassDB::bind_method(D_METHOD("get_texture_count", "cache_index", "size"), &FontData::get_texture_count);
+	ClassDB::bind_method(D_METHOD("clear_textures", "cache_index", "size"), &FontData::clear_textures);
+	ClassDB::bind_method(D_METHOD("remove_texture", "cache_index", "size", "texture_index"), &FontData::remove_texture);
+
+	ClassDB::bind_method(D_METHOD("set_texture_image", "cache_index", "size", "texture_index", "image"), &FontData::set_texture_image);
+	ClassDB::bind_method(D_METHOD("get_texture_image", "cache_index", "size", "texture_index"), &FontData::get_texture_image);
+
+	ClassDB::bind_method(D_METHOD("set_texture_offsets", "cache_index", "size", "texture_index", "offset"), &FontData::set_texture_offsets);
+	ClassDB::bind_method(D_METHOD("get_texture_offsets", "cache_index", "size", "texture_index"), &FontData::get_texture_offsets);
+
+	ClassDB::bind_method(D_METHOD("get_glyph_list", "cache_index", "size"), &FontData::get_glyph_list);
+	ClassDB::bind_method(D_METHOD("clear_glyphs", "cache_index", "size"), &FontData::clear_glyphs);
+	ClassDB::bind_method(D_METHOD("remove_glyph", "cache_index", "size", "glyph"), &FontData::remove_glyph);
+
+	ClassDB::bind_method(D_METHOD("set_glyph_advance", "cache_index", "size", "glyph", "advance"), &FontData::set_glyph_advance);
+	ClassDB::bind_method(D_METHOD("get_glyph_advance", "cache_index", "size", "glyph"), &FontData::get_glyph_advance);
+
+	ClassDB::bind_method(D_METHOD("set_glyph_offset", "cache_index", "size", "glyph", "offset"), &FontData::set_glyph_offset);
+	ClassDB::bind_method(D_METHOD("get_glyph_offset", "cache_index", "size", "glyph"), &FontData::get_glyph_offset);
+
+	ClassDB::bind_method(D_METHOD("set_glyph_size", "cache_index", "size", "glyph", "gl_size"), &FontData::set_glyph_size);
+	ClassDB::bind_method(D_METHOD("get_glyph_size", "cache_index", "size", "glyph"), &FontData::get_glyph_size);
 
-	ClassDB::bind_method(D_METHOD("get_glyph_advance", "index", "size"), &FontData::get_glyph_advance);
-	ClassDB::bind_method(D_METHOD("get_glyph_kerning", "index_a", "index_b", "size"), &FontData::get_glyph_kerning);
+	ClassDB::bind_method(D_METHOD("set_glyph_uv_rect", "cache_index", "size", "glyph", "uv_rect"), &FontData::set_glyph_uv_rect);
+	ClassDB::bind_method(D_METHOD("get_glyph_uv_rect", "cache_index", "size", "glyph"), &FontData::get_glyph_uv_rect);
 
-	ClassDB::bind_method(D_METHOD("get_base_size"), &FontData::get_base_size);
+	ClassDB::bind_method(D_METHOD("set_glyph_texture_idx", "cache_index", "size", "glyph", "texture_idx"), &FontData::set_glyph_texture_idx);
+	ClassDB::bind_method(D_METHOD("get_glyph_texture_idx", "cache_index", "size", "glyph"), &FontData::get_glyph_texture_idx);
 
-	ClassDB::bind_method(D_METHOD("has_outline"), &FontData::has_outline);
+	ClassDB::bind_method(D_METHOD("get_kerning_list", "cache_index", "size"), &FontData::get_kerning_list);
+	ClassDB::bind_method(D_METHOD("clear_kerning_map", "cache_index", "size"), &FontData::clear_kerning_map);
+	ClassDB::bind_method(D_METHOD("remove_kerning", "cache_index", "size", "glyph_pair"), &FontData::remove_kerning);
+
+	ClassDB::bind_method(D_METHOD("set_kerning", "cache_index", "size", "glyph_pair", "kerning"), &FontData::set_kerning);
+	ClassDB::bind_method(D_METHOD("get_kerning", "cache_index", "size", "glyph_pair"), &FontData::get_kerning);
+
+	ClassDB::bind_method(D_METHOD("render_range", "cache_index", "size", "start", "end"), &FontData::render_range);
+	ClassDB::bind_method(D_METHOD("render_glyph", "cache_index", "size", "index"), &FontData::render_glyph);
+
+	ClassDB::bind_method(D_METHOD("get_cache_rid", "cache_index"), &FontData::get_cache_rid);
 
 	ClassDB::bind_method(D_METHOD("is_language_supported", "language"), &FontData::is_language_supported);
 	ClassDB::bind_method(D_METHOD("set_language_support_override", "language", "supported"), &FontData::set_language_support_override);
@@ -97,511 +172,915 @@ void FontData::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("remove_script_support_override", "script"), &FontData::remove_script_support_override);
 	ClassDB::bind_method(D_METHOD("get_script_support_overrides"), &FontData::get_script_support_overrides);
 
-	ClassDB::bind_method(D_METHOD("get_glyph_index", "char", "variation_selector"), &FontData::get_glyph_index, DEFVAL(0x0000));
-	ClassDB::bind_method(D_METHOD("draw_glyph", "canvas", "size", "pos", "index", "color"), &FontData::draw_glyph, DEFVAL(Color(1, 1, 1)));
-	ClassDB::bind_method(D_METHOD("draw_glyph_outline", "canvas", "size", "outline_size", "pos", "index", "color"), &FontData::draw_glyph_outline, DEFVAL(Color(1, 1, 1)));
-
-	ADD_PROPERTY(PropertyInfo(Variant::STRING, "data_path", PROPERTY_HINT_FILE, "*.ttf,*.otf,*.woff,*.fnt,*.font"), "set_data_path", "get_data_path");
-
-	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "antialiased"), "set_antialiased", "get_antialiased");
-	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "force_autohinter"), "set_force_autohinter", "get_force_autohinter");
-	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "distance_field_hint"), "set_distance_field_hint", "get_distance_field_hint");
-
-	ADD_PROPERTY(PropertyInfo(Variant::INT, "hinting", PROPERTY_HINT_ENUM, "None,Light,Normal"), "set_hinting", "get_hinting");
+	ClassDB::bind_method(D_METHOD("has_char", "char"), &FontData::has_char);
+	ClassDB::bind_method(D_METHOD("get_supported_chars"), &FontData::get_supported_chars);
 
-	ADD_GROUP("Extra Spacing", "extra_spacing");
-	ADD_PROPERTYI(PropertyInfo(Variant::INT, "extra_spacing_glyph"), "set_spacing", "get_spacing", SPACING_GLYPH);
-	ADD_PROPERTYI(PropertyInfo(Variant::INT, "extra_spacing_space"), "set_spacing", "get_spacing", SPACING_SPACE);
+	ClassDB::bind_method(D_METHOD("get_glyph_index", "char", "variation_selector"), &FontData::get_glyph_index);
 
-	BIND_ENUM_CONSTANT(SPACING_GLYPH);
-	BIND_ENUM_CONSTANT(SPACING_SPACE);
+	ClassDB::bind_method(D_METHOD("get_supported_feature_list"), &FontData::get_supported_feature_list);
+	ClassDB::bind_method(D_METHOD("get_supported_variation_list"), &FontData::get_supported_variation_list);
 }
 
 bool FontData::_set(const StringName &p_name, const Variant &p_value) {
-	String str = p_name;
-	if (str.begins_with("language_support_override/")) {
-		String lang = str.get_slicec('/', 1);
-		if (lang == "_new") {
-			return false;
+	Vector<String> tokens = p_name.operator String().split("/");
+	if (tokens.size() == 1) {
+		if (tokens[0] == "data") {
+			set_data(p_value);
+			return true;
+		} else if (tokens[0] == "antialiased") {
+			set_antialiased(p_value);
+			return true;
+		} else if (tokens[0] == "multichannel_signed_distance_field") {
+			set_multichannel_signed_distance_field(p_value);
+			return true;
+		} else if (tokens[0] == "msdf_pixel_range") {
+			set_msdf_pixel_range(p_value);
+			return true;
+		} else if (tokens[0] == "msdf_size") {
+			set_msdf_size(p_value);
+			return true;
+		} else if (tokens[0] == "fixed_size") {
+			set_fixed_size(p_value);
+			return true;
+		} else if (tokens[0] == "hinting") {
+			set_hinting((TextServer::Hinting)p_value.operator int());
+			return true;
+		} else if (tokens[0] == "force_autohinter") {
+			set_force_autohinter(p_value);
+			return true;
+		} else if (tokens[0] == "oversampling") {
+			set_oversampling(p_value);
+			return true;
 		}
+	} else if (tokens.size() == 2 && tokens[0] == "language_support_override") {
+		String lang = tokens[1];
 		set_language_support_override(lang, p_value);
 		return true;
-	}
-	if (str.begins_with("script_support_override/")) {
-		String scr = str.get_slicec('/', 1);
-		if (scr == "_new") {
-			return false;
-		}
-		set_script_support_override(scr, p_value);
-		return true;
-	}
-	if (str.begins_with("variation/")) {
-		String name = str.get_slicec('/', 1);
-		set_variation(name, p_value);
+	} else if (tokens.size() == 2 && tokens[0] == "script_support_override") {
+		String script = tokens[1];
+		set_script_support_override(script, p_value);
 		return true;
+	} else if (tokens.size() >= 3 && tokens[0] == "cache") {
+		int cache_index = tokens[1].to_int();
+		if (tokens.size() == 3 && tokens[2] == "variation_coordinates") {
+			set_variation_coordinates(cache_index, p_value);
+			return true;
+		}
+		if (tokens.size() >= 5) {
+			Vector2i sz = Vector2i(tokens[2].to_int(), tokens[3].to_int());
+			if (tokens[4] == "ascent") {
+				set_ascent(cache_index, sz.x, p_value);
+				return true;
+			} else if (tokens[4] == "descent") {
+				set_descent(cache_index, sz.x, p_value);
+				return true;
+			} else if (tokens[4] == "underline_position") {
+				set_underline_position(cache_index, sz.x, p_value);
+				return true;
+			} else if (tokens[4] == "underline_thickness") {
+				set_underline_thickness(cache_index, sz.x, p_value);
+				return true;
+			} else if (tokens[4] == "scale") {
+				set_scale(cache_index, sz.x, p_value);
+				return true;
+			} else if (tokens[4] == "spacing_glyph") {
+				set_spacing(cache_index, sz.x, TextServer::SPACING_GLYPH, p_value);
+				return true;
+			} else if (tokens[4] == "spacing_space") {
+				set_spacing(cache_index, sz.x, TextServer::SPACING_SPACE, p_value);
+				return true;
+			} else if (tokens.size() == 7 && tokens[4] == "textures") {
+				int texture_index = tokens[5].to_int();
+				if (tokens[6] == "image") {
+					set_texture_image(cache_index, sz, texture_index, p_value);
+					return true;
+				} else if (tokens[6] == "offsets") {
+					set_texture_offsets(cache_index, sz, texture_index, p_value);
+					return true;
+				}
+			} else if (tokens.size() == 7 && tokens[4] == "glyphs") {
+				int32_t glyph_index = tokens[5].to_int();
+				if (tokens[6] == "advance") {
+					set_glyph_advance(cache_index, sz.x, glyph_index, p_value);
+					return true;
+				} else if (tokens[6] == "offset") {
+					set_glyph_offset(cache_index, sz, glyph_index, p_value);
+					return true;
+				} else if (tokens[6] == "size") {
+					set_glyph_size(cache_index, sz, glyph_index, p_value);
+					return true;
+				} else if (tokens[6] == "uv_rect") {
+					set_glyph_uv_rect(cache_index, sz, glyph_index, p_value);
+					return true;
+				} else if (tokens[6] == "texture_idx") {
+					set_glyph_texture_idx(cache_index, sz, glyph_index, p_value);
+					return true;
+				}
+			} else if (tokens.size() == 7 && tokens[4] == "kerning_overrides") {
+				Vector2i gp = Vector2i(tokens[5].to_int(), tokens[6].to_int());
+				set_kerning(cache_index, sz.x, gp, p_value);
+				return true;
+			}
+		}
 	}
-
 	return false;
 }
 
 bool FontData::_get(const StringName &p_name, Variant &r_ret) const {
-	String str = p_name;
-	if (str.begins_with("language_support_override/")) {
-		String lang = str.get_slicec('/', 1);
-		if (lang == "_new") {
+	Vector<String> tokens = p_name.operator String().split("/");
+	if (tokens.size() == 1) {
+		if (tokens[0] == "data") {
+			r_ret = get_data();
+			return true;
+		} else if (tokens[0] == "antialiased") {
+			r_ret = is_antialiased();
+			return true;
+		} else if (tokens[0] == "multichannel_signed_distance_field") {
+			r_ret = is_multichannel_signed_distance_field();
+			return true;
+		} else if (tokens[0] == "msdf_pixel_range") {
+			r_ret = get_msdf_pixel_range();
+			return true;
+		} else if (tokens[0] == "msdf_size") {
+			r_ret = get_msdf_size();
+			return true;
+		} else if (tokens[0] == "fixed_size") {
+			r_ret = get_fixed_size();
+			return true;
+		} else if (tokens[0] == "hinting") {
+			r_ret = get_hinting();
+			return true;
+		} else if (tokens[0] == "force_autohinter") {
+			r_ret = is_force_autohinter();
+			return true;
+		} else if (tokens[0] == "oversampling") {
+			r_ret = get_oversampling();
 			return true;
 		}
+	} else if (tokens.size() == 2 && tokens[0] == "language_support_override") {
+		String lang = tokens[1];
 		r_ret = get_language_support_override(lang);
 		return true;
-	}
-	if (str.begins_with("script_support_override/")) {
-		String scr = str.get_slicec('/', 1);
-		if (scr == "_new") {
+	} else if (tokens.size() == 2 && tokens[0] == "script_support_override") {
+		String script = tokens[1];
+		r_ret = get_script_support_override(script);
+		return true;
+	} else if (tokens.size() >= 3 && tokens[0] == "cache") {
+		int cache_index = tokens[1].to_int();
+		if (tokens.size() == 3 && tokens[2] == "variation_coordinates") {
+			r_ret = get_variation_coordinates(cache_index);
 			return true;
 		}
-		r_ret = get_script_support_override(scr);
-		return true;
-	}
-	if (str.begins_with("variation/")) {
-		String name = str.get_slicec('/', 1);
-
-		r_ret = get_variation(name);
-		return true;
+		if (tokens.size() >= 5) {
+			Vector2i sz = Vector2i(tokens[2].to_int(), tokens[3].to_int());
+			if (tokens[4] == "ascent") {
+				r_ret = get_ascent(cache_index, sz.x);
+				return true;
+			} else if (tokens[4] == "descent") {
+				r_ret = get_descent(cache_index, sz.x);
+				return true;
+			} else if (tokens[4] == "underline_position") {
+				r_ret = get_underline_position(cache_index, sz.x);
+				return true;
+			} else if (tokens[4] == "underline_thickness") {
+				r_ret = get_underline_thickness(cache_index, sz.x);
+				return true;
+			} else if (tokens[4] == "scale") {
+				r_ret = get_scale(cache_index, sz.x);
+				return true;
+			} else if (tokens[4] == "spacing_glyph") {
+				r_ret = get_spacing(cache_index, sz.x, TextServer::SPACING_GLYPH);
+				return true;
+			} else if (tokens[4] == "spacing_space") {
+				r_ret = get_spacing(cache_index, sz.x, TextServer::SPACING_SPACE);
+				return true;
+			} else if (tokens.size() == 7 && tokens[4] == "textures") {
+				int texture_index = tokens[5].to_int();
+				if (tokens[6] == "image") {
+					r_ret = get_texture_image(cache_index, sz, texture_index);
+					return true;
+				} else if (tokens[6] == "offsets") {
+					r_ret = get_texture_offsets(cache_index, sz, texture_index);
+					return true;
+				}
+			} else if (tokens.size() == 7 && tokens[4] == "glyphs") {
+				int32_t glyph_index = tokens[5].to_int();
+				if (tokens[6] == "advance") {
+					r_ret = get_glyph_advance(cache_index, sz.x, glyph_index);
+					return true;
+				} else if (tokens[6] == "offset") {
+					r_ret = get_glyph_offset(cache_index, sz, glyph_index);
+					return true;
+				} else if (tokens[6] == "size") {
+					r_ret = get_glyph_size(cache_index, sz, glyph_index);
+					return true;
+				} else if (tokens[6] == "uv_rect") {
+					r_ret = get_glyph_uv_rect(cache_index, sz, glyph_index);
+					return true;
+				} else if (tokens[6] == "texture_idx") {
+					r_ret = get_glyph_texture_idx(cache_index, sz, glyph_index);
+					return true;
+				}
+			} else if (tokens.size() == 7 && tokens[4] == "kerning_overrides") {
+				Vector2i gp = Vector2i(tokens[5].to_int(), tokens[6].to_int());
+				r_ret = get_kerning(cache_index, sz.x, gp);
+				return true;
+			}
+		}
 	}
-
 	return false;
 }
 
 void FontData::_get_property_list(List<PropertyInfo> *p_list) const {
+	p_list->push_back(PropertyInfo(Variant::PACKED_BYTE_ARRAY, "data", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_STORAGE));
+
+	p_list->push_back(PropertyInfo(Variant::BOOL, "antialiased", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_STORAGE));
+	p_list->push_back(PropertyInfo(Variant::BOOL, "multichannel_signed_distance_field", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_STORAGE));
+	p_list->push_back(PropertyInfo(Variant::INT, "msdf_pixel_range", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_STORAGE));
+	p_list->push_back(PropertyInfo(Variant::INT, "msdf_size", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_STORAGE));
+	p_list->push_back(PropertyInfo(Variant::INT, "fixed_size", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_STORAGE));
+	p_list->push_back(PropertyInfo(Variant::INT, "hinting", PROPERTY_HINT_ENUM, "None,Light,Normal", PROPERTY_USAGE_STORAGE));
+	p_list->push_back(PropertyInfo(Variant::BOOL, "force_autohinter", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_STORAGE));
+	p_list->push_back(PropertyInfo(Variant::FLOAT, "oversampling", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_STORAGE));
+
 	Vector<String> lang_over = get_language_support_overrides();
 	for (int i = 0; i < lang_over.size(); i++) {
-		p_list->push_back(PropertyInfo(Variant::BOOL, "language_support_override/" + lang_over[i], PROPERTY_HINT_NONE, "", PROPERTY_USAGE_EDITOR | PROPERTY_USAGE_STORAGE));
+		p_list->push_back(PropertyInfo(Variant::BOOL, "language_support_override/" + lang_over[i], PROPERTY_HINT_NONE, "", PROPERTY_USAGE_STORAGE));
 	}
-	p_list->push_back(PropertyInfo(Variant::NIL, "language_support_override/_new", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_EDITOR));
-
 	Vector<String> scr_over = get_script_support_overrides();
 	for (int i = 0; i < scr_over.size(); i++) {
-		p_list->push_back(PropertyInfo(Variant::BOOL, "script_support_override/" + scr_over[i], PROPERTY_HINT_NONE, "", PROPERTY_USAGE_EDITOR | PROPERTY_USAGE_STORAGE));
-	}
-	p_list->push_back(PropertyInfo(Variant::NIL, "script_support_override/_new", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_EDITOR));
+		p_list->push_back(PropertyInfo(Variant::BOOL, "script_support_override/" + scr_over[i], PROPERTY_HINT_NONE, "", PROPERTY_USAGE_STORAGE));
+	}
+	for (int i = 0; i < cache.size(); i++) {
+		String prefix = "cache/" + itos(i) + "/";
+		Array sizes = get_size_cache_list(i);
+		p_list->push_back(PropertyInfo(Variant::DICTIONARY, prefix + "variation_coordinates", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_STORAGE));
+		for (int j = 0; j < sizes.size(); j++) {
+			Vector2i sz = sizes[j];
+			String prefix_sz = prefix + itos(sz.x) + "/" + itos(sz.y) + "/";
+			if (sz.y == 0) {
+				p_list->push_back(PropertyInfo(Variant::FLOAT, prefix_sz + "ascent", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_STORAGE));
+				p_list->push_back(PropertyInfo(Variant::FLOAT, prefix_sz + "descent", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_STORAGE));
+				p_list->push_back(PropertyInfo(Variant::FLOAT, prefix_sz + "underline_position", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_STORAGE));
+				p_list->push_back(PropertyInfo(Variant::FLOAT, prefix_sz + "underline_thickness", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_STORAGE));
+				p_list->push_back(PropertyInfo(Variant::FLOAT, prefix_sz + "scale", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_STORAGE));
+				p_list->push_back(PropertyInfo(Variant::BOOL, prefix_sz + "spacing_glyph", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_STORAGE));
+				p_list->push_back(PropertyInfo(Variant::BOOL, prefix_sz + "spacing_space", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_STORAGE));
+			}
 
-	Dictionary variations = get_variation_list();
-	for (const Variant *ftr = variations.next(nullptr); ftr != nullptr; ftr = variations.next(ftr)) {
-		Vector3i v = variations[*ftr];
-		p_list->push_back(PropertyInfo(Variant::FLOAT, "variation/" + TS->tag_to_name(*ftr), PROPERTY_HINT_RANGE, itos(v.x) + "," + itos(v.y), PROPERTY_USAGE_EDITOR | PROPERTY_USAGE_STORAGE));
+			int tx_cnt = get_texture_count(i, sz);
+			for (int k = 0; k < tx_cnt; k++) {
+				p_list->push_back(PropertyInfo(Variant::PACKED_INT32_ARRAY, prefix_sz + "textures/" + itos(k) + "/offsets", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_STORAGE));
+				p_list->push_back(PropertyInfo(Variant::OBJECT, prefix_sz + "textures/" + itos(k) + "/image", PROPERTY_HINT_RESOURCE_TYPE, "Image", PROPERTY_USAGE_STORAGE | PROPERTY_USAGE_RESOURCE_NOT_PERSISTENT));
+			}
+			Array glyphs = get_glyph_list(i, sz);
+			for (int k = 0; k < glyphs.size(); k++) {
+				const int32_t &gl = glyphs[k];
+				if (sz.y == 0) {
+					p_list->push_back(PropertyInfo(Variant::VECTOR2, prefix_sz + "glyphs/" + itos(gl) + "/advance", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_STORAGE));
+				}
+				p_list->push_back(PropertyInfo(Variant::VECTOR2, prefix_sz + "glyphs/" + itos(gl) + "/offset", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_STORAGE));
+				p_list->push_back(PropertyInfo(Variant::VECTOR2, prefix_sz + "glyphs/" + itos(gl) + "/size", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_STORAGE));
+				p_list->push_back(PropertyInfo(Variant::RECT2, prefix_sz + "glyphs/" + itos(gl) + "/uv_rect", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_STORAGE));
+				p_list->push_back(PropertyInfo(Variant::INT, prefix_sz + "glyphs/" + itos(gl) + "/texture_idx", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_STORAGE));
+			}
+			if (sz.y == 0) {
+				Array kerning_map = get_kerning_list(i, sz.x);
+				for (int k = 0; k < kerning_map.size(); k++) {
+					const Vector2i &gl_pair = kerning_map[k];
+					p_list->push_back(PropertyInfo(Variant::VECTOR2, prefix_sz + "kerning_overrides/" + itos(gl_pair.x) + "/" + itos(gl_pair.y), PROPERTY_HINT_NONE, "", PROPERTY_USAGE_STORAGE));
+				}
+			}
+		}
 	}
 }
 
 void FontData::reset_state() {
-	if (rid != RID()) {
-		TS->free(rid);
-	}
-	base_size = 16;
-	path = String();
-}
+	_clear_cache();
+	data.clear();
+	data_ptr = nullptr;
+	data_size = 0;
+	cache.clear();
 
-RID FontData::get_rid() const {
-	return rid;
+	antialiased = true;
+	msdf = false;
+	force_autohinter = false;
+	hinting = TextServer::HINTING_LIGHT;
+	msdf_pixel_range = 14;
+	msdf_size = 128;
+	oversampling = 0.f;
 }
 
-void FontData::load_resource(const String &p_filename, int p_base_size) {
-	if (rid != RID()) {
-		TS->free(rid);
+/*************************************************************************/
+
+void FontData::set_data_ptr(const uint8_t *p_data, size_t p_size) {
+	data.clear();
+	data_ptr = p_data;
+	data_size = p_size;
+
+	if (data_ptr != nullptr) {
+		for (int i = 0; i < cache.size(); i++) {
+			if (cache[i].is_valid()) {
+				TS->font_set_data_ptr(cache[i], data_ptr, data_size);
+			}
+		}
 	}
-	rid = TS->create_font_resource(p_filename, p_base_size);
-	path = p_filename;
-	base_size = TS->font_get_base_size(rid);
-	emit_changed();
 }
 
-void FontData::_load_memory(const PackedByteArray &p_data, const String &p_type, int p_base_size) {
-	if (rid != RID()) {
-		TS->free(rid);
+void FontData::set_data(const PackedByteArray &p_data) {
+	data = p_data;
+	data_ptr = data.ptr();
+	data_size = data.size();
+
+	if (data_ptr != nullptr) {
+		for (int i = 0; i < cache.size(); i++) {
+			if (cache[i].is_valid()) {
+				TS->font_set_data_ptr(cache[i], data_ptr, data_size);
+			}
+		}
 	}
-	rid = TS->create_font_memory(p_data.ptr(), p_data.size(), p_type, p_base_size);
-	path = TTR("(Memory: " + p_type.to_upper() + " @ 0x" + String::num_int64((uint64_t)p_data.ptr(), 16, true) + ")");
-	base_size = TS->font_get_base_size(rid);
-	emit_changed();
 }
 
-void FontData::load_memory(const uint8_t *p_data, size_t p_size, const String &p_type, int p_base_size) {
-	if (rid != RID()) {
-		TS->free(rid);
-	}
-	rid = TS->create_font_memory(p_data, p_size, p_type, p_base_size);
-	path = TTR("(Memory: " + p_type.to_upper() + " @ 0x" + String::num_int64((uint64_t)p_data, 16, true) + ")");
-	base_size = TS->font_get_base_size(rid);
-	emit_changed();
+PackedByteArray FontData::get_data() const {
+	return data;
 }
 
-void FontData::new_bitmap(float p_height, float p_ascent, int p_base_size) {
-	if (rid != RID()) {
-		TS->free(rid);
+void FontData::set_antialiased(bool p_antialiased) {
+	if (antialiased != p_antialiased) {
+		antialiased = p_antialiased;
+		for (int i = 0; i < cache.size(); i++) {
+			_ensure_rid(i);
+			TS->font_set_antialiased(cache[i], antialiased);
+		}
+		emit_changed();
 	}
-	rid = TS->create_font_bitmap(p_height, p_ascent, p_base_size);
-	path = TTR("(Bitmap: " + String::num_int64(rid.get_id(), 16, true) + ")");
-	base_size = TS->font_get_base_size(rid);
-	emit_changed();
 }
 
-void FontData::bitmap_add_texture(const Ref<Texture> &p_texture) {
-	if (rid != RID()) {
-		TS->font_bitmap_add_texture(rid, p_texture);
-	}
+bool FontData::is_antialiased() const {
+	return antialiased;
 }
 
-void FontData::bitmap_add_char(char32_t p_char, int p_texture_idx, const Rect2 &p_rect, const Size2 &p_align, float p_advance) {
-	if (rid != RID()) {
-		TS->font_bitmap_add_char(rid, p_char, p_texture_idx, p_rect, p_align, p_advance);
+void FontData::set_multichannel_signed_distance_field(bool p_msdf) {
+	if (msdf != p_msdf) {
+		msdf = p_msdf;
+		for (int i = 0; i < cache.size(); i++) {
+			_ensure_rid(i);
+			TS->font_set_multichannel_signed_distance_field(cache[i], msdf);
+		}
+		emit_changed();
 	}
 }
 
-void FontData::bitmap_add_kerning_pair(char32_t p_A, char32_t p_B, int p_kerning) {
-	if (rid != RID()) {
-		TS->font_bitmap_add_kerning_pair(rid, p_A, p_B, p_kerning);
-	}
+bool FontData::is_multichannel_signed_distance_field() const {
+	return msdf;
 }
 
-void FontData::set_data_path(const String &p_path) {
-	load_resource(p_path, base_size);
+void FontData::set_msdf_pixel_range(int p_msdf_pixel_range) {
+	if (msdf_pixel_range != p_msdf_pixel_range) {
+		msdf_pixel_range = p_msdf_pixel_range;
+		for (int i = 0; i < cache.size(); i++) {
+			_ensure_rid(i);
+			TS->font_set_msdf_pixel_range(cache[i], msdf_pixel_range);
+		}
+		emit_changed();
+	}
 }
 
-String FontData::get_data_path() const {
-	return path;
+int FontData::get_msdf_pixel_range() const {
+	return msdf_pixel_range;
 }
 
-float FontData::get_height(int p_size) const {
-	if (rid == RID()) {
-		return 0.f; // Do not raise errors in getters, to prevent editor from spamming errors on incomplete (without data_path set) fonts.
+void FontData::set_msdf_size(int p_msdf_size) {
+	if (msdf_size != p_msdf_size) {
+		msdf_size = p_msdf_size;
+		for (int i = 0; i < cache.size(); i++) {
+			_ensure_rid(i);
+			TS->font_set_msdf_size(cache[i], msdf_size);
+		}
+		emit_changed();
 	}
-	return TS->font_get_height(rid, (p_size < 0) ? base_size : p_size);
 }
 
-float FontData::get_ascent(int p_size) const {
-	if (rid == RID()) {
-		return 0.f;
-	}
-	return TS->font_get_ascent(rid, (p_size < 0) ? base_size : p_size);
+int FontData::get_msdf_size() const {
+	return msdf_size;
 }
 
-float FontData::get_descent(int p_size) const {
-	if (rid == RID()) {
-		return 0.f;
+void FontData::set_fixed_size(int p_fixed_size) {
+	if (fixed_size != p_fixed_size) {
+		fixed_size = p_fixed_size;
+		for (int i = 0; i < cache.size(); i++) {
+			_ensure_rid(i);
+			TS->font_set_fixed_size(cache[i], fixed_size);
+		}
+		emit_changed();
 	}
-	return TS->font_get_descent(rid, (p_size < 0) ? base_size : p_size);
 }
 
-float FontData::get_underline_position(int p_size) const {
-	if (rid == RID()) {
-		return 0.f;
-	}
-	return TS->font_get_underline_position(rid, (p_size < 0) ? base_size : p_size);
+int FontData::get_fixed_size() const {
+	return fixed_size;
 }
 
-Dictionary FontData::get_feature_list() const {
-	if (rid == RID()) {
-		return Dictionary();
+void FontData::set_force_autohinter(bool p_force_autohinter) {
+	if (force_autohinter != p_force_autohinter) {
+		force_autohinter = p_force_autohinter;
+		for (int i = 0; i < cache.size(); i++) {
+			_ensure_rid(i);
+			TS->font_set_force_autohinter(cache[i], force_autohinter);
+		}
+		emit_changed();
 	}
-	return TS->font_get_feature_list(rid);
 }
 
-float FontData::get_underline_thickness(int p_size) const {
-	if (rid == RID()) {
-		return 0.f;
-	}
-	return TS->font_get_underline_thickness(rid, (p_size < 0) ? base_size : p_size);
+bool FontData::is_force_autohinter() const {
+	return force_autohinter;
 }
 
-Dictionary FontData::get_variation_list() const {
-	if (rid == RID()) {
-		return Dictionary();
+void FontData::set_hinting(TextServer::Hinting p_hinting) {
+	if (hinting != p_hinting) {
+		hinting = p_hinting;
+		for (int i = 0; i < cache.size(); i++) {
+			_ensure_rid(i);
+			TS->font_set_hinting(cache[i], hinting);
+		}
+		emit_changed();
 	}
-	return TS->font_get_variation_list(rid);
 }
 
-void FontData::set_variation(const String &p_name, double p_value) {
-	ERR_FAIL_COND(rid == RID());
-	TS->font_set_variation(rid, p_name, p_value);
-	emit_changed();
+TextServer::Hinting FontData::get_hinting() const {
+	return hinting;
 }
 
-double FontData::get_variation(const String &p_name) const {
-	if (rid == RID()) {
-		return 0;
+void FontData::set_oversampling(real_t p_oversampling) {
+	if (oversampling != p_oversampling) {
+		oversampling = p_oversampling;
+		for (int i = 0; i < cache.size(); i++) {
+			_ensure_rid(i);
+			TS->font_set_oversampling(cache[i], oversampling);
+		}
+		emit_changed();
+	}
+}
+
+real_t FontData::get_oversampling() const {
+	return oversampling;
+}
+
+RID FontData::find_cache(const Dictionary &p_variation_coordinates) const {
+	// Find existing variation cache.
+	const Dictionary &supported_coords = get_supported_variation_list();
+	for (int i = 0; i < cache.size(); i++) {
+		if (cache[i].is_valid()) {
+			const Dictionary &cache_var = TS->font_get_variation_coordinates(cache[i]);
+			bool match = true;
+			for (const Variant *V = supported_coords.next(nullptr); V && match; V = supported_coords.next(V)) {
+				const Vector3 &def = supported_coords[*V];
+
+				real_t c_v = def.z;
+				if (cache_var.has(*V)) {
+					real_t val = cache_var[*V];
+					c_v = CLAMP(val, def.x, def.y);
+				}
+				if (cache_var.has(TS->tag_to_name(*V))) {
+					real_t val = cache_var[TS->tag_to_name(*V)];
+					c_v = CLAMP(val, def.x, def.y);
+				}
+
+				real_t s_v = def.z;
+				if (p_variation_coordinates.has(*V)) {
+					real_t val = p_variation_coordinates[*V];
+					s_v = CLAMP(val, def.x, def.y);
+				}
+				if (p_variation_coordinates.has(TS->tag_to_name(*V))) {
+					real_t val = p_variation_coordinates[TS->tag_to_name(*V)];
+					s_v = CLAMP(val, def.x, def.y);
+				}
+
+				match = match && (c_v == s_v);
+			}
+			if (match) {
+				return cache[i];
+			}
+		}
 	}
-	return TS->font_get_variation(rid, p_name);
+
+	// Create new variation cache.
+	int idx = cache.size();
+	_ensure_rid(idx);
+	TS->font_set_variation_coordinates(cache[idx], p_variation_coordinates);
+	return cache[idx];
 }
 
-int FontData::get_spacing(int p_type) const {
-	if (rid == RID()) {
-		return 0;
-	}
-	if (p_type == SPACING_GLYPH) {
-		return TS->font_get_spacing_glyph(rid);
-	} else {
-		return TS->font_get_spacing_space(rid);
-	}
+int FontData::get_cache_count() const {
+	return cache.size();
 }
 
-void FontData::set_spacing(int p_type, int p_value) {
-	ERR_FAIL_COND(rid == RID());
-	if (p_type == SPACING_GLYPH) {
-		TS->font_set_spacing_glyph(rid, p_value);
-	} else {
-		TS->font_set_spacing_space(rid, p_value);
+void FontData::clear_cache() {
+	_clear_cache();
+	cache.clear();
+}
+
+void FontData::remove_cache(int p_cache_index) {
+	ERR_FAIL_INDEX(p_cache_index, cache.size());
+	if (cache[p_cache_index].is_valid()) {
+		TS->free(cache.write[p_cache_index]);
 	}
+	cache.remove(p_cache_index);
 	emit_changed();
 }
 
-void FontData::set_antialiased(bool p_antialiased) {
-	ERR_FAIL_COND(rid == RID());
-	TS->font_set_antialiased(rid, p_antialiased);
-	emit_changed();
+Array FontData::get_size_cache_list(int p_cache_index) const {
+	_ensure_rid(p_cache_index);
+	return TS->font_get_size_cache_list(cache[p_cache_index]);
 }
 
-bool FontData::get_antialiased() const {
-	if (rid == RID()) {
-		return false;
-	}
-	return TS->font_get_antialiased(rid);
+void FontData::clear_size_cache(int p_cache_index) {
+	_ensure_rid(p_cache_index);
+	TS->font_clear_size_cache(cache[p_cache_index]);
+}
+
+void FontData::remove_size_cache(int p_cache_index, const Vector2i &p_size) {
+	_ensure_rid(p_cache_index);
+	TS->font_remove_size_cache(cache[p_cache_index], p_size);
 }
 
-void FontData::set_distance_field_hint(bool p_distance_field) {
-	ERR_FAIL_COND(rid == RID());
-	TS->font_set_distance_field_hint(rid, p_distance_field);
+void FontData::set_variation_coordinates(int p_cache_index, const Dictionary &p_variation_coordinates) {
+	_ensure_rid(p_cache_index);
+	TS->font_set_variation_coordinates(cache[p_cache_index], p_variation_coordinates);
 	emit_changed();
 }
 
-bool FontData::get_distance_field_hint() const {
-	if (rid == RID()) {
-		return false;
-	}
-	return TS->font_get_distance_field_hint(rid);
+Dictionary FontData::get_variation_coordinates(int p_cache_index) const {
+	_ensure_rid(p_cache_index);
+	return TS->font_get_variation_coordinates(cache[p_cache_index]);
 }
 
-void FontData::set_hinting(TextServer::Hinting p_hinting) {
-	ERR_FAIL_COND(rid == RID());
-	TS->font_set_hinting(rid, p_hinting);
-	emit_changed();
+void FontData::set_ascent(int p_cache_index, int p_size, real_t p_ascent) {
+	_ensure_rid(p_cache_index);
+	TS->font_set_ascent(cache[p_cache_index], p_size, p_ascent);
 }
 
-TextServer::Hinting FontData::get_hinting() const {
-	if (rid == RID()) {
-		return TextServer::HINTING_NONE;
-	}
-	return TS->font_get_hinting(rid);
+real_t FontData::get_ascent(int p_cache_index, int p_size) const {
+	_ensure_rid(p_cache_index);
+	return TS->font_get_ascent(cache[p_cache_index], p_size);
 }
 
-void FontData::set_force_autohinter(bool p_enabeld) {
-	ERR_FAIL_COND(rid == RID());
-	TS->font_set_force_autohinter(rid, p_enabeld);
-	emit_changed();
+void FontData::set_descent(int p_cache_index, int p_size, real_t p_descent) {
+	_ensure_rid(p_cache_index);
+	TS->font_set_descent(cache[p_cache_index], p_size, p_descent);
 }
 
-bool FontData::get_force_autohinter() const {
-	if (rid == RID()) {
-		return false;
-	}
-	return TS->font_get_force_autohinter(rid);
+real_t FontData::get_descent(int p_cache_index, int p_size) const {
+	_ensure_rid(p_cache_index);
+	return TS->font_get_descent(cache[p_cache_index], p_size);
 }
 
-bool FontData::has_char(char32_t p_char) const {
-	if (rid == RID()) {
-		return false;
-	}
-	return TS->font_has_char(rid, p_char);
+void FontData::set_underline_position(int p_cache_index, int p_size, real_t p_underline_position) {
+	_ensure_rid(p_cache_index);
+	TS->font_set_underline_position(cache[p_cache_index], p_size, p_underline_position);
 }
 
-String FontData::get_supported_chars() const {
-	ERR_FAIL_COND_V(rid == RID(), String());
-	return TS->font_get_supported_chars(rid);
+real_t FontData::get_underline_position(int p_cache_index, int p_size) const {
+	_ensure_rid(p_cache_index);
+	return TS->font_get_underline_position(cache[p_cache_index], p_size);
 }
 
-Vector2 FontData::get_glyph_advance(uint32_t p_index, int p_size) const {
-	ERR_FAIL_COND_V(rid == RID(), Vector2());
-	return TS->font_get_glyph_advance(rid, p_index, (p_size < 0) ? base_size : p_size);
+void FontData::set_underline_thickness(int p_cache_index, int p_size, real_t p_underline_thickness) {
+	_ensure_rid(p_cache_index);
+	TS->font_set_underline_thickness(cache[p_cache_index], p_size, p_underline_thickness);
 }
 
-Vector2 FontData::get_glyph_kerning(uint32_t p_index_a, uint32_t p_index_b, int p_size) const {
-	ERR_FAIL_COND_V(rid == RID(), Vector2());
-	return TS->font_get_glyph_kerning(rid, p_index_a, p_index_b, (p_size < 0) ? base_size : p_size);
+real_t FontData::get_underline_thickness(int p_cache_index, int p_size) const {
+	_ensure_rid(p_cache_index);
+	return TS->font_get_underline_thickness(cache[p_cache_index], p_size);
 }
 
-bool FontData::has_outline() const {
-	if (rid == RID()) {
-		return false;
-	}
-	return TS->font_has_outline(rid);
+void FontData::set_scale(int p_cache_index, int p_size, real_t p_scale) {
+	_ensure_rid(p_cache_index);
+	TS->font_set_scale(cache[p_cache_index], p_size, p_scale);
 }
 
-float FontData::get_base_size() const {
-	return base_size;
+real_t FontData::get_scale(int p_cache_index, int p_size) const {
+	_ensure_rid(p_cache_index);
+	return TS->font_get_scale(cache[p_cache_index], p_size);
+}
+
+void FontData::set_spacing(int p_cache_index, int p_size, TextServer::SpacingType p_spacing, int p_value) {
+	_ensure_rid(p_cache_index);
+	TS->font_set_spacing(cache[p_cache_index], p_size, p_spacing, p_value);
+}
+
+int FontData::get_spacing(int p_cache_index, int p_size, TextServer::SpacingType p_spacing) const {
+	_ensure_rid(p_cache_index);
+	return TS->font_get_spacing(cache[p_cache_index], p_size, p_spacing);
+}
+
+int FontData::get_texture_count(int p_cache_index, const Vector2i &p_size) const {
+	_ensure_rid(p_cache_index);
+	return TS->font_get_texture_count(cache[p_cache_index], p_size);
+}
+
+void FontData::clear_textures(int p_cache_index, const Vector2i &p_size) {
+	_ensure_rid(p_cache_index);
+	TS->font_clear_textures(cache[p_cache_index], p_size);
+}
+
+void FontData::remove_texture(int p_cache_index, const Vector2i &p_size, int p_texture_index) {
+	_ensure_rid(p_cache_index);
+	TS->font_remove_texture(cache[p_cache_index], p_size, p_texture_index);
+}
+
+void FontData::set_texture_image(int p_cache_index, const Vector2i &p_size, int p_texture_index, const Ref<Image> &p_image) {
+	_ensure_rid(p_cache_index);
+	TS->font_set_texture_image(cache[p_cache_index], p_size, p_texture_index, p_image);
+}
+
+Ref<Image> FontData::get_texture_image(int p_cache_index, const Vector2i &p_size, int p_texture_index) const {
+	_ensure_rid(p_cache_index);
+	return TS->font_get_texture_image(cache[p_cache_index], p_size, p_texture_index);
+}
+
+void FontData::set_texture_offsets(int p_cache_index, const Vector2i &p_size, int p_texture_index, const PackedInt32Array &p_offset) {
+	_ensure_rid(p_cache_index);
+	TS->font_set_texture_offsets(cache[p_cache_index], p_size, p_texture_index, p_offset);
+}
+
+PackedInt32Array FontData::get_texture_offsets(int p_cache_index, const Vector2i &p_size, int p_texture_index) const {
+	_ensure_rid(p_cache_index);
+	return TS->font_get_texture_offsets(cache[p_cache_index], p_size, p_texture_index);
+}
+
+Array FontData::get_glyph_list(int p_cache_index, const Vector2i &p_size) const {
+	_ensure_rid(p_cache_index);
+	return TS->font_get_glyph_list(cache[p_cache_index], p_size);
+}
+
+void FontData::clear_glyphs(int p_cache_index, const Vector2i &p_size) {
+	_ensure_rid(p_cache_index);
+	TS->font_clear_glyphs(cache[p_cache_index], p_size);
+}
+
+void FontData::remove_glyph(int p_cache_index, const Vector2i &p_size, int32_t p_glyph) {
+	_ensure_rid(p_cache_index);
+	TS->font_remove_glyph(cache[p_cache_index], p_size, p_glyph);
+}
+
+void FontData::set_glyph_advance(int p_cache_index, int p_size, int32_t p_glyph, const Vector2 &p_advance) {
+	_ensure_rid(p_cache_index);
+	TS->font_set_glyph_advance(cache[p_cache_index], p_size, p_glyph, p_advance);
+}
+
+Vector2 FontData::get_glyph_advance(int p_cache_index, int p_size, int32_t p_glyph) const {
+	_ensure_rid(p_cache_index);
+	return TS->font_get_glyph_advance(cache[p_cache_index], p_size, p_glyph);
+}
+
+void FontData::set_glyph_offset(int p_cache_index, const Vector2i &p_size, int32_t p_glyph, const Vector2 &p_offset) {
+	_ensure_rid(p_cache_index);
+	TS->font_set_glyph_offset(cache[p_cache_index], p_size, p_glyph, p_offset);
+}
+
+Vector2 FontData::get_glyph_offset(int p_cache_index, const Vector2i &p_size, int32_t p_glyph) const {
+	_ensure_rid(p_cache_index);
+	return TS->font_get_glyph_offset(cache[p_cache_index], p_size, p_glyph);
+}
+
+void FontData::set_glyph_size(int p_cache_index, const Vector2i &p_size, int32_t p_glyph, const Vector2 &p_gl_size) {
+	_ensure_rid(p_cache_index);
+	TS->font_set_glyph_size(cache[p_cache_index], p_size, p_glyph, p_gl_size);
+}
+
+Vector2 FontData::get_glyph_size(int p_cache_index, const Vector2i &p_size, int32_t p_glyph) const {
+	_ensure_rid(p_cache_index);
+	return TS->font_get_glyph_size(cache[p_cache_index], p_size, p_glyph);
+}
+
+void FontData::set_glyph_uv_rect(int p_cache_index, const Vector2i &p_size, int32_t p_glyph, const Rect2 &p_uv_rect) {
+	_ensure_rid(p_cache_index);
+	TS->font_set_glyph_uv_rect(cache[p_cache_index], p_size, p_glyph, p_uv_rect);
+}
+
+Rect2 FontData::get_glyph_uv_rect(int p_cache_index, const Vector2i &p_size, int32_t p_glyph) const {
+	_ensure_rid(p_cache_index);
+	return TS->font_get_glyph_uv_rect(cache[p_cache_index], p_size, p_glyph);
+}
+
+void FontData::set_glyph_texture_idx(int p_cache_index, const Vector2i &p_size, int32_t p_glyph, int p_texture_idx) {
+	_ensure_rid(p_cache_index);
+	TS->font_set_glyph_texture_idx(cache[p_cache_index], p_size, p_glyph, p_texture_idx);
+}
+
+int FontData::get_glyph_texture_idx(int p_cache_index, const Vector2i &p_size, int32_t p_glyph) const {
+	_ensure_rid(p_cache_index);
+	return TS->font_get_glyph_texture_idx(cache[p_cache_index], p_size, p_glyph);
+}
+
+Array FontData::get_kerning_list(int p_cache_index, int p_size) const {
+	_ensure_rid(p_cache_index);
+	return TS->font_get_kerning_list(cache[p_cache_index], p_size);
+}
+
+void FontData::clear_kerning_map(int p_cache_index, int p_size) {
+	_ensure_rid(p_cache_index);
+	TS->font_clear_kerning_map(cache[p_cache_index], p_size);
+}
+
+void FontData::remove_kerning(int p_cache_index, int p_size, const Vector2i &p_glyph_pair) {
+	_ensure_rid(p_cache_index);
+	TS->font_remove_kerning(cache[p_cache_index], p_size, p_glyph_pair);
+}
+
+void FontData::set_kerning(int p_cache_index, int p_size, const Vector2i &p_glyph_pair, const Vector2 &p_kerning) {
+	_ensure_rid(p_cache_index);
+	TS->font_set_kerning(cache[p_cache_index], p_size, p_glyph_pair, p_kerning);
+}
+
+Vector2 FontData::get_kerning(int p_cache_index, int p_size, const Vector2i &p_glyph_pair) const {
+	_ensure_rid(p_cache_index);
+	return TS->font_get_kerning(cache[p_cache_index], p_size, p_glyph_pair);
+}
+
+void FontData::render_range(int p_cache_index, const Vector2i &p_size, char32_t p_start, char32_t p_end) {
+	_ensure_rid(p_cache_index);
+	TS->font_render_range(cache[p_cache_index], p_size, p_start, p_end);
+}
+
+void FontData::render_glyph(int p_cache_index, const Vector2i &p_size, int32_t p_index) {
+	_ensure_rid(p_cache_index);
+	TS->font_render_glyph(cache[p_cache_index], p_size, p_index);
+}
+
+RID FontData::get_cache_rid(int p_cache_index) const {
+	_ensure_rid(p_cache_index);
+	return cache[p_cache_index];
 }
 
 bool FontData::is_language_supported(const String &p_language) const {
-	if (rid == RID()) {
-		return false;
-	}
-	return TS->font_is_language_supported(rid, p_language);
+	_ensure_rid(0);
+	return TS->font_is_language_supported(cache[0], p_language);
 }
 
 void FontData::set_language_support_override(const String &p_language, bool p_supported) {
-	ERR_FAIL_COND(rid == RID());
-	TS->font_set_language_support_override(rid, p_language, p_supported);
-	emit_changed();
+	_ensure_rid(0);
+	TS->font_set_language_support_override(cache[0], p_language, p_supported);
 }
 
 bool FontData::get_language_support_override(const String &p_language) const {
-	if (rid == RID()) {
-		return false;
-	}
-	return TS->font_get_language_support_override(rid, p_language);
+	_ensure_rid(0);
+	return TS->font_get_language_support_override(cache[0], p_language);
 }
 
 void FontData::remove_language_support_override(const String &p_language) {
-	ERR_FAIL_COND(rid == RID());
-	TS->font_remove_language_support_override(rid, p_language);
-	emit_changed();
+	_ensure_rid(0);
+	TS->font_remove_language_support_override(cache[0], p_language);
 }
 
 Vector<String> FontData::get_language_support_overrides() const {
-	if (rid == RID()) {
-		return Vector<String>();
-	}
-	return TS->font_get_language_support_overrides(rid);
+	_ensure_rid(0);
+	return TS->font_get_language_support_overrides(cache[0]);
 }
 
 bool FontData::is_script_supported(const String &p_script) const {
-	if (rid == RID()) {
-		return false;
-	}
-	return TS->font_is_script_supported(rid, p_script);
+	_ensure_rid(0);
+	return TS->font_is_script_supported(cache[0], p_script);
 }
 
 void FontData::set_script_support_override(const String &p_script, bool p_supported) {
-	ERR_FAIL_COND(rid == RID());
-	TS->font_set_script_support_override(rid, p_script, p_supported);
-	emit_changed();
+	_ensure_rid(0);
+	TS->font_set_script_support_override(cache[0], p_script, p_supported);
 }
 
 bool FontData::get_script_support_override(const String &p_script) const {
-	if (rid == RID()) {
-		return false;
-	}
-	return TS->font_get_script_support_override(rid, p_script);
+	_ensure_rid(0);
+	return TS->font_get_script_support_override(cache[0], p_script);
 }
 
 void FontData::remove_script_support_override(const String &p_script) {
-	ERR_FAIL_COND(rid == RID());
-	TS->font_remove_script_support_override(rid, p_script);
-	emit_changed();
+	_ensure_rid(0);
+	TS->font_remove_script_support_override(cache[0], p_script);
 }
 
 Vector<String> FontData::get_script_support_overrides() const {
-	if (rid == RID()) {
-		return Vector<String>();
-	}
-	return TS->font_get_script_support_overrides(rid);
+	_ensure_rid(0);
+	return TS->font_get_script_support_overrides(cache[0]);
 }
 
-uint32_t FontData::get_glyph_index(char32_t p_char, char32_t p_variation_selector) const {
-	ERR_FAIL_COND_V(rid == RID(), 0);
-	return TS->font_get_glyph_index(rid, p_char, p_variation_selector);
+bool FontData::has_char(char32_t p_char) const {
+	_ensure_rid(0);
+	return TS->font_has_char(cache[0], p_char);
 }
 
-Vector2 FontData::draw_glyph(RID p_canvas, int p_size, const Vector2 &p_pos, uint32_t p_index, const Color &p_color) const {
-	ERR_FAIL_COND_V(rid == RID(), Vector2());
-	return TS->font_draw_glyph(rid, p_canvas, (p_size <= 0) ? base_size : p_size, p_pos, p_index, p_color);
+String FontData::get_supported_chars() const {
+	_ensure_rid(0);
+	return TS->font_get_supported_chars(cache[0]);
 }
 
-Vector2 FontData::draw_glyph_outline(RID p_canvas, int p_size, int p_outline_size, const Vector2 &p_pos, uint32_t p_index, const Color &p_color) const {
-	ERR_FAIL_COND_V(rid == RID(), Vector2());
-	return TS->font_draw_glyph_outline(rid, p_canvas, (p_size <= 0) ? base_size : p_size, p_outline_size, p_pos, p_index, p_color);
+int32_t FontData::get_glyph_index(int p_size, char32_t p_char, char32_t p_variation_selector) const {
+	_ensure_rid(0);
+	return TS->font_get_glyph_index(cache[0], p_size, p_char, p_variation_selector);
 }
 
-FontData::FontData() {}
+Dictionary FontData::get_supported_feature_list() const {
+	_ensure_rid(0);
+	return TS->font_supported_feature_list(cache[0]);
+}
 
-FontData::FontData(const String &p_filename, int p_base_size) {
-	load_resource(p_filename, p_base_size);
+Dictionary FontData::get_supported_variation_list() const {
+	_ensure_rid(0);
+	return TS->font_supported_variation_list(cache[0]);
 }
 
-FontData::FontData(const PackedByteArray &p_data, const String &p_type, int p_base_size) {
-	_load_memory(p_data, p_type, p_base_size);
+FontData::FontData() {
+	/* NOP */
 }
 
 FontData::~FontData() {
-	if (rid != RID()) {
-		TS->free(rid);
-	}
+	_clear_cache();
 }
 
 /*************************************************************************/
 
+void Font::_data_changed() {
+	for (int i = 0; i < rids.size(); i++) {
+		rids.write[i] = RID();
+	}
+	emit_changed();
+}
+
+void Font::_ensure_rid(int p_index) const {
+	// Find or create cache record.
+	for (int i = 0; i < rids.size(); i++) {
+		if (!rids[i].is_valid() && data[i].is_valid()) {
+			rids.write[i] = data[i]->find_cache(variation_coordinates);
+		}
+	}
+}
+
 void Font::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("add_data", "data"), &Font::add_data);
 	ClassDB::bind_method(D_METHOD("set_data", "idx", "data"), &Font::set_data);
 	ClassDB::bind_method(D_METHOD("get_data_count"), &Font::get_data_count);
 	ClassDB::bind_method(D_METHOD("get_data", "idx"), &Font::get_data);
+	ClassDB::bind_method(D_METHOD("get_data_rid", "idx"), &Font::get_data_rid);
+	ClassDB::bind_method(D_METHOD("clear_data"), &Font::clear_data);
 	ClassDB::bind_method(D_METHOD("remove_data", "idx"), &Font::remove_data);
 
+	ClassDB::bind_method(D_METHOD("set_base_size", "size"), &Font::set_base_size);
+	ClassDB::bind_method(D_METHOD("get_base_size"), &Font::get_base_size);
+	ADD_PROPERTY(PropertyInfo(Variant::INT, "base_size"), "set_base_size", "get_base_size");
+
+	ClassDB::bind_method(D_METHOD("set_variation_coordinates", "variation_coordinates"), &Font::set_variation_coordinates);
+	ClassDB::bind_method(D_METHOD("get_variation_coordinates"), &Font::get_variation_coordinates);
+	ADD_PROPERTY(PropertyInfo(Variant::DICTIONARY, "variation_coordinates"), "set_variation_coordinates", "get_variation_coordinates");
+
+	ClassDB::bind_method(D_METHOD("set_spacing", "spacing", "value"), &Font::set_spacing);
+	ClassDB::bind_method(D_METHOD("get_spacing", "spacing"), &Font::get_spacing);
+
+	ADD_GROUP("Extra Spacing", "spacing");
+	ADD_PROPERTYI(PropertyInfo(Variant::INT, "spacing_top"), "set_spacing", "get_spacing", TextServer::SPACING_TOP);
+	ADD_PROPERTYI(PropertyInfo(Variant::INT, "spacing_bottom"), "set_spacing", "get_spacing", TextServer::SPACING_BOTTOM);
+
 	ClassDB::bind_method(D_METHOD("get_height", "size"), &Font::get_height, DEFVAL(-1));
 	ClassDB::bind_method(D_METHOD("get_ascent", "size"), &Font::get_ascent, DEFVAL(-1));
 	ClassDB::bind_method(D_METHOD("get_descent", "size"), &Font::get_descent, DEFVAL(-1));
-
 	ClassDB::bind_method(D_METHOD("get_underline_position", "size"), &Font::get_underline_position, DEFVAL(-1));
 	ClassDB::bind_method(D_METHOD("get_underline_thickness", "size"), &Font::get_underline_thickness, DEFVAL(-1));
 
-	ClassDB::bind_method(D_METHOD("get_spacing", "type"), &Font::get_spacing);
-	ClassDB::bind_method(D_METHOD("set_spacing", "type", "value"), &Font::set_spacing);
-
-	ClassDB::bind_method(D_METHOD("get_string_size", "text", "size"), &Font::get_string_size, DEFVAL(-1));
+	ClassDB::bind_method(D_METHOD("get_string_size", "text", "size", "align", "width", "flags"), &Font::get_string_size, DEFVAL(-1), DEFVAL(HALIGN_LEFT), DEFVAL(-1), DEFVAL(TextServer::JUSTIFICATION_KASHIDA | TextServer::JUSTIFICATION_WORD_BOUND));
 	ClassDB::bind_method(D_METHOD("get_multiline_string_size", "text", "width", "size", "flags"), &Font::get_multiline_string_size, DEFVAL(-1), DEFVAL(-1), DEFVAL(TextServer::BREAK_MANDATORY | TextServer::BREAK_WORD_BOUND));
 
 	ClassDB::bind_method(D_METHOD("draw_string", "canvas_item", "pos", "text", "align", "width", "size", "modulate", "outline_size", "outline_modulate", "flags"), &Font::draw_string, DEFVAL(HALIGN_LEFT), DEFVAL(-1), DEFVAL(-1), DEFVAL(Color(1, 1, 1)), DEFVAL(0), DEFVAL(Color(1, 1, 1, 0)), DEFVAL(TextServer::JUSTIFICATION_KASHIDA | TextServer::JUSTIFICATION_WORD_BOUND));
 	ClassDB::bind_method(D_METHOD("draw_multiline_string", "canvas_item", "pos", "text", "align", "width", "max_lines", "size", "modulate", "outline_size", "outline_modulate", "flags"), &Font::draw_multiline_string, DEFVAL(HALIGN_LEFT), DEFVAL(-1), DEFVAL(-1), DEFVAL(-1), DEFVAL(Color(1, 1, 1)), DEFVAL(0), DEFVAL(Color(1, 1, 1, 0)), DEFVAL(TextServer::BREAK_MANDATORY | TextServer::BREAK_WORD_BOUND | TextServer::JUSTIFICATION_KASHIDA | TextServer::JUSTIFICATION_WORD_BOUND));
 
-	ClassDB::bind_method(D_METHOD("has_char", "char"), &Font::has_char);
-	ClassDB::bind_method(D_METHOD("get_supported_chars"), &Font::get_supported_chars);
-
 	ClassDB::bind_method(D_METHOD("get_char_size", "char", "next", "size"), &Font::get_char_size, DEFVAL(0), DEFVAL(-1));
 	ClassDB::bind_method(D_METHOD("draw_char", "canvas_item", "pos", "char", "next", "size", "modulate", "outline_size", "outline_modulate"), &Font::draw_char, DEFVAL(0), DEFVAL(-1), DEFVAL(Color(1, 1, 1)), DEFVAL(0), DEFVAL(Color(1, 1, 1, 0)));
 
-	ClassDB::bind_method(D_METHOD("update_changes"), &Font::update_changes);
-
-	ADD_GROUP("Extra Spacing", "extra_spacing");
-	ADD_PROPERTYI(PropertyInfo(Variant::INT, "extra_spacing_top"), "set_spacing", "get_spacing", SPACING_TOP);
-	ADD_PROPERTYI(PropertyInfo(Variant::INT, "extra_spacing_bottom"), "set_spacing", "get_spacing", SPACING_BOTTOM);
-
-	BIND_ENUM_CONSTANT(SPACING_TOP);
-	BIND_ENUM_CONSTANT(SPACING_BOTTOM);
-}
-
-void Font::_data_changed() {
-	cache.clear();
-	cache_wrap.clear();
+	ClassDB::bind_method(D_METHOD("has_char", "char"), &Font::has_char);
+	ClassDB::bind_method(D_METHOD("get_supported_chars"), &Font::get_supported_chars);
 
-	emit_changed();
-	notify_property_list_changed();
+	ClassDB::bind_method(D_METHOD("update_changes"), &Font::update_changes);
 }
 
 bool Font::_set(const StringName &p_name, const Variant &p_value) {
-	String str = p_name;
+	Vector<String> tokens = p_name.operator String().split("/");
 #ifndef DISABLE_DEPRECATED
-	if (str == "font_data") { // Compatibility, DynamicFont main data
+	if (tokens.size() == 1 && tokens[0] == "font_data") {
+		// Compatibility, DynamicFont main data.
 		Ref<FontData> fd = p_value;
 		if (fd.is_valid()) {
 			add_data(fd);
 			return true;
 		}
 		return false;
-	} else if (str.begins_with("fallback/")) { // Compatibility, DynamicFont fallback data
+	} else if (tokens.size() == 2 && tokens[0] == "fallback") {
+		// Compatibility, DynamicFont fallback data.
 		Ref<FontData> fd = p_value;
 		if (fd.is_valid()) {
 			add_data(fd);
 			return true;
 		}
 		return false;
-	} else if (str == "fallback") { // Compatibility, BitmapFont fallback
+	} else if (tokens.size() == 1 && tokens[0] == "fallback") {
+		// Compatibility, BitmapFont fallback data.
 		Ref<Font> f = p_value;
 		if (f.is_valid()) {
 			for (int i = 0; i < f->get_data_count(); i++) {
@@ -612,10 +1091,9 @@ bool Font::_set(const StringName &p_name, const Variant &p_value) {
 		return false;
 	}
 #endif /* DISABLE_DEPRECATED */
-	if (str.begins_with("data/")) {
-		int idx = str.get_slicec('/', 1).to_int();
+	if (tokens.size() == 2 && tokens[0] == "data") {
+		int idx = tokens[1].to_int();
 		Ref<FontData> fd = p_value;
-
 		if (fd.is_valid()) {
 			if (idx == data.size()) {
 				add_data(fd);
@@ -631,14 +1109,13 @@ bool Font::_set(const StringName &p_name, const Variant &p_value) {
 			return true;
 		}
 	}
-
 	return false;
 }
 
 bool Font::_get(const StringName &p_name, Variant &r_ret) const {
-	String str = p_name;
-	if (str.begins_with("data/")) {
-		int idx = str.get_slicec('/', 1).to_int();
+	Vector<String> tokens = p_name.operator String().split("/");
+	if (tokens.size() == 2 && tokens[0] == "data") {
+		int idx = tokens[1].to_int();
 
 		if (idx == data.size()) {
 			r_ret = Ref<FontData>();
@@ -656,24 +1133,44 @@ void Font::_get_property_list(List<PropertyInfo> *p_list) const {
 	for (int i = 0; i < data.size(); i++) {
 		p_list->push_back(PropertyInfo(Variant::OBJECT, "data/" + itos(i), PROPERTY_HINT_RESOURCE_TYPE, "FontData"));
 	}
-
 	p_list->push_back(PropertyInfo(Variant::OBJECT, "data/" + itos(data.size()), PROPERTY_HINT_RESOURCE_TYPE, "FontData"));
 }
 
 void Font::reset_state() {
-	spacing_top = 0;
-	spacing_bottom = 0;
+	for (int i = 0; i < data.size(); i++) {
+		if (data[i].is_valid()) {
+			data.write[i]->connect(SNAME("changed"), callable_mp(this, &Font::_data_changed), varray(), CONNECT_REFERENCE_COUNTED);
+		}
+	}
 	cache.clear();
 	cache_wrap.clear();
 	data.clear();
+	rids.clear();
+
+	base_size = 16;
+	variation_coordinates.clear();
+	spacing_bottom = 0;
+	spacing_top = 0;
+}
+
+Dictionary Font::get_feature_list() const {
+	Dictionary out;
+	for (int i = 0; i < data.size(); i++) {
+		Dictionary data_ftrs = data[i]->get_supported_feature_list();
+		for (const Variant *ftr = data_ftrs.next(nullptr); ftr != nullptr; ftr = data_ftrs.next(ftr)) {
+			out[*ftr] = data_ftrs[*ftr];
+		}
+	}
+	return out;
 }
 
 void Font::add_data(const Ref<FontData> &p_data) {
 	ERR_FAIL_COND(p_data.is_null());
 	data.push_back(p_data);
+	rids.push_back(RID());
 
 	if (data[data.size() - 1].is_valid()) {
-		data.write[data.size() - 1]->connect("changed", callable_mp(this, &Font::_data_changed), varray(), CONNECT_REFERENCE_COUNTED);
+		data.write[data.size() - 1]->connect(SNAME("changed"), callable_mp(this, &Font::_data_changed), varray(), CONNECT_REFERENCE_COUNTED);
 	}
 
 	cache.clear();
@@ -688,13 +1185,14 @@ void Font::set_data(int p_idx, const Ref<FontData> &p_data) {
 	ERR_FAIL_INDEX(p_idx, data.size());
 
 	if (data[p_idx].is_valid()) {
-		data.write[p_idx]->disconnect("changed", callable_mp(this, &Font::_data_changed));
+		data.write[p_idx]->disconnect(SNAME("changed"), callable_mp(this, &Font::_data_changed));
 	}
 
 	data.write[p_idx] = p_data;
+	rids.write[p_idx] = RID();
 
 	if (data[p_idx].is_valid()) {
-		data.write[p_idx]->connect("changed", callable_mp(this, &Font::_data_changed), varray(), CONNECT_REFERENCE_COUNTED);
+		data.write[p_idx]->connect(SNAME("changed"), callable_mp(this, &Font::_data_changed), varray(), CONNECT_REFERENCE_COUNTED);
 	}
 
 	cache.clear();
@@ -713,14 +1211,31 @@ Ref<FontData> Font::get_data(int p_idx) const {
 	return data[p_idx];
 }
 
+RID Font::get_data_rid(int p_idx) const {
+	ERR_FAIL_INDEX_V(p_idx, data.size(), RID());
+	_ensure_rid(p_idx);
+	return rids[p_idx];
+}
+
+void Font::clear_data() {
+	for (int i = 0; i < data.size(); i++) {
+		if (data[i].is_valid()) {
+			data.write[i]->connect(SNAME("changed"), callable_mp(this, &Font::_data_changed), varray(), CONNECT_REFERENCE_COUNTED);
+		}
+	}
+	data.clear();
+	rids.clear();
+}
+
 void Font::remove_data(int p_idx) {
 	ERR_FAIL_INDEX(p_idx, data.size());
 
 	if (data[p_idx].is_valid()) {
-		data.write[p_idx]->disconnect("changed", callable_mp(this, &Font::_data_changed));
+		data.write[p_idx]->disconnect(SNAME("changed"), callable_mp(this, &Font::_data_changed));
 	}
 
 	data.remove(p_idx);
+	rids.remove(p_idx);
 
 	cache.clear();
 	cache_wrap.clear();
@@ -729,117 +1244,148 @@ void Font::remove_data(int p_idx) {
 	notify_property_list_changed();
 }
 
-Dictionary Font::get_feature_list() const {
-	Dictionary out;
-	for (int i = 0; i < data.size(); i++) {
-		Dictionary data_ftrs = data[i]->get_feature_list();
-		for (const Variant *ftr = data_ftrs.next(nullptr); ftr != nullptr; ftr = data_ftrs.next(ftr)) {
-			out[*ftr] = data_ftrs[*ftr];
-		}
+void Font::set_base_size(int p_size) {
+	base_size = p_size;
+}
+
+int Font::get_base_size() const {
+	return base_size;
+}
+
+void Font::set_variation_coordinates(const Dictionary &p_variation_coordinates) {
+	_data_changed();
+	variation_coordinates = p_variation_coordinates;
+}
+
+Dictionary Font::get_variation_coordinates() const {
+	return variation_coordinates;
+}
+
+void Font::set_spacing(TextServer::SpacingType p_spacing, int p_value) {
+	_data_changed();
+	switch (p_spacing) {
+		case TextServer::SPACING_TOP: {
+			spacing_top = p_value;
+		} break;
+		case TextServer::SPACING_BOTTOM: {
+			spacing_bottom = p_value;
+		} break;
+		default: {
+			ERR_FAIL_MSG("Invalid spacing type: " + itos(p_spacing));
+		} break;
+	}
+}
+
+int Font::get_spacing(TextServer::SpacingType p_spacing) const {
+	switch (p_spacing) {
+		case TextServer::SPACING_TOP: {
+			return spacing_top;
+		} break;
+		case TextServer::SPACING_BOTTOM: {
+			return spacing_bottom;
+		} break;
+		default: {
+			ERR_FAIL_V_MSG(0, "Invalid spacing type: " + itos(p_spacing));
+		} break;
 	}
-	return out;
 }
 
-float Font::get_height(int p_size) const {
-	float ret = 0.f;
+real_t Font::get_height(int p_size) const {
+	int size = (p_size <= 0) ? base_size : p_size;
+	real_t ret = 0.f;
 	for (int i = 0; i < data.size(); i++) {
-		ret = MAX(ret, data[i]->get_height(p_size));
+		_ensure_rid(i);
+		ret = MAX(ret, TS->font_get_ascent(rids[i], size) + TS->font_get_descent(rids[i], size));
 	}
-	return ret + spacing_top + spacing_bottom;
+	return ret + spacing_bottom + spacing_top;
 }
 
-float Font::get_ascent(int p_size) const {
-	float ret = 0.f;
+real_t Font::get_ascent(int p_size) const {
+	int size = (p_size <= 0) ? base_size : p_size;
+	real_t ret = 0.f;
 	for (int i = 0; i < data.size(); i++) {
-		ret = MAX(ret, data[i]->get_ascent(p_size));
+		_ensure_rid(i);
+		ret = MAX(ret, TS->font_get_ascent(rids[i], size));
 	}
 	return ret + spacing_top;
 }
 
-float Font::get_descent(int p_size) const {
-	float ret = 0.f;
+real_t Font::get_descent(int p_size) const {
+	int size = (p_size <= 0) ? base_size : p_size;
+	real_t ret = 0.f;
 	for (int i = 0; i < data.size(); i++) {
-		ret = MAX(ret, data[i]->get_descent(p_size));
+		_ensure_rid(i);
+		ret = MAX(ret, TS->font_get_descent(rids[i], size));
 	}
 	return ret + spacing_bottom;
 }
 
-float Font::get_underline_position(int p_size) const {
-	float ret = 0.f;
+real_t Font::get_underline_position(int p_size) const {
+	int size = (p_size <= 0) ? base_size : p_size;
+	real_t ret = 0.f;
 	for (int i = 0; i < data.size(); i++) {
-		ret = MAX(ret, data[i]->get_underline_position(p_size));
+		_ensure_rid(i);
+		ret = MAX(ret, TS->font_get_underline_position(rids[i], size));
 	}
-	return ret;
+	return ret + spacing_top;
 }
 
-float Font::get_underline_thickness(int p_size) const {
-	float ret = 0.f;
+real_t Font::get_underline_thickness(int p_size) const {
+	int size = (p_size <= 0) ? base_size : p_size;
+	real_t ret = 0.f;
 	for (int i = 0; i < data.size(); i++) {
-		ret = MAX(ret, data[i]->get_underline_thickness(p_size));
+		_ensure_rid(i);
+		ret = MAX(ret, TS->font_get_underline_thickness(rids[i], size));
 	}
 	return ret;
 }
 
-int Font::get_spacing(int p_type) const {
-	if (p_type == SPACING_TOP) {
-		return spacing_top;
-	} else if (p_type == SPACING_BOTTOM) {
-		return spacing_bottom;
-	}
+Size2 Font::get_string_size(const String &p_text, int p_size, HAlign p_align, real_t p_width, uint8_t p_flags) const {
+	ERR_FAIL_COND_V(data.is_empty(), Size2());
 
-	return 0;
-}
+	int size = (p_size <= 0) ? base_size : p_size;
 
-void Font::set_spacing(int p_type, int p_value) {
-	if (p_type == SPACING_TOP) {
-		spacing_top = p_value;
-	} else if (p_type == SPACING_BOTTOM) {
-		spacing_bottom = p_value;
+	for (int i = 0; i < data.size(); i++) {
+		_ensure_rid(i);
 	}
 
-	emit_changed();
-	notify_property_list_changed();
-}
-
-// Drawing string and string sizes, cached.
-
-Size2 Font::get_string_size(const String &p_text, int p_size) const {
-	ERR_FAIL_COND_V(data.is_empty(), Size2());
-
 	uint64_t hash = p_text.hash64();
-	hash = hash_djb2_one_64(p_size, hash);
+	if (p_align == HALIGN_FILL) {
+		hash = hash_djb2_one_64(hash_djb2_one_float(p_width), hash);
+		hash = hash_djb2_one_64(p_flags, hash);
+	}
+	hash = hash_djb2_one_64(size, hash);
 
 	Ref<TextLine> buffer;
 	if (cache.has(hash)) {
 		buffer = cache.get(hash);
 	} else {
 		buffer.instantiate();
-		int size = p_size <= 0 ? data[0]->get_base_size() : p_size;
 		buffer->add_string(p_text, Ref<Font>(this), size, Dictionary(), TranslationServer::get_singleton()->get_tool_locale());
 		cache.insert(hash, buffer);
 	}
-	if (buffer->get_orientation() == TextServer::ORIENTATION_HORIZONTAL) {
-		return buffer->get_size() + Vector2(0, spacing_top + spacing_bottom);
-	} else {
-		return buffer->get_size() + Vector2(spacing_top + spacing_bottom, 0);
-	}
+	return buffer->get_size();
 }
 
-Size2 Font::get_multiline_string_size(const String &p_text, float p_width, int p_size, uint8_t p_flags) const {
+Size2 Font::get_multiline_string_size(const String &p_text, real_t p_width, int p_size, uint8_t p_flags) const {
 	ERR_FAIL_COND_V(data.is_empty(), Size2());
 
-	uint64_t hash = p_text.hash64();
-	hash = hash_djb2_one_64(p_size, hash);
+	int size = (p_size <= 0) ? base_size : p_size;
 
+	for (int i = 0; i < data.size(); i++) {
+		_ensure_rid(i);
+	}
+
+	uint64_t hash = p_text.hash64();
 	uint64_t wrp_hash = hash_djb2_one_64(hash_djb2_one_float(p_width), hash);
 	wrp_hash = hash_djb2_one_64(p_flags, wrp_hash);
+	wrp_hash = hash_djb2_one_64(size, wrp_hash);
 
 	Ref<TextParagraph> lines_buffer;
 	if (cache_wrap.has(wrp_hash)) {
 		lines_buffer = cache_wrap.get(wrp_hash);
 	} else {
 		lines_buffer.instantiate();
-		int size = p_size <= 0 ? data[0]->get_base_size() : p_size;
 		lines_buffer->add_string(p_text, Ref<Font>(this), size, Dictionary(), TranslationServer::get_singleton()->get_tool_locale());
 		lines_buffer->set_width(p_width);
 		lines_buffer->set_flags(p_flags);
@@ -851,40 +1397,50 @@ Size2 Font::get_multiline_string_size(const String &p_text, float p_width, int p
 		Size2 line_size = lines_buffer->get_line_size(i);
 		if (lines_buffer->get_orientation() == TextServer::ORIENTATION_HORIZONTAL) {
 			ret.x = MAX(ret.x, line_size.x);
-			ret.y += line_size.y + spacing_top + spacing_bottom;
+			ret.y += line_size.y;
 		} else {
 			ret.y = MAX(ret.y, line_size.y);
-			ret.x += line_size.x + spacing_top + spacing_bottom;
+			ret.x += line_size.x;
 		}
 	}
 	return ret;
 }
 
-void Font::draw_string(RID p_canvas_item, const Point2 &p_pos, const String &p_text, HAlign p_align, float p_width, int p_size, const Color &p_modulate, int p_outline_size, const Color &p_outline_modulate, uint8_t p_flags) const {
+void Font::draw_string(RID p_canvas_item, const Point2 &p_pos, const String &p_text, HAlign p_align, real_t p_width, int p_size, const Color &p_modulate, int p_outline_size, const Color &p_outline_modulate, uint8_t p_flags) const {
 	ERR_FAIL_COND(data.is_empty());
 
+	int size = (p_size <= 0) ? base_size : p_size;
+
+	for (int i = 0; i < data.size(); i++) {
+		_ensure_rid(i);
+	}
+
 	uint64_t hash = p_text.hash64();
-	hash = hash_djb2_one_64(p_size, hash);
+	if (p_align == HALIGN_FILL) {
+		hash = hash_djb2_one_64(hash_djb2_one_float(p_width), hash);
+		hash = hash_djb2_one_64(p_flags, hash);
+	}
+	hash = hash_djb2_one_64(size, hash);
 
 	Ref<TextLine> buffer;
 	if (cache.has(hash)) {
 		buffer = cache.get(hash);
 	} else {
 		buffer.instantiate();
-		int size = p_size <= 0 ? data[0]->get_base_size() : p_size;
 		buffer->add_string(p_text, Ref<Font>(this), size, Dictionary(), TranslationServer::get_singleton()->get_tool_locale());
 		cache.insert(hash, buffer);
 	}
 
 	Vector2 ofs = p_pos;
 	if (buffer->get_orientation() == TextServer::ORIENTATION_HORIZONTAL) {
-		ofs.y += spacing_top - buffer->get_line_ascent();
+		ofs.y -= buffer->get_line_ascent();
 	} else {
-		ofs.x += spacing_top - buffer->get_line_ascent();
+		ofs.x -= buffer->get_line_ascent();
 	}
 
 	buffer->set_width(p_width);
 	buffer->set_align(p_align);
+	buffer->set_flags(p_flags);
 
 	if (p_outline_size > 0 && p_outline_modulate.a != 0.0f) {
 		buffer->draw_outline(p_canvas_item, ofs, p_outline_size, p_outline_modulate);
@@ -895,18 +1451,22 @@ void Font::draw_string(RID p_canvas_item, const Point2 &p_pos, const String &p_t
 void Font::draw_multiline_string(RID p_canvas_item, const Point2 &p_pos, const String &p_text, HAlign p_align, float p_width, int p_max_lines, int p_size, const Color &p_modulate, int p_outline_size, const Color &p_outline_modulate, uint8_t p_flags) const {
 	ERR_FAIL_COND(data.is_empty());
 
-	uint64_t hash = p_text.hash64();
-	hash = hash_djb2_one_64(p_size, hash);
+	int size = (p_size <= 0) ? base_size : p_size;
 
+	for (int i = 0; i < data.size(); i++) {
+		_ensure_rid(i);
+	}
+
+	uint64_t hash = p_text.hash64();
 	uint64_t wrp_hash = hash_djb2_one_64(hash_djb2_one_float(p_width), hash);
 	wrp_hash = hash_djb2_one_64(p_flags, wrp_hash);
+	wrp_hash = hash_djb2_one_64(size, wrp_hash);
 
 	Ref<TextParagraph> lines_buffer;
 	if (cache_wrap.has(wrp_hash)) {
 		lines_buffer = cache_wrap.get(wrp_hash);
 	} else {
 		lines_buffer.instantiate();
-		int size = p_size <= 0 ? data[0]->get_base_size() : p_size;
 		lines_buffer->add_string(p_text, Ref<Font>(this), size, Dictionary(), TranslationServer::get_singleton()->get_tool_locale());
 		lines_buffer->set_width(p_width);
 		lines_buffer->set_flags(p_flags);
@@ -918,12 +1478,10 @@ void Font::draw_multiline_string(RID p_canvas_item, const Point2 &p_pos, const S
 	Vector2 lofs = p_pos;
 	for (int i = 0; i < lines_buffer->get_line_count(); i++) {
 		if (lines_buffer->get_orientation() == TextServer::ORIENTATION_HORIZONTAL) {
-			lofs.y += spacing_top;
 			if (i == 0) {
 				lofs.y -= lines_buffer->get_line_ascent(0);
 			}
 		} else {
-			lofs.x += spacing_top;
 			if (i == 0) {
 				lofs.x -= lines_buffer->get_line_ascent(0);
 			}
@@ -939,9 +1497,9 @@ void Font::draw_multiline_string(RID p_canvas_item, const Point2 &p_pos, const S
 
 		Size2 line_size = lines_buffer->get_line_size(i);
 		if (lines_buffer->get_orientation() == TextServer::ORIENTATION_HORIZONTAL) {
-			lofs.y += line_size.y + spacing_bottom;
+			lofs.y += line_size.y;
 		} else {
-			lofs.x += line_size.x + spacing_bottom;
+			lofs.x += line_size.x;
 		}
 
 		if ((p_max_lines > 0) && (i >= p_max_lines)) {
@@ -950,37 +1508,17 @@ void Font::draw_multiline_string(RID p_canvas_item, const Point2 &p_pos, const S
 	}
 }
 
-bool Font::has_char(char32_t p_char) const {
-	for (int i = 0; i < data.size(); i++) {
-		if (data[i]->has_char(p_char)) {
-			return true;
-		}
-	}
-	return false;
-}
-
-String Font::get_supported_chars() const {
-	String chars;
-	for (int i = 0; i < data.size(); i++) {
-		String data_chars = data[i]->get_supported_chars();
-		for (int j = 0; j < data_chars.length(); j++) {
-			if (chars.find_char(data_chars[j]) == -1) {
-				chars += data_chars[j];
-			}
-		}
-	}
-	return chars;
-}
-
 Size2 Font::get_char_size(char32_t p_char, char32_t p_next, int p_size) const {
+	int size = (p_size <= 0) ? base_size : p_size;
+
 	for (int i = 0; i < data.size(); i++) {
+		_ensure_rid(i);
 		if (data[i]->has_char(p_char)) {
-			int size = p_size <= 0 ? data[i]->get_base_size() : p_size;
-			uint32_t glyph_a = data[i]->get_glyph_index(p_char);
-			Size2 ret = Size2(data[i]->get_glyph_advance(glyph_a, size).x, data[i]->get_height(size));
+			int32_t glyph_a = TS->font_get_glyph_index(rids[i], size, p_char, 0);
+			Size2 ret = Size2(TS->font_get_glyph_advance(rids[i], size, glyph_a).x, TS->font_get_ascent(rids[i], size) + TS->font_get_descent(rids[i], size));
 			if ((p_next != 0) && data[i]->has_char(p_next)) {
-				uint32_t glyph_b = data[i]->get_glyph_index(p_next);
-				ret.x -= data[i]->get_glyph_kerning(glyph_a, glyph_b, size).x;
+				int32_t glyph_b = TS->font_get_glyph_index(rids[i], size, p_next, 0);
+				ret.x -= TS->font_get_kerning(rids[i], size, Vector2i(glyph_a, glyph_b)).x;
 			}
 			return ret;
 		}
@@ -988,35 +1526,55 @@ Size2 Font::get_char_size(char32_t p_char, char32_t p_next, int p_size) const {
 	return Size2();
 }
 
-float Font::draw_char(RID p_canvas_item, const Point2 &p_pos, char32_t p_char, char32_t p_next, int p_size, const Color &p_modulate, int p_outline_size, const Color &p_outline_modulate) const {
+real_t Font::draw_char(RID p_canvas_item, const Point2 &p_pos, char32_t p_char, char32_t p_next, int p_size, const Color &p_modulate, int p_outline_size, const Color &p_outline_modulate) const {
+	int size = (p_size <= 0) ? base_size : p_size;
+
 	for (int i = 0; i < data.size(); i++) {
+		_ensure_rid(i);
 		if (data[i]->has_char(p_char)) {
-			int size = p_size <= 0 ? data[i]->get_base_size() : p_size;
-			uint32_t glyph_a = data[i]->get_glyph_index(p_char);
-			float ret = data[i]->get_glyph_advance(glyph_a, size).x;
+			int32_t glyph_a = TS->font_get_glyph_index(rids[i], size, p_char, 0);
+			real_t ret = TS->font_get_glyph_advance(rids[i], size, glyph_a).x;
 			if ((p_next != 0) && data[i]->has_char(p_next)) {
-				uint32_t glyph_b = data[i]->get_glyph_index(p_next);
-				ret -= data[i]->get_glyph_kerning(glyph_a, glyph_b, size).x;
+				int32_t glyph_b = TS->font_get_glyph_index(rids[i], size, p_next, 0);
+				ret -= TS->font_get_kerning(rids[i], size, Vector2i(glyph_a, glyph_b)).x;
 			}
+
 			if (p_outline_size > 0 && p_outline_modulate.a != 0.0f) {
-				data[i]->draw_glyph_outline(p_canvas_item, size, p_outline_size, p_pos, glyph_a, p_outline_modulate);
+				TS->font_draw_glyph_outline(rids[i], p_canvas_item, size, p_outline_size, p_pos, glyph_a, p_outline_modulate);
 			}
-			data[i]->draw_glyph(p_canvas_item, size, p_pos, glyph_a, p_modulate);
+			TS->font_draw_glyph(rids[i], p_canvas_item, size, p_pos, glyph_a, p_modulate);
 			return ret;
 		}
 	}
 	return 0;
 }
 
-Vector<RID> Font::get_rids() const {
-	Vector<RID> ret;
+bool Font::has_char(char32_t p_char) const {
+	for (int i = 0; i < data.size(); i++) {
+		if (data[i]->has_char(p_char))
+			return true;
+	}
+	return false;
+}
+
+String Font::get_supported_chars() const {
+	String chars;
 	for (int i = 0; i < data.size(); i++) {
-		RID rid = data[i]->get_rid();
-		if (rid != RID()) {
-			ret.push_back(rid);
+		String data_chars = data[i]->get_supported_chars();
+		for (int j = 0; j < data_chars.length(); j++) {
+			if (chars.find_char(data_chars[j]) == -1) {
+				chars += data_chars[j];
+			}
 		}
 	}
-	return ret;
+	return chars;
+}
+
+Vector<RID> Font::get_rids() const {
+	for (int i = 0; i < data.size(); i++) {
+		_ensure_rid(i);
+	}
+	return rids;
 }
 
 void Font::update_changes() {
@@ -1029,103 +1587,7 @@ Font::Font() {
 }
 
 Font::~Font() {
+	clear_data();
 	cache.clear();
 	cache_wrap.clear();
 }
-
-/*************************************************************************/
-
-RES ResourceFormatLoaderFont::load(const String &p_path, const String &p_original_path, Error *r_error, bool p_use_sub_threads, float *r_progress, CacheMode p_cache_mode) {
-	if (r_error) {
-		*r_error = ERR_FILE_CANT_OPEN;
-	}
-
-	Ref<FontData> dfont;
-	dfont.instantiate();
-	dfont->load_resource(p_path);
-
-	if (r_error) {
-		*r_error = OK;
-	}
-
-	return dfont;
-}
-
-void ResourceFormatLoaderFont::get_recognized_extensions_for_type(const String &p_type, List<String> *p_extensions) const {
-#ifndef DISABLE_DEPRECATED
-	if (p_type == "DynamicFontData") {
-		p_extensions->push_back("ttf");
-		p_extensions->push_back("otf");
-		p_extensions->push_back("woff");
-		return;
-	}
-	if (p_type == "BitmapFont") { // BitmapFont (*.font, *fnt) is handled by ResourceFormatLoaderCompatFont
-		return;
-	}
-#endif /* DISABLE_DEPRECATED */
-	if (p_type == "" || handles_type(p_type)) {
-		get_recognized_extensions(p_extensions);
-	}
-}
-
-void ResourceFormatLoaderFont::get_recognized_extensions(List<String> *p_extensions) const {
-	p_extensions->push_back("ttf");
-	p_extensions->push_back("otf");
-	p_extensions->push_back("woff");
-	p_extensions->push_back("font");
-	p_extensions->push_back("fnt");
-}
-
-bool ResourceFormatLoaderFont::handles_type(const String &p_type) const {
-	return (p_type == "FontData");
-}
-
-String ResourceFormatLoaderFont::get_resource_type(const String &p_path) const {
-	String el = p_path.get_extension().to_lower();
-	if (el == "ttf" || el == "otf" || el == "woff" || el == "font" || el == "fnt") {
-		return "FontData";
-	}
-	return "";
-}
-
-#ifndef DISABLE_DEPRECATED
-
-RES ResourceFormatLoaderCompatFont::load(const String &p_path, const String &p_original_path, Error *r_error, bool p_use_sub_threads, float *r_progress, CacheMode p_cache_mode) {
-	if (r_error) {
-		*r_error = ERR_FILE_CANT_OPEN;
-	}
-
-	Ref<FontData> dfont;
-	dfont.instantiate();
-	dfont->load_resource(p_path);
-
-	Ref<Font> font;
-	font.instantiate();
-	font->add_data(dfont);
-
-	if (r_error) {
-		*r_error = OK;
-	}
-
-	return font;
-}
-
-void ResourceFormatLoaderCompatFont::get_recognized_extensions_for_type(const String &p_type, List<String> *p_extensions) const {
-	if (p_type == "BitmapFont") {
-		p_extensions->push_back("font");
-		p_extensions->push_back("fnt");
-	}
-}
-
-void ResourceFormatLoaderCompatFont::get_recognized_extensions(List<String> *p_extensions) const {
-}
-
-bool ResourceFormatLoaderCompatFont::handles_type(const String &p_type) const {
-	return (p_type == "Font");
-}
-
-String ResourceFormatLoaderCompatFont::get_resource_type(const String &p_path) const {
-	return "";
-}
-
-#endif /* DISABLE_DEPRECATED */
diff --git a/scene/resources/font.h b/scene/resources/font.h
index 200373aa8c..9a34edce64 100644
--- a/scene/resources/font.h
+++ b/scene/resources/font.h
@@ -41,17 +41,27 @@
 
 class FontData : public Resource {
 	GDCLASS(FontData, Resource);
+	RES_BASE_EXTENSION("fontdata");
 
-public:
-	enum SpacingType {
-		SPACING_GLYPH,
-		SPACING_SPACE,
-	};
+	// Font source data.
+	const uint8_t *data_ptr = nullptr;
+	size_t data_size = 0;
+	PackedByteArray data;
 
-private:
-	RID rid;
-	int base_size = 16;
-	String path;
+	bool antialiased = true;
+	bool msdf = false;
+	int msdf_pixel_range = 16;
+	int msdf_size = 48;
+	int fixed_size = 0;
+	bool force_autohinter = false;
+	TextServer::Hinting hinting = TextServer::HINTING_LIGHT;
+	real_t oversampling = 0.f;
+
+	// Cache.
+	mutable Vector<RID> cache;
+
+	_FORCE_INLINE_ void _clear_cache();
+	_FORCE_INLINE_ void _ensure_rid(int p_cache_index) const;
 
 protected:
 	static void _bind_methods();
@@ -63,79 +73,132 @@ protected:
 	virtual void reset_state() override;
 
 public:
-	virtual RID get_rid() const override;
+	// Font source data.
+	virtual void set_data_ptr(const uint8_t *p_data, size_t p_size);
+	virtual void set_data(const PackedByteArray &p_data);
+	virtual PackedByteArray get_data() const;
 
-	void load_resource(const String &p_filename, int p_base_size = 16);
-	void load_memory(const uint8_t *p_data, size_t p_size, const String &p_type, int p_base_size = 16);
-	void _load_memory(const PackedByteArray &p_data, const String &p_type, int p_base_size = 16);
+	// Common properties.
+	virtual void set_antialiased(bool p_antialiased);
+	virtual bool is_antialiased() const;
 
-	void new_bitmap(float p_height, float p_ascent, int p_base_size = 16);
+	virtual void set_multichannel_signed_distance_field(bool p_msdf);
+	virtual bool is_multichannel_signed_distance_field() const;
 
-	void bitmap_add_texture(const Ref<Texture> &p_texture);
-	void bitmap_add_char(char32_t p_char, int p_texture_idx, const Rect2 &p_rect, const Size2 &p_align, float p_advance);
-	void bitmap_add_kerning_pair(char32_t p_A, char32_t p_B, int p_kerning);
+	virtual void set_msdf_pixel_range(int p_msdf_pixel_range);
+	virtual int get_msdf_pixel_range() const;
 
-	void set_data_path(const String &p_path);
-	String get_data_path() const;
+	virtual void set_msdf_size(int p_msdf_size);
+	virtual int get_msdf_size() const;
 
-	float get_height(int p_size) const;
-	float get_ascent(int p_size) const;
-	float get_descent(int p_size) const;
+	virtual void set_fixed_size(int p_fixed_size);
+	virtual int get_fixed_size() const;
 
-	Dictionary get_feature_list() const;
-	Dictionary get_variation_list() const;
+	virtual void set_force_autohinter(bool p_force_autohinter);
+	virtual bool is_force_autohinter() const;
 
-	void set_variation(const String &p_name, double p_value);
-	double get_variation(const String &p_name) const;
+	virtual void set_hinting(TextServer::Hinting p_hinting);
+	virtual TextServer::Hinting get_hinting() const;
 
-	float get_underline_position(int p_size) const;
-	float get_underline_thickness(int p_size) const;
+	virtual void set_oversampling(real_t p_oversampling);
+	virtual real_t get_oversampling() const;
 
-	int get_spacing(int p_type) const;
-	void set_spacing(int p_type, int p_value);
+	// Cache.
+	virtual RID find_cache(const Dictionary &p_variation_coordinates) const;
 
-	void set_antialiased(bool p_antialiased);
-	bool get_antialiased() const;
+	virtual int get_cache_count() const;
+	virtual void clear_cache();
+	virtual void remove_cache(int p_cache_index);
 
-	void set_distance_field_hint(bool p_distance_field);
-	bool get_distance_field_hint() const;
+	virtual Array get_size_cache_list(int p_cache_index) const;
+	virtual void clear_size_cache(int p_cache_index);
+	virtual void remove_size_cache(int p_cache_index, const Vector2i &p_size);
 
-	void set_force_autohinter(bool p_enabeld);
-	bool get_force_autohinter() const;
+	virtual void set_variation_coordinates(int p_cache_index, const Dictionary &p_variation_coordinates);
+	virtual Dictionary get_variation_coordinates(int p_cache_index) const;
 
-	void set_hinting(TextServer::Hinting p_hinting);
-	TextServer::Hinting get_hinting() const;
+	virtual void set_ascent(int p_cache_index, int p_size, real_t p_ascent);
+	virtual real_t get_ascent(int p_cache_index, int p_size) const;
 
-	bool has_char(char32_t p_char) const;
-	String get_supported_chars() const;
+	virtual void set_descent(int p_cache_index, int p_size, real_t p_descent);
+	virtual real_t get_descent(int p_cache_index, int p_size) const;
 
-	Vector2 get_glyph_advance(uint32_t p_index, int p_size) const;
-	Vector2 get_glyph_kerning(uint32_t p_index_a, uint32_t p_index_b, int p_size) const;
+	virtual void set_underline_position(int p_cache_index, int p_size, real_t p_underline_position);
+	virtual real_t get_underline_position(int p_cache_index, int p_size) const;
 
-	bool has_outline() const;
-	float get_base_size() const;
+	virtual void set_underline_thickness(int p_cache_index, int p_size, real_t p_underline_thickness);
+	virtual real_t get_underline_thickness(int p_cache_index, int p_size) const;
 
-	bool is_language_supported(const String &p_language) const;
-	void set_language_support_override(const String &p_language, bool p_supported);
-	bool get_language_support_override(const String &p_language) const;
-	void remove_language_support_override(const String &p_language);
-	Vector<String> get_language_support_overrides() const;
+	virtual void set_scale(int p_cache_index, int p_size, real_t p_scale); // Rendering scale for bitmap fonts (e.g. emoji fonts).
+	virtual real_t get_scale(int p_cache_index, int p_size) const;
 
-	bool is_script_supported(const String &p_script) const;
-	void set_script_support_override(const String &p_script, bool p_supported);
-	bool get_script_support_override(const String &p_script) const;
-	void remove_script_support_override(const String &p_script);
-	Vector<String> get_script_support_overrides() const;
+	virtual void set_spacing(int p_cache_index, int p_size, TextServer::SpacingType p_spacing, int p_value);
+	virtual int get_spacing(int p_cache_index, int p_size, TextServer::SpacingType p_spacing) const;
 
-	uint32_t get_glyph_index(char32_t p_char, char32_t p_variation_selector = 0x0000) const;
+	virtual int get_texture_count(int p_cache_index, const Vector2i &p_size) const;
+	virtual void clear_textures(int p_cache_index, const Vector2i &p_size);
+	virtual void remove_texture(int p_cache_index, const Vector2i &p_size, int p_texture_index);
 
-	Vector2 draw_glyph(RID p_canvas, int p_size, const Vector2 &p_pos, uint32_t p_index, const Color &p_color = Color(1, 1, 1)) const;
-	Vector2 draw_glyph_outline(RID p_canvas, int p_size, int p_outline_size, const Vector2 &p_pos, uint32_t p_index, const Color &p_color = Color(1, 1, 1)) const;
+	virtual void set_texture_image(int p_cache_index, const Vector2i &p_size, int p_texture_index, const Ref<Image> &p_image);
+	virtual Ref<Image> get_texture_image(int p_cache_index, const Vector2i &p_size, int p_texture_index) const;
 
-	FontData();
-	FontData(const String &p_filename, int p_base_size);
-	FontData(const PackedByteArray &p_data, const String &p_type, int p_base_size);
+	virtual void set_texture_offsets(int p_cache_index, const Vector2i &p_size, int p_texture_index, const PackedInt32Array &p_offset);
+	virtual PackedInt32Array get_texture_offsets(int p_cache_index, const Vector2i &p_size, int p_texture_index) const;
+
+	virtual Array get_glyph_list(int p_cache_index, const Vector2i &p_size) const;
+	virtual void clear_glyphs(int p_cache_index, const Vector2i &p_size);
+	virtual void remove_glyph(int p_cache_index, const Vector2i &p_size, int32_t p_glyph);
+
+	virtual void set_glyph_advance(int p_cache_index, int p_size, int32_t p_glyph, const Vector2 &p_advance);
+	virtual Vector2 get_glyph_advance(int p_cache_index, int p_size, int32_t p_glyph) const;
+
+	virtual void set_glyph_offset(int p_cache_index, const Vector2i &p_size, int32_t p_glyph, const Vector2 &p_offset);
+	virtual Vector2 get_glyph_offset(int p_cache_index, const Vector2i &p_size, int32_t p_glyph) const;
+
+	virtual void set_glyph_size(int p_cache_index, const Vector2i &p_size, int32_t p_glyph, const Vector2 &p_gl_size);
+	virtual Vector2 get_glyph_size(int p_cache_index, const Vector2i &p_size, int32_t p_glyph) const;
+
+	virtual void set_glyph_uv_rect(int p_cache_index, const Vector2i &p_size, int32_t p_glyph, const Rect2 &p_uv_rect);
+	virtual Rect2 get_glyph_uv_rect(int p_cache_index, const Vector2i &p_size, int32_t p_glyph) const;
+
+	virtual void set_glyph_texture_idx(int p_cache_index, const Vector2i &p_size, int32_t p_glyph, int p_texture_idx);
+	virtual int get_glyph_texture_idx(int p_cache_index, const Vector2i &p_size, int32_t p_glyph) const;
 
+	virtual Array get_kerning_list(int p_cache_index, int p_size) const;
+	virtual void clear_kerning_map(int p_cache_index, int p_size);
+	virtual void remove_kerning(int p_cache_index, int p_size, const Vector2i &p_glyph_pair);
+
+	virtual void set_kerning(int p_cache_index, int p_size, const Vector2i &p_glyph_pair, const Vector2 &p_kerning);
+	virtual Vector2 get_kerning(int p_cache_index, int p_size, const Vector2i &p_glyph_pair) const;
+
+	virtual void render_range(int p_cache_index, const Vector2i &p_size, char32_t p_start, char32_t p_end);
+	virtual void render_glyph(int p_cache_index, const Vector2i &p_size, int32_t p_index);
+
+	virtual RID get_cache_rid(int p_cache_index) const;
+
+	// Language/script support override.
+	virtual bool is_language_supported(const String &p_language) const;
+	virtual void set_language_support_override(const String &p_language, bool p_supported);
+	virtual bool get_language_support_override(const String &p_language) const;
+	virtual void remove_language_support_override(const String &p_language);
+	virtual Vector<String> get_language_support_overrides() const;
+
+	virtual bool is_script_supported(const String &p_script) const;
+	virtual void set_script_support_override(const String &p_script, bool p_supported);
+	virtual bool get_script_support_override(const String &p_script) const;
+	virtual void remove_script_support_override(const String &p_script);
+	virtual Vector<String> get_script_support_overrides() const;
+
+	// Base font properties.
+	virtual bool has_char(char32_t p_char) const;
+	virtual String get_supported_chars() const;
+
+	virtual int32_t get_glyph_index(int p_size, char32_t p_char, char32_t p_variation_selector = 0x0000) const;
+
+	virtual Dictionary get_supported_feature_list() const;
+	virtual Dictionary get_supported_variation_list() const;
+
+	FontData();
 	~FontData();
 };
 
@@ -147,20 +210,22 @@ class TextParagraph;
 class Font : public Resource {
 	GDCLASS(Font, Resource);
 
-public:
-	enum SpacingType {
-		SPACING_TOP,
-		SPACING_BOTTOM,
-	};
-
-private:
-	int spacing_top = 0;
-	int spacing_bottom = 0;
-
+	// Shaped string cache.
 	mutable LRUCache<uint64_t, Ref<TextLine>> cache;
 	mutable LRUCache<uint64_t, Ref<TextParagraph>> cache_wrap;
 
+	// Font data cache.
 	Vector<Ref<FontData>> data;
+	mutable Vector<RID> rids;
+
+	// Font config.
+	int base_size = 16;
+	Dictionary variation_coordinates;
+	int spacing_bottom = 0;
+	int spacing_top = 0;
+
+	_FORCE_INLINE_ void _data_changed();
+	_FORCE_INLINE_ void _ensure_rid(int p_index) const; // Find or create cache record.
 
 protected:
 	static void _bind_methods();
@@ -171,41 +236,49 @@ protected:
 
 	virtual void reset_state() override;
 
-	void _data_changed();
-
 public:
 	Dictionary get_feature_list() const;
 
-	// Font data control.
-	void add_data(const Ref<FontData> &p_data);
-	void set_data(int p_idx, const Ref<FontData> &p_data);
-	int get_data_count() const;
-	Ref<FontData> get_data(int p_idx) const;
-	void remove_data(int p_idx);
+	// Font data.
+	virtual void add_data(const Ref<FontData> &p_data);
+	virtual void set_data(int p_idx, const Ref<FontData> &p_data);
+	virtual int get_data_count() const;
+	virtual Ref<FontData> get_data(int p_idx) const;
+	virtual RID get_data_rid(int p_idx) const;
+	virtual void clear_data();
+	virtual void remove_data(int p_idx);
+
+	// Font configuration.
+	virtual void set_base_size(int p_size);
+	virtual int get_base_size() const;
 
-	float get_height(int p_size = -1) const;
-	float get_ascent(int p_size = -1) const;
-	float get_descent(int p_size = -1) const;
+	virtual void set_variation_coordinates(const Dictionary &p_variation_coordinates);
+	virtual Dictionary get_variation_coordinates() const;
 
-	float get_underline_position(int p_size = -1) const;
-	float get_underline_thickness(int p_size = -1) const;
+	virtual void set_spacing(TextServer::SpacingType p_spacing, int p_value);
+	virtual int get_spacing(TextServer::SpacingType p_spacing) const;
 
-	int get_spacing(int p_type) const;
-	void set_spacing(int p_type, int p_value);
+	// Font metrics.
+	virtual real_t get_height(int p_size = -1) const;
+	virtual real_t get_ascent(int p_size = -1) const;
+	virtual real_t get_descent(int p_size = -1) const;
+	virtual real_t get_underline_position(int p_size = -1) const;
+	virtual real_t get_underline_thickness(int p_size = -1) const;
 
 	// Drawing string.
-	Size2 get_string_size(const String &p_text, int p_size = -1) const;
-	Size2 get_multiline_string_size(const String &p_text, float p_width = -1, int p_size = -1, uint8_t p_flags = TextServer::BREAK_MANDATORY | TextServer::BREAK_WORD_BOUND) const;
+	virtual Size2 get_string_size(const String &p_text, int p_size = -1, HAlign p_align = HALIGN_LEFT, real_t p_width = -1, uint8_t p_flags = TextServer::JUSTIFICATION_KASHIDA | TextServer::JUSTIFICATION_WORD_BOUND) const;
+	virtual Size2 get_multiline_string_size(const String &p_text, real_t p_width = -1, int p_size = -1, uint8_t p_flags = TextServer::BREAK_MANDATORY | TextServer::BREAK_WORD_BOUND) const;
 
-	void draw_string(RID p_canvas_item, const Point2 &p_pos, const String &p_text, HAlign p_align = HALIGN_LEFT, float p_width = -1, int p_size = -1, const Color &p_modulate = Color(1, 1, 1), int p_outline_size = 0, const Color &p_outline_modulate = Color(1, 1, 1, 0), uint8_t p_flags = TextServer::JUSTIFICATION_KASHIDA | TextServer::JUSTIFICATION_WORD_BOUND) const;
-	void draw_multiline_string(RID p_canvas_item, const Point2 &p_pos, const String &p_text, HAlign p_align = HALIGN_LEFT, float p_width = -1, int p_max_lines = -1, int p_size = -1, const Color &p_modulate = Color(1, 1, 1), int p_outline_size = 0, const Color &p_outline_modulate = Color(1, 1, 1, 0), uint8_t p_flags = TextServer::BREAK_MANDATORY | TextServer::BREAK_WORD_BOUND | TextServer::JUSTIFICATION_KASHIDA | TextServer::JUSTIFICATION_WORD_BOUND) const;
+	virtual void draw_string(RID p_canvas_item, const Point2 &p_pos, const String &p_text, HAlign p_align = HALIGN_LEFT, real_t p_width = -1, int p_size = -1, const Color &p_modulate = Color(1, 1, 1), int p_outline_size = 0, const Color &p_outline_modulate = Color(1, 1, 1, 0), uint8_t p_flags = TextServer::JUSTIFICATION_KASHIDA | TextServer::JUSTIFICATION_WORD_BOUND) const;
+	virtual void draw_multiline_string(RID p_canvas_item, const Point2 &p_pos, const String &p_text, HAlign p_align = HALIGN_LEFT, real_t p_width = -1, int p_max_lines = -1, int p_size = -1, const Color &p_modulate = Color(1, 1, 1), int p_outline_size = 0, const Color &p_outline_modulate = Color(1, 1, 1, 0), uint8_t p_flags = TextServer::BREAK_MANDATORY | TextServer::BREAK_WORD_BOUND | TextServer::JUSTIFICATION_KASHIDA | TextServer::JUSTIFICATION_WORD_BOUND) const;
 
 	// Helper functions.
-	bool has_char(char32_t p_char) const;
-	String get_supported_chars() const;
+	virtual bool has_char(char32_t p_char) const;
+	virtual String get_supported_chars() const;
 
-	Size2 get_char_size(char32_t p_char, char32_t p_next = 0, int p_size = -1) const;
-	float draw_char(RID p_canvas_item, const Point2 &p_pos, char32_t p_char, char32_t p_next = 0, int p_size = -1, const Color &p_modulate = Color(1, 1, 1), int p_outline_size = 0, const Color &p_outline_modulate = Color(1, 1, 1, 0)) const;
+	// Drawing char.
+	virtual Size2 get_char_size(char32_t p_char, char32_t p_next = 0, int p_size = -1) const;
+	virtual real_t draw_char(RID p_canvas_item, const Point2 &p_pos, char32_t p_char, char32_t p_next = 0, int p_size = -1, const Color &p_modulate = Color(1, 1, 1), int p_outline_size = 0, const Color &p_outline_modulate = Color(1, 1, 1, 0)) const;
 
 	Vector<RID> get_rids() const;
 
@@ -215,31 +288,4 @@ public:
 	~Font();
 };
 
-VARIANT_ENUM_CAST(FontData::SpacingType);
-VARIANT_ENUM_CAST(Font::SpacingType);
-
-/*************************************************************************/
-
-class ResourceFormatLoaderFont : public ResourceFormatLoader {
-public:
-	virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = nullptr, bool p_use_sub_threads = false, float *r_progress = nullptr, CacheMode p_cache_mode = CACHE_MODE_REUSE);
-	virtual void get_recognized_extensions_for_type(const String &p_type, List<String> *p_extensions) const;
-	virtual void get_recognized_extensions(List<String> *p_extensions) const;
-	virtual bool handles_type(const String &p_type) const;
-	virtual String get_resource_type(const String &p_path) const;
-};
-
-#ifndef DISABLE_DEPRECATED
-
-class ResourceFormatLoaderCompatFont : public ResourceFormatLoader {
-public:
-	virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = nullptr, bool p_use_sub_threads = false, float *r_progress = nullptr, CacheMode p_cache_mode = CACHE_MODE_REUSE);
-	virtual void get_recognized_extensions_for_type(const String &p_type, List<String> *p_extensions) const;
-	virtual void get_recognized_extensions(List<String> *p_extensions) const;
-	virtual bool handles_type(const String &p_type) const;
-	virtual String get_resource_type(const String &p_path) const;
-};
-
-#endif /* DISABLE_DEPRECATED */
-
 #endif /* FONT_H */
diff --git a/scene/resources/text_line.cpp b/scene/resources/text_line.cpp
index 0807a062f2..d2f38ba836 100644
--- a/scene/resources/text_line.cpp
+++ b/scene/resources/text_line.cpp
@@ -211,8 +211,8 @@ void TextLine::set_bidi_override(const Vector<Vector2i> &p_override) {
 bool TextLine::add_string(const String &p_text, const Ref<Font> &p_fonts, int p_size, const Dictionary &p_opentype_features, const String &p_language) {
 	ERR_FAIL_COND_V(p_fonts.is_null(), false);
 	bool res = TS->shaped_text_add_string(rid, p_text, p_fonts->get_rids(), p_size, p_opentype_features, p_language);
-	spacing_top = p_fonts->get_spacing(Font::SPACING_TOP);
-	spacing_bottom = p_fonts->get_spacing(Font::SPACING_BOTTOM);
+	spacing_top = p_fonts->get_spacing(TextServer::SPACING_TOP);
+	spacing_bottom = p_fonts->get_spacing(TextServer::SPACING_BOTTOM);
 	dirty = true;
 	return res;
 }
@@ -409,8 +409,8 @@ int TextLine::hit_test(float p_coords) const {
 
 TextLine::TextLine(const String &p_text, const Ref<Font> &p_fonts, int p_size, const Dictionary &p_opentype_features, const String &p_language, TextServer::Direction p_direction, TextServer::Orientation p_orientation) {
 	rid = TS->create_shaped_text(p_direction, p_orientation);
-	spacing_top = p_fonts->get_spacing(Font::SPACING_TOP);
-	spacing_bottom = p_fonts->get_spacing(Font::SPACING_BOTTOM);
+	spacing_top = p_fonts->get_spacing(TextServer::SPACING_TOP);
+	spacing_bottom = p_fonts->get_spacing(TextServer::SPACING_BOTTOM);
 	TS->shaped_text_add_string(rid, p_text, p_fonts->get_rids(), p_size, p_opentype_features, p_language);
 }
 
diff --git a/scene/resources/text_paragraph.cpp b/scene/resources/text_paragraph.cpp
index 763033354a..62949b9b98 100644
--- a/scene/resources/text_paragraph.cpp
+++ b/scene/resources/text_paragraph.cpp
@@ -333,8 +333,8 @@ void TextParagraph::clear_dropcap() {
 bool TextParagraph::add_string(const String &p_text, const Ref<Font> &p_fonts, int p_size, const Dictionary &p_opentype_features, const String &p_language) {
 	ERR_FAIL_COND_V(p_fonts.is_null(), false);
 	bool res = TS->shaped_text_add_string(rid, p_text, p_fonts->get_rids(), p_size, p_opentype_features, p_language);
-	spacing_top = p_fonts->get_spacing(Font::SPACING_TOP);
-	spacing_bottom = p_fonts->get_spacing(Font::SPACING_BOTTOM);
+	spacing_top = p_fonts->get_spacing(TextServer::SPACING_TOP);
+	spacing_bottom = p_fonts->get_spacing(TextServer::SPACING_BOTTOM);
 	lines_dirty = true;
 	return res;
 }
@@ -829,8 +829,8 @@ void TextParagraph::draw_line_outline(RID p_canvas, const Vector2 &p_pos, int p_
 TextParagraph::TextParagraph(const String &p_text, const Ref<Font> &p_fonts, int p_size, const Dictionary &p_opentype_features, const String &p_language, float p_width, TextServer::Direction p_direction, TextServer::Orientation p_orientation) {
 	rid = TS->create_shaped_text(p_direction, p_orientation);
 	TS->shaped_text_add_string(rid, p_text, p_fonts->get_rids(), p_size, p_opentype_features, p_language);
-	spacing_top = p_fonts->get_spacing(Font::SPACING_TOP);
-	spacing_bottom = p_fonts->get_spacing(Font::SPACING_BOTTOM);
+	spacing_top = p_fonts->get_spacing(TextServer::SPACING_TOP);
+	spacing_bottom = p_fonts->get_spacing(TextServer::SPACING_BOTTOM);
 	width = p_width;
 }