From bd8296d27c44906df200ad1232a1ef48cf6a0628 Mon Sep 17 00:00:00 2001
From: mattn <mattn.jp@gmail.com>
Date: Wed, 24 Oct 2012 10:20:25 +0900
Subject: [PATCH] support m10-5 like format.

---
 autoload/zencoding/lang/css.vim | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/autoload/zencoding/lang/css.vim b/autoload/zencoding/lang/css.vim
index 5053cdb..402c98e 100644
--- a/autoload/zencoding/lang/css.vim
+++ b/autoload/zencoding/lang/css.vim
@@ -9,24 +9,30 @@ function! zencoding#lang#css#parseIntoTree(abbr, type)
   let value = ''
 
   " emmet
-  let prop = matchlist(abbr, '^\(-\{0,1}[a-zA-Z]\+\)\([0-9.]\+p\{0,1}\)$')
+  let prop = matchlist(abbr, '^\(-\{0,1}[a-zA-Z]\+\)\(\%([0-9.-]\+[pe]\{0,1}-\{0,1}\|-auto\)*\)$')
+  echo prop
   if len(prop)
     let abbr = prop[1]
     if abbr =~ '^-'
       let prefix = 1
       let abbr = abbr[1:]
     endif
-    let value = prop[2]
-    if abbr =~ '^[z]'
-      " TODO
-	  let value = substitute(value, '[^0-9.]*$', '', '')
-	elseif value =~ 'p$'
-      let value = substitute(prop[2], 'p$', '%', '')
-    elseif value =~ '\.'
-      let value .= 'em'
-    else
-      let value .= 'px'
-    endif
+    let value = ''
+    for v in split(prop[2], '\d\zs-')
+      if len(value) > 0
+        let value .= ' '
+      endif
+      if abbr =~ '^[z]'
+        " TODO
+        let value .= substitute(v, '[^0-9.]*$', '', '')
+      elseif v =~ 'p$'
+        let value .= substitute(v, 'p$', '%', '')
+      elseif v =~ '\.' || v =~ 'e$'
+        let value .= v . 'em'
+      else
+        let value .= v . 'px'
+      endif
+    endfor
   endif
   let settings = zencoding#getSettings()
   let indent = zencoding#getIndentation(type)