Skip to content

css_ast: Enable FontFeatureSettingsStyleValue, FontVariationSettingsStyleValue #862

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
keithamus merged 1 commit into from
Feb 3, 2026
Merged

css_ast: Enable FontFeatureSettingsStyleValue, FontVariationSettingsStyleValue #862

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions crates/css_ast/src/css_atom_set.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1353,6 +1353,7 @@ pub enum CssAtomSet {
ObliqueOnly,
Odd,
OffsetDistance,
Off,
OffsetPath,
OffsetAnchor,
OffsetPosition,
Expand All @@ -1362,6 +1363,7 @@ pub enum CssAtomSet {
Oldlace,
Olive,
Olivedrab,
On,
Once,
Only,
OnlyChild,
Expand Down
59 changes: 59 additions & 0 deletions crates/css_ast/src/types/feature_tag_value.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
use super::prelude::*;
use crate::{CSSInt, NonNegative, OpentypeTag};

/// `<feature-tag-value>` as defined in [css-fonts-4](https://drafts.csswg.org/css-fonts-4/#font-feature-settings-prop).
///
/// ```text,ignore
/// <feature-tag-value> = <opentype-tag> [ <integer [0,∞]> | on | off ]?
/// ```
#[derive(Parse, Peek, ToCursors, ToSpan, SemanticEq, Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
#[cfg_attr(feature = "serde", derive(serde::Serialize), serde())]
#[cfg_attr(feature = "visitable", derive(csskit_derives::Visitable), visit(skip))]
#[derive(csskit_derives::NodeWithMetadata)]
pub struct FeatureTagValue(pub OpentypeTag, pub Option<FeatureTagToggle>);

/// The optional value for a feature tag: `<integer [0,∞]> | on | off`
#[derive(Parse, Peek, IntoCursor, ToCursors, Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
#[cfg_attr(feature = "serde", derive(serde::Serialize), serde())]
#[cfg_attr(feature = "visitable", derive(csskit_derives::Visitable), visit(skip))]
pub enum FeatureTagToggle {
#[atom(CssAtomSet::On)]
On(T![Ident]),
#[atom(CssAtomSet::Off)]
Off(T![Ident]),
Integer(NonNegative<CSSInt>),
}

#[cfg(test)]
mod tests {
use super::*;
use crate::CssAtomSet;
use css_parse::{assert_parse, assert_parse_error};

#[test]
fn size_test() {
assert_eq!(std::mem::size_of::<FeatureTagValue>(), 28);
}

#[test]
fn test_parses() {
assert_parse!(CssAtomSet::ATOMS, FeatureTagValue, "\"kern\"");
assert_parse!(CssAtomSet::ATOMS, FeatureTagValue, "\"liga\"");
assert_parse!(CssAtomSet::ATOMS, FeatureTagValue, "\"kern\" on");
assert_parse!(CssAtomSet::ATOMS, FeatureTagValue, "\"kern\" off");
assert_parse!(CssAtomSet::ATOMS, FeatureTagValue, "\"liga\" on");
assert_parse!(CssAtomSet::ATOMS, FeatureTagValue, "\"kern\" 1");
assert_parse!(CssAtomSet::ATOMS, FeatureTagValue, "\"kern\" 0");
assert_parse!(CssAtomSet::ATOMS, FeatureTagValue, "\"ss01\" 2");
assert_parse!(CssAtomSet::ATOMS, FeatureTagValue, "'smcp'");
assert_parse!(CssAtomSet::ATOMS, FeatureTagValue, "'smcp' on");
}

#[test]
fn test_errors() {
assert_parse_error!(CssAtomSet::ATOMS, FeatureTagValue, "\"ker\"");
assert_parse_error!(CssAtomSet::ATOMS, FeatureTagValue, "\"kerns\"");
assert_parse_error!(CssAtomSet::ATOMS, FeatureTagValue, "\"kern\" -1");
assert_parse_error!(CssAtomSet::ATOMS, FeatureTagValue, "kern");
}
}
6 changes: 6 additions & 0 deletions crates/css_ast/src/types/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ mod display_listitem;
mod display_outside;
mod event_trigger_event;
mod family_name;
mod feature_tag_value;
mod font_weight_absolute;
mod gap_auto_rule_list;
mod gap_rule_list;
Expand All @@ -53,6 +54,7 @@ mod line_width_or_repeat;
mod none_or;
mod normal_or;
mod opacity_value;
mod opentype_tag;
mod outline_style;
mod overflow_position;
mod paint_box;
Expand Down Expand Up @@ -87,6 +89,7 @@ mod track_size;
mod transform_list;
mod transition_behavior_value;
mod try_size;
mod variation_tag_value;
mod visual_box;

pub use absolute_size::*;
Expand Down Expand Up @@ -127,6 +130,7 @@ pub use display_listitem::*;
pub use display_outside::*;
pub use event_trigger_event::*;
pub use family_name::*;
pub use feature_tag_value::*;
pub use font_weight_absolute::*;
pub use gap_auto_rule_list::*;
pub use gap_rule_list::*;
Expand All @@ -144,6 +148,7 @@ pub use line_width_or_repeat::*;
pub use none_or::*;
pub use normal_or::*;
pub use opacity_value::*;
pub use opentype_tag::*;
pub use outline_style::*;
pub use overflow_position::*;
pub use paint_box::*;
Expand Down Expand Up @@ -178,6 +183,7 @@ pub use track_size::*;
pub use transform_list::*;
pub use transition_behavior_value::*;
pub use try_size::*;
pub use variation_tag_value::*;
pub use visual_box::*;

mod prelude {
Expand Down
79 changes: 79 additions & 0 deletions crates/css_ast/src/types/opentype_tag.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
use super::prelude::*;

/// `<opentype-tag>` as defined in [css-fonts-4](https://drafts.csswg.org/css-fonts-4/#font-feature-settings-prop).
///
/// An OpenType feature or variation axis tag. Tags are case-sensitive and must be
/// exactly 4 ASCII characters (U+20-7E).
///
/// Wraps `T![String]` for parsing purposes.
#[derive(IntoCursor, ToCursors, Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
#[cfg_attr(feature = "serde", derive(serde::Serialize), serde())]
#[cfg_attr(feature = "visitable", derive(csskit_derives::Visitable), visit(skip))]
#[derive(csskit_derives::NodeWithMetadata)]
pub struct OpentypeTag(pub T![String]);

impl<'a> Peek<'a> for OpentypeTag {
fn peek<I>(p: &Parser<'a, I>, c: Cursor) -> bool
where
I: Iterator<Item = Cursor> + Clone,
{
<T![String]>::peek(p, c)
}
}

impl<'a> Parse<'a> for OpentypeTag {
fn parse<I>(p: &mut Parser<'a, I>) -> ParserResult<Self>
where
I: Iterator<Item = Cursor> + Clone,
{
let string = p.parse::<T![String]>()?;
let sc = p.to_source_cursor(string.into());
let source = sc.source();
let token = sc.token();
let has_close = token.has_close_quote();
let inner = &source[1..(token.len() as usize) - has_close as usize];

if inner.len() != 4 {
return Err(Diagnostic::new(string.into(), Diagnostic::opentype_tag_length));
}

for byte in inner.bytes() {
if !(0x20..=0x7E).contains(&byte) {
return Err(Diagnostic::new(string.into(), Diagnostic::opentype_tag_ascii));
}
}

Ok(Self(string))
}
}

#[cfg(test)]
mod tests {
use super::*;
use crate::CssAtomSet;
use css_parse::{assert_parse, assert_parse_error};

#[test]
fn size_test() {
assert_eq!(std::mem::size_of::<OpentypeTag>(), 12);
}

#[test]
fn test_parses() {
assert_parse!(CssAtomSet::ATOMS, OpentypeTag, "\"kern\"");
assert_parse!(CssAtomSet::ATOMS, OpentypeTag, "\"liga\"");
assert_parse!(CssAtomSet::ATOMS, OpentypeTag, "\"smcp\"");
assert_parse!(CssAtomSet::ATOMS, OpentypeTag, "\"wght\"");
assert_parse!(CssAtomSet::ATOMS, OpentypeTag, "\"cv01\"");
assert_parse!(CssAtomSet::ATOMS, OpentypeTag, "\"ss01\"");
assert_parse!(CssAtomSet::ATOMS, OpentypeTag, "'kern'");
}

#[test]
fn test_errors() {
assert_parse_error!(CssAtomSet::ATOMS, OpentypeTag, "\"ker\"");
assert_parse_error!(CssAtomSet::ATOMS, OpentypeTag, "\"kerns\"");
assert_parse_error!(CssAtomSet::ATOMS, OpentypeTag, "\"\"");
assert_parse_error!(CssAtomSet::ATOMS, OpentypeTag, "kern");
}
}
41 changes: 41 additions & 0 deletions crates/css_ast/src/types/variation_tag_value.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
use super::prelude::*;
use crate::OpentypeTag;

/// Value for `font-variation-settings`: `<opentype-tag> <number>`
///
/// ```text,ignore
/// <opentype-tag> <number>
/// ```
#[derive(Parse, Peek, ToCursors, ToSpan, SemanticEq, Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
#[cfg_attr(feature = "serde", derive(serde::Serialize), serde())]
#[cfg_attr(feature = "visitable", derive(csskit_derives::Visitable), visit(skip))]
#[derive(csskit_derives::NodeWithMetadata)]
pub struct VariationTagValue(pub OpentypeTag, pub T![Number]);

#[cfg(test)]
mod tests {
use super::*;
use crate::CssAtomSet;
use css_parse::{assert_parse, assert_parse_error};

#[test]
fn size_test() {
assert_eq!(std::mem::size_of::<VariationTagValue>(), 24);
}

#[test]
fn test_parses() {
assert_parse!(CssAtomSet::ATOMS, VariationTagValue, "\"wght\" 700");
assert_parse!(CssAtomSet::ATOMS, VariationTagValue, "\"wdth\" 100");
assert_parse!(CssAtomSet::ATOMS, VariationTagValue, "\"slnt\" -12");
assert_parse!(CssAtomSet::ATOMS, VariationTagValue, "'ital' 1");
assert_parse!(CssAtomSet::ATOMS, VariationTagValue, "\"opsz\" 48");
}

#[test]
fn test_errors() {
assert_parse_error!(CssAtomSet::ATOMS, VariationTagValue, "\"wght\"");
assert_parse_error!(CssAtomSet::ATOMS, VariationTagValue, "\"wg\" 700");
assert_parse_error!(CssAtomSet::ATOMS, VariationTagValue, "wght 700");
}
}
Loading
Loading