Rename AtRule#between to afterParams and add afterName

lib/at-rule.coffee

@@ -22,14 +22,24 @@ class AtRule extends Container
 
   # Stringify at-rule
   stringify: (builder, last) ->
-    start  = '@' + @name + @_params.stringify(before: ' ')
+    name   = '@' + @name + if @afterName? then @afterName else ' '
+    params = @_params.stringify()
+
     if @rules or @decls
-      start += if @between? then @between else ' '
-      @stringifyBlock(builder, start + '{')
+      params +=  if @afterParams?
+        @afterParams
+      else if params
+        ' '
+      else
+        ''
+
+      @stringifyBlock(builder, name + params + '{')
+
     else
       builder(@before) if @before
+      params   += if @afterParams? then @afterParams else ''
       semicolon = if not last or @semicolon then ';' else ''
-      builder(start + semicolon, @)
+      builder(name + params + semicolon, @)
 
 # Detect container type by child type
 for name in ['append', 'prepend']

lib/parse.coffee

@@ -116,7 +116,7 @@ class Parser
         @setType('atrule-param')
 
       else if @letter == ';' or @letter == '{' or close
-        @current.between = ''
+        @current.afterName = ''
         @checkAtruleName()
         @endAtruleParams()
 
@@ -126,9 +126,11 @@ class Parser
 
     else if @inside('atrule-param')
       if @letter == ';' or @letter == '{' or close
-        [raw, spaces]    = @endSpaces(@prevBuffer())
-        @current.params  = new Raw(raw, @trim @trimmed)
-        @current.between = spaces
+        [raw, left]          = @startSpaces(@prevBuffer())
+        [raw, right]         = @endSpaces(raw)
+        @current.afterName   = left
+        @current.params      = new Raw(raw, @trim @trimmed)
+        @current.afterParams = right
         @endAtruleParams()
 
       else

test/cases/parse/atrule-decls.json

@@ -15,11 +15,12 @@
             },
             "before": "",
             "name": "page",
+            "afterName": " ",
             "_params": {
-                "raw": " :left",
+                "raw": ":left",
                 "trimmed": ":left"
             },
-            "between": " ",
+            "afterParams": " ",
             "decls": [
                 {
                     "type": "decl",
@@ -58,11 +59,12 @@
             },
             "before": "\n\n",
             "name": "font-face",
+            "afterName": " ",
             "_params": {
                 "raw": "",
                 "trimmed": ""
             },
-            "between": " ",
+            "afterParams": "",
             "decls": [
                 {
                     "type": "decl",
@@ -102,11 +104,12 @@
             },
             "before": "\n\n",
             "name": "viewport",
+            "afterName": " ",
             "_params": {
                 "raw": "",
                 "trimmed": ""
             },
-            "between": " ",
+            "afterParams": "",
             "decls": [
                 {
                     "type": "decl",
@@ -146,11 +149,12 @@
             },
             "before": "\n\n",
             "name": "-ms-viewport",
+            "afterName": " ",
             "_params": {
                 "raw": "",
                 "trimmed": ""
             },
-            "between": " ",
+            "afterParams": "",
             "decls": [
                 {
                     "type": "decl",

test/cases/parse/atrule-empty.json

@@ -15,11 +15,12 @@
             },
             "before": "",
             "name": "charset",
+            "afterName": " ",
             "_params": {
-                "raw": " \"UTF-8\"",
+                "raw": "\"UTF-8\"",
                 "trimmed": "\"UTF-8\""
             },
-            "between": "",
+            "afterParams": "",
             "semicolon": true
         }
     ],

test/cases/parse/atrule-no-params.json

@@ -15,7 +15,7 @@
             },
             "before": "",
             "name": "page",
-            "between": "",
+            "afterName": "",
             "decls": [],
             "after": " "
         }

test/cases/parse/atrule-no-semicolon.json

@@ -15,11 +15,12 @@
             },
             "before": "\n",
             "name": "charset",
+            "afterName": " ",
             "_params": {
-                "raw": " \"UTF-8\"",
+                "raw": "\"UTF-8\"",
                 "trimmed": "\"UTF-8\""
             },
-            "between": ""
+            "afterParams": ""
         }
     ],
     "after": "\n\n"

test/cases/parse/atrule-params.json

@@ -15,11 +15,12 @@
             },
             "before": "",
             "name": "-moz-document",
+            "afterName": "",
             "_params": {
                 "raw": "/* near */ /* filter */ url(\"example.com/{\") /* a */",
                 "trimmed": "url(\"example.com/{\")"
             },
-            "between": " ",
+            "afterParams": " ",
             "rules": [],
             "after": ""
         }

test/cases/parse/atrule-rules.json

@@ -15,11 +15,12 @@
             },
             "before": "",
             "name": "supports",
+            "afterName": " ",
             "_params": {
-                "raw": " (animation-name: test)",
+                "raw": "(animation-name: test)",
                 "trimmed": "(animation-name: test)"
             },
-            "between": " ",
+            "afterParams": " ",
             "rules": [
                 {
                     "type": "atrule",
@@ -35,11 +36,12 @@
                     },
                     "before": "\n    ",
                     "name": "-custom-keyframe",
+                    "afterName": " ",
                     "_params": {
-                        "raw": " anim",
+                        "raw": "anim",
                         "trimmed": "anim"
                     },
-                    "between": " ",
+                    "afterParams": " ",
                     "rules": [
                         {
                             "type": "rule",