diff --git a/autoload/zencoding/lang/haml.vim b/autoload/zencoding/lang/haml.vim index c5bc521..85aa0de 100644 --- a/autoload/zencoding/lang/haml.vim +++ b/autoload/zencoding/lang/haml.vim @@ -136,7 +136,7 @@ function! zencoding#lang#haml#encodeImage() endfunction function! zencoding#lang#haml#parseTag(tag) - let current = { 'name': '', 'attr': {}, 'child': [], 'snippet': '', 'multiplier': 1, 'parent': {}, 'value': '', 'pos': 0 } + let current = { 'name': '', 'attr': {}, 'child': [], 'snippet': '', 'multiplier': 1, 'parent': {}, 'value': '', 'pos': 0, 'attrs_order': ['id', 'class'] } let mx = '%\([a-zA-Z][a-zA-Z0-9]*\)\s*\%({\(.*\)}\)' let match = matchstr(a:tag, mx) let current.name = substitute(match, mx, '\1', 'i') diff --git a/autoload/zencoding/lang/slim.vim b/autoload/zencoding/lang/slim.vim index ce17556..449cbb6 100644 --- a/autoload/zencoding/lang/slim.vim +++ b/autoload/zencoding/lang/slim.vim @@ -114,7 +114,7 @@ function! zencoding#lang#slim#encodeImage() endfunction function! zencoding#lang#slim#parseTag(tag) - let current = { 'name': '', 'attr': {}, 'child': [], 'snippet': '', 'multiplier': 1, 'parent': {}, 'value': '', 'pos': 0 } + let current = { 'name': '', 'attr': {}, 'child': [], 'snippet': '', 'multiplier': 1, 'parent': {}, 'value': '', 'pos': 0, 'attrs_order': ['id', 'class'] } let mx = '\([a-zA-Z][a-zA-Z0-9]*\)\s\+\(.*\)' let match = matchstr(a:tag, mx) let current.name = substitute(match, mx, '\1', 'i') diff --git a/autoload/zencoding/util.vim b/autoload/zencoding/util.vim index fd0c768..5a028c9 100644 --- a/autoload/zencoding/util.vim +++ b/autoload/zencoding/util.vim @@ -235,9 +235,9 @@ endfunction function! zencoding#util#imageSizeWithImageMagick(fn) let img_info = system('identify -format "%wx%h" "'.a:fn.'"') - let img_size = split(img_info, 'x') + let img_size = split(substitute(img_info, '\n', '', ''), 'x') let width = img_size[0] - let height = substitute(img_size[1], '\n', '', '') + let height = img_size[1] return [width, height] endfunction