Fix font

devongovett · devongovett · commit 69ee0ddf4c9d · 2021-12-06T00:32:36.000-05:00
diff --git a/src/lib.rs b/src/lib.rs
@@ -2053,6 +2053,19 @@ mod tests {
     "#
     });
 
+    test(r#"
+      .foo {
+        font: 12px "Helvetica", "Times New Roman", sans-serif;
+        line-height: var(--lh);
+      }
+    "#, indoc! {r#"
+      .foo {
+        font: 12px Helvetica, Times New Roman, sans-serif;
+        line-height: var(--lh);
+      }
+    "#
+    });
+
     minify_test(r#"
       .foo {
         font-family: "Helvetica", "Times New Roman", sans-serif;
diff --git a/src/properties/font.rs b/src/properties/font.rs
@@ -6,7 +6,7 @@ use crate::values::{
   percentage::Percentage
 };
 use crate::traits::{Parse, ToCss, PropertyHandler};
-use super::Property;
+use super::{Property, PropertyId};
 use crate::declaration::DeclarationList;
 use crate::printer::Printer;
 
@@ -597,7 +597,7 @@ pub(crate) struct FontHandler {
 }
 
 impl PropertyHandler for FontHandler {
-  fn handle_property(&mut self, property: &Property, _: &mut DeclarationList) -> bool {
+  fn handle_property(&mut self, property: &Property, dest: &mut DeclarationList) -> bool {
     use Property::*;
 
     macro_rules! property {
@@ -626,6 +626,10 @@ impl PropertyHandler for FontHandler {
         self.has_any = true;
         // TODO: reset other properties
       }
+      Unparsed(val) if is_font_property(&val.property_id) => {
+        self.finalize(dest);
+        dest.push(property.clone());
+      }
       _ => return false
     }
 
@@ -695,3 +699,18 @@ impl PropertyHandler for FontHandler {
     }
   }
 }
+
+#[inline]
+fn is_font_property(property_id: &PropertyId) -> bool {
+  match property_id {
+    PropertyId::FontFamily |
+    PropertyId::FontSize |
+    PropertyId::FontStyle |
+    PropertyId::FontWeight |
+    PropertyId::FontStretch |
+    PropertyId::FontVariantCaps |
+    PropertyId::LineHeight |
+    PropertyId::Font => true,
+    _ => false
+  }
+}
