Correctly parse font-weight and font-stretch ranges in @font-face rules

Author: devongovett

src/lib.rs

@@ -4450,6 +4450,10 @@ mod tests {
     minify_test("@font-face {src: url(\"test.woff\") format(woff supports variations);}", "@font-face{src:url(test.woff)format(\"woff\" supports variations)}");
     minify_test("@font-face {src: url(\"test.woff\") format(woff supports palettes);}", "@font-face{src:url(test.woff)format(\"woff\" supports palettes)}");
     minify_test("@font-face {src: url(\"test.woff\") format(woff supports features(opentype) color(sbix));}", "@font-face{src:url(test.woff)format(\"woff\" supports features(opentype) color(sbix))}");
+    minify_test("@font-face {font-weight: 200 400}", "@font-face{font-weight:200 400}");
+    minify_test("@font-face {font-weight: 400 400}", "@font-face{font-weight:400}");
+    minify_test("@font-face {font-stretch: 50% 200%}", "@font-face{font-stretch:50% 200%}");
+    minify_test("@font-face {font-stretch: 50% 50%}", "@font-face{font-stretch:50%}");
   }
 
   #[test]

src/rules/font_face.rs

@@ -2,6 +2,7 @@ use cssparser::*;
 use crate::traits::{Parse, ToCss};
 use crate::printer::Printer;
 use crate::properties::font::{FontFamily, FontStyle, FontWeight, FontStretch};
+use crate::values::size::Size2D;
 use crate::properties::custom::CustomProperty;
 use crate::macros::enum_property;
 
@@ -16,8 +17,8 @@ pub enum FontFaceProperty {
   Source(Vec<Source>),
   FontFamily(FontFamily),
   FontStyle(FontStyle),
-  FontWeight(FontWeight),
-  FontStretch(FontStretch),
+  FontWeight(Size2D<FontWeight>),
+  FontStretch(Size2D<FontStretch>),
   Custom(CustomProperty)
 }
 
@@ -258,8 +259,8 @@ impl<'i> cssparser::DeclarationParser<'i> for FontFaceDeclarationParser {
       input: &mut cssparser::Parser<'i, 't>,
   ) -> Result<Self::Declaration, cssparser::ParseError<'i, Self::Error>> {
     macro_rules! property {
-      ($property: ident, $type: ident) => {
-        if let Ok(c) = $type::parse(input) {
+      ($property: ident, $type: ty) => {
+        if let Ok(c) = <$type>::parse(input) {
           return Ok(FontFaceProperty::$property(c))
         }
       };
@@ -273,9 +274,9 @@ impl<'i> cssparser::DeclarationParser<'i> for FontFaceDeclarationParser {
         }
       },
       "font-family" => property!(FontFamily, FontFamily),
-      "font-weight" => property!(FontWeight, FontWeight),
+      "font-weight" => property!(FontWeight, Size2D<FontWeight>),
       "font-style" => property!(FontStyle, FontStyle),
-      "font-stretch" => property!(FontStretch, FontStretch),
+      "font-stretch" => property!(FontStretch, Size2D<FontStretch>),
       _ => {}
     }