Fix bug parsing normal keyword in font shorthand. Fixes parcel-bundler#42.

Author: devongovett

src/lib.rs

@@ -2937,6 +2937,11 @@ mod tests {
       }
     "#
     });
+
+    minify_test(".foo { font: normal normal 600 9px/normal Charcoal; }", ".foo{font:600 9px Charcoal}");
+    minify_test(".foo { font: normal normal 500 medium/normal Charcoal; }", ".foo{font:500 medium Charcoal}");
+    minify_test(".foo { font: normal normal 400 medium Charcoal; }", ".foo{font:400 medium Charcoal}");
+    minify_test(".foo { font: normal normal 500 medium/10px Charcoal; }", ".foo{font:500 medium/10px Charcoal}");
   }
 
   #[test]

src/properties/font.rs

@@ -487,37 +487,51 @@ impl Parse for Font {
     let mut stretch = None;
     let size;
     let mut variant_caps = None;
+    let mut count = 0;
 
     loop {
+      // Skip "normal" since it is valid for several properties, but we don't know which ones it will be used for yet.
+      if input.try_parse(|input| input.expect_ident_matching("normal")).is_ok() {
+        count += 1;
+        continue
+      }
       if style.is_none() {
         if let Ok(value) = input.try_parse(FontStyle::parse) {
           style = Some(value);
+          count += 1;
           continue
         }
       }
       if weight.is_none() {
         if let Ok(value) = input.try_parse(FontWeight::parse) {
           weight = Some(value);
+          count += 1;
           continue
         }
       }
       if variant_caps.is_none() {
         if let Ok(value) = input.try_parse(FontVariantCapsCSS2::parse) {
           variant_caps = Some(value);
+          count += 1;
           continue
         }
       }
 
       if stretch.is_none() {
         if let Ok(value) = input.try_parse(FontStretchKeyword::parse) {
           stretch = Some(FontStretch::Keyword(value));
+          count += 1;
           continue
         }
       }
       size = Some(FontSize::parse(input)?);
       break
     }
 
+    if count > 4 {
+      return Err(input.new_custom_error(ParserError::InvalidDeclaration))
+    } 
+
     let size = match size {
       Some(s) => s,
       None => {