mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2025-04-22 12:35:14 +00:00
LibWeb/CSS: Serialize font-variant property closer to spec
It also needs special handling when reading it from CSSStyleDeclaration.
This commit is contained in:
Sam Atkins
parent
8236022152
commit
62c18d1dec
Notes:
github-actions[bot]
2025-02-12 16:01:55 +00:00
Author: https://github.com/AtkinsSJ Commit: https://github.com/LadybirdBrowser/ladybird/commit/62c18d1dec5 Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/3482 Reviewed-by: https://github.com/jdahlin
4 changed files with 65 additions and 97 deletions
|
|
@ -11,6 +11,7 @@
|
|||
#include <LibWeb/CSS/CSSStyleDeclaration.h>
|
||||
#include <LibWeb/CSS/Parser/Parser.h>
|
||||
#include <LibWeb/CSS/StyleComputer.h>
|
||||
#include <LibWeb/CSS/StyleValues/CSSKeywordValue.h>
|
||||
#include <LibWeb/CSS/StyleValues/ImageStyleValue.h>
|
||||
#include <LibWeb/CSS/StyleValues/ShorthandStyleValue.h>
|
||||
#include <LibWeb/CSS/StyleValues/StyleValueList.h>
|
||||
|
|
@ -343,6 +344,40 @@ Optional<StyleProperty> CSSStyleDeclaration::get_property_internal(PropertyID pr
|
|||
auto left = get_property_internal(PropertyID::BorderLeftWidth);
|
||||
return style_property_for_sided_shorthand(property_id, top, right, bottom, left);
|
||||
}
|
||||
case PropertyID::FontVariant: {
|
||||
auto ligatures = get_property_internal(PropertyID::FontVariantLigatures);
|
||||
auto caps = get_property_internal(PropertyID::FontVariantCaps);
|
||||
auto alternates = get_property_internal(PropertyID::FontVariantAlternates);
|
||||
auto numeric = get_property_internal(PropertyID::FontVariantNumeric);
|
||||
auto east_asian = get_property_internal(PropertyID::FontVariantEastAsian);
|
||||
auto position = get_property_internal(PropertyID::FontVariantPosition);
|
||||
auto emoji = get_property_internal(PropertyID::FontVariantEmoji);
|
||||
|
||||
if (!ligatures.has_value() || !caps.has_value() || !alternates.has_value() || !numeric.has_value() || !east_asian.has_value() || !position.has_value() || !emoji.has_value())
|
||||
return {};
|
||||
|
||||
if (ligatures->important != caps->important || ligatures->important != alternates->important || ligatures->important != numeric->important || ligatures->important != east_asian->important || ligatures->important != position->important || ligatures->important != emoji->important)
|
||||
return {};
|
||||
|
||||
// If ligatures is `none` and any other value isn't `normal`, that's invalid.
|
||||
if (ligatures->value->to_keyword() == Keyword::None
|
||||
&& (caps->value->to_keyword() != Keyword::Normal
|
||||
|| alternates->value->to_keyword() != Keyword::Normal
|
||||
|| numeric->value->to_keyword() != Keyword::Normal
|
||||
|| east_asian->value->to_keyword() != Keyword::Normal
|
||||
|| position->value->to_keyword() != Keyword::Normal
|
||||
|| emoji->value->to_keyword() != Keyword::Normal)) {
|
||||
return {};
|
||||
}
|
||||
|
||||
return StyleProperty {
|
||||
.important = ligatures->important,
|
||||
.property_id = property_id,
|
||||
.value = ShorthandStyleValue::create(property_id,
|
||||
{ PropertyID::FontVariantLigatures, PropertyID::FontVariantCaps, PropertyID::FontVariantAlternates, PropertyID::FontVariantNumeric, PropertyID::FontVariantEastAsian, PropertyID::FontVariantPosition, PropertyID::FontVariantEmoji },
|
||||
{ ligatures->value, caps->value, alternates->value, numeric->value, east_asian->value, position->value, emoji->value })
|
||||
};
|
||||
}
|
||||
case PropertyID::Margin: {
|
||||
auto top = get_property_internal(PropertyID::MarginTop);
|
||||
auto right = get_property_internal(PropertyID::MarginRight);
|
||||
|
|
|
|||
|
|
@ -197,100 +197,33 @@ String ShorthandStyleValue::to_string(SerializationMode mode) const
|
|||
return builder.to_string_without_validation();
|
||||
}
|
||||
case PropertyID::FontVariant: {
|
||||
Vector<StringView> values;
|
||||
auto ligatures_or_null = longhand(PropertyID::FontVariantLigatures)->to_font_variant_ligatures();
|
||||
if (ligatures_or_null.has_value()) {
|
||||
auto ligatures = ligatures_or_null.release_value();
|
||||
if (ligatures.none) {
|
||||
return MUST(String::formatted(""sv));
|
||||
} else {
|
||||
if (ligatures.common == Gfx::FontVariantLigatures::Common::Common)
|
||||
values.append("common-ligatures"sv);
|
||||
else if (ligatures.common == Gfx::FontVariantLigatures::Common::NoCommon)
|
||||
values.append("no-common-ligatures"sv);
|
||||
if (ligatures.discretionary == Gfx::FontVariantLigatures::Discretionary::Discretionary)
|
||||
values.append("discretionary-ligatures"sv);
|
||||
else if (ligatures.discretionary == Gfx::FontVariantLigatures::Discretionary::NoDiscretionary)
|
||||
values.append("no-discretionary-ligatures"sv);
|
||||
if (ligatures.historical == Gfx::FontVariantLigatures::Historical::Historical)
|
||||
values.append("historical-ligatures"sv);
|
||||
else if (ligatures.historical == Gfx::FontVariantLigatures::Historical::NoHistorical)
|
||||
values.append("no-historical-ligatures"sv);
|
||||
if (ligatures.contextual == Gfx::FontVariantLigatures::Contextual::Contextual)
|
||||
values.append("contextual"sv);
|
||||
else if (ligatures.contextual == Gfx::FontVariantLigatures::Contextual::NoContextual)
|
||||
values.append("no-contextual"sv);
|
||||
}
|
||||
}
|
||||
auto ligatures = longhand(PropertyID::FontVariantLigatures);
|
||||
auto caps = longhand(PropertyID::FontVariantCaps);
|
||||
auto alternates = longhand(PropertyID::FontVariantAlternates);
|
||||
auto numeric = longhand(PropertyID::FontVariantNumeric);
|
||||
auto east_asian = longhand(PropertyID::FontVariantEastAsian);
|
||||
auto position = longhand(PropertyID::FontVariantPosition);
|
||||
auto emoji = longhand(PropertyID::FontVariantEmoji);
|
||||
|
||||
auto caps_or_null = longhand(PropertyID::FontVariantCaps)->to_font_variant_caps();
|
||||
if (caps_or_null.has_value() && caps_or_null.value() != CSS::FontVariantCaps::Normal) {
|
||||
values.append(CSS::to_string(caps_or_null.release_value()));
|
||||
}
|
||||
Vector<String> values;
|
||||
if (ligatures->to_keyword() != Keyword::Normal)
|
||||
values.append(ligatures->to_string(mode));
|
||||
if (caps->to_keyword() != Keyword::Normal)
|
||||
values.append(caps->to_string(mode));
|
||||
if (alternates->to_keyword() != Keyword::Normal)
|
||||
values.append(alternates->to_string(mode));
|
||||
if (numeric->to_keyword() != Keyword::Normal)
|
||||
values.append(numeric->to_string(mode));
|
||||
if (east_asian->to_keyword() != Keyword::Normal)
|
||||
values.append(east_asian->to_string(mode));
|
||||
if (position->to_keyword() != Keyword::Normal)
|
||||
values.append(position->to_string(mode));
|
||||
if (emoji->to_keyword() != Keyword::Normal)
|
||||
values.append(emoji->to_string(mode));
|
||||
|
||||
auto emoji_or_null = longhand(PropertyID::FontVariantEmoji)->to_font_variant_emoji();
|
||||
if (emoji_or_null.has_value() && emoji_or_null.value() != CSS::FontVariantEmoji::Normal) {
|
||||
values.append(CSS::to_string(emoji_or_null.release_value()));
|
||||
}
|
||||
|
||||
auto alternates_or_null = longhand(PropertyID::FontVariantAlternates)->to_font_variant_alternates();
|
||||
if (alternates_or_null.has_value())
|
||||
values.append("historical-forms"sv);
|
||||
|
||||
auto numeric_or_null = longhand(PropertyID::FontVariantNumeric)->to_font_variant_numeric();
|
||||
if (numeric_or_null.has_value()) {
|
||||
auto numeric = numeric_or_null.release_value();
|
||||
if (numeric.ordinal)
|
||||
values.append("ordinal"sv);
|
||||
if (numeric.slashed_zero)
|
||||
values.append("slashed-zero"sv);
|
||||
if (numeric.figure == Gfx::FontVariantNumeric::Figure::Oldstyle)
|
||||
values.append("oldstyle-nums"sv);
|
||||
else if (numeric.figure == Gfx::FontVariantNumeric::Figure::Lining)
|
||||
values.append("lining-nums"sv);
|
||||
if (numeric.spacing == Gfx::FontVariantNumeric::Spacing::Proportional)
|
||||
values.append("proportional-nums"sv);
|
||||
else if (numeric.spacing == Gfx::FontVariantNumeric::Spacing::Tabular)
|
||||
values.append("tabular-nums"sv);
|
||||
if (numeric.fraction == Gfx::FontVariantNumeric::Fraction::Diagonal)
|
||||
values.append("diagonal-fractions"sv);
|
||||
else if (numeric.fraction == Gfx::FontVariantNumeric::Fraction::Stacked)
|
||||
values.append("stacked-fractions"sv);
|
||||
}
|
||||
auto east_asian_or_null = longhand(PropertyID::FontVariantEastAsian)->to_font_variant_east_asian();
|
||||
if (east_asian_or_null.has_value()) {
|
||||
auto east_asian = east_asian_or_null.release_value();
|
||||
if (east_asian.ruby)
|
||||
values.append("ruby"sv);
|
||||
else {
|
||||
if (east_asian.variant == Gfx::FontVariantEastAsian::Variant::Jis78)
|
||||
values.append("jis78"sv);
|
||||
else if (east_asian.variant == Gfx::FontVariantEastAsian::Variant::Jis83)
|
||||
values.append("jis83"sv);
|
||||
else if (east_asian.variant == Gfx::FontVariantEastAsian::Variant::Jis90)
|
||||
values.append("jis90"sv);
|
||||
else if (east_asian.variant == Gfx::FontVariantEastAsian::Variant::Jis04)
|
||||
values.append("jis04"sv);
|
||||
else if (east_asian.variant == Gfx::FontVariantEastAsian::Variant::Simplified)
|
||||
values.append("simplified"sv);
|
||||
else if (east_asian.variant == Gfx::FontVariantEastAsian::Variant::Traditional)
|
||||
values.append("traditional"sv);
|
||||
if (east_asian.width == Gfx::FontVariantEastAsian::Width::Proportional)
|
||||
values.append("proportional-width"sv);
|
||||
else if (east_asian.width == Gfx::FontVariantEastAsian::Width::FullWidth)
|
||||
values.append("full-width"sv);
|
||||
}
|
||||
}
|
||||
auto position_or_null = longhand(PropertyID::FontVariantPosition)->to_font_variant_position();
|
||||
if (position_or_null.has_value() && position_or_null.value() != CSS::FontVariantPosition::Normal) {
|
||||
values.append(CSS::to_string(position_or_null.release_value()));
|
||||
}
|
||||
StringBuilder builder;
|
||||
if (values.is_empty())
|
||||
builder.append("normal"sv);
|
||||
else
|
||||
builder.join(' ', values);
|
||||
return MUST(builder.to_string());
|
||||
return "normal"_string;
|
||||
return MUST(String::join(' ', values));
|
||||
}
|
||||
case PropertyID::GridArea: {
|
||||
auto& row_start = longhand(PropertyID::GridRowStart)->as_grid_track_placement();
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@ Harness status: OK
|
|||
|
||||
Found 46 tests
|
||||
|
||||
36 Pass
|
||||
10 Fail
|
||||
37 Pass
|
||||
9 Fail
|
||||
Pass e.style['font-variant'] = "normal" should set the property value
|
||||
Pass e.style['font-variant'] = "none" should set the property value
|
||||
Pass e.style['font-variant'] = "common-ligatures" should set the property value
|
||||
|
|
@ -49,4 +49,4 @@ Pass e.style['font-variant'] = "ruby" should set the property value
|
|||
Pass e.style['font-variant'] = "sub" should set the property value
|
||||
Pass e.style['font-variant'] = "super" should set the property value
|
||||
Fail e.style['font-variant'] = "common-ligatures discretionary-ligatures historical-ligatures contextual small-caps stylistic(flowing) lining-nums proportional-nums diagonal-fractions ordinal slashed-zero jis78 full-width ruby sub" should set the property value
|
||||
Fail e.style['font-variant'] = "super proportional-width jis83 stacked-fractions tabular-nums oldstyle-nums historical-forms all-small-caps no-contextual no-historical-ligatures no-discretionary-ligatures no-common-ligatures" should set the property value
|
||||
Pass e.style['font-variant'] = "super proportional-width jis83 stacked-fractions tabular-nums oldstyle-nums historical-forms all-small-caps no-contextual no-historical-ligatures no-discretionary-ligatures no-common-ligatures" should set the property value
|
||||
|
|
@ -2,10 +2,10 @@ Harness status: OK
|
|||
|
||||
Found 7 tests
|
||||
|
||||
4 Pass
|
||||
3 Fail
|
||||
5 Pass
|
||||
2 Fail
|
||||
Pass font-variant: normal serialization
|
||||
Fail font-variant: none serialization
|
||||
Pass font-variant: none serialization
|
||||
Pass font-variant-ligatures: none serialization with non-default value for another longhand
|
||||
Pass font-variant: normal with non-default longhands
|
||||
Fail CSS-wide keyword in one longhand
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue