From eefd49426f85445187c5e90da912e83e51949ea4 Mon Sep 17 00:00:00 2001 From: mattn Date: Thu, 6 Jan 2011 10:36:39 +0900 Subject: [PATCH 01/16] fix issue #17. --- autoload/zencoding.vim | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/autoload/zencoding.vim b/autoload/zencoding.vim index 0ae3aad..20c3401 100644 --- a/autoload/zencoding.vim +++ b/autoload/zencoding.vim @@ -1,7 +1,7 @@ "============================================================================= " zencoding.vim " Author: Yasuhiro Matsumoto -" Last Change: 22-Nov-2010. +" Last Change: 06-Jan-2011. let s:save_cpo = &cpo set cpo&vim @@ -61,8 +61,12 @@ function! s:zen_parseIntoTree(abbr, type) let indent = s:zen_settings.indentation endif - let abbr = substitute(abbr, '\([a-zA-Z][a-zA-Z0-9]*\)+\([()]\|$\)', '\="(".s:zen_getExpandos(type, submatch(1)).")".submatch(2)', 'i') - let mx = '\([+>]\|<\+\)\{-}\s*\((*\)\{-}\s*\([@#]\{-}[a-zA-Z\!][a-zA-Z0-9:\!\-]*\|{[^}]\+}\)\(\%(\%(#{[{}a-zA-Z0-9_\-\$]\+\|#[a-zA-Z0-9_\-\$]\+\)\|\%(\[[^\]]\+\]\)\|\%(\.{[{}a-zA-Z0-9_\-\$]\+\|\.[a-zA-Z0-9_\-\$]\+\)\)*\)\%(\({[^}]\+}\)\)\{0,1}\%(\s*\*\s*\([0-9]\+\)\s*\)\{0,1}\(\%(\s*)\%(\s*\*\s*[0-9]\+\s*\)\{0,1}\)*\)' + if s:zen_isExtends(type, "html") + let abbr = substitute(abbr, '\([a-zA-Z][a-zA-Z0-9]*\)+\([()]\|$\)', '\="(".s:zen_getExpandos(type, submatch(1)).")".submatch(2)', 'i') + let mx = '\([+>]\|<\+\)\{-}\s*\((*\)\{-}\s*\([@#]\{-}[a-zA-Z\!][a-zA-Z0-9:\!\-]*\|{[^}]\+}\)\(\%(\%(#{[{}a-zA-Z0-9_\-\$]\+\|#[a-zA-Z0-9_\-\$]\+\)\|\%(\[[^\]]\+\]\)\|\%(\.{[{}a-zA-Z0-9_\-\$]\+\|\.[a-zA-Z0-9_\-\$]\+\)\)*\)\%(\({[^}]\+}\)\)\{0,1}\%(\s*\*\s*\([0-9]\+\)\s*\)\{0,1}\(\%(\s*)\%(\s*\*\s*[0-9]\+\s*\)\{0,1}\)*\)' + else + let mx = '\([+>]\|<\+\)\{-}\s*\((*\)\{-}\s*\([@#]\{-}[a-zA-Z\!][a-zA-Z0-9:\!\+\-]*\|{[^}]\+}\)\(\%(\%(#{[{}a-zA-Z0-9_\-\$]\+\|#[a-zA-Z0-9_\-\$]\+\)\|\%(\[[^\]]\+\]\)\|\%(\.{[{}a-zA-Z0-9_\-\$]\+\|\.[a-zA-Z0-9_\-\$]\+\)\)*\)\%(\({[^}]\+}\)\)\{0,1}\%(\s*\*\s*\([0-9]\+\)\s*\)\{0,1}\(\%(\s*)\%(\s*\*\s*[0-9]\+\s*\)\{0,1}\)*\)' + endif let root = { 'name': '', 'attr': {}, 'child': [], 'snippet': '', 'multiplier': 1, 'parent': {}, 'value': '', 'pos': 0 } let parent = root let last = root @@ -729,6 +733,9 @@ function! zencoding#expandAbbr(mode) range silent! exe "normal! v7h\"_s" let &selection = oldselection endif + if g:zencoding_debug > 1 + call getchar() + endif endfunction function! zencoding#moveNextPrev(flag) From 771343cf2404bcadc0986a56a834843aaa2763cc Mon Sep 17 00:00:00 2001 From: mattn Date: Thu, 6 Jan 2011 10:37:24 +0900 Subject: [PATCH 02/16] add test for bg+ --- unittest.vim | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/unittest.vim b/unittest.vim index 8eda70e..f2312e9 100644 --- a/unittest.vim +++ b/unittest.vim @@ -435,6 +435,12 @@ finish 'type': "css", 'result': "float: left;", }, + { + 'name': "bg+", + 'query': "bg+", + 'type': "css", + 'result': "background:#FFF url() 0 0 no-repeat;", + }, ], }, { From d9b9733bd034a2e5340a18afc91ae6c9addffb4a Mon Sep 17 00:00:00 2001 From: mattn Date: Thu, 6 Jan 2011 10:48:32 +0900 Subject: [PATCH 03/16] fix issue #16 --- autoload/zencoding.vim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/autoload/zencoding.vim b/autoload/zencoding.vim index 20c3401..1c816a3 100644 --- a/autoload/zencoding.vim +++ b/autoload/zencoding.vim @@ -331,8 +331,8 @@ function! s:zen_toString_haml(settings, current, type, inline, filters, itemno, for attr in keys(current.attr) let val = current.attr[attr] if current.multiplier > 1 - while val =~ '\$[^{]*' - let val = substitute(val, '\(\$\+\)\([^{]*\)', '\=printf("%0".len(submatch(1))."d", itemno+1).submatch(2)', 'g') + while val =~ '\$\([^{]\|$\)' + let val = substitute(val, '\(\$\+\)\([^{]\|$\)', '\=printf("%0".len(submatch(1))."d", itemno+1).submatch(2)', 'g') endwhile endif if attr == 'id' From 72ef007a846b8966f4a02a7b864d735697b58d52 Mon Sep 17 00:00:00 2001 From: mattn Date: Thu, 6 Jan 2011 10:51:25 +0900 Subject: [PATCH 04/16] add test for haml a*3 --- unittest.vim | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/unittest.vim b/unittest.vim index f2312e9..79fd64f 100644 --- a/unittest.vim +++ b/unittest.vim @@ -458,6 +458,12 @@ finish 'type': "haml", 'result': "%div\n %p<\n %ul#foo\n %li.bar1{ :foo => \"bar\", :bar => \"baz\" } baz\n %li.bar2{ :foo => \"bar\", :bar => \"baz\" } baz\n %li.bar3{ :foo => \"bar\", :bar => \"baz\" } baz\n", }, + { + 'name': "a*3|haml", + 'query': "a*3|haml", + 'type': "haml", + 'result': "%a{ :href => \"\" }\n%a{ :href => \"\" }\n%a{ :href => \"\" }\n", + }, ], }, { From 1bbf5b06ad6eed5e157e106b6a86c081147b6669 Mon Sep 17 00:00:00 2001 From: mattn Date: Thu, 6 Jan 2011 11:06:54 +0900 Subject: [PATCH 05/16] no more scroll --- unittest.vim | 1 + 1 file changed, 1 insertion(+) diff --git a/unittest.vim b/unittest.vim index 79fd64f..619a8d3 100644 --- a/unittest.vim +++ b/unittest.vim @@ -23,6 +23,7 @@ function! s:testExpandAbbr() else echohl WarningMsg | echon "ng\n" | echohl None echohl ErrorMsg | echo "failed test #".(n+1) | echohl None + set more echo " expect:".tests[n].result echo " got:".res echo "" From 96e256df371be7c9e833a98468c1249e9bc6eba5 Mon Sep 17 00:00:00 2001 From: mattn Date: Thu, 6 Jan 2011 11:13:44 +0900 Subject: [PATCH 06/16] expand .content to class="content" --- autoload/zencoding.vim | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/autoload/zencoding.vim b/autoload/zencoding.vim index 1c816a3..90a650f 100644 --- a/autoload/zencoding.vim +++ b/autoload/zencoding.vim @@ -63,9 +63,9 @@ function! s:zen_parseIntoTree(abbr, type) if s:zen_isExtends(type, "html") let abbr = substitute(abbr, '\([a-zA-Z][a-zA-Z0-9]*\)+\([()]\|$\)', '\="(".s:zen_getExpandos(type, submatch(1)).")".submatch(2)', 'i') - let mx = '\([+>]\|<\+\)\{-}\s*\((*\)\{-}\s*\([@#]\{-}[a-zA-Z\!][a-zA-Z0-9:\!\-]*\|{[^}]\+}\)\(\%(\%(#{[{}a-zA-Z0-9_\-\$]\+\|#[a-zA-Z0-9_\-\$]\+\)\|\%(\[[^\]]\+\]\)\|\%(\.{[{}a-zA-Z0-9_\-\$]\+\|\.[a-zA-Z0-9_\-\$]\+\)\)*\)\%(\({[^}]\+}\)\)\{0,1}\%(\s*\*\s*\([0-9]\+\)\s*\)\{0,1}\(\%(\s*)\%(\s*\*\s*[0-9]\+\s*\)\{0,1}\)*\)' + let mx = '\([+>]\|<\+\)\{-}\s*\((*\)\{-}\s*\([@#.]\{-}[a-zA-Z\!][a-zA-Z0-9:\!\-]*\|{[^}]\+}\)\(\%(\%(#{[{}a-zA-Z0-9_\-\$]\+\|#[a-zA-Z0-9_\-\$]\+\)\|\%(\[[^\]]\+\]\)\|\%(\.{[{}a-zA-Z0-9_\-\$]\+\|\.[a-zA-Z0-9_\-\$]\+\)\)*\)\%(\({[^}]\+}\)\)\{0,1}\%(\s*\*\s*\([0-9]\+\)\s*\)\{0,1}\(\%(\s*)\%(\s*\*\s*[0-9]\+\s*\)\{0,1}\)*\)' else - let mx = '\([+>]\|<\+\)\{-}\s*\((*\)\{-}\s*\([@#]\{-}[a-zA-Z\!][a-zA-Z0-9:\!\+\-]*\|{[^}]\+}\)\(\%(\%(#{[{}a-zA-Z0-9_\-\$]\+\|#[a-zA-Z0-9_\-\$]\+\)\|\%(\[[^\]]\+\]\)\|\%(\.{[{}a-zA-Z0-9_\-\$]\+\|\.[a-zA-Z0-9_\-\$]\+\)\)*\)\%(\({[^}]\+}\)\)\{0,1}\%(\s*\*\s*\([0-9]\+\)\s*\)\{0,1}\(\%(\s*)\%(\s*\*\s*[0-9]\+\s*\)\{0,1}\)*\)' + let mx = '\([+>]\|<\+\)\{-}\s*\((*\)\{-}\s*\([@#.]\{-}[a-zA-Z\!][a-zA-Z0-9:\!\+\-]*\|{[^}]\+}\)\(\%(\%(#{[{}a-zA-Z0-9_\-\$]\+\|#[a-zA-Z0-9_\-\$]\+\)\|\%(\[[^\]]\+\]\)\|\%(\.{[{}a-zA-Z0-9_\-\$]\+\|\.[a-zA-Z0-9_\-\$]\+\)\)*\)\%(\({[^}]\+}\)\)\{0,1}\%(\s*\*\s*\([0-9]\+\)\s*\)\{0,1}\(\%(\s*)\%(\s*\*\s*[0-9]\+\s*\)\{0,1}\)*\)' endif let root = { 'name': '', 'attr': {}, 'child': [], 'snippet': '', 'multiplier': 1, 'parent': {}, 'value': '', 'pos': 0 } let parent = root @@ -89,6 +89,10 @@ function! s:zen_parseIntoTree(abbr, type) let attributes = tag_name . attributes let tag_name = 'div' endif + if tag_name =~ '^\.' + let attributes = tag_name . attributes + let tag_name = 'div' + endif if multiplier <= 0 | let multiplier = 1 | endif " make default node @@ -680,9 +684,6 @@ function! zencoding#expandAbbr(mode) range else let part = matchstr(line, '\(\S.*\)$') endif - if part =~ '!' - let part = substitute(part, '.*!', '!', '') - endif let rest = getline('.')[len(line):] let str = part let mx = '|\(\%(html\|haml\|e\|c\|fc\|xsl\)\s*,\{0,1}\s*\)*$' From cda02374cd705725acfbf309a874a4d0a92c7c08 Mon Sep 17 00:00:00 2001 From: mattn Date: Thu, 6 Jan 2011 11:16:55 +0900 Subject: [PATCH 07/16] add test for .content{Hello!} --- unittest.vim | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/unittest.vim b/unittest.vim index 619a8d3..7b251c1 100644 --- a/unittest.vim +++ b/unittest.vim @@ -413,6 +413,12 @@ finish 'type': "html", 'result': "
\n\tbar\n
\n", }, + { + 'name': ".content{Hello!}", + 'query': ".content{Hello!}", + 'type': "html", + 'result': "
Hello!
\n", + }, ], }, { @@ -465,6 +471,12 @@ finish 'type': "haml", 'result': "%a{ :href => \"\" }\n%a{ :href => \"\" }\n%a{ :href => \"\" }\n", }, + { + 'name': ".content{Hello!}|haml", + 'query': ".content{Hello!}|haml", + 'type': "haml", + 'result': "%div.content Hello!\n", + }, ], }, { From e4dc78bc9b25cad641f89c8e836c8ae10ff1b439 Mon Sep 17 00:00:00 2001 From: mattn Date: Wed, 12 Jan 2011 11:49:03 +0900 Subject: [PATCH 08/16] fixed wrap expanding with '&'. --- autoload/zencoding.vim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/autoload/zencoding.vim b/autoload/zencoding.vim index 90a650f..c66eab2 100644 --- a/autoload/zencoding.vim +++ b/autoload/zencoding.vim @@ -1,7 +1,7 @@ "============================================================================= " zencoding.vim " Author: Yasuhiro Matsumoto -" Last Change: 06-Jan-2011. +" Last Change: 12-Jan-2011. let s:save_cpo = &cpo set cpo&vim @@ -642,7 +642,7 @@ function! zencoding#expandAbbr(mode) range for n in range(a:firstline, a:lastline) let lline = getline(n) let lpart = substitute(lline, '^\s*', '', '') - let expand = substitute(expand, '\$line\$', lpart, '') + let expand = join(split(expand, '\$line\$'), lpart) endfor else let str = '' From 8b8aa71043448048ffc6cd3bd5b403765569e684 Mon Sep 17 00:00:00 2001 From: mattn Date: Thu, 13 Jan 2011 14:52:26 +0900 Subject: [PATCH 09/16] version bump --- plugin/zencoding.vim | 4 ++-- zencoding.vim.vimup | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/plugin/zencoding.vim b/plugin/zencoding.vim index c7caf76..f6e06aa 100644 --- a/plugin/zencoding.vim +++ b/plugin/zencoding.vim @@ -1,8 +1,8 @@ "============================================================================= " File: zencoding.vim " Author: Yasuhiro Matsumoto -" Last Change: 22-Nov-2010. -" Version: 0.50 +" Last Change: 13-Jan-2011. +" Version: 0.51 " WebPage: http://github.com/mattn/zencoding-vim " Description: vim plugins for HTML and CSS hi-speed coding. " SeeAlso: http://code.google.com/p/zen-coding/ diff --git a/zencoding.vim.vimup b/zencoding.vim.vimup index d38e38a..de78183 100644 --- a/zencoding.vim.vimup +++ b/zencoding.vim.vimup @@ -2,7 +2,7 @@ script_name: ZenCoding.vim script_id: '2981' script_type: utility script_package: zencoding-vim.zip -script_version: '0.50' +script_version: '0.51' required_vim_version: '7.0' summary: vim plugins for HTML and CSS hi-speed coding. @@ -98,6 +98,12 @@ install_details: | # git clone http://github.com/mattn/zencoding-vim.git versions: +- '0.51': | + This is an upgrade for ZenCoding.vim: + [fix] wrap expanding with '&'. + [fix] expand .content to class="content". + [fix] haml expanding. + [fix] bg+ snippet - '0.50': | This is an upgrade for ZenCoding.vim: [fix] fixed parsing '#{{foo}}' and '.{{bar}}'. From 9a941aad9be4903257d7e61ea433591cce6bb8ed Mon Sep 17 00:00:00 2001 From: mattn Date: Fri, 14 Jan 2011 09:23:08 +0900 Subject: [PATCH 10/16] fix broken wrap expanding. --- autoload/zencoding.vim | 7 +++++-- plugin/zencoding.vim | 4 ++-- zencoding.vim.vimup | 2 ++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/autoload/zencoding.vim b/autoload/zencoding.vim index c66eab2..09d0918 100644 --- a/autoload/zencoding.vim +++ b/autoload/zencoding.vim @@ -1,7 +1,7 @@ "============================================================================= " zencoding.vim " Author: Yasuhiro Matsumoto -" Last Change: 12-Jan-2011. +" Last Change: 14-Jan-2011. let s:save_cpo = &cpo set cpo&vim @@ -642,7 +642,10 @@ function! zencoding#expandAbbr(mode) range for n in range(a:firstline, a:lastline) let lline = getline(n) let lpart = substitute(lline, '^\s*', '', '') - let expand = join(split(expand, '\$line\$'), lpart) + let pos = stridx(expand, "$line$") + if pos != -1 + let expand = expand[:pos-1] . lpart . expand[pos+6:] + endif endfor else let str = '' diff --git a/plugin/zencoding.vim b/plugin/zencoding.vim index f6e06aa..4f0788c 100644 --- a/plugin/zencoding.vim +++ b/plugin/zencoding.vim @@ -1,8 +1,8 @@ "============================================================================= " File: zencoding.vim " Author: Yasuhiro Matsumoto -" Last Change: 13-Jan-2011. -" Version: 0.51 +" Last Change: 14-Jan-2011. +" Version: 0.52 " WebPage: http://github.com/mattn/zencoding-vim " Description: vim plugins for HTML and CSS hi-speed coding. " SeeAlso: http://code.google.com/p/zen-coding/ diff --git a/zencoding.vim.vimup b/zencoding.vim.vimup index de78183..9298e0f 100644 --- a/zencoding.vim.vimup +++ b/zencoding.vim.vimup @@ -98,6 +98,8 @@ install_details: | # git clone http://github.com/mattn/zencoding-vim.git versions: +- '0.52': | + [fix] broken wrap expanding. - '0.51': | This is an upgrade for ZenCoding.vim: [fix] wrap expanding with '&'. From 3ba6851c1abc1489229bb225ca62ecc71313fe6b Mon Sep 17 00:00:00 2001 From: Andy Ferra Date: Wed, 19 Jan 2011 11:58:42 -0700 Subject: [PATCH 11/16] removed whitespace removal behvavior for empty tags --- autoload/zencoding.vim | 2 -- 1 file changed, 2 deletions(-) diff --git a/autoload/zencoding.vim b/autoload/zencoding.vim index 09d0918..9d1c5a1 100644 --- a/autoload/zencoding.vim +++ b/autoload/zencoding.vim @@ -353,8 +353,6 @@ function! s:zen_toString_haml(settings, current, type, inline, filters, itemno, endif if stridx(','.settings.html.empty_elements.',', ','.current.name.',') != -1 && len(current.value) == 0 let str .= "/" - elseif stridx(','.settings.html.block_elements.',', ','.current.name.',') != -1 && (len(current.child) == 0 && len(current.value) == 0) - let str .= '<' endif let inner = '' From 3ece783f74d7c6439f002b1acf0269811c2ba799 Mon Sep 17 00:00:00 2001 From: mattn Date: Tue, 25 Jan 2011 09:20:42 +0900 Subject: [PATCH 12/16] gif size was swapped. --- autoload/zencoding.vim | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/autoload/zencoding.vim b/autoload/zencoding.vim index 9d1c5a1..7d27e1b 100644 --- a/autoload/zencoding.vim +++ b/autoload/zencoding.vim @@ -1,7 +1,7 @@ "============================================================================= " zencoding.vim " Author: Yasuhiro Matsumoto -" Last Change: 14-Jan-2011. +" Last Change: 25-Jan-2011. let s:save_cpo = &cpo set cpo&vim @@ -784,8 +784,8 @@ function! zencoding#imageSize() endif if hex =~ '^47494638' let type = 'gif' - let width = eval('0x'.hex[18:19].hex[16:17]) - let height = eval('0x'.hex[14:15].hex[12:13]) + let width = eval('0x'.hex[14:15].hex[12:13]) + let height = eval('0x'.hex[18:19].hex[16:17]) endif if width == -1 && height == -1 From aa7d54e0f0edc38dcb19c0d2a9ea105eb294d01a Mon Sep 17 00:00:00 2001 From: mattn Date: Wed, 23 Feb 2011 15:25:13 +0900 Subject: [PATCH 13/16] fix haml test. --- unittest.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unittest.vim b/unittest.vim index 7b251c1..65be5d7 100644 --- a/unittest.vim +++ b/unittest.vim @@ -463,7 +463,7 @@ finish 'name': "div>p+ul#foo>li.bar$[foo=bar][bar=baz]*3>{baz}|haml", 'query': "div>p+ul#foo>li.bar$[foo=bar][bar=baz]*3>{baz}|haml", 'type': "haml", - 'result': "%div\n %p<\n %ul#foo\n %li.bar1{ :foo => \"bar\", :bar => \"baz\" } baz\n %li.bar2{ :foo => \"bar\", :bar => \"baz\" } baz\n %li.bar3{ :foo => \"bar\", :bar => \"baz\" } baz\n", + 'result': "%div\n %p\n %ul#foo\n %li.bar1{ :foo => \"bar\", :bar => \"baz\" } baz\n %li.bar2{ :foo => \"bar\", :bar => \"baz\" } baz\n %li.bar3{ :foo => \"bar\", :bar => \"baz\" } baz\n", }, { 'name': "a*3|haml", From 77e480c140719e3da77be2eba6326a5fbaa0fece Mon Sep 17 00:00:00 2001 From: mattn Date: Wed, 23 Feb 2011 15:40:49 +0900 Subject: [PATCH 14/16] remove $line$ at the last. --- autoload/zencoding.vim | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/autoload/zencoding.vim b/autoload/zencoding.vim index 7d27e1b..d3a8823 100644 --- a/autoload/zencoding.vim +++ b/autoload/zencoding.vim @@ -1,7 +1,7 @@ "============================================================================= " zencoding.vim " Author: Yasuhiro Matsumoto -" Last Change: 25-Jan-2011. +" Last Change: 23-Feb-2011. let s:save_cpo = &cpo set cpo&vim @@ -440,9 +440,13 @@ function! s:zen_toString_html(settings, current, type, inline, filters, itemno, elseif len(current.child) if inline == 0 if stridx(','.settings.html.inline_elements.',', ','.current.name.',') == -1 - let inner = substitute(inner, "\n", "\n" . indent, 'g') - let inner = substitute(inner, indent . "$", "", 'g') - let str .= ">\n" . indent . inner . "\n" + if inner =~ "\n$" + let inner = substitute(inner, "\n", "\n" . indent, 'g') + let inner = substitute(inner, indent . "$", "", 'g') + let str .= ">\n" . indent . inner . "\n" + else + let str .= ">\n" . indent . inner . indent . "\n\n" + endif else let str .= ">" . inner . "\n" endif @@ -645,6 +649,7 @@ function! zencoding#expandAbbr(mode) range let expand = expand[:pos-1] . lpart . expand[pos+6:] endif endfor + let expand = substitute(expand, '\$line\$', '', 'g') else let str = '' if a:firstline != a:lastline From 2091f33c821cadcc0848c6390d234f4243f54b47 Mon Sep 17 00:00:00 2001 From: mattn Date: Wed, 23 Feb 2011 15:44:33 +0900 Subject: [PATCH 15/16] django template --- autoload/zencoding.vim | 2 ++ 1 file changed, 2 insertions(+) diff --git a/autoload/zencoding.vim b/autoload/zencoding.vim index d3a8823..44ddfd2 100644 --- a/autoload/zencoding.vim +++ b/autoload/zencoding.vim @@ -595,6 +595,8 @@ endfunction function! s:zen_getFileType() let type = &ft if type == 'xslt' | let type = 'xsl' | endif + if type == 'htmldjango' | let type = 'html' | endif + if type == 'html.django_template' | let type = 'html' | endif if synIDattr(synID(line("."), col("."), 1), "name") =~ '^css' let type = 'css' endif From 4bbbe1d3dee9c53be185efa924819a3b98c0f7c1 Mon Sep 17 00:00:00 2001 From: mattn Date: Thu, 24 Feb 2011 19:04:00 +0900 Subject: [PATCH 16/16] enable fc filter for css. fix issue #21 --- autoload/zencoding.vim | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/autoload/zencoding.vim b/autoload/zencoding.vim index 44ddfd2..d0f3d4b 100644 --- a/autoload/zencoding.vim +++ b/autoload/zencoding.vim @@ -1,7 +1,7 @@ "============================================================================= " zencoding.vim " Author: Yasuhiro Matsumoto -" Last Change: 23-Feb-2011. +" Last Change: 24-Feb-2011. let s:save_cpo = &cpo set cpo&vim @@ -1807,7 +1807,8 @@ let s:zen_settings = { \ 'pgba:r': 'page-break-after:right;', \ 'orp': 'orphans:|;', \ 'wid': 'widows:|;' -\ } +\ }, +\ 'filters': 'fc' \ }, \ 'html': { \ 'snippets': {