godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-03 18:11:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #112661 from bruvzg/lang_shape

Browse Source 
Improve language selection when shaping text.
This commit is contained in:
Rémi Verschelde
2025-12-18 14:23:42 +01:00
parent 4be81ddf44 997f326b58
commit 5d89816d93
9 changed files with 791 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
modules/text_server_adv/text_server_adv.cpp
View File

@@ -4254,6 +4254,9 @@ bool TextServerAdvanced::_font_is_language_supported(const RID &p_font_rid, cons
if (fd->language_support_overrides.has(p_language)) {
return fd->language_support_overrides[p_language];
} else {
if (fd->language_support_overrides.has("*")) {
return fd->language_support_overrides["*"];
}
return true;
}
}
@@ -4302,6 +4305,9 @@ bool TextServerAdvanced::_font_is_script_supported(const RID &p_font_rid, const
if (fd->script_support_overrides.has(p_script)) {
return fd->script_support_overrides[p_script];
} else {
if (fd->script_support_overrides.has("*")) {
return fd->script_support_overrides["*"];
}
Vector2i size = _get_size(fd, 16);
FontForSizeAdvanced *ffsd = nullptr;
ERR_FAIL_COND_V(!_ensure_cache_for_size(fd, size, ffsd), false);
@@ -6770,7 +6776,7 @@ UBreakIterator *TextServerAdvanced::_create_line_break_iterator_for_locale(const
return ubrk_clone(bi, r_err);
}
void TextServerAdvanced::_shape_run(ShapedTextDataAdvanced *p_sd, int64_t p_start, int64_t p_end, hb_script_t p_script, hb_direction_t p_direction, FontPriorityList &p_fonts, int64_t p_span, int64_t p_fb_index, int64_t p_prev_start, int64_t p_prev_end, RID p_prev_font) {
void TextServerAdvanced::_shape_run(ShapedTextDataAdvanced *p_sd, int64_t p_start, int64_t p_end, const String &p_language, hb_script_t p_script, hb_direction_t p_direction, FontPriorityList &p_fonts, int64_t p_span, int64_t p_fb_index, int64_t p_prev_start, int64_t p_prev_end, RID p_prev_font) {
RID f;
int fs = p_sd->spans[p_span].font_size;
if (p_fb_index >= 0 && p_fb_index < p_fonts.size()) {
@@ -6793,7 +6799,7 @@ void TextServerAdvanced::_shape_run(ShapedTextDataAdvanced *p_sd, int64_t p_star
String script_code = String(scr_buffer);
String text = p_sd->text.substr(p_start, next - p_start);
f = _find_sys_font_for_text(p_fonts[0], script_code, p_sd->spans[p_span].language, text);
f = _find_sys_font_for_text(p_fonts[0], script_code, p_language, text);
}
}
@@ -6888,7 +6894,7 @@ void TextServerAdvanced::_shape_run(ShapedTextDataAdvanced *p_sd, int64_t p_star
if (p_script == HB_TAG('Z', 's', 'y', 'e') && !color && _font_is_allow_system_fallback(p_fonts[0])) {
// Color emoji is requested, skip non-color font.
_shape_run(p_sd, p_start, p_end, p_script, p_direction, p_fonts, p_span, p_fb_index + 1, p_start, p_end, f);
_shape_run(p_sd, p_start, p_end, p_language, p_script, p_direction, p_fonts, p_span, p_fb_index + 1, p_start, p_end, f);
return;
}
@@ -6914,13 +6920,8 @@ void TextServerAdvanced::_shape_run(ShapedTextDataAdvanced *p_sd, int64_t p_star
hb_buffer_set_flags(p_sd->hb_buffer, (hb_buffer_flags_t)flags);
hb_buffer_set_script(p_sd->hb_buffer, (p_script == HB_TAG('Z', 's', 'y', 'e')) ? HB_SCRIPT_COMMON : p_script);
if (p_sd->spans[p_span].language.is_empty()) {
hb_language_t lang = hb_language_from_string(TranslationServer::get_singleton()->get_tool_locale().ascii().get_data(), -1);
hb_buffer_set_language(p_sd->hb_buffer, lang);
} else {
hb_language_t lang = hb_language_from_string(p_sd->spans[p_span].language.ascii().get_data(), -1);
hb_buffer_set_language(p_sd->hb_buffer, lang);
}
hb_language_t lang = hb_language_from_string(p_language.ascii().get_data(), -1);
hb_buffer_set_language(p_sd->hb_buffer, lang);
hb_buffer_add_utf32(p_sd->hb_buffer, (const uint32_t *)p_sd->text.ptr(), p_sd->text.length(), p_start, p_end - p_start);
@@ -7104,7 +7105,7 @@ void TextServerAdvanced::_shape_run(ShapedTextDataAdvanced *p_sd, int64_t p_star
for (unsigned int i = 0; i < glyph_count; i++) {
if ((w[i].flags & GRAPHEME_IS_VALID) == GRAPHEME_IS_VALID) {
if (failed_subrun_start != p_end + 1) {
_shape_run(p_sd, failed_subrun_start, failed_subrun_end, p_script, p_direction, p_fonts, p_span, p_fb_index + 1, p_start, p_end, (p_fb_index >= p_fonts.size()) ? f : RID());
_shape_run(p_sd, failed_subrun_start, failed_subrun_end, p_language, p_script, p_direction, p_fonts, p_span, p_fb_index + 1, p_start, p_end, (p_fb_index >= p_fonts.size()) ? f : RID());
failed_subrun_start = p_end + 1;
failed_subrun_end = p_start;
}
@@ -7135,7 +7136,7 @@ void TextServerAdvanced::_shape_run(ShapedTextDataAdvanced *p_sd, int64_t p_star
}
memfree(w);
if (failed_subrun_start != p_end + 1) {
_shape_run(p_sd, failed_subrun_start, failed_subrun_end, p_script, p_direction, p_fonts, p_span, p_fb_index + 1, p_start, p_end, (p_fb_index >= p_fonts.size()) ? f : RID());
_shape_run(p_sd, failed_subrun_start, failed_subrun_end, p_language, p_script, p_direction, p_fonts, p_span, p_fb_index + 1, p_start, p_end, (p_fb_index >= p_fonts.size()) ? f : RID());
}
p_sd->ascent = MAX(p_sd->ascent, _font_get_ascent(f, fs) + _font_get_spacing(f, SPACING_TOP));
p_sd->descent = MAX(p_sd->descent, _font_get_descent(f, fs) + _font_get_spacing(f, SPACING_BOTTOM));
@@ -7157,7 +7158,7 @@ void TextServerAdvanced::_shape_run(ShapedTextDataAdvanced *p_sd, int64_t p_star
p_sd->upos = MAX(p_sd->upos, _font_get_underline_position(f, fs));
p_sd->uthk = MAX(p_sd->uthk, _font_get_underline_thickness(f, fs));
} else {
_shape_run(p_sd, p_start, p_end, p_script, p_direction, p_fonts, p_span, p_fb_index + 1, p_start, p_end, f);
_shape_run(p_sd, p_start, p_end, p_language, p_script, p_direction, p_fonts, p_span, p_fb_index + 1, p_start, p_end, f);
}
}
}
@@ -7186,6 +7187,8 @@ bool TextServerAdvanced::_shaped_text_shape(const RID &p_shaped) {
return true;
}
const String &project_locale = TranslationServer::get_singleton()->get_tool_locale();
sd->utf16 = sd->text.utf16();
const UChar *data = sd->utf16.get_data();
@@ -7353,8 +7356,18 @@ bool TextServerAdvanced::_shaped_text_shape(const RID &p_shaped) {
}
sd->glyphs.push_back(gl);
} else {
FontPriorityList fonts(this, span.fonts, span.language, script_code, sd->script_iter->script_ranges[j].script == HB_TAG('Z', 's', 'y', 'e'));
_shape_run(sd, MAX(span.start - sd->start, script_run_start), MIN(span.end - sd->start, script_run_end), sd->script_iter->script_ranges[j].script, bidi_run_direction, fonts, k, 0, 0, 0, RID());
// Select best matching language for the run.
String language = span.language;
if (!language.contains("force")) {
if (language.is_empty() || !TranslationServer::get_singleton()->is_script_suppored_by_locale(language, script_code)) {
language = project_locale;
if (language.is_empty() || !TranslationServer::get_singleton()->is_script_suppored_by_locale(language, script_code)) {
language = os_locale;
}
}
}
FontPriorityList fonts(this, span.fonts, language.left(3).remove_char('_'), script_code, sd->script_iter->script_ranges[j].script == HB_TAG('Z', 's', 'y', 'e'));
_shape_run(sd, MAX(span.start - sd->start, script_run_start), MIN(span.end - sd->start, script_run_end), language, sd->script_iter->script_ranges[j].script, bidi_run_direction, fonts, k, 0, 0, 0, RID());
}
}
}
@@ -8104,6 +8117,8 @@ void TextServerAdvanced::_update_settings() {
}
TextServerAdvanced::TextServerAdvanced() {
os_locale = OS::get_singleton()->get_locale();
_insert_feature_sets();
_bmp_create_font_funcs();
_update_settings();

14
modules/text_server_adv/text_server_adv.h
View File

@@ -703,8 +703,8 @@ class TextServerAdvanced : public TextServerExtension {
int current_priority = 0;
uint32_t current_index = 0;
uint32_t font_count = 0;
const String *language;
const String *script_code;
String language;
String script_code;
bool color = false;
LocalVector<Pair<RID, int>> unprocessed_fonts;
LocalVector<RID> fonts;
@@ -712,8 +712,8 @@ class TextServerAdvanced : public TextServerExtension {
FontPriorityList(const TextServerAdvanced *p_text_server, const Array &p_fonts, const String &p_language, const String &p_script_code, bool p_color) {
text_server = p_text_server;
language = &p_language;
script_code = &p_script_code;
language = p_language;
script_code = p_script_code;
font_count = p_fonts.size();
color = p_color;
@@ -738,7 +738,7 @@ class TextServerAdvanced : public TextServerExtension {
if (color && text_server->_font_is_color(p_font)) {
return 0;
}
return text_server->_font_is_script_supported(p_font, *script_code) ? (text_server->_font_is_language_supported(p_font, *language) ? 0 : 1) : 2;
return text_server->_font_is_script_supported(p_font, script_code) ? (text_server->_font_is_language_supported(p_font, language) ? 0 : 1) : 2;
}
RID operator[](uint32_t p_index) {
@@ -767,12 +767,14 @@ class TextServerAdvanced : public TextServerExtension {
return RID();
}
};
void _shape_run(ShapedTextDataAdvanced *p_sd, int64_t p_start, int64_t p_end, hb_script_t p_script, hb_direction_t p_direction, FontPriorityList &p_fonts, int64_t p_span, int64_t p_fb_index, int64_t p_prev_start, int64_t p_prev_end, RID p_prev_font);
void _shape_run(ShapedTextDataAdvanced *p_sd, int64_t p_start, int64_t p_end, const String &p_language, hb_script_t p_script, hb_direction_t p_direction, FontPriorityList &p_fonts, int64_t p_span, int64_t p_fb_index, int64_t p_prev_start, int64_t p_prev_end, RID p_prev_font);
Glyph _shape_single_glyph(ShapedTextDataAdvanced *p_sd, char32_t p_char, hb_script_t p_script, hb_direction_t p_direction, const RID &p_font, int64_t p_font_size);
_FORCE_INLINE_ RID _find_sys_font_for_text(const RID &p_fdef, const String &p_script_code, const String &p_language, const String &p_text);
_FORCE_INLINE_ void _add_features(const Dictionary &p_source, Vector<hb_feature_t> &r_ftrs);
String os_locale;
Mutex ft_mutex;
// HarfBuzz bitmap font interface.