From 7b0c846018eedad6043dc12d2d6cf73185320533 Mon Sep 17 00:00:00 2001
From: mattn <mattn.jp@gmail.com>
Date: Sat, 2 Jun 2012 23:06:28 +0900
Subject: [PATCH] fix re-set parent of brother node. all tests are passed
 again!

---
 autoload/zencoding.vim           |  2 +-
 autoload/zencoding/lang/html.vim |  9 ++++++---
 unittest.vim                     | 12 +++---------
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/autoload/zencoding.vim b/autoload/zencoding.vim
index e15d319..71b1269 100644
--- a/autoload/zencoding.vim
+++ b/autoload/zencoding.vim
@@ -1,7 +1,7 @@
 "=============================================================================
 " zencoding.vim
 " Author: Yasuhiro Matsumoto <mattn.jp@gmail.com>
-" Last Change: 01-Jun-2012.
+" Last Change: 02-Jun-2012.
 
 let s:save_cpo = &cpo
 set cpo&vim
diff --git a/autoload/zencoding/lang/html.vim b/autoload/zencoding/lang/html.vim
index 6976c49..9ddde00 100644
--- a/autoload/zencoding/lang/html.vim
+++ b/autoload/zencoding/lang/html.vim
@@ -21,7 +21,7 @@ function! zencoding#lang#html#findTokens(str)
     if token == ''
       break
     endif
-	if token =~ '^\s'
+    if token =~ '^\s'
       let token = matchstr(token, '^\s*\zs.*')
       let last_pos = stridx(str, token, pos)
     endif
@@ -218,6 +218,7 @@ function! zencoding#lang#html#parseIntoTree(abbr, type)
           break
         endif
         let parent = tmp
+        let current.parent = tmp
       endfor
     endif
 
@@ -301,7 +302,9 @@ function! zencoding#lang#html#toString(settings, current, type, inline, filters,
   let current_name = substitute(current.name, '\$$', itemno+1, '')
 
   if len(current.parent.name) > 0 && current.multiplier > 0 && stridx(','.settings.html.inline_elements.',', ','.current_name.',') == -1
-    let str .= "\n"
+    if current.parent.multiplier > 0
+      let str .= "\n"
+    endif
   endif
 
   let tmp = '<' . current_name
@@ -365,7 +368,7 @@ function! zencoding#lang#html#toString(settings, current, type, inline, filters,
   else
     if inline == 0
       if stridx(','.settings.html.empty_elements.',', ','.current_name.',') != -1
-        let str .= " />\n"
+        let str .= " />"
       else
         let str .= ">" . inner . '${cursor}</' . current_name . ">"
       endif
diff --git a/unittest.vim b/unittest.vim
index b1ead31..abffcb9 100644
--- a/unittest.vim
+++ b/unittest.vim
@@ -321,15 +321,13 @@ finish
       'name': "a>b>i<<b",
       'query': "a>b>i<<b",
       'type': "html",
-      'result': "<a href=\"\"><b><i></i></b></a>\n<b></b>",
-      'skip': 0,
+      'result': "<a href=\"\"><b><i></i></b></a>\n<b></b>\n",
     },
     {
       'name': "blockquote>b>i<<b",
       'query': "blockquote>b>i<<b",
       'type': "html",
-      'result': "<blockquote><b><i></i></b></blockquote>\n<b></b>",
-      'skip': 0,
+      'result': "<blockquote><b><i></i></b></blockquote>\n<b></b>\n",
     },
     {
       'name': "a[href=foo][class=bar]",
@@ -414,7 +412,6 @@ finish
       'query': "#header>li<#content",
       'type': "html",
       'result': "<div id=\"header\">\n\t<li></li>\n</div>\n<div id=\"content\"></div>\n",
-      'skip': 1,
     },
     {
       'name': "(#header>li)<#content",
@@ -427,7 +424,6 @@ finish
       'query': "a>b>i<<div",
       'type': "html",
       'result': "<a href=\"\"><b><i></i></b></a>\n<div></div>\n",
-      'skip': 1,
     },
     {
       'name': "(#header>h1)+#content+#footer",
@@ -439,8 +435,7 @@ finish
       'name': "(#header>h1)+(#content>(#main>h2+div#entry$.section*5>(h3>a)+div>p*3+ul+)+(#utilities))+(#footer>address)",
       'query': "(#header>h1)+(#content>(#main>h2+div#entry$.section*5>(h3>a)+div>p*3+ul+)+(#utilities))+(#footer>address)",
       'type': "html",
-      'result': "<div id=\"header\">\n\t<h1></h1>\n</div>\n<div id=\"content\">\n\t<div id=\"main\">\n\t\t<h2></h2>\n\t\t<div id=\"entry1\" class=\"section\">\n\t\t\t<h3>\n\t\t\t\t<a href=\"\"></a>\n\t\t\t</h3>\n\t\t\t<div>\n\t\t\t\t<p></p>\n\t\t\t\t<p></p>\n\t\t\t\t<p></p>\n\t\t\t\t<ul>\n\t\t\t\t\t<li></li>\n\t\t\t\t</ul>\n\t\t\t</div>\n\t\t</div>\n\t\t<div id=\"entry2\" class=\"section\">\n\t\t\t<h3>\n\t\t\t\t<a href=\"\"></a>\n\t\t\t</h3>\n\t\t\t<div>\n\t\t\t\t<p></p>\n\t\t\t\t<p></p>\n\t\t\t\t<p></p>\n\t\t\t\t<ul>\n\t\t\t\t\t<li></li>\n\t\t\t\t</ul>\n\t\t\t</div>\n\t\t</div>\n\t\t<div id=\"entry3\" class=\"section\">\n\t\t\t<h3>\n\t\t\t\t<a href=\"\"></a>\n\t\t\t</h3>\n\t\t\t<div>\n\t\t\t\t<p></p>\n\t\t\t\t<p></p>\n\t\t\t\t<p></p>\n\t\t\t\t<ul>\n\t\t\t\t\t<li></li>\n\t\t\t\t</ul>\n\t\t\t</div>\n\t\t</div>\n\t\t<div id=\"entry4\" class=\"section\">\n\t\t\t<h3>\n\t\t\t\t<a href=\"\"></a>\n\t\t\t</h3>\n\t\t\t<div>\n\t\t\t\t<p></p>\n\t\t\t\t<p></p>\n\t\t\t\t<p></p>\n\t\t\t\t<ul>\n\t\t\t\t\t<li></li>\n\t\t\t\t</ul>\n\t\t\t</div>\n\t\t</div>\n\t\t<div id=\"entry5\" class=\"section\">\n\t\t\t<h3>\n\t\t\t\t<a href=\"\"></a>\n\t\t\t</h3>\n\t\t\t<div>\n\t\t\t\t<p></p>\n\t\t\t\t<p></p>\n\t\t\t\t<p></p>\n\t\t\t\t<ul>\n\t\t\t\t\t<li></li>\n\t\t\t\t</ul>\n\t\t\t</div>\n\t\t</div>\n\t</div>\n\t<div id=\"utilities\"></div>\n</div>\n<div id=\"footer\">\n\t<address></address>\n</div>\n",
-      'skip': 1,
+      'result': "<div id=\"header\">\n\t<h1></h1>\n</div>\n<div id=\"content\">\n\t<div id=\"main\">\n\t\t<h2></h2>\n\t\t<div id=\"entry1\" class=\"section\">\n\t\t\t<h3><a href=\"\"></a></h3>\n\t\t\t<div>\n\t\t\t\t<p></p>\n\t\t\t\t<p></p>\n\t\t\t\t<p></p>\n\t\t\t\t<ul>\n\t\t\t\t\t<li></li>\n\t\t\t\t</ul>\n\t\t\t</div>\n\t\t</div>\n\t\t<div id=\"entry2\" class=\"section\">\n\t\t\t<h3><a href=\"\"></a></h3>\n\t\t\t<div>\n\t\t\t\t<p></p>\n\t\t\t\t<p></p>\n\t\t\t\t<p></p>\n\t\t\t\t<ul>\n\t\t\t\t\t<li></li>\n\t\t\t\t</ul>\n\t\t\t</div>\n\t\t</div>\n\t\t<div id=\"entry3\" class=\"section\">\n\t\t\t<h3><a href=\"\"></a></h3>\n\t\t\t<div>\n\t\t\t\t<p></p>\n\t\t\t\t<p></p>\n\t\t\t\t<p></p>\n\t\t\t\t<ul>\n\t\t\t\t\t<li></li>\n\t\t\t\t</ul>\n\t\t\t</div>\n\t\t</div>\n\t\t<div id=\"entry4\" class=\"section\">\n\t\t\t<h3><a href=\"\"></a></h3>\n\t\t\t<div>\n\t\t\t\t<p></p>\n\t\t\t\t<p></p>\n\t\t\t\t<p></p>\n\t\t\t\t<ul>\n\t\t\t\t\t<li></li>\n\t\t\t\t</ul>\n\t\t\t</div>\n\t\t</div>\n\t\t<div id=\"entry5\" class=\"section\">\n\t\t\t<h3><a href=\"\"></a></h3>\n\t\t\t<div>\n\t\t\t\t<p></p>\n\t\t\t\t<p></p>\n\t\t\t\t<p></p>\n\t\t\t\t<ul>\n\t\t\t\t\t<li></li>\n\t\t\t\t</ul>\n\t\t\t</div>\n\t\t</div>\n\t</div>\n\t<div id=\"utilities\"></div>\n</div>\n<div id=\"footer\">\n\t<address></address>\n</div>\n",
     },
     {
       'name': "(div>(ul*2)*2)+(#utilities)",
@@ -489,7 +484,6 @@ finish
       'query': "link:css",
       'type': "html",
       'result': "<link media=\"all\" rel=\"stylesheet\" href=\"style.css\" type=\"text/css\" />\n",
-      'skip': 1,
     },
     {
       'name': "a[title=\"Hello', world\" rel]",