From 15c3f99c6844cc4c89c25b35fae83426faef855f Mon Sep 17 00:00:00 2001
From: mattn <mattn.jp@gmail.com>
Date: Mon, 11 Jun 2012 17:41:41 +0900
Subject: [PATCH] fix: {item number $ ${nl}}*5

---
 autoload/zencoding.vim           |  6 +++++-
 autoload/zencoding/lang/html.vim | 19 +++++++++++++------
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/autoload/zencoding.vim b/autoload/zencoding.vim
index 5f8b27c..d8e2999 100644
--- a/autoload/zencoding.vim
+++ b/autoload/zencoding.vim
@@ -173,7 +173,11 @@ function! zencoding#toString(...)
           let str .= current.name
         endif
         if len(current.value)
-          let str .= current.value[1:-2]
+          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')
+          let str .= text
         endif
       endif
       let inner = ''
diff --git a/autoload/zencoding/lang/html.vim b/autoload/zencoding/lang/html.vim
index b184898..15f341e 100644
--- a/autoload/zencoding/lang/html.vim
+++ b/autoload/zencoding/lang/html.vim
@@ -1,9 +1,16 @@
-"let s:mx = '\([+>]\|<\+\)\{-}\((*\)\{-}\([@#.]\{-}[a-zA-Z\!][a-zA-Z0-9:_\!\-$]*\|'
-let s:mx = '\([+>]\|<\+\)\{-}\s*\((*\)\{-}\s*\([@#.]\{-}[a-zA-Z\!][a-zA-Z0-9:_\!\-$]*\|'
-\       .'{.\{-}}[ \t\r\n}]*\)\(\%(\%(#{[{}a-zA-Z0-9_\-\$]\+\|'
-\       .'#[a-zA-Z0-9_\-\$]\+\)\|\%(\[[^\]]\+\]\)\|'
-\       .'\%(\.{[{}a-zA-Z0-9_\-\$]\+\|'
-\       .'\.[a-zA-Z0-9_\-\$]\+\)\)*\)\%(\({[^}]\+}\+\)\)\{0,1}\%(\*\([0-9]\+\)\)\{0,1}\(\%()\%(\*[0-9]\+\)\{0,1}\)*\)'
+let s:mx = '\([+>]\|<\+\)\{-}\s*'
+\     .'\((*\)\{-}\s*'
+\       .'\([@#.]\{-}[a-zA-Z\!][a-zA-Z0-9:_\!\-$]*\|{\%([^$}]\+\|\$#\|\$\${\w\+}\|\$\+\)*}[ \t\r\n}]*\)'
+\       .'\('
+\         .'\%('
+\           .'\%(#{[{}a-zA-Z0-9_\-\$]\+\|#[a-zA-Z0-9_\-\$]\+\)'
+\           .'\|\%(\[[^\]]\+\]\)'
+\           .'\|\%(\.{[{}a-zA-Z0-9_\-\$]\+\|\.[a-zA-Z0-9_\-\$]\+\)'
+\         .'\)*'
+\       .'\)'
+\       .'\%(\({\%([^$}]\+\|\$#\|\$\${\w\+}\|\$\+\)*}\)\)\{0,1}'
+\         .'\%(\*\([0-9]\+\)\)\{0,1}'
+\     .'\(\%()\%(\*[0-9]\+\)\{0,1}\)*\)'
 
 function! zencoding#lang#html#findTokens(str)
   let str = a:str