Merge pull request #57 from daleeidd/master

Add @font-face messed test case and update parsing

Author: conradz

lib/parse/index.js

@@ -461,7 +461,7 @@ module.exports = function(css, options){
 
   function atfontface() {
     var pos = position();
-    var m = match(/^@font-face */);
+    var m = match(/^@font-face\s*/);
     if (!m) return;
 
     if (!open()) return error("@font-face missing '{'");

test/cases/font-face-messed/ast.json

@@ -0,0 +1,90 @@
+{
+  "type": "stylesheet",
+  "stylesheet": {
+    "rules": [
+      {
+        "type": "font-face",
+        "declarations": [
+          {
+            "type": "declaration",
+            "property": "font-family",
+            "value": "\"Bitstream Vera Serif Bold\"",
+            "position": {
+              "start": {
+                "line": 4,
+                "column": 3
+              },
+              "end": {
+                "line": 4,
+                "column": 43
+              },
+              "source": "input.css"
+            }
+          },
+          {
+            "type": "declaration",
+            "property": "src",
+            "value": "url(\"http://developer.mozilla.org/@api/deki/files/2934/=VeraSeBd.ttf\")",
+            "position": {
+              "start": {
+                "line": 5,
+                "column": 3
+              },
+              "end": {
+                "line": 5,
+                "column": 78
+              },
+              "source": "input.css"
+            }
+          }
+        ],
+        "position": {
+          "start": {
+            "line": 1,
+            "column": 1
+          },
+          "end": {
+            "line": 6,
+            "column": 2
+          },
+          "source": "input.css"
+        }
+      },
+      {
+        "type": "rule",
+        "selectors": [
+          "body"
+        ],
+        "declarations": [
+          {
+            "type": "declaration",
+            "property": "font-family",
+            "value": "\"Bitstream Vera Serif Bold\", serif",
+            "position": {
+              "start": {
+                "line": 9,
+                "column": 3
+              },
+              "end": {
+                "line": 9,
+                "column": 50
+              },
+              "source": "input.css"
+            }
+          }
+        ],
+        "position": {
+          "start": {
+            "line": 8,
+            "column": 1
+          },
+          "end": {
+            "line": 10,
+            "column": 2
+          },
+          "source": "input.css"
+        }
+      }
+    ]
+  }
+}

test/cases/font-face-messed/compressed.css

@@ -0,0 +1 @@
+@font-face{font-family:"Bitstream Vera Serif Bold";src:url("http://developer.mozilla.org/@api/deki/files/2934/=VeraSeBd.ttf");}body{font-family:"Bitstream Vera Serif Bold", serif;}

test/cases/font-face-messed/input.css

@@ -0,0 +1,10 @@
+@font-face
+  
+       {
+  font-family: "Bitstream Vera Serif Bold";
+  src: url("http://developer.mozilla.org/@api/deki/files/2934/=VeraSeBd.ttf");
+}
+
+body {
+  font-family: "Bitstream Vera Serif Bold", serif;
+}

test/cases/font-face-messed/output.css

@@ -0,0 +1,8 @@
+@font-face {
+  font-family: "Bitstream Vera Serif Bold";
+  src: url("http://developer.mozilla.org/@api/deki/files/2934/=VeraSeBd.ttf");
+}
+
+body {
+  font-family: "Bitstream Vera Serif Bold", serif;
+}