Merge branch 'master' of https://github.com/mattn/emmet-vim

autoload/emmet.vim

@@ -1671,6 +1671,7 @@ let s:emmet_settings = {
 \                    ."\t%body\n"
 \                    ."\t\t${child}|\n",
 \        },
+\        'attribute_style': 'hash',
 \    },
 \    'slim': {
 \        'indentation': '  ',

autoload/emmet/lang/css.vim

@@ -19,7 +19,7 @@ function! emmet#lang#css#parseIntoTree(abbr, type)
   " emmet
   let tokens = split(abbr, '+\ze[^+)!]')
   let block = emmet#util#searchRegion("{", "}")
-  if abbr !~ '^@' && emmet#getBaseType(type) == 'css' && block[0] == [0,0] && block[1] == [0,0]
+  if abbr !~ '^@' && emmet#getBaseType(type) == 'css' && type != 'sass' && block[0] == [0,0] && block[1] == [0,0]
     let current = emmet#newNode()
     let current.snippet = abbr . " {\n" . indent . "${cursor}\n}"
     let current.name = ''

autoload/emmet/lang/haml.vim

@@ -15,6 +15,7 @@ function! emmet#lang#haml#toString(settings, current, type, inline, filters, ite
   let itemno = a:itemno
   let indent = emmet#getIndentation(type)
   let dollar_expr = emmet#getResource(type, 'dollar_expr', 1)
+  let attribute_style = emmet#getResource('haml', 'attribute_style', 'hash')
   let str = ""
 
   let comment_indent = ''
@@ -32,8 +33,12 @@ function! emmet#lang#haml#toString(settings, current, type, inline, filters, ite
       endif
       let Val = current.attr[attr]
       if type(Val) == 2 && Val == function('emmet#types#true')
-        let tmp .= ' :' . attr . ' => true'
-	  else
+        if attribute_style == 'hash'
+          let tmp .= ' :' . attr . ' => true'
+        elseif attribute_style == 'html'
+          let tmp .= attr . '=true'
+        end
+      else
         if dollar_expr
           while Val =~ '\$\([^#{]\|$\)'
             let Val = substitute(Val, '\(\$\+\)\([^{]\|$\)', '\=printf("%0".len(submatch(1))."d", itemno+1).submatch(2)', 'g')
@@ -46,14 +51,28 @@ function! emmet#lang#haml#toString(settings, current, type, inline, filters, ite
         elseif attr == 'class' && len(valtmp) > 0
           let str .= '.' . substitute(Val, ' ', '.', 'g')
         else
-          if len(tmp) > 0 | let tmp .= ',' | endif
+          if len(tmp) > 0 
+            if attribute_style == 'hash'
+              let tmp .= ',' 
+            elseif attribute_style == 'html'
+              let tmp .= ' ' 
+            endif
+          endif
           let Val = substitute(Val, '\${cursor}', '', '')
-          let tmp .= ' :' . attr . ' => "' . Val . '"'
+          if attribute_style == 'hash'
+            let tmp .= ' :' . attr . ' => "' . Val . '"'
+          elseif attribute_style == 'html'
+            let tmp .= attr . '="' . Val . '"'
+          end
         endif
       endif
     endfor
     if len(tmp)
-      let str .= '{' . tmp . ' }'
+      if attribute_style == 'hash'
+        let str .= '{' . tmp . ' }'
+      elseif attribute_style == 'html'
+        let str .= '(' . tmp . ')'
+      end
     endif
     if stridx(','.settings.html.empty_elements.',', ','.current_name.',') != -1 && len(current.value) == 0
       let str .= "/"

autoload/emmet/lang/html.vim

@@ -213,6 +213,8 @@ function! emmet#lang#html#parseIntoTree(abbr, type)
             endif
             if len(ks) > 0
               let current.attr[ks[0]] = atts
+            else
+              let current.attr[atts] = ""
             endif
           else
             while len(atts)