From 820977512973a8a2ee862c6dce9f046327073739 Mon Sep 17 00:00:00 2001
From: mattn <mattn.jp@gmail.com>
Date: Fri, 6 Jul 2012 13:39:08 +0900
Subject: [PATCH] add new option dollar_expr that don't replace $ to numbers.

---
 autoload/zencoding/lang/haml.vim | 39 ++++++++++++++++++++------------
 autoload/zencoding/lang/html.vim | 31 ++++++++++++++++---------
 autoload/zencoding/lang/slim.vim | 37 +++++++++++++++++++-----------
 3 files changed, 69 insertions(+), 38 deletions(-)

diff --git a/autoload/zencoding/lang/haml.vim b/autoload/zencoding/lang/haml.vim
index 6d6ee0f..bb88bbf 100644
--- a/autoload/zencoding/lang/haml.vim
+++ b/autoload/zencoding/lang/haml.vim
@@ -14,21 +14,26 @@ function! zencoding#lang#haml#toString(settings, current, type, inline, filters,
   let filters = a:filters
   let itemno = a:itemno
   let indent = a:indent
+  let dollar_expr = zencoding#getResource(type, 'dollar_expr', 1)
   let str = ""
 
   let comment_indent = ''
   let comment = ''
   let current_name = current.name
-  let current_name = substitute(current.name, '\$$', itemno+1, '')
+  if dollar_expr
+    let current_name = substitute(current.name, '\$$', itemno+1, '')
+  endif
   if len(current.name) > 0
     let str .= '%' . current_name
     let tmp = ''
     for attr in keys(current.attr)
       let val = current.attr[attr]
-      while val =~ '\$\([^#{]\|$\)'
-        let val = substitute(val, '\(\$\+\)\([^{]\|$\)', '\=printf("%0".len(submatch(1))."d", itemno+1).submatch(2)', 'g')
-      endwhile
-      let attr = substitute(attr, '\$$', itemno+1, '')
+      if dollar_expr
+        while val =~ '\$\([^#{]\|$\)'
+          let val = substitute(val, '\(\$\+\)\([^{]\|$\)', '\=printf("%0".len(submatch(1))."d", itemno+1).submatch(2)', 'g')
+        endwhile
+        let attr = substitute(attr, '\$$', itemno+1, '')
+      endif
       let valtmp = substitute(val, '\${cursor}', '', '')
       if attr == 'id' && len(valtmp) > 0
         let str .= '#' . val
@@ -50,9 +55,11 @@ function! zencoding#lang#haml#toString(settings, current, type, inline, filters,
     let inner = ''
     if len(current.value) > 0
       let text = current.value[1:-2]
-      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')
+      if dollar_expr
+        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')
+      endif
       let lines = split(text, "\n")
       if len(lines) == 1
         let str .= " " . text
@@ -64,9 +71,11 @@ function! zencoding#lang#haml#toString(settings, current, type, inline, filters,
     endif
     if len(current.child) == 1 && len(current.child[0].name) == 0
       let text = current.child[0].value[1:-2]
-      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')
+      if dollar_expr
+        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')
+      endif
       let lines = split(text, "\n")
       if len(lines) == 1
         let str .= " " . text
@@ -85,9 +94,11 @@ function! zencoding#lang#haml#toString(settings, current, type, inline, filters,
     endif
   else
     let str = current.value[1:-2]
-    let str = substitute(str, '\%(\\\)\@\<!\(\$\+\)\([^{#]\|$\)', '\=printf("%0".len(submatch(1))."d", itemno+1).submatch(2)', 'g')
-    let str = substitute(str, '\${nr}', "\n", 'g')
-    let str = substitute(str, '\\\$', '$', 'g')
+    if dollar_expr
+      let str = substitute(str, '\%(\\\)\@\<!\(\$\+\)\([^{#]\|$\)', '\=printf("%0".len(submatch(1))."d", itemno+1).submatch(2)', 'g')
+      let str = substitute(str, '\${nr}', "\n", 'g')
+      let str = substitute(str, '\\\$', '$', 'g')
+    endif
   endif
   let str .= "\n"
   return str
diff --git a/autoload/zencoding/lang/html.vim b/autoload/zencoding/lang/html.vim
index bf2b825..f3fe541 100644
--- a/autoload/zencoding/lang/html.vim
+++ b/autoload/zencoding/lang/html.vim
@@ -290,6 +290,7 @@ function! zencoding#lang#html#toString(settings, current, type, inline, filters,
   let filters = a:filters
   let itemno = a:itemno
   let indent = a:indent
+  let dollar_expr = zencoding#getResource(type, 'dollar_expr', 1)
 
   if zencoding#useFilter(filters, 'haml')
     return zencoding#lang#haml#toString(settings, current, type, inline, filters, itemno, indent)
@@ -300,24 +301,30 @@ function! zencoding#lang#html#toString(settings, current, type, inline, filters,
 
   let comment = ''
   let current_name = current.name
-  let current_name = substitute(current_name, '\$$', itemno+1, '')
+  if dollar_expr
+    let current_name = substitute(current_name, '\$$', itemno+1, '')
+  endif
 
   let str = ''
   if len(current_name) == 0
     let text = current.value[1:-2]
-    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')
+    if dollar_expr
+      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')
+    endif
     return text
   endif
   if len(current_name) > 0
   let str .= '<' . current_name
   for attr in keys(current.attr)
     let val = current.attr[attr]
-    while val =~ '\$\([^#{]\|$\)'
-      let val = substitute(val, '\(\$\+\)\([^{]\|$\)', '\=printf("%0".len(submatch(1))."d", itemno+1).submatch(2)', 'g')
-    endwhile
-    let attr = substitute(attr, '\$$', itemno+1, '')
+    if dollar_expr
+      while val =~ '\$\([^#{]\|$\)'
+        let val = substitute(val, '\(\$\+\)\([^{]\|$\)', '\=printf("%0".len(submatch(1))."d", itemno+1).submatch(2)', 'g')
+      endwhile
+      let attr = substitute(attr, '\$$', itemno+1, '')
+    endif
     let str .= ' ' . attr . '="' . val . '"'
     if zencoding#useFilter(filters, 'c')
       if attr == 'id' | let comment .= '#' . val | endif
@@ -332,9 +339,11 @@ function! zencoding#lang#html#toString(settings, current, type, inline, filters,
   else
     let str .= ">"
     let text = current.value[1:-2]
-    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')
+    if dollar_expr
+      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')
+    endif
     let str .= text
     let nc = len(current.child)
     let dr = 0
diff --git a/autoload/zencoding/lang/slim.vim b/autoload/zencoding/lang/slim.vim
index c2a5bb1..beea0c7 100644
--- a/autoload/zencoding/lang/slim.vim
+++ b/autoload/zencoding/lang/slim.vim
@@ -14,19 +14,24 @@ function! zencoding#lang#slim#toString(settings, current, type, inline, filters,
   let filters = a:filters
   let itemno = a:itemno
   let indent = a:indent
+  let dollar_expr = zencoding#getResource(type, 'dollar_expr', 1)
   let str = ""
 
   let comment_indent = ''
   let comment = ''
   let current_name = current.name
-  let current_name = substitute(current.name, '\$$', itemno+1, '')
+  if dollar_expr
+    let current_name = substitute(current.name, '\$$', itemno+1, '')
+  endif
   if len(current.name) > 0
     let str .= current_name
     for attr in keys(current.attr)
       let val = current.attr[attr]
-      while val =~ '\$\([^#{]\|$\)'
-        let val = substitute(val, '\(\$\+\)\([^{]\|$\)', '\=printf("%0".len(submatch(1))."d", itemno+1).submatch(2)', 'g')
-      endwhile
+      if dollar_expr
+        while val =~ '\$\([^#{]\|$\)'
+          let val = substitute(val, '\(\$\+\)\([^{]\|$\)', '\=printf("%0".len(submatch(1))."d", itemno+1).submatch(2)', 'g')
+        endwhile
+      endif
       let attr = substitute(attr, '\$$', itemno+1, '')
       let str .= ' ' . attr . '="' . val . '"'
     endfor
@@ -35,9 +40,11 @@ function! zencoding#lang#slim#toString(settings, current, type, inline, filters,
     if len(current.value) > 0
       let str .= "\n"
       let text = current.value[1:-2]
-      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')
+      if dollar_expr
+        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')
+      endif
       for line in split(text, "\n")
         let str .= indent . "| " . line . "\n"
       endfor
@@ -45,9 +52,11 @@ function! zencoding#lang#slim#toString(settings, current, type, inline, filters,
     if len(current.child) == 1 && len(current.child[0].name) == 0
       let str .= "\n"
       let text = current.child[0].value[1:-2]
-      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')
+      if dollar_expr
+        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')
+      endif
       for line in split(text, "\n")
         let str .= indent . "| " . line . "\n"
       endfor
@@ -61,9 +70,11 @@ function! zencoding#lang#slim#toString(settings, current, type, inline, filters,
     endif
   else
     let str = current.value[1:-2]
-    let str = substitute(str, '\%(\\\)\@\<!\(\$\+\)\([^{#]\|$\)', '\=printf("%0".len(submatch(1))."d", itemno+1).submatch(2)', 'g')
-    let str = substitute(str, '\${nr}', "\n", 'g')
-    let str = substitute(str, '\\\$', '$', 'g')
+    if dollar_expr
+      let str = substitute(str, '\%(\\\)\@\<!\(\$\+\)\([^{#]\|$\)', '\=printf("%0".len(submatch(1))."d", itemno+1).submatch(2)', 'g')
+      let str = substitute(str, '\${nr}', "\n", 'g')
+      let str = substitute(str, '\\\$', '$', 'g')
+    endif
   endif
   if str !~ "\n$"
     let str .= "\n"