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

Add font-weight descriptor to @font-face

Browse source
This commit is contained in:
Simon Sapin 2017-02-02 19:52:57 +01:00
parent 8767b0d7cc
commit fe8f5fad16
2 changed files with 18 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
components/style/font_face.rs
View file

@ -8,8 +8,8 @@
#![deny(missing_docs)] #![deny(missing_docs)]
#[cfg(feature = "gecko")] use computed_values::{font_style, font_weight};
use computed_values::font_family::FamilyName; use computed_values::font_family::FamilyName;
#[cfg(feature = "gecko")] use computed_values::font_style;
use cssparser::{AtRuleParser, DeclarationListParser, DeclarationParser, Parser}; use cssparser::{AtRuleParser, DeclarationListParser, DeclarationParser, Parser};
use parser::{ParserContext, log_css_error, Parse}; use parser::{ParserContext, log_css_error, Parse};
use std::fmt; use std::fmt;
@ -295,6 +295,9 @@ font_face_descriptors! {
optional descriptors = [ optional descriptors = [
/// The style of this font face /// The style of this font face
"font-style" style: font_style::T = font_style::T::normal, "font-style" style: font_style::T = font_style::T::normal,
/// The weight of this font face
"font-weight" weight: font_weight::T = font_weight::T::Weight400 /* normal */,
] ]
} }

14
components/style/properties/longhand/font.mako.rs
View file

@ -273,6 +273,20 @@ ${helpers.single_keyword("font-variant-caps",
} }
}) })
} }
/// Used in @font-face, where relative keywords are not allowed.
impl Parse for computed_value::T {
fn parse(context: &ParserContext, input: &mut Parser) -> Result<Self, ()> {
match parse(context, input)? {
% for weight in range(100, 901, 100):
SpecifiedValue::Weight${weight} => Ok(computed_value::T::Weight${weight}),
% endfor
SpecifiedValue::Bolder |
SpecifiedValue::Lighter => Err(())
}
}
}
pub mod computed_value { pub mod computed_value {
use std::fmt; use std::fmt;
#[derive(PartialEq, Eq, Copy, Clone, Hash, Debug)] #[derive(PartialEq, Eq, Copy, Clone, Hash, Debug)]