From f5bb76ba396c072c862bbfc89d47157b487bfe75 Mon Sep 17 00:00:00 2001
From: mattn <mattn.jp@gmail.com>
Date: Tue, 9 Apr 2013 18:05:28 +0900
Subject: [PATCH] Expands $# as content. close #116

---
 autoload/zencoding.vim           | 4 ++--
 autoload/zencoding/lang/haml.vim | 1 +
 autoload/zencoding/lang/html.vim | 1 +
 autoload/zencoding/lang/slim.vim | 1 +
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/autoload/zencoding.vim b/autoload/zencoding.vim
index a7b2013..40024c3 100644
--- a/autoload/zencoding.vim
+++ b/autoload/zencoding.vim
@@ -1,7 +1,7 @@
 "=============================================================================
 " zencoding.vim
 " Author: Yasuhiro Matsumoto <mattn.jp@gmail.com>
-" Last Change: 26-Mar-2013.
+" Last Change: 09-Apr-2013.
 
 let s:save_cpo = &cpo
 set cpo&vim
@@ -172,7 +172,7 @@ function! zencoding#toString(...)
         let inner = zencoding#lang#{rtype}#toString(s:zen_settings, current, type, inline, filters, itemno, indent)
       endif
       if current.multiplier > 1
-        let inner = substitute(inner, '\$#', '$line'.(itemno+1).'$', 'g')
+        let inner = substitute(inner, '\("\zs$#\ze"\|\s\zs\$#"\|"\$#\ze\s\)', '$line'.(itemno+1).'$', 'g')
       endif
       let str .= inner
     else
diff --git a/autoload/zencoding/lang/haml.vim b/autoload/zencoding/lang/haml.vim
index e22cde2..be421c1 100644
--- a/autoload/zencoding/lang/haml.vim
+++ b/autoload/zencoding/lang/haml.vim
@@ -62,6 +62,7 @@ function! zencoding#lang#haml#toString(settings, current, type, inline, filters,
         let text = substitute(text, '\%(\\\)\@\<!\(\$\+\)\([^{#]\|$\)', '\=printf("%0".len(submatch(1))."d", itemno+1).submatch(2)', 'g')
         let text = substitute(text, '\${nr}', "\n", 'g')
         let text = substitute(text, '\\\$', '$', 'g')
+        let str = substitute(str, '\$#', text, 'g')
       endif
       let lines = split(text, "\n")
       if len(lines) == 1
diff --git a/autoload/zencoding/lang/html.vim b/autoload/zencoding/lang/html.vim
index d48052f..b67587f 100644
--- a/autoload/zencoding/lang/html.vim
+++ b/autoload/zencoding/lang/html.vim
@@ -351,6 +351,7 @@ function! zencoding#lang#html#toString(settings, current, type, inline, filters,
       let text = substitute(text, '\%(\\\)\@\<!\(\$\+\)\([^{#]\|$\)', '\=printf("%0".len(submatch(1))."d", itemno+1).submatch(2)', 'g')
       let text = substitute(text, '\${nr}', "\n", 'g')
       let text = substitute(text, '\\\$', '$', 'g')
+      let str = substitute(str, '\("\zs$#\ze"\|\s\zs\$#"\|"\$#\ze\s\)', text, 'g')
     endif
     let str .= text
     let nc = len(current.child)
diff --git a/autoload/zencoding/lang/slim.vim b/autoload/zencoding/lang/slim.vim
index e8f95da..15bc968 100644
--- a/autoload/zencoding/lang/slim.vim
+++ b/autoload/zencoding/lang/slim.vim
@@ -47,6 +47,7 @@ function! zencoding#lang#slim#toString(settings, current, type, inline, filters,
         let text = substitute(text, '\%(\\\)\@\<!\(\$\+\)\([^{#]\|$\)', '\=printf("%0".len(submatch(1))."d", itemno+1).submatch(2)', 'g')
         let text = substitute(text, '\${nr}', "\n", 'g')
         let text = substitute(text, '\\\$', '$', 'g')
+        let str = substitute(str, '\$#', text, 'g')
       endif
       for line in split(text, "\n")
         let str .= indent . "| " . line . "\n"