1 files changed, 286 insertions, 151 deletions

diff --git a/scene/gui/rich_text_label.cpp b/scene/gui/rich_text_label.cpp
index 0516c8e722..8e424977c4 100644
--- a/scene/gui/rich_text_label.cpp
+++ b/scene/gui/rich_text_label.cpp
@@ -149,7 +149,12 @@ RichTextLabel::Item *RichTextLabel::_get_item_at_pos(RichTextLabel::Item *p_item
 					return it;
 				}
 			} break;
-			case ITEM_NEWLINE:
+			case ITEM_NEWLINE: {
+				offset += 1;
+				if (offset == p_position) {
+					return it;
+				}
+			} break;
 			case ITEM_IMAGE:
 			case ITEM_TABLE: {
 				offset += 1;
@@ -219,16 +224,26 @@ void RichTextLabel::_update_line_font(ItemFrame *p_frame, int p_line, const Ref<
 	for (int i = 0; i < spans; i++) {
 		ItemText *it = reinterpret_cast<ItemText *>((uint64_t)TS->shaped_get_span_meta(t, i));
 		if (it) {
-			Ref<Font> font = _find_font(it);
-			if (font.is_null()) {
-				font = p_base_font;
+			Ref<Font> font = p_base_font;
+			int font_size = p_base_font_size;
+
+			ItemFont *font_it = _find_font(it);
+			if (font_it) {
+				if (font_it->font.is_valid()) {
+					font = font_it->font;
+				}
+				if (font_it->font_size > 0) {
+					font_size = font_it->font_size;
+				}
+			}
+			ItemFontSize *font_size_it = _find_font_size(it);
+			if (font_size_it && font_size_it->font_size > 0) {
+				font_size = font_size_it->font_size;
 			}
-			int font_size = _find_font_size(it);
-			if (font_size == -1) {
-				font_size = p_base_font_size;
+			TS->shaped_set_span_update_font(t, i, font->get_rids(), font_size, font->get_opentype_features());
+			for (int j = 0; j < TextServer::SPACING_MAX; j++) {
+				TS->shaped_text_set_spacing(t, TextServer::SpacingType(j), font->get_spacing(TextServer::SpacingType(j)));
 			}
-			Dictionary font_ftr = _find_font_features(it);
-			TS->shaped_set_span_update_font(t, i, font->get_rids(), font_size, font_ftr);
 		}
 	}
 
@@ -263,7 +278,7 @@ float RichTextLabel::_resize_line(ItemFrame *p_frame, int p_line, const Ref<Font
 
 	if (tab_size > 0) { // Align inline tabs.
 		Vector<float> tabs;
-		tabs.push_back(tab_size * p_base_font->get_char_size(' ', 0, p_base_font_size).width);
+		tabs.push_back(tab_size * p_base_font->get_char_size(' ', p_base_font_size).width);
 		l.text_buf->tab_align(tabs);
 	}
 
@@ -424,10 +439,10 @@ float RichTextLabel::_shape_line(ItemFrame *p_frame, int p_line, const Ref<Font>
 	Line &l = p_frame->lines[p_line];
 	MutexLock lock(l.text_buf->get_mutex());
 
-	uint16_t autowrap_flags = TextServer::BREAK_MANDATORY;
+	BitField<TextServer::LineBreakFlag> autowrap_flags = TextServer::BREAK_MANDATORY;
 	switch (autowrap_mode) {
 		case TextServer::AUTOWRAP_WORD_SMART:
-			autowrap_flags = TextServer::BREAK_WORD_BOUND_ADAPTIVE | TextServer::BREAK_MANDATORY;
+			autowrap_flags = TextServer::BREAK_WORD_BOUND | TextServer::BREAK_ADAPTIVE | TextServer::BREAK_MANDATORY;
 			break;
 		case TextServer::AUTOWRAP_WORD:
 			autowrap_flags = TextServer::BREAK_WORD_BOUND | TextServer::BREAK_MANDATORY;
@@ -441,7 +456,8 @@ float RichTextLabel::_shape_line(ItemFrame *p_frame, int p_line, const Ref<Font>
 
 	// Clear cache.
 	l.text_buf->clear();
-	l.text_buf->set_flags(autowrap_flags | TextServer::JUSTIFICATION_KASHIDA | TextServer::JUSTIFICATION_WORD_BOUND | TextServer::JUSTIFICATION_TRIM_EDGE_SPACES);
+	l.text_buf->set_break_flags(autowrap_flags);
+	l.text_buf->set_justification_flags(TextServer::JUSTIFICATION_KASHIDA | TextServer::JUSTIFICATION_WORD_BOUND | TextServer::JUSTIFICATION_TRIM_EDGE_SPACES);
 	l.char_offset = *r_char_offset;
 	l.char_count = 0;
 
@@ -453,7 +469,7 @@ float RichTextLabel::_shape_line(ItemFrame *p_frame, int p_line, const Ref<Font>
 
 	if (tab_size > 0) { // Align inline tabs.
 		Vector<float> tabs;
-		tabs.push_back(tab_size * p_base_font->get_char_size(' ', 0, p_base_font_size).width);
+		tabs.push_back(tab_size * p_base_font->get_char_size(' ', p_base_font_size).width);
 		l.text_buf->tab_align(tabs);
 	}
 
@@ -475,30 +491,45 @@ float RichTextLabel::_shape_line(ItemFrame *p_frame, int p_line, const Ref<Font>
 				l.dc_ol_color = dc->ol_color;
 			} break;
 			case ITEM_NEWLINE: {
-				Ref<Font> font = _find_font(it);
-				if (font.is_null()) {
-					font = p_base_font;
+				Ref<Font> font = p_base_font;
+				int font_size = p_base_font_size;
+
+				ItemFont *font_it = _find_font(it);
+				if (font_it) {
+					if (font_it->font.is_valid()) {
+						font = font_it->font;
+					}
+					if (font_it->font_size > 0) {
+						font_size = font_it->font_size;
+					}
 				}
-				int font_size = _find_font_size(it);
-				if (font_size == -1) {
-					font_size = p_base_font_size;
+				ItemFontSize *font_size_it = _find_font_size(it);
+				if (font_size_it && font_size_it->font_size > 0) {
+					font_size = font_size_it->font_size;
 				}
-				l.text_buf->add_string("\n", font, font_size, Dictionary(), "");
+				l.text_buf->add_string("\n", font, font_size);
 				text += "\n";
 				l.char_count++;
 				remaining_characters--;
 			} break;
 			case ITEM_TEXT: {
 				ItemText *t = static_cast<ItemText *>(it);
-				Ref<Font> font = _find_font(it);
-				if (font.is_null()) {
-					font = p_base_font;
+				Ref<Font> font = p_base_font;
+				int font_size = p_base_font_size;
+
+				ItemFont *font_it = _find_font(it);
+				if (font_it) {
+					if (font_it->font.is_valid()) {
+						font = font_it->font;
+					}
+					if (font_it->font_size > 0) {
+						font_size = font_it->font_size;
+					}
 				}
-				int font_size = _find_font_size(it);
-				if (font_size == -1) {
-					font_size = p_base_font_size;
+				ItemFontSize *font_size_it = _find_font_size(it);
+				if (font_size_it && font_size_it->font_size > 0) {
+					font_size = font_size_it->font_size;
 				}
-				Dictionary font_ftr = _find_font_features(it);
 				String lang = _find_language(it);
 				String tx = t->text;
 				if (visible_chars_behavior == TextServer::VC_CHARS_BEFORE_SHAPING && visible_characters >= 0 && remaining_characters >= 0) {
@@ -506,7 +537,7 @@ float RichTextLabel::_shape_line(ItemFrame *p_frame, int p_line, const Ref<Font>
 				}
 				remaining_characters -= tx.length();
 
-				l.text_buf->add_string(tx, font, font_size, font_ftr, lang, (uint64_t)it);
+				l.text_buf->add_string(tx, font, font_size, lang, (uint64_t)it);
 				text += tx;
 				l.char_count += tx.length();
 			} break;
@@ -743,13 +774,21 @@ int RichTextLabel::_draw_line(ItemFrame *p_frame, int p_line, const Vector2 &p_o
 		}
 	}
 	if (!prefix.is_empty()) {
-		Ref<Font> font = _find_font(l.from);
-		if (font.is_null()) {
-			font = get_theme_font(SNAME("normal_font"));
+		Ref<Font> font = get_theme_font(SNAME("normal_font"));
+		int font_size = get_theme_font_size(SNAME("normal_font_size"));
+
+		ItemFont *font_it = _find_font(l.from);
+		if (font_it) {
+			if (font_it->font.is_valid()) {
+				font = font_it->font;
+			}
+			if (font_it->font_size > 0) {
+				font_size = font_it->font_size;
+			}
 		}
-		int font_size = _find_font_size(l.from);
-		if (font_size == -1) {
-			font_size = get_theme_font_size(SNAME("normal_font_size"));
+		ItemFontSize *font_size_it = _find_font_size(l.from);
+		if (font_size_it && font_size_it->font_size > 0) {
+			font_size = font_size_it->font_size;
 		}
 		if (rtl) {
 			float offx = 0.0f;
@@ -837,7 +876,7 @@ int RichTextLabel::_draw_line(ItemFrame *p_frame, int p_line, const Vector2 &p_o
 
 		//draw_rect(Rect2(p_ofs + off, TS->shaped_text_get_size(rid)), Color(1,0,0), false, 2); //DEBUG_RECTS
 
-		off.y += TS->shaped_text_get_ascent(rid) + l.text_buf->get_spacing_top();
+		off.y += TS->shaped_text_get_ascent(rid);
 		// Draw inlined objects.
 		Array objects = TS->shaped_text_get_objects(rid);
 		for (int i = 0; i < objects.size(); i++) {
@@ -1299,7 +1338,7 @@ int RichTextLabel::_draw_line(ItemFrame *p_frame, int p_line, const Vector2 &p_o
 		// Draw foreground color box
 		_draw_fbg_boxes(ci, rid, fbg_line_off, it_from, it_to, chr_range.x, chr_range.y, 1);
 
-		off.y += TS->shaped_text_get_descent(rid) + l.text_buf->get_spacing_bottom();
+		off.y += TS->shaped_text_get_descent(rid);
 	}
 
 	return line_count;
@@ -1343,6 +1382,8 @@ void RichTextLabel::_find_click(ItemFrame *p_frame, const Point2i &p_click, Item
 float RichTextLabel::_find_click_in_line(ItemFrame *p_frame, int p_line, const Vector2 &p_ofs, int p_width, const Point2i &p_click, ItemFrame **r_click_frame, int *r_click_line, Item **r_click_item, int *r_click_char, bool p_table) {
 	Vector2 off;
 
+	bool line_clicked = false;
+	float text_rect_begin = 0.0;
 	int char_pos = -1;
 	Line &l = p_frame->lines[p_line];
 	MutexLock lock(l.text_buf->get_mutex());
@@ -1394,7 +1435,7 @@ float RichTextLabel::_find_click_in_line(ItemFrame *p_frame, int p_line, const V
 			} break;
 		}
 
-		off.y += TS->shaped_text_get_ascent(rid) + l.text_buf->get_spacing_top();
+		off.y += TS->shaped_text_get_ascent(rid);
 
 		Array objects = TS->shaped_text_get_objects(rid);
 		for (int i = 0; i < objects.size(); i++) {
@@ -1468,7 +1509,11 @@ float RichTextLabel::_find_click_in_line(ItemFrame *p_frame, int p_line, const V
 		}
 
 		if (p_click.y >= rect.position.y && p_click.y <= rect.position.y + rect.size.y) {
-			char_pos = TS->shaped_text_hit_test_position(rid, p_click.x - rect.position.x);
+			if ((!rtl && p_click.x >= rect.position.x) || (rtl && p_click.x <= rect.position.x + rect.size.x)) {
+				char_pos = TS->shaped_text_hit_test_position(rid, p_click.x - rect.position.x);
+			}
+			line_clicked = true;
+			text_rect_begin = rtl ? rect.position.x + rect.size.x : rect.position.x;
 		}
 
 		// If table hit was detected, and line hit is in the table bounds use table hit.
@@ -1491,27 +1536,49 @@ float RichTextLabel::_find_click_in_line(ItemFrame *p_frame, int p_line, const V
 			return table_offy;
 		}
 
-		off.y += TS->shaped_text_get_descent(rid) + l.text_buf->get_spacing_bottom() + get_theme_constant(SNAME("line_separation"));
+		off.y += TS->shaped_text_get_descent(rid) + get_theme_constant(SNAME("line_separation"));
 	}
 
 	// Text line hit.
-	if (char_pos >= 0) {
+	if (line_clicked) {
 		// Find item.
 		if (r_click_item != nullptr) {
 			Item *it = p_frame->lines[p_line].from;
 			Item *it_to = (p_line + 1 < (int)p_frame->lines.size()) ? p_frame->lines[p_line + 1].from : nullptr;
-			if (char_pos == p_frame->lines[p_line].char_count) {
-				// Selection after the end of line, select last item.
-				if (it_to != nullptr) {
-					*r_click_item = _get_prev_item(it_to);
-				} else {
-					for (Item *i = it; i; i = _get_next_item(i)) {
-						*r_click_item = i;
+			if (char_pos >= 0) {
+				*r_click_item = _get_item_at_pos(it, it_to, char_pos);
+			} else {
+				int stop = text_rect_begin;
+				*r_click_item = _find_indentable(it);
+				while (*r_click_item) {
+					Ref<Font> font = get_theme_font(SNAME("normal_font"));
+					int font_size = get_theme_font_size(SNAME("normal_font_size"));
+					ItemFont *font_it = _find_font(*r_click_item);
+					if (font_it) {
+						if (font_it->font.is_valid()) {
+							font = font_it->font;
+						}
+						if (font_it->font_size > 0) {
+							font_size = font_it->font_size;
+						}
+					}
+					ItemFontSize *font_size_it = _find_font_size(*r_click_item);
+					if (font_size_it && font_size_it->font_size > 0) {
+						font_size = font_size_it->font_size;
+					}
+					if (rtl) {
+						stop += tab_size * font->get_char_size(' ', font_size).width;
+						if (stop > p_click.x) {
+							break;
+						}
+					} else {
+						stop -= tab_size * font->get_char_size(' ', font_size).width;
+						if (stop < p_click.x) {
+							break;
+						}
 					}
+					*r_click_item = _find_indentable((*r_click_item)->parent);
 				}
-			} else {
-				// Selection in the line.
-				*r_click_item = _get_item_at_pos(it, it_to, char_pos);
 			}
 		}
 
@@ -2068,34 +2135,47 @@ void RichTextLabel::_find_frame(Item *p_item, ItemFrame **r_frame, int *r_line)
 	}
 }
 
-Ref<Font> RichTextLabel::_find_font(Item *p_item) {
+RichTextLabel::Item *RichTextLabel::_find_indentable(Item *p_item) {
+	Item *indentable = p_item;
+
+	while (indentable) {
+		if (indentable->type == ITEM_INDENT || indentable->type == ITEM_LIST) {
+			return indentable;
+		}
+		indentable = indentable->parent;
+	}
+
+	return indentable;
+}
+
+RichTextLabel::ItemFont *RichTextLabel::_find_font(Item *p_item) {
 	Item *fontitem = p_item;
 
 	while (fontitem) {
 		if (fontitem->type == ITEM_FONT) {
 			ItemFont *fi = static_cast<ItemFont *>(fontitem);
-			return fi->font;
+			return fi;
 		}
 
 		fontitem = fontitem->parent;
 	}
 
-	return Ref<Font>();
+	return nullptr;
 }
 
-int RichTextLabel::_find_font_size(Item *p_item) {
+RichTextLabel::ItemFontSize *RichTextLabel::_find_font_size(Item *p_item) {
 	Item *sizeitem = p_item;
 
 	while (sizeitem) {
 		if (sizeitem->type == ITEM_FONT_SIZE) {
 			ItemFontSize *fi = static_cast<ItemFontSize *>(sizeitem);
-			return fi->font_size;
+			return fi;
 		}
 
 		sizeitem = sizeitem->parent;
 	}
 
-	return -1;
+	return nullptr;
 }
 
 int RichTextLabel::_find_outline_size(Item *p_item, int p_default) {
@@ -2113,21 +2193,6 @@ int RichTextLabel::_find_outline_size(Item *p_item, int p_default) {
 	return p_default;
 }
 
-Dictionary RichTextLabel::_find_font_features(Item *p_item) {
-	Item *ffitem = p_item;
-
-	while (ffitem) {
-		if (ffitem->type == ITEM_FONT_FEATURES) {
-			ItemFontFeatures *fi = static_cast<ItemFontFeatures *>(ffitem);
-			return fi->opentype_features;
-		}
-
-		ffitem = ffitem->parent;
-	}
-
-	return Dictionary();
-}
-
 RichTextLabel::ItemDropcap *RichTextLabel::_find_dc_item(Item *p_item) {
 	Item *item = p_item;
 
@@ -2196,26 +2261,42 @@ int RichTextLabel::_find_margin(Item *p_item, const Ref<Font> &p_base_font, int
 
 	while (item) {
 		if (item->type == ITEM_INDENT) {
-			Ref<Font> font = _find_font(item);
-			if (font.is_null()) {
-				font = p_base_font;
+			Ref<Font> font = p_base_font;
+			int font_size = p_base_font_size;
+
+			ItemFont *font_it = _find_font(item);
+			if (font_it) {
+				if (font_it->font.is_valid()) {
+					font = font_it->font;
+				}
+				if (font_it->font_size > 0) {
+					font_size = font_it->font_size;
+				}
 			}
-			int font_size = _find_font_size(item);
-			if (font_size == -1) {
-				font_size = p_base_font_size;
+			ItemFontSize *font_size_it = _find_font_size(item);
+			if (font_size_it && font_size_it->font_size > 0) {
+				font_size = font_size_it->font_size;
 			}
-			margin += tab_size * font->get_char_size(' ', 0, font_size).width;
+			margin += tab_size * font->get_char_size(' ', font_size).width;
 
 		} else if (item->type == ITEM_LIST) {
-			Ref<Font> font = _find_font(item);
-			if (font.is_null()) {
-				font = p_base_font;
+			Ref<Font> font = p_base_font;
+			int font_size = p_base_font_size;
+
+			ItemFont *font_it = _find_font(item);
+			if (font_it) {
+				if (font_it->font.is_valid()) {
+					font = font_it->font;
+				}
+				if (font_it->font_size > 0) {
+					font_size = font_it->font_size;
+				}
 			}
-			int font_size = _find_font_size(item);
-			if (font_size == -1) {
-				font_size = p_base_font_size;
+			ItemFontSize *font_size_it = _find_font_size(item);
+			if (font_size_it && font_size_it->font_size > 0) {
+				font_size = font_size_it->font_size;
 			}
-			margin += tab_size * font->get_char_size(' ', 0, font_size).width;
+			margin += tab_size * font->get_char_size(' ', font_size).width;
 		}
 
 		item = item->parent;
@@ -2584,8 +2665,8 @@ void RichTextLabel::_process_line_caches() {
 	MutexLock data_lock(data_mutex);
 	Rect2 text_rect = _get_text_rect();
 
-	Ref<Font> base_font = get_theme_font(SNAME("normal_font"));
 	int base_font_size = get_theme_font_size(SNAME("normal_font_size"));
+	Ref<Font> base_font = get_theme_font(SNAME("normal_font"));
 	int ctrl_height = get_size().height;
 	int fi = main->first_invalid_line.load();
 	int total_chars = (fi == 0) ? 0 : (main->lines[fi].char_offset + main->lines[fi].char_count);
@@ -2892,7 +2973,7 @@ void RichTextLabel::push_dropcap(const String &p_string, const Ref<Font> &p_font
 	_add_item(item, false);
 }
 
-void RichTextLabel::push_font(const Ref<Font> &p_font) {
+void RichTextLabel::push_font(const Ref<Font> &p_font, int p_size) {
 	_stop_thread();
 	MutexLock data_lock(data_mutex);
 
@@ -2901,6 +2982,7 @@ void RichTextLabel::push_font(const Ref<Font> &p_font) {
 	ItemFont *item = memnew(ItemFont);
 
 	item->font = p_font;
+	item->font_size = p_size;
 	_add_item(item, true);
 }
 
@@ -2908,35 +2990,35 @@ void RichTextLabel::push_normal() {
 	Ref<Font> normal_font = get_theme_font(SNAME("normal_font"));
 	ERR_FAIL_COND(normal_font.is_null());
 
-	push_font(normal_font);
+	push_font(normal_font, get_theme_font_size(SNAME("normal_font_size")));
 }
 
 void RichTextLabel::push_bold() {
 	Ref<Font> bold_font = get_theme_font(SNAME("bold_font"));
 	ERR_FAIL_COND(bold_font.is_null());
 
-	push_font(bold_font);
+	push_font(bold_font, get_theme_font_size(SNAME("bold_font_size")));
 }
 
 void RichTextLabel::push_bold_italics() {
 	Ref<Font> bold_italics_font = get_theme_font(SNAME("bold_italics_font"));
 	ERR_FAIL_COND(bold_italics_font.is_null());
 
-	push_font(bold_italics_font);
+	push_font(bold_italics_font, get_theme_font_size(SNAME("bold_italics_font_size")));
 }
 
 void RichTextLabel::push_italics() {
 	Ref<Font> italics_font = get_theme_font(SNAME("italics_font"));
 	ERR_FAIL_COND(italics_font.is_null());
 
-	push_font(italics_font);
+	push_font(italics_font, get_theme_font_size(SNAME("italics_font_size")));
 }
 
 void RichTextLabel::push_mono() {
 	Ref<Font> mono_font = get_theme_font(SNAME("mono_font"));
 	ERR_FAIL_COND(mono_font.is_null());
 
-	push_font(mono_font);
+	push_font(mono_font, get_theme_font_size(SNAME("mono_font_size")));
 }
 
 void RichTextLabel::push_font_size(int p_font_size) {
@@ -2950,25 +3032,14 @@ void RichTextLabel::push_font_size(int p_font_size) {
 	_add_item(item, true);
 }
 
-void RichTextLabel::push_font_features(const Dictionary &p_features) {
-	_stop_thread();
-	MutexLock data_lock(data_mutex);
-
-	ERR_FAIL_COND(current->type == ITEM_TABLE);
-	ItemFontFeatures *item = memnew(ItemFontFeatures);
-
-	item->opentype_features = p_features;
-	_add_item(item, true);
-}
-
-void RichTextLabel::push_outline_size(int p_font_size) {
+void RichTextLabel::push_outline_size(int p_ol_size) {
 	_stop_thread();
 	MutexLock data_lock(data_mutex);
 
 	ERR_FAIL_COND(current->type == ITEM_TABLE);
 	ItemOutlineSize *item = memnew(ItemOutlineSize);
 
-	item->outline_size = p_font_size;
+	item->outline_size = p_ol_size;
 	_add_item(item, true);
 }
 
@@ -3537,9 +3608,9 @@ void RichTextLabel::append_text(const String &p_bbcode) {
 			//use bold font
 			in_bold = true;
 			if (in_italics) {
-				push_font(bold_italics_font);
+				push_font(bold_italics_font, get_theme_font_size(SNAME("bold_italics_font_size")));
 			} else {
-				push_font(bold_font);
+				push_font(bold_font, get_theme_font_size(SNAME("bold_font_size")));
 			}
 			pos = brk_end + 1;
 			tag_stack.push_front(tag);
@@ -3547,15 +3618,15 @@ void RichTextLabel::append_text(const String &p_bbcode) {
 			//use italics font
 			in_italics = true;
 			if (in_bold) {
-				push_font(bold_italics_font);
+				push_font(bold_italics_font, get_theme_font_size(SNAME("bold_italics_font_size")));
 			} else {
-				push_font(italics_font);
+				push_font(italics_font, get_theme_font_size(SNAME("italics_font_size")));
 			}
 			pos = brk_end + 1;
 			tag_stack.push_front(tag);
 		} else if (tag == "code") {
 			//use monospace font
-			push_font(mono_font);
+			push_font(mono_font, get_theme_font_size(SNAME("mono_font_size")));
 			pos = brk_end + 1;
 			tag_stack.push_front(tag);
 		} else if (tag.begins_with("table=")) {
@@ -3840,8 +3911,8 @@ void RichTextLabel::append_text(const String &p_bbcode) {
 			tag_stack.push_front("hint");
 		} else if (tag.begins_with("dropcap")) {
 			Vector<String> subtag = tag.substr(5, tag.length()).split(" ");
-			Ref<Font> f = get_theme_font(SNAME("normal_font"));
 			int fs = get_theme_font_size(SNAME("normal_font_size")) * 3;
+			Ref<Font> f = get_theme_font(SNAME("normal_font"));
 			Color color = get_theme_color(SNAME("default_color"));
 			Color outline_color = get_theme_color(SNAME("outline_color"));
 			int outline_size = get_theme_constant(SNAME("outline_size"));
@@ -3974,64 +4045,132 @@ void RichTextLabel::append_text(const String &p_bbcode) {
 			pos = brk_end + 1;
 			tag_stack.push_front("outline_color");
 
-		} else if (tag.begins_with("font=")) {
-			String fnt = tag.substr(5, tag.length());
-
-			Ref<Font> font = ResourceLoader::load(fnt, "Font");
-			if (font.is_valid()) {
-				push_font(font);
-			} else {
-				push_font(normal_font);
-			}
-
-			pos = brk_end + 1;
-			tag_stack.push_front("font");
 		} else if (tag.begins_with("font_size=")) {
 			int fnt_size = tag.substr(10, tag.length()).to_int();
 			push_font_size(fnt_size);
 			pos = brk_end + 1;
 			tag_stack.push_front("font_size");
+
 		} else if (tag.begins_with("opentype_features=")) {
 			String fnt_ftr = tag.substr(18, tag.length());
 			Vector<String> subtag = fnt_ftr.split(",");
-			Dictionary ftrs;
-			for (int i = 0; i < subtag.size(); i++) {
-				Vector<String> subtag_a = subtag[i].split("=");
-				if (subtag_a.size() == 2) {
-					ftrs[TS->name_to_tag(subtag_a[0])] = subtag_a[1].to_int();
-				} else if (subtag_a.size() == 1) {
-					ftrs[TS->name_to_tag(subtag_a[0])] = 1;
+			if (subtag.size() > 0) {
+				Ref<Font> font = normal_font;
+				int font_size = 0;
+				ItemFont *font_it = _find_font(current);
+				if (font_it) {
+					if (font_it->font.is_valid()) {
+						font = font_it->font;
+					}
+					if (font_it->font_size > 0) {
+						font_size = font_it->font_size;
+					}
+				}
+				Ref<FontVariation> fc;
+				fc.instantiate();
+				fc->set_base_font(font);
+				Dictionary features;
+				for (int i = 0; i < subtag.size(); i++) {
+					Vector<String> subtag_a = subtag[i].split("=");
+					if (subtag_a.size() == 2) {
+						features[TS->name_to_tag(subtag_a[0])] = subtag_a[1].to_int();
+					} else if (subtag_a.size() == 1) {
+						features[TS->name_to_tag(subtag_a[0])] = 1;
+					}
 				}
+				fc->set_opentype_features(features);
+				push_font(fc, font_size);
 			}
-			push_font_features(ftrs);
 			pos = brk_end + 1;
 			tag_stack.push_front("opentype_features");
+
+		} else if (tag.begins_with("font=")) {
+			String fnt = tag.substr(5, tag.length());
+
+			Ref<Font> fc = ResourceLoader::load(fnt, "Font");
+			if (fc.is_valid()) {
+				push_font(fc);
+			}
+
+			pos = brk_end + 1;
+			tag_stack.push_front("font");
+
 		} else if (tag.begins_with("font ")) {
 			Vector<String> subtag = tag.substr(2, tag.length()).split(" ");
 
+			Ref<FontVariation> fc;
+			fc.instantiate();
+			int fnt_size = 0;
 			for (int i = 1; i < subtag.size(); i++) {
 				Vector<String> subtag_a = subtag[i].split("=", true, 2);
 				if (subtag_a.size() == 2) {
 					if (subtag_a[0] == "name" || subtag_a[0] == "n") {
 						String fnt = subtag_a[1];
-						Ref<Font> font = ResourceLoader::load(fnt, "Font");
-						if (font.is_valid()) {
-							push_font(font);
-						} else {
-							push_font(normal_font);
+						Ref<Font> font_data = ResourceLoader::load(fnt, "Font");
+						if (font_data.is_valid()) {
+							fc->set_base_font(font_data);
 						}
 					} else if (subtag_a[0] == "size" || subtag_a[0] == "s") {
-						int fnt_size = subtag_a[1].to_int();
-						push_font_size(fnt_size);
+						fnt_size = subtag_a[1].to_int();
+					} else if (subtag_a[0] == "glyph_spacing" || subtag_a[0] == "gl") {
+						int spacing = subtag_a[1].to_int();
+						fc->set_spacing(TextServer::SPACING_GLYPH, spacing);
+					} else if (subtag_a[0] == "space_spacing" || subtag_a[0] == "sp") {
+						int spacing = subtag_a[1].to_int();
+						fc->set_spacing(TextServer::SPACING_SPACE, spacing);
+					} else if (subtag_a[0] == "top_spacing" || subtag_a[0] == "top") {
+						int spacing = subtag_a[1].to_int();
+						fc->set_spacing(TextServer::SPACING_TOP, spacing);
+					} else if (subtag_a[0] == "bottom_spacing" || subtag_a[0] == "bt") {
+						int spacing = subtag_a[1].to_int();
+						fc->set_spacing(TextServer::SPACING_BOTTOM, spacing);
+					} else if (subtag_a[0] == "embolden" || subtag_a[0] == "emb") {
+						float emb = subtag_a[1].to_float();
+						fc->set_variation_embolden(emb);
+					} else if (subtag_a[0] == "face_index" || subtag_a[0] == "fi") {
+						int fi = subtag_a[1].to_int();
+						fc->set_variation_face_index(fi);
+					} else if (subtag_a[0] == "slant" || subtag_a[0] == "sln") {
+						float slant = subtag_a[1].to_float();
+						fc->set_variation_transform(Transform2D(1.0, slant, 0.0, 1.0, 0.0, 0.0));
+					} else if (subtag_a[0] == "opentype_variation" || subtag_a[0] == "otv") {
+						Dictionary variations;
+						if (!subtag_a[1].is_empty()) {
+							Vector<String> variation_tags = subtag_a[1].split(",");
+							for (int j = 0; j < variation_tags.size(); j++) {
+								Vector<String> subtag_b = variation_tags[j].split("=");
+								if (subtag_b.size() == 2) {
+									variations[TS->name_to_tag(subtag_b[0])] = subtag_b[1].to_float();
+								}
+							}
+							fc->set_variation_opentype(variations);
+						}
+					} else if (subtag_a[0] == "opentype_features" || subtag_a[0] == "otf") {
+						Dictionary features;
+						if (!subtag_a[1].is_empty()) {
+							Vector<String> feature_tags = subtag_a[1].split(",");
+							for (int j = 0; j < feature_tags.size(); j++) {
+								Vector<String> subtag_b = feature_tags[j].split("=");
+								if (subtag_b.size() == 2) {
+									features[TS->name_to_tag(subtag_b[0])] = subtag_b[1].to_float();
+								} else if (subtag_b.size() == 1) {
+									features[TS->name_to_tag(subtag_b[0])] = 1;
+								}
+							}
+							fc->set_opentype_features(features);
+						}
 					}
 				}
 			}
-
+			push_font(fc, fnt_size);
 			pos = brk_end + 1;
 			tag_stack.push_front("font");
+
 		} else if (tag.begins_with("outline_size=")) {
 			int fnt_size = tag.substr(13, tag.length()).to_int();
-			push_outline_size(fnt_size);
+			if (fnt_size > 0) {
+				push_outline_size(fnt_size);
+			}
 			pos = brk_end + 1;
 			tag_stack.push_front("outline_size");
 
@@ -4805,11 +4944,10 @@ void RichTextLabel::install_effect(const Variant effect) {
 	Ref<RichTextEffect> rteffect;
 	rteffect = effect;
 
-	if (rteffect.is_valid()) {
-		custom_effects.push_back(effect);
-		if ((!text.is_empty()) && use_bbcode) {
-			parse_bbcode(text);
-		}
+	ERR_FAIL_COND_MSG(rteffect.is_null(), "Invalid RichTextEffect resource.");
+	custom_effects.push_back(effect);
+	if ((!text.is_empty()) && use_bbcode) {
+		parse_bbcode(text);
 	}
 }
 
@@ -4852,9 +4990,8 @@ void RichTextLabel::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("add_image", "image", "width", "height", "color", "inline_align"), &RichTextLabel::add_image, DEFVAL(0), DEFVAL(0), DEFVAL(Color(1.0, 1.0, 1.0)), DEFVAL(INLINE_ALIGNMENT_CENTER));
 	ClassDB::bind_method(D_METHOD("newline"), &RichTextLabel::add_newline);
 	ClassDB::bind_method(D_METHOD("remove_line", "line"), &RichTextLabel::remove_line);
-	ClassDB::bind_method(D_METHOD("push_font", "font"), &RichTextLabel::push_font);
+	ClassDB::bind_method(D_METHOD("push_font", "font", "font_size"), &RichTextLabel::push_font);
 	ClassDB::bind_method(D_METHOD("push_font_size", "font_size"), &RichTextLabel::push_font_size);
-	ClassDB::bind_method(D_METHOD("push_font_features", "opentype_features"), &RichTextLabel::push_font_features);
 	ClassDB::bind_method(D_METHOD("push_normal"), &RichTextLabel::push_normal);
 	ClassDB::bind_method(D_METHOD("push_bold"), &RichTextLabel::push_bold);
 	ClassDB::bind_method(D_METHOD("push_bold_italics"), &RichTextLabel::push_bold_italics);
@@ -5018,11 +5155,9 @@ void RichTextLabel::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "context_menu_enabled"), "set_context_menu_enabled", "is_context_menu_enabled");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "shortcut_keys_enabled"), "set_shortcut_keys_enabled", "is_shortcut_keys_enabled");
 
-	ADD_GROUP("Locale", "");
+	ADD_GROUP("BiDi", "");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "text_direction", PROPERTY_HINT_ENUM, "Auto,Left-to-Right,Right-to-Left,Inherited"), "set_text_direction", "get_text_direction");
 	ADD_PROPERTY(PropertyInfo(Variant::STRING, "language", PROPERTY_HINT_LOCALE_ID, ""), "set_language", "get_language");
-
-	ADD_GROUP("Structured Text", "structured_text_");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "structured_text_bidi_override", PROPERTY_HINT_ENUM, "Default,URI,File,Email,List,None,Custom"), "set_structured_text_bidi_override", "get_structured_text_bidi_override");
 	ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "structured_text_bidi_override_options"), "set_structured_text_bidi_override_options", "get_structured_text_bidi_override_options");