fix: support text-emphasis all feature.

NiuGuohui · tordex · commit e077b977809a · 2025-04-02T23:11:03.000+03:00
diff --git a/.clang-format b/.clang-format
@@ -4,3 +4,4 @@
 Standard: c++17
 TabWidth: 4
 UseTab: Always
+IndentWidth: 4
diff --git a/include/litehtml/css_properties.h b/include/litehtml/css_properties.h
@@ -68,7 +68,9 @@ namespace litehtml
 		text_decoration_style	m_text_decoration_style = text_decoration_style_solid;
 		css_length				m_text_decoration_thickness;
 		web_color				m_text_decoration_color;
-		string					m_text_emphasis;
+		string					m_text_emphasis_style;
+		web_color				m_text_emphasis_color;
+		int						m_text_emphasis_position;
 		font_metrics			m_font_metrics;
 		text_transform			m_text_transform;
 		web_color				m_color;
@@ -285,6 +287,10 @@ namespace litehtml
 		text_decoration_style get_text_decoration_style() const;
 		const css_length& get_text_decoration_thickness() const;
 		const web_color& get_text_decoration_color() const;
+
+		string get_text_emphasis_style() const;
+		web_color get_text_emphasis_color() const;
+		int get_text_emphasis_position() const;
 	};
 
 	inline element_position css_properties::get_position() const
@@ -725,6 +731,21 @@ namespace litehtml
 	{
 		return m_text_decoration_color;
 	}
+
+	inline string css_properties::get_text_emphasis_style() const
+	{
+		return m_text_emphasis_style;
+	}
+
+	inline web_color css_properties::get_text_emphasis_color() const
+	{
+		return m_text_emphasis_color;
+	}
+
+	inline int css_properties::get_text_emphasis_position() const
+	{
+		return m_text_emphasis_position;
+	}
 }
 
 #endif //LITEHTML_CSS_PROPERTIES_H
diff --git a/include/litehtml/font_description.h b/include/litehtml/font_description.h
@@ -18,6 +18,9 @@ namespace litehtml
 		css_length				decoration_thickness;	// Decoration line thickness in pixels. See predefined values in enumtext_decoration_thickness
 		text_decoration_style	decoration_style = text_decoration_style_solid;	// Decoration line style. See enum text_decoration_style
 		web_color				decoration_color = web_color::current_color;	// Decoration line color
+		std::string				emphasis_style;	// Text emphasis style
+		web_color				emphasis_color = web_color::current_color;	// Text emphasis color
+		int						emphasis_position = text_emphasis_position_over;	// Text emphasis position
 
 		std::string	hash() const
 		{
@@ -30,6 +33,9 @@ namespace litehtml
 			out += ":dt=" + decoration_thickness.to_string();
 			out += ":ds=" + std::to_string(decoration_style);
 			out += ":dc=" + decoration_color.to_string();
+			out += ":ephs=" + emphasis_style;
+			out += ":ephc=" + emphasis_color.to_string();
+			out += ":ephp=" + std::to_string(emphasis_position);
 
 			return out;
 		}
diff --git a/include/litehtml/string_id.h b/include/litehtml/string_id.h
@@ -257,6 +257,9 @@ STRING_ID(
 	_text_decoration_color_,
 	_text_decoration_thickness_,
 	_text_emphasis_,
+	_text_emphasis_style_,
+	_text_emphasis_color_,
+	_text_emphasis_position_,
 
 	_white_space_,
 	_text_align_,
diff --git a/include/litehtml/style.h b/include/litehtml/style.h
@@ -86,6 +86,10 @@ namespace litehtml
 		bool parse_text_decoration_color(const css_token& token, bool important, document_container* container);
 		void parse_text_decoration_line(const css_token_vector& tokens, bool important);
 
+		void parse_text_emphasis(const css_token_vector& tokens, bool important, document_container* container);
+		bool parse_text_emphasis_color(const css_token& token, bool important, document_container* container);
+		void parse_text_emphasis_position(const css_token_vector& tokens, bool important);
+
 		void parse_flex_flow(const css_token_vector& tokens, bool important);
 		void parse_flex(const css_token_vector& tokens, bool important);
 		void parse_align_self(string_id name, const css_token_vector& tokens, bool important);
diff --git a/include/litehtml/types.h b/include/litehtml/types.h
@@ -80,6 +80,16 @@ namespace litehtml
 		text_decoration_thickness_from_font,
 	};
 
+	#define  style_text_emphasis_position_strings	"over;under;left;right"
+
+	enum text_emphasis_position
+	{
+		text_emphasis_position_over		= 0x00,
+		text_emphasis_position_under	= 0x01,
+		text_emphasis_position_left		= 0x02,
+		text_emphasis_position_right	= 0x04,
+	};
+
 
 	using byte = unsigned char;
 	using ucode_t = unsigned int;
diff --git a/src/css_properties.cpp b/src/css_properties.cpp
@@ -362,7 +362,6 @@ void litehtml::css_properties::compute_font(const html_tag* el, const document::
 	m_font_family		=              el->get_property<string>(    _font_family_,		true, doc->container()->get_default_font_name(),	offset(m_font_family));
 	m_font_weight		=              el->get_property<css_length>(_font_weight_,		true, css_length::predef_value(font_weight_normal), offset(m_font_weight));
 	m_font_style		= (font_style) el->get_property<int>(       _font_style_,		true, font_style_normal,							offset(m_font_style));
-	m_text_emphasis	  =              el->get_property<string>(_text_emphasis_,     true, "none",										offset(m_text_emphasis));
 	bool propagate_decoration = !is_one_of(m_display, display_inline_block, display_inline_table, display_inline_flex) &&
 								m_float == float_none && !is_one_of(m_el_position, element_position_absolute, element_position_fixed);
 
@@ -385,6 +384,23 @@ void litehtml::css_properties::compute_font(const html_tag* el, const document::
 		m_text_decoration_color = web_color::current_color;
 	}
 
+	// text-emphasis
+	m_text_emphasis_style = el->get_property<string>(_text_emphasis_style_, true, "unset", offset(m_text_emphasis_style));
+	m_text_emphasis_position = el->get_property<int>(_text_emphasis_position_, true, text_emphasis_position_over, offset(m_text_emphasis_position));
+	m_text_emphasis_color = get_color_property(el, _text_emphasis_color_, true, web_color::current_color, offset(m_text_emphasis_color));
+
+	if(el->parent())
+	{
+		if(m_text_emphasis_style == "initial" || m_text_emphasis_style == "unset")
+		{
+			m_text_emphasis_style = el->parent()->css().get_text_emphasis_style();
+		}
+		if(m_text_emphasis_color == web_color::current_color)
+		{
+			m_text_emphasis_color = el->parent()->css().get_text_emphasis_color();
+		}
+		m_text_emphasis_position |= el->parent()->css().get_text_emphasis_position();
+	}
 
 	if(m_font_weight.is_predefined())
 	{
@@ -424,6 +440,9 @@ void litehtml::css_properties::compute_font(const html_tag* el, const document::
 	descr.decoration_thickness	= m_text_decoration_thickness;
 	descr.decoration_style		= m_text_decoration_style;
 	descr.decoration_color		= m_text_decoration_color;
+	descr.emphasis_style		= m_text_emphasis_style;
+	descr.emphasis_color		= m_text_emphasis_color;
+	descr.emphasis_position		= m_text_emphasis_position;
 
 	m_font = doc->get_font(descr, &m_font_metrics);
 }
diff --git a/src/style.cpp b/src/style.cpp
@@ -65,6 +65,7 @@ std::map<string_id, string> style::m_valid_values =
 	{ _caption_side_, caption_side_strings },
 
 	{ _text_decoration_style_, style_text_decoration_style_strings },
+	{ _text_emphasis_position_, style_text_emphasis_position_strings },
 };
 
 std::map<string_id, vector<string_id>> shorthands =
@@ -106,6 +107,7 @@ std::map<string_id, vector<string_id>> shorthands =
 	{ _flex_flow_, {_flex_direction_, _flex_wrap_}},
 
 	{ _text_decoration_, {_text_decoration_color_, _text_decoration_line_, _text_decoration_style_, _text_decoration_thickness_}},
+	{ _text_emphasis_, {_text_emphasis_style_, _text_emphasis_color_}},
 };
 
 void style::add(const string& txt, const string& baseurl, document_container* container)
@@ -447,10 +449,22 @@ void style::add_property(string_id name, const css_token_vector& value, const st
 		break;
 
 	case _text_emphasis_:
+		parse_text_emphasis(value, important, container);
+		break;
+
+	case _text_emphasis_style_:
 		str = get_repr(value, 0, -1, true);
 		add_parsed_property(name, property_value(str, important));
 		break;
 
+	case _text_emphasis_color_:
+		parse_text_emphasis_color(val, important, container);
+		break;
+
+	case _text_emphasis_position_:
+		parse_text_emphasis_position(value, important);
+		break;
+
 	//  =============================  FLEX  =============================
 
 	case _flex_:
@@ -1322,6 +1336,51 @@ void style::parse_text_decoration_line(const css_token_vector& tokens, bool impo
 	add_parsed_property(_text_decoration_line_, property_value(val, important));
 }
 
+void style::parse_text_emphasis(const css_token_vector& tokens, bool important, document_container *container) {
+	string style;
+	for(const auto& token : std::vector(tokens.rbegin(), tokens.rend()))
+	{
+		if(parse_text_emphasis_color(token, important, container)) continue;
+		style.insert(0, token.str + " ");
+	}
+	if (!style.empty())
+	{
+		add_parsed_property(_text_emphasis_style_, property_value(style, important));
+	}
+}
+
+bool style::parse_text_emphasis_color(const css_token &token, bool important, document_container *container)
+{
+	web_color _color;
+	if(parse_color(token, _color, container))
+	{
+		add_parsed_property(_text_emphasis_color_, property_value(_color, important));
+		return true;
+	}
+	if(token.type == IDENT && value_in_list(token.ident(), "auto;currentcolor"))
+	{
+		add_parsed_property(_text_emphasis_color_, property_value(web_color::current_color, important));
+		return true;
+	}
+	return false;
+}
+
+void style::parse_text_emphasis_position(const css_token_vector &tokens, bool important)
+{
+	int val = 0;
+	for(const auto& token : tokens)
+	{
+		if(token.type == IDENT)
+		{
+			int idx = value_index(token.ident(), style_text_emphasis_position_strings);
+			if(idx >= 0)
+			{
+				val |= 1 << (idx - 1);
+			}
+		}
+	}
+	add_parsed_property(_text_emphasis_position_, property_value(val, important));
+}
 
 // https://developer.mozilla.org/en-US/docs/Web/CSS/flex
 // https://drafts.csswg.org/css-flexbox/#flex-property
