From f86c34fbe88f0772328b4cb9706de0b89ca70b20 Mon Sep 17 00:00:00 2001
From: mattn <mattn.jp@gmail.com>
Date: Sat, 6 Apr 2013 22:31:53 +0900
Subject: [PATCH] Fix parseTag

---
 autoload/zencoding/lang/html.vim | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/autoload/zencoding/lang/html.vim b/autoload/zencoding/lang/html.vim
index c38c035..f92174f 100644
--- a/autoload/zencoding/lang/html.vim
+++ b/autoload/zencoding/lang/html.vim
@@ -58,7 +58,7 @@ function! zencoding#lang#html#parseIntoTree(abbr, type)
   endif
   let abbr = rabbr
 
-  let root = { 'name': '', 'attr': {}, 'child': [], 'snippet': '', 'multiplier': 1, 'parent': {}, 'value': '', 'pos': 0, 'important': 0 }
+  let root = { 'name': '', 'attr': {}, 'child': [], 'snippet': '', 'multiplier': 1, 'parent': {}, 'value': '', 'pos': 0, 'important': 0, 'attrs_order': ['id', 'class'] }
   let parent = root
   let last = root
   let pos = []
@@ -419,6 +419,7 @@ function! zencoding#lang#html#imageSize()
   endif
   let current.attr.width = width
   let current.attr.height = height
+  let current.attrs_order += ['width', 'height']
   let html = substitute(zencoding#toString(current, 'html', 1), '\n', '', '')
   call zencoding#util#setContent(img_region, html)
 endfunction
@@ -452,7 +453,7 @@ function! zencoding#lang#html#encodeImage()
 endfunction
 
 function! zencoding#lang#html#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[a-zA-Z][a-zA-Z0-9]\+=\%([^"'' \t]\+\|"[^"]\{-}"\|''[^'']\{-}''\)\s*\)*\)\(/\{0,1}\)>'
   let match = matchstr(a:tag, mx)
   let current.name = substitute(match, mx, '\1', 'i')
@@ -469,6 +470,7 @@ function! zencoding#lang#html#parseTag(tag)
     let current.attr[name] = value
     let attrs = attrs[stridx(attrs, match) + len(match):]
   endwhile
+  let current.attrs_order = keys(current.attr)
   return current
 endfunction