Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

style: Ensure font-variant-alternates values are serialized in canonical order

Browse source 
Differential Revision: https://phabricator.services.mozilla.com/D168281
This commit is contained in:
Jonathan Kew 2023-01-31 21:07:05 +00:00 • committed by Martin Robinson
parent 3de6f5a887
commit 2d441672be
2 changed files with 39 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

11
components/style/properties/shorthands/font.mako.rs
View file

@ -336,12 +336,11 @@
${'font-variant-numeric' if engine == 'gecko' else ''} ${'font-variant-numeric' if engine == 'gecko' else ''}
${'font-variant-position' if engine == 'gecko' else ''}" ${'font-variant-position' if engine == 'gecko' else ''}"
spec="https://drafts.csswg.org/css-fonts-3/#propdef-font-variant"> spec="https://drafts.csswg.org/css-fonts-3/#propdef-font-variant">
<% gecko_sub_properties = "alternates east_asian emoji ligatures numeric position".split() %> % if engine == 'gecko':
<% <% sub_properties = "ligatures caps alternates numeric east_asian position emoji".split() %>
sub_properties = ["caps"] % else:
if engine == "gecko": <% sub_properties = ["caps"] %>
sub_properties += gecko_sub_properties % endif
%>
% for prop in sub_properties: % for prop in sub_properties:
use crate::properties::longhands::font_variant_${prop}; use crate::properties::longhands::font_variant_${prop};

42
components/style/values/specified/font.rs
View file

@ -1122,7 +1122,15 @@ impl Parse for FontVariantAlternates {
return Ok(Default::default()); return Ok(Default::default());
} }
let mut alternates = Vec::new(); let mut stylistic = None;
let mut historical = None;
let mut styleset = None;
let mut character_variant = None;
let mut swash = None;
let mut ornaments = None;
let mut annotation = None;
// Parse values for the various alternate types in any order.
let mut parsed_alternates = VariantAlternatesParsingFlags::empty(); let mut parsed_alternates = VariantAlternatesParsingFlags::empty();
macro_rules! check_if_parsed( macro_rules! check_if_parsed(
($input:expr, $flag:path) => ( ($input:expr, $flag:path) => (
@ -1135,7 +1143,7 @@ impl Parse for FontVariantAlternates {
while let Ok(_) = input.try_parse(|input| match *input.next()? { while let Ok(_) = input.try_parse(|input| match *input.next()? {
Token::Ident(ref value) if value.eq_ignore_ascii_case("historical-forms") => { Token::Ident(ref value) if value.eq_ignore_ascii_case("historical-forms") => {
check_if_parsed!(input, VariantAlternatesParsingFlags::HISTORICAL_FORMS); check_if_parsed!(input, VariantAlternatesParsingFlags::HISTORICAL_FORMS);
alternates.push(VariantAlternates::HistoricalForms); historical = Some(VariantAlternates::HistoricalForms);
Ok(()) Ok(())
}, },
Token::Function(ref name) => { Token::Function(ref name) => {
@ -1146,28 +1154,28 @@ impl Parse for FontVariantAlternates {
check_if_parsed!(i, VariantAlternatesParsingFlags::SWASH); check_if_parsed!(i, VariantAlternatesParsingFlags::SWASH);
let location = i.current_source_location(); let location = i.current_source_location();
let ident = CustomIdent::from_ident(location, i.expect_ident()?, &[])?; let ident = CustomIdent::from_ident(location, i.expect_ident()?, &[])?;
alternates.push(VariantAlternates::Swash(ident)); swash = Some(VariantAlternates::Swash(ident));
Ok(()) Ok(())
}, },
"stylistic" => { "stylistic" => {
check_if_parsed!(i, VariantAlternatesParsingFlags::STYLISTIC); check_if_parsed!(i, VariantAlternatesParsingFlags::STYLISTIC);
let location = i.current_source_location(); let location = i.current_source_location();
let ident = CustomIdent::from_ident(location, i.expect_ident()?, &[])?; let ident = CustomIdent::from_ident(location, i.expect_ident()?, &[])?;
alternates.push(VariantAlternates::Stylistic(ident)); stylistic = Some(VariantAlternates::Stylistic(ident));
Ok(()) Ok(())
}, },
"ornaments" => { "ornaments" => {
check_if_parsed!(i, VariantAlternatesParsingFlags::ORNAMENTS); check_if_parsed!(i, VariantAlternatesParsingFlags::ORNAMENTS);
let location = i.current_source_location(); let location = i.current_source_location();
let ident = CustomIdent::from_ident(location, i.expect_ident()?, &[])?; let ident = CustomIdent::from_ident(location, i.expect_ident()?, &[])?;
alternates.push(VariantAlternates::Ornaments(ident)); ornaments = Some(VariantAlternates::Ornaments(ident));
Ok(()) Ok(())
}, },
"annotation" => { "annotation" => {
check_if_parsed!(i, VariantAlternatesParsingFlags::ANNOTATION); check_if_parsed!(i, VariantAlternatesParsingFlags::ANNOTATION);
let location = i.current_source_location(); let location = i.current_source_location();
let ident = CustomIdent::from_ident(location, i.expect_ident()?, &[])?; let ident = CustomIdent::from_ident(location, i.expect_ident()?, &[])?;
alternates.push(VariantAlternates::Annotation(ident)); annotation = Some(VariantAlternates::Annotation(ident));
Ok(()) Ok(())
}, },
"styleset" => { "styleset" => {
@ -1176,7 +1184,7 @@ impl Parse for FontVariantAlternates {
let location = i.current_source_location(); let location = i.current_source_location();
CustomIdent::from_ident(location, i.expect_ident()?, &[]) CustomIdent::from_ident(location, i.expect_ident()?, &[])
})?; })?;
alternates.push(VariantAlternates::Styleset(idents.into())); styleset = Some(VariantAlternates::Styleset(idents.into()));
Ok(()) Ok(())
}, },
"character-variant" => { "character-variant" => {
@ -1185,7 +1193,7 @@ impl Parse for FontVariantAlternates {
let location = i.current_source_location(); let location = i.current_source_location();
CustomIdent::from_ident(location, i.expect_ident()?, &[]) CustomIdent::from_ident(location, i.expect_ident()?, &[])
})?; })?;
alternates.push(VariantAlternates::CharacterVariant(idents.into())); character_variant = Some(VariantAlternates::CharacterVariant(idents.into()));
Ok(()) Ok(())
}, },
_ => return Err(i.new_custom_error(StyleParseErrorKind::UnspecifiedError)), _ => return Err(i.new_custom_error(StyleParseErrorKind::UnspecifiedError)),
@ -1198,6 +1206,24 @@ impl Parse for FontVariantAlternates {
if parsed_alternates.is_empty() { if parsed_alternates.is_empty() {
return Err(input.new_custom_error(StyleParseErrorKind::UnspecifiedError)); return Err(input.new_custom_error(StyleParseErrorKind::UnspecifiedError));
} }
// Collect the parsed values in canonical order, so that we'll serialize correctly.
let mut alternates = Vec::new();
macro_rules! push_if_some(
($value:expr) => (
if let Some(v) = $value {
alternates.push(v);
}
)
);
push_if_some!(stylistic);
push_if_some!(historical);
push_if_some!(styleset);
push_if_some!(character_variant);
push_if_some!(swash);
push_if_some!(ornaments);
push_if_some!(annotation);
Ok(FontVariantAlternates(alternates.into())) Ok(FontVariantAlternates(alternates.into()))
} }
} }