adding new stuff

plugins/bundle/xptemplate/ftplugin/htmldjango/htmldjango.ftdetect.vim

@@ -0,0 +1,77 @@
+if exists( "g:__HTMLDJANGO_FTDETECT_VIM__" )
+    finish
+endif
+let g:__HTMLDJANGO_FTDETECT_VIM__ = 1
+
+
+if &filetype !~ 'htmldjango'
+    finish
+endif
+
+
+" TODO use array instead of dict because of duplicated key could be possible
+let s:skipPattern = 'synIDattr(synID(line("."), col("."), 0), "name") =~? "\\vstring|comment"'
+let s:pattern = {
+            \   'django'    : {
+            \       'start' : '\V\c{%',
+            \       'mid'   : '',
+            \       'end'   : '\V\c%}',
+            \       'skip'  : s:skipPattern,
+            \   },
+            \   'django_expr'    : {
+            \       'start' : '\V\c{{',
+            \       'mid'   : '',
+            \       'end'   : '\V\c}}',
+            \       'skip'  : s:skipPattern,
+            \   },
+            \   'javascript'    : {
+            \       'start' : '\V\c<script\_[^>]\*>',
+            \       'mid'   : '',
+            \       'end'   : '\V\c</script>',
+            \       'skip'  : s:skipPattern,
+            \   },
+            \   'css'           : {
+            \       'start' : '\V\c<style\_[^>]\*>',
+            \       'mid'   : '',
+            \       'end'   : '\V\c</style>',
+            \       'skip'  : s:skipPattern,
+            \   },
+            \}
+
+let s:topFT = 'htmldjango'
+
+fun! XPT_htmldjangoFiletypeDetect() "{{{
+    let pos = [ line( "." ), col( "." ) ]
+
+    let synName = xpt#util#NearestSynName()
+
+    if synName == ''
+
+        return s:topFT
+
+    else
+
+        for [ name, ftPattern ] in items( s:pattern )
+            let pos = searchpairpos( ftPattern.start, ftPattern.mid, ftPattern.end, 'nbW', ftPattern.skip )
+            if pos != [0, 0]
+                return name
+            endif
+        endfor
+
+        if synName =~ '\v^\cjavascript'
+            return 'javascript'
+        elseif synName =~ '\v^\ccss'
+            return 'css'
+        endif
+
+        return s:topFT
+
+    endif
+
+endfunction "}}}
+
+if exists( 'b:XPTfiletypeDetect' )
+    unlet b:XPTfiletypeDetect
+endif
+let b:XPTfiletypeDetect = function( 'XPT_htmldjangoFiletypeDetect' )
+

plugins/bundle/xptemplate/ftplugin/htmldjango/htmldjango.xpt.vim

@@ -0,0 +1,80 @@
+XPTemplate priority=lang-
+
+
+XPTinclude
+      \ _common/common
+      \ html/html
+
+
+XPT _simpletag hidden " {% $_xSnipName %}
+{% `$_xSnipName^ %}
+..XPT
+
+
+XPT _tag hidden " {% $_xSnipName params %}
+{% `$_xSnipName^ `params^ %}
+..XPT
+
+
+XPT _qtag hidden " {% $_xSnipName "params" %}
+{% `$_xSnipName^ "`params^" %}
+..XPT
+
+
+XPT _simpleblock hidden " {% $_xSnipName %}..{% end$_xSnipName %}
+{% `$_xSnipName^ %}`content^{% end`$_xSnipName^ %}
+..XPT
+
+
+XPT _block wrap=content hidden " {% $_xSnipName  params %}..{% end$_xSnipName %} 
+{% `$_xSnipName^ `params^ %}
+    `content^
+{% end`$_xSnipName^ %}
+..XPT
+
+
+XPT _qblock wrap=content hidden " {% $_xSnipName "params" %}..{% end$_xSnipName %} 
+{% `$_xSnipName^ "`params^" %}
+    `content^
+{% end`$_xSnipName^ %}
+..XPT
+
+
+XPT _if wrap=content " $_xSnipName .. else .. end$_xSnipName
+{% `$_xSnipName^ `param^ %}
+    `content^
+`else...{{^{% else %}
+    `content^`}}^
+{% end`$_xSnipName^ %}
+..XPT
+
+
+XPT var " {{ var }}
+{{ `var^ }}
+..XPT
+
+
+XPT autoescape  alias=_block
+XPT block       alias=_block
+XPT comment     alias=_simpleblock
+XPT csrf_token  alias=_simpletag
+XPT cycle       alias=_tag
+XPT debug       alias=_simpletag
+XPT extends     alias=_qtag
+XPT filter      alias=_block
+XPT firstof     alias=_tag
+XPT for         alias=_block
+XPT empty       alias=_simpletag
+XPT else        alias=_simpletag
+XPT if          alias=_if
+XPT ifchanged   alias=_if
+XPT ifequal     alias=_if
+XPT ifnotequal  alias=_if
+XPT include     alias=_qtag
+XPT load        alias=_tag
+XPT now         alias=_tag
+XPT regroup     alias=_tag
+XPT url         alias=_tag
+XPT spaceless   alias=_simpleblock
+XPT ssi         alias=_tag
+XPT with        alias=_block