Refactored @font-face support

a-ignatov-parc · a-ignatov-parc · commit 94d2d16fa688 · 2014-03-12T12:18:41.000+03:00
diff --git a/index.js b/index.js
@@ -437,50 +437,22 @@ module.exports = function(css, options){
   function atfontface() {
     var pos = position();
     var m = match(/^@font-face */);
-    var re = /url\(['"]([^'"]+)['"]\)\s*(?:format\(['"]([^'"]+)['"]\))?/i;
-    var src = [];
-    var decls = [];
-    var srcList;
 
     if (!m) return;
-
     if (!open()) return error("@font-face missing '{'");
+    var decls = comments();
 
-    var name = match(/^font-family\s*:\s*['"]([^'"]+)['"];/);
-
-    if (!name) return error("@font-face missing 'font-family'");
-    decls.push({
-      type: 'declaration',
-      property: 'font-family',
-      value: trim(name[1])
-    })
-    whitespace();
-
-    while (srcList = match(/^src\s*:\s*([^;]+);/)) {
-      var val = trim(srcList[1]);
-      var set = val.split(',');
-
-      decls.push({
-        type: 'declaration',
-        property: 'src',
-        value: val
-      });
-
-      set.forEach(function(item) {
-        m = re.exec(item);
-        src.push({
-          url: trim(m[1]),
-          format: trim(m[2])
-        });
-      })
-      whitespace();
+    // declarations
+    var decl;
+    while (decl = declaration()) {
+      decls.push(decl);
+      decls = decls.concat(comments());
     }
 
     if (!close()) return error("@font-face missing '}'");
 
     return pos({
       type: 'fontface',
-      src: src,
       declarations: decls
     });
   }
