diff --git a/README.md b/README.md
new file mode 100644
index 00000000..7bfc6cb8
--- /dev/null
+++ b/README.md
@@ -0,0 +1,674 @@
+<!-- START doctoc generated TOC please keep comment here to allow auto update -->
+<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
+**Table of Contents**  *generated with [DocToc](http://doctoc.herokuapp.com/)*
+
+- [XPTemplate](#xptemplate)
+  - [Usage](#usage)
+    - [Browse and basic usage](#browse-and-basic-usage)
+    - [C skeleton](#c-skeleton)
+    - [C macro](#c-macro)
+    - [C for loop and wrapper](#c-for-loop-and-wrapper)
+    - [C if-else-else](#c-if-else-else)
+    - [Python option argument](#python-option-argument)
+    - [Python def and def in class](#python-def-and-def-in-class)
+    - [Python inline completion](#python-inline-completion)
+    - [Python try-except can be a wrapper](#python-try-except-can-be-a-wrapper)
+    - [Python quickly add snippet](#python-quickly-add-snippet)
+    - [Video tutorial](#video-tutorial)
+  - [Stay up-to-date](#stay-up-to-date)
+  - [About branches](#about-branches)
+  - [Features](#features)
+- [FAQ](#faq)
+  - [Trouble Shooting. Why not work?](#trouble-shooting-why-not-work)
+  - [What else does xptemlate required to work](#what-else-does-xptemlate-required-to-work)
+  - [How to install](#how-to-install)
+  - [How to reload snippets, after I changes snippet definition files(*.xpt.vim)?](#how-to-reload-snippets-after-i-changes-snippet-definition-filesxptvim)
+  - [Do NOT like spaces in auto-completed brackets/braces](#do-not-like-spaces-in-auto-completed-bracketsbraces)
+  - [I need spaces in brackets/braces only for this language, not that](#i-need-spaces-in-bracketsbraces-only-for-this-language-not-that)
+  - [I do not want XPTemplate to auto-complete braces](#i-do-not-want-xptemplate-to-auto-complete-braces)
+  - [Adjust space and line-break](#adjust-space-and-line-break)
+  - [Adjust format style of c functions, such as `main()`](#adjust-format-style-of-c-functions-such-as-main)
+  - [Supertab support](#supertab-support)
+  - [With popup menu opened, `<TAB>` doesn't trigger Snippe](#with-popup-menu-opened-tab-doesnt-trigger-snippe)
+  - [Set up personal info. XPTemplate complains: "author is not set .."](#set-up-personal-info-xptemplate-complains-author-is-not-set-)
+  - [Browse snippets: Pop up menu, Drop down list](#browse-snippets-pop-up-menu-drop-down-list)
+  - [Extend XPTemplate. Write new snippets](#extend-xptemplate-write-new-snippets)
+  - [Example of repetition snippet.](#example-of-repetition-snippet)
+  - [Define repetition trigger place holder](#define-repetition-trigger-place-holder)
+- [Known Issues](#known-issues)
+
+<!-- END doctoc generated TOC please keep comment here to allow auto update -->
+
+
+# XPTemplate
+
+Code snippets engine for Vim, And snippets library.
+Write codes in a smooth, quick and comfortable way.
+[xptemplate-vim.org][xpt-vim]
+
+<iframe src="http://ghbtns.com/github-btn.html?user=drmingdrmer&repo=xptemplate&type=watch&count=true"
+  allowtransparency="true" frameborder="0" scrolling="0" width="110" height="20"></iframe>
+
+
+## Usage
+
+    >vim xpt.c
+    for<C-\>
+
+generates:
+
+    for (i = 0; i < len; ++i){
+        /* cursor */
+    }
+
+Press `<tab>`,`<tab>`.. to navigate through "i", "0", "len" and finally stop at "`/* cursor */`"
+
+
+### Browse and basic usage
+![](readme-img/600x/browse-and-basic.gif)
+
+### C skeleton
+![](readme-img/600x/c-outline.gif)
+
+### C macro
+![](readme-img/600x/c-macro.gif)
+
+### C for loop and wrapper
+![](readme-img/600x/c-loop-and-wrapper.gif)
+
+### C if-else-else
+![](readme-img/600x/c-ifee.gif)
+
+
+### Python option argument
+![](readme-img/600x/py-optional-ph.gif)
+
+### Python def and def in class
+![](readme-img/600x/py-class-def.gif)
+
+### Python inline completion
+![](readme-img/600x/py-for-inline-cmpl.gif)
+
+### Python try-except can be a wrapper
+![](readme-img/600x/py-try.gif)
+
+### Python quickly add snippet
+![](readme-img/600x/py-quick-add.gif)
+
+
+### Video tutorial
+
+Tutorial by Derek Wyatt :
+<http://vimeo.com/4449258>
+
+
+## Stay up-to-date
+
+There are two major branches: "master" and "dev".
+
+* "master" is compacted, logging-removed version.
+Always use branch "master" unless you know what you are doing.
+* "dev" is for development, that it contains debug statements thus it is a bit slow.
+
+
+Before 2014-06-01, The two major branches are: "master" and "dist":
+
+* "master" is for developing purpose.
+* "dist" is for end user.
+
+
+## About branches
+
+* Branch `master` is the branch for end user.
+
+* Branch `dev` is for doing further developing on top of
+XPTemplate.
+
+* Branches that starts with `f.` are feature branches for different sub system
+of XPTemplate.
+
+* Branches that starts with `fd.` are feature breanches that has not yet been
+merged into `dev` and `master`, which are NOT considered stable.
+
+* Branches that starts with `snp.` are snippet branches.
+
+
+## Features
+
+* Live update while typing.
+* Navigate forward and backward with `<Tab>` and `<S-Tab>`.
+* Support embedded language like JAVASCRIPT in HTML. Or HTML in PHP.
+* Wrapper snippet.
+* Inclusion.
+* Generate dynamic content with variables/functions.
+* code style customization: line break before "{".
+* Filters.
+
+
+# FAQ
+
+## Trouble Shooting. Why not work?
+
+First of all, Enter VIM.
+
+* Check setting "compatible". In VIM, type:
+
+        :set compatible?
+
+    Make sure you get *"nocompatible"*. Or you need the following statement in your .vimrc:
+
+        set nocompatible
+
+* Check setting "filetype". In VIM, type:
+
+        :filetype
+
+    Make sure you get *"filetype detection:ON  plugin:ON ..."*. Or you need the following statement in you .vimrc:
+
+        filetype plugin  on
+
+
+* Check if XPTemplate is loaded. In VIM, type:
+
+        :scriptnames
+
+    You will get a list of scripts VIM has loaded. There should be some files with name started with "xpt", like this:
+
+        97: /data/.../dist/plugin/xptemplate.vim
+        98: /data/.../dist/plugin/xptemplate.conf.vim
+        99: /data/.../dist/plugin/xptemplate.util.vim
+
+    If not, you should check if you have XPTemplate installed correctly.
+
+    You should see files with name started with "xpt.." in folder ~/.vim/ (Unix-like OS) or in $VIMH/vimfiles/ (Windows). Like this:
+
+        |-- plugin
+        ...
+        |   |-- xpopup.vim
+        |   |-- xpreplace.vim
+        |   |-- xptemplate.conf.vim
+        ...
+
+    Reference:
+
+        :help 'runtimepath'
+
+* Check key binding. Make sure you have a clear environment:
+none of XPTemplate settings like *"let g:xpt..."* in you .vimrc file.
+In VIM, type:
+
+        :imap <C-\>
+
+    You will get something like this:
+
+        i  <C-\>       * <C-R>=XPTemplateStart(0,{'k':'<C-\++'})<CR>
+
+    This means your XPTemplate should work well.
+    Or check if some other plugin has conflicting key-binding.
+    If so, solve it by adding the following statement into you .vimrc file to change XPTemplate key-binding:
+
+        let g:xptemplate_key = '<Tab>'
+
+* Now type in *insert-mode*:
+
+        Date<C-\>
+
+    You will get current date.
+
+
+## What else does xptemlate required to work
+
+VIM and nothing else!
+
+XPTemplate is implemented purely with VIM script.
+Nothing else(like python) is required but a single VIM( at least 7.2 ).
+
+XPTemplate works also in VIM 7.0 too. But it's no as good as in VIM 7.2.
+
+
+
+## How to install
+
+Copy all folders in to your ~/.vim folder(on unix-like OS)
+
+Or add path to XPTemplate to VIM setting 'runtimepath'.
+
+
+## How to reload snippets, after I changes snippet definition files(*.xpt.vim)?
+
+    :XPTreload
+
+
+
+## Do NOT like spaces in auto-completed brackets/braces
+
+Spaces inside auto-completed brackets are controlled by XPTemplate variable $SParg.
+
+The Simplest way to disable spaces globally is to add following statements to .vimrc:
+
+    let g:xptemplate_vars = "SParg="
+
+
+With this setting, `"("` results in `"()"` but not `"(  )"` by default.
+
+
+## I need spaces in brackets/braces only for this language, not that
+
+Assume you do need spaces in brackets for java( that you want `"()"` but not `"(  )"`).
+
+Create a snippet file to defines your own preference:
+
+    .vim/ftplugin/java/mine.xpt.vim
+
+Add add following contents to this file:
+
+    XPTemplate priority=personal
+    XPTvar $SParg   ''
+
+
+## I do not want XPTemplate to auto-complete braces
+
+I want XPTemplate to complete `(`, `[`, but not `{`.
+
+Add this to .vimrc:
+
+    let g:xptemplate_brace_complete = '(['
+
+
+Or you may just want to disable brackets complete:
+
+    let g:xptemplate_brace_complete = ''
+
+
+
+## Adjust space and line-break
+
+Spaces and line-breaks are defined by some *variable*.
+Instead of rewrite snippet in your own coding style, modifying these *variable* is the easiest way.
+
+For example by default "for" loop snippet in C lang is like:
+
+    for ( i = 0; i < len; i++ ) {
+        /* cursor */
+    }
+
+As snippet "for" defined as:
+
+    for`$SPcmd^(`$SParg^`$FOR_SCOPE^`$VAR_PRE`i^`$SPop^=`$SPop^`0^; `i^`$SPop^<`$SPop^`len^; `i^++`$SParg^)`$BRloop^{
+        `cursor^
+    }
+
+If you want to remove space after "for" and create a line-break before "{":
+
+    for( i = 0; i < len; i++ )
+    {
+        /* cursor */
+    }
+
+Just add two variables into your *.vimrc* file:
+
+    let g:xptemplate_vars = "SPcmd=&BRloop=\n"
+
+
+## Adjust format style of c functions, such as `main()`
+
+Default c function indent is like this:
+
+        int
+    main( int argc, char **argv )
+    {
+        return 0;
+    }
+
+This is controlled by variable `$BRfun`, if you prefer the single line style:
+
+    int main( int argc, char **argv ) {
+        return 0;
+    }
+
+Add variable into your *.vimrc* file, to make ***ALL*** function snippets to
+use single line style:
+
+    let g:xptemplate_vars = "BRfun= "
+
+Or redefine `$BRfun` in higher priority snippet file to modify only c
+functions:
+
+    XPTemplate priority=personal
+    XPTvar $BRfun          ' '
+
+Add the above lines into `ftplugin/c/foobar.xpt.vim`.
+
+
+## Supertab support
+
+Let XPTemplate try to match any snippet,
+then let supertab try to complete,
+and then fall back to literal input.
+
+Put following lines into `~/.vimrc`:
+
+```vim
+" Prevent supertab from mapping <tab> to anything.
+let g:SuperTabMappingForward = '<Plug>xpt_void'
+
+" Tell XPTemplate what to fall back to, if nothing matches.
+" Original SuperTab() yields nothing if g:SuperTabMappingForward was set to
+" something it does not know.
+let g:xptemplate_fallback = '<C-r>=XPTwrapSuperTab("n")<CR>'
+
+fun! XPTwrapSuperTab(command) "{{{
+    let v = SuperTab(a:command)
+    if v == ''
+        " Change \<Tab> to whatever you want, when neither XPTemplate or
+        " supertab needs to do anything.
+        return "\<Tab>"
+    else
+        return v
+    end
+endfunction "}}}
+```
+
+## With popup menu opened, `<TAB>` doesn't trigger Snippe
+
+By default if popup menu is opened and `<TAB>` is used as trigger key, a `<TAB>` key press does not  trigger a snippet, according to convention in many other application user use `<TAB>`.
+
+If you always want to trigger snippet with `<TAB>` no matter popup menu opened or not, add these lines to your .vimrc:
+
+    let g:xptemplate_key = '<Plug>triggerxpt'
+    inoremap <Plug>closePUM <C-v><C-v><BS>
+    imap <TAB> <Plug>closePUM<Plug>triggerxpt
+    " let g:xptemplate_fallback = 'nore:<TAB>' " Optional. Use this only when you have no other plugin like SuperTab to handle <TAB>.
+
+It first forces popup menu to close and then trigger snippet.
+
+This fix issue that some plugin like AutoComplPop opens popup menu automatically.
+
+
+
+
+## Set up personal info. XPTemplate complains: "author is not set .."
+
+You can set up your name and email for just one time, and use them everywhere, like that in a document comment block the name of the author(you) will be filled in.
+
+Set up variable $author and $email in your .vimrc:
+
+    let g:xptemplate_vars = "author=your_name&email=drdr.xp@gmail.com&..."
+
+
+Thus "filehead" snippet of C language should result in:
+
+    ...
+     * @author : your_name | drdr.xp@gmail.com
+    ...
+
+
+## Browse snippets: Pop up menu, Drop down list
+
+By default, to list snippets whose name starts with "i", Press:
+
+    i<C-r><C-\>
+
+By default, when pressing `<C-\>`
+there must be at least one letter before cursor
+so that XPTemplate triggers any snippet.
+
+* If there is only one snippet matching the preceding letters:
+
+    XPTemplate expands it.
+
+* If there are multiple matching:
+
+    XPTemplate shows up a drop down menu to let user to browse and select
+    snippet.
+![c-pum-starts-with-f](readme-img/c-pum-starts-with-f.png)
+
+* In order to always show drop down menu even when there is no preceding
+letters before cursor, add `g:xptemplate_minimal_prefix = 0` to `.vimrc`:
+```vim
+    let g:xptemplate_minimal_prefix = 0
+```
+
+See also:
+```vim
+    :help g:xptemplate_minimal_prefix
+    :help g:xptemplate_key_force_pum
+```
+
+
+## Extend XPTemplate. Write new snippets
+
+Do *NOT* modify snippets supplied by XPTemplate.
+
+***Where***:
+
+Add your own snippets into folder **personal** :
+
+    <path_to_xpt>/personal/ftplugins/
+
+
+It is meant for user-defined snippets.
+It shares the same directory-structure with the xpt-snippet-folder.
+
+Example personal-snippet-folder:
+
+    |~personal/
+    | |~ftplugin/
+    | | |+_common/
+    | | `~c/
+    | |   |-c_ext.xpt.vim
+    | |   `-c_new.xpt.vim
+    ...
+
+
+***How***:
+
+***NOTE: File names does not matter except it must ends with '.xpt.vim'.***
+
+* To create new snippet: Create *c_new.xpt.vim*. Add new snippets in it.
+
+* To override existing ones, Create *c_ext.xpte.vim* with *higher priority*.
+Put modified snippets into this file.
+For example an extended "*for*" snippet looks like:
+
+        XPTemplate priority=lang-1
+        XPTinclude
+              \ _common/common
+
+        XPTemplate for " tips
+        for (
+            `i^ = 0;
+            `i^ < `len^;
+            ++`i^
+        )
+
+
+The header line declares a higher priority than priority "*lang*"( lower number means higher priority ):
+
+    XPTemplate priority=lang-1
+
+All snippets in this file override snippets in *xpt-snippet-folder/ftplugin/c/c.xpt.vim* which declares with priority "*lang*".
+
+Except that this file is with higher **priority**, **Personal-snippet-folder** has no differences from **xpt-snippet-folder**.
+
+***If you use GIT to sync vim plugins and your own snippets,
+it's a good idea to place your snippet GIT folder somewhere outside XPTemplate
+folder and add snippet folder path to `runtimepath`.***
+
+References:
+
+    :help xpt-write-snippet
+    :help xpt-snippet-priority
+
+
+## Example of repetition snippet.
+
+Repetition snippet generates repeating contents such as multiple `else if` or
+multiple `case `.
+
+The following example is c struct snippet:
+```vim
+XPT struct
+struct `a^ {
+    `data_type^ `member^;
+`    `more...`
+{{^    `data_type^ `member^;
+`    `more...`
+^`}}^};
+```
+
+It generates:
+```
+struct a {
+    data_type member;
+    data_type member;
+    data_type member;
+    more...
+}
+```
+The last `more...` is trigger place holder for next repetitive part.
+
+Pressing `<Tab>` on `more...` generates another `data_type member;`.
+
+Pressing `<CR>` on `more...` quits applying repetition.
+
+
+One of the problems with repetition is controlling line breaks.
+XPTemplate accepts space and line-break as part of placeholder.
+
+When trigger place holder is removed by pressing `<CR>`,
+line break `\n` should also be removed togeter.
+Thus space and line break should be part of place holder.
+
+
+To do this, use the complete-form of placeholder:
+```vim
+`left-edge`placeholder_name`right-edge^
+```
+`left-edge` and `right-edge` can be space char or non-space char.
+
+Thus in this c struct snippet:
+
+![screen shot 2014-05-10 at 5 09 21 pm](https://cloud.githubusercontent.com/assets/44069/2935685/c9c9dfac-d822-11e3-8fda-ef428576bfee.png)
+
+The repetition trigger is `more...` in cyan.
+
+4 spaces on the left to `more...` and 1 line break on the right to `more...`.
+
+Repetition body is the text in green.
+
+Trigger for next repetition is the text in red.
+***These two triggers(cyan and red) must be the same to generate consistent copies***.
+
+Thus there will always be correct indent and a line break around trigger.
+
+![screen shot 2014-05-10 at 5 13 44 pm](https://cloud.githubusercontent.com/assets/44069/2935690/63288d6a-d823-11e3-978a-734e7451df9d.png)
+
+When trigger of repetition is removed,
+4 space indent and line break is also removed all together with trigger,
+
+![screen shot 2014-05-10 at 5 15 32 pm](https://cloud.githubusercontent.com/assets/44069/2935691/a1f1e17c-d823-11e3-97fe-9f1af63cdec3.png)
+
+
+## Define repetition trigger place holder
+
+Indent and line breaks are a bit complicated in repetition snippet.
+
+This section describes how to define repetition correctly and clearly.
+
+You may expect repetition `struct` in c to be like:
+```c
+struct a {         //
+    int a;         //
+    more...        // focused here
+}                  //
+
+struct a {         //
+    int a;         //
+    int name;      // when triggered, repetitive content generated.
+    more...        // focused here
+}                  //
+
+struct a {         //
+    int a;         //
+    int name;      // when repetition canceled.
+}                  //
+```
+
+General rule is:
+
+* Think of snippet as a single string.
+* The text of place holder is actually the change from text with place holder
+not removed to the text with place holder removed.
+
+
+The following three examples show what repetition trigger is, with:
+* only content before repetitions
+* only content after repetitions
+* both before and after
+
+( `*` = space)
+
+With only content ***BEFORE*** repetition:
+
+```
+    |                 | what on screen | plain string      | trigger     |
+    |---------------------------------------------------------------------
+    | repetition      | before         | before\n****ph... |             |
+    |                 | ****ph...      |                   |             |
+    |------------------------------------------------------|             |
+    | after canceling | before         | before            | \n****ph... |
+    | repetition      |                |                   |             |
+    |---------------------------------------------------------------------
+
+XPT rep_before
+before`
+    `ph...`{{^repetitive-content`
+    `ph...`^`}}^
+```
+
+With only content ***AFTER*** repetition:
+
+```
+    |                 | what on screen | plain string      | trigger     |
+    |---------------------------------------------------------------------
+    | repetition      | ****ph...      | ****ph...\nafter  |             |
+    |                 | after          |                   |             |
+    |------------------------------------------------------|             |
+    | after canceling | after          | after             | ****ph...\n |
+    | repetition      |                |                   |             |
+    |---------------------------------------------------------------------
+
+XPT rep_after
+`    `ph...`
+{{^repetitive-content
+`    `ph...`
+^`}}^after
+```
+
+Both before and after:
+
+```
+    |                 | what on screen | what happened            | trigger     |
+    |----------------------------------------------------------------------------
+    | repetition      | before         | before\n****ph...\nafter |             |
+    | place holder    | ****ph...      |                          |             |
+    |                 | after          |                          |             |
+    |-------------------------------------------------------------|             |
+    | after canceling | before         | before\nafter            | \n****ph... |
+    | repetition      | after          |                          |     or      |
+    |                 |                |                          | ****ph...\n |
+    |----------------------------------------------------------------------------
+```
+Either of rep_before and rep_after is OK in this case.
+
+
+# Known Issues
+
+* Before VIM 7.4, during applying snippet, key-mapping saving/restoring does not support `<expr>` mapping well.
+[#43](../../issues/43)  
+Solution: upgrade to VIM 7.4
+
+
+[xpt-github]: https://github.com/drmingdrmer/xptemplate
+[xpt-vim]: http://www.vim.org/scripts/script.php?script_id=2611
diff --git a/VERSION b/VERSION
index cb498ab2..76914ddc 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.4.8
+0.4.9
diff --git a/_script/build b/_script/build
new file mode 100755
index 00000000..b5af6869
--- /dev/null
+++ b/_script/build
@@ -0,0 +1,204 @@
+#!/bin/bash
+
+
+case $1 in
+    gentest)
+        cd ftplugin/
+        langs=`ls -d * | grep -v "^_" | awk '{printf($1" ");}'`
+        cd -
+
+        echo "vim -c \"XPTtestAll $langs\"" >test.bat
+        exit
+        ;;
+
+    "")
+        mode=""
+        echo "export"
+        ;;
+
+    "test")
+        mode=test
+        echo "export"
+        ;;
+
+    *)
+        echo "error"
+        exit -1
+        ;;
+
+esac
+
+
+CurrentDir=$PWD
+ParentDir=${PWD%/*}
+githash=`git log --max-count=1 --format=%h`
+today=`date +%y%m%d`
+ver=`cat VERSION`.$today-$githash
+build_name=build-$today-$githash
+
+dev_branch=dev
+build_branch=master
+
+
+compact() {
+    local file=$1
+
+    echo Join splitted lines
+    echo Remove Logs/Comments/Empty_Lines from $file
+
+    grep -v "call s:log.\(Log\|Debug\)(" $file |\
+        grep -v "^ *Assert " |\
+        grep -v "^ *\"" |\
+        grep -v "^ *$" |\
+        sed 's/ *" *{{{//; s/ *" *}}}//' |\
+        gawk -f _script/build-d/cleanspace.awk |\
+        gawk -f _script/build-d/joinlines.awk |\
+        gawk -f _script/build-d/formatindent.awk \
+        > .tmp
+
+    mv .tmp $file
+}
+
+create_tgz() {
+    rm -rf $ParentDir/xpt && mkdir $ParentDir/xpt && cp -R ./* $ParentDir/xpt/
+    cd $ParentDir/xpt && tar -czf ../xpt-$ver.tgz *
+    cd $CurrentDir
+}
+
+build_for_release () {
+    check_cur_branch \
+        && create_build_branch \
+        && compact_files \
+        && update_doc \
+        && clean_files \
+        && remove_tests \
+        && generate_version \
+        && commit_build \
+        && create_tgz \
+        && update_built_branch \
+        && echo "Done"
+}
+
+build_for_test () {
+    check_cur_branch \
+        && git checkout $githash \
+        && compact_files \
+        && update_doc \
+        && clean_files \
+        && generate_version \
+        && git commit -a -m "$build_name for test" \
+        && vim -c 'call xpt#unittest#Runall() | call getchar() | qa' \
+        && echo "Done building for test"
+}
+
+check_cur_branch() {
+    local cur_branch=$(git symbolic-ref HEAD 2>/dev/null | cut -c 12-)
+
+    echo $cur_branch
+
+    if [ ".$cur_branch" != ".$dev_branch" ]; then
+        echo "not on $dev_branch!!"
+        return -1;
+    fi
+}
+
+create_build_branch() {
+    git checkout -b $build_name || { echo "Failed to create branch $build_name"; return 1; }
+}
+
+clean_files() {
+    cat $CurrentDir/$0 | awk '/^# __TO_REMOVE__/,/^# __TO_REMOVE__ END/{ if ( $1 != "#" ) print $0; }' | while read f; do git rm -rf $f; done
+    git rm `find . -name "test.page*"`
+    rm `find . -name "*.xpt.vimc"`
+    return 0
+}
+
+remove_tests() {
+    git rm -rf test/
+    git rm -rf autoload/xpt/ut/
+    git rm -rf autoload/xpt/unittest.vim
+}
+
+compact_files() {
+
+    for file in `find {plugin,autoload}/ -name *.vim | grep -v "/debug\.vim$"`;do
+        compact $file
+    done
+}
+
+generate_version() {
+
+    mv plugin/xptemplate.vim .tmp
+    cat > plugin/xptemplate.vim <<-END
+	" GetLatestVimScripts: 2611 1 :AutoInstall: xpt.tgz
+	" VERSION: $ver
+	END
+    cat .tmp >> plugin/xptemplate.vim && rm .tmp
+}
+
+update_doc() {
+    local doc_sections="option snippet-function"
+
+    _script/credit-update \
+        && _script/doc_merge.py \
+        || return 1
+
+    for sec in $doc_sections; do
+        git rm -r doc/xpt/$sec || return 1
+    done
+
+    vim -c "helptags ./doc" -c 'qa!'
+
+    for sec in $doc_sections credit; do
+        git add doc/xpt/$sec.txt || return 1
+    done
+}
+
+commit_build() {
+    git commit -a -m "$build_name"
+}
+
+update_built_branch(){
+
+    local base=$(git merge-base $dev_branch $build_branch)
+    local mes="$(git log $base..$dev_branch --format="%b" | grep -v "x-update-from")"
+    local subject="$(git log $base..$dev_branch --format="%s")"
+    subject="$(echo $subject)"
+
+    local tree_hash=$(git_obj_get_tree "$build_name")
+    local built_commit_hash=$(echo "$subject
+
+$mes" | git commit-tree $tree_hash -p $build_branch -p $dev_branch)
+    git update-ref refs/heads/$build_branch $built_commit_hash
+
+    git checkout $dev_branch \
+        && git branch -D $build_name
+
+}
+
+git_obj_get_tree () {
+    git cat-file -p "$1" | head -n1 | awk '{print $2}'
+}
+
+if [ "$mode" == "test" ]; then
+    build_for_test
+else
+    build_for_release
+fi
+exit
+
+# __TO_REMOVE__
+plugin/xptemplateTest.vim
+plugin/xptTestKey.vim
+plugin/xptemplate.importer.vim
+doc/tags
+make-dev
+make-mix
+tags
+test.bat
+test.sh
+to-gitcafe
+todo
+_script/
+VERSION
+# __TO_REMOVE__ END
diff --git a/_script/build-d/cleanspace.awk b/_script/build-d/cleanspace.awk
new file mode 100644
index 00000000..68b7da79
--- /dev/null
+++ b/_script/build-d/cleanspace.awk
@@ -0,0 +1,23 @@
+/^[^"']*$/ {
+    gsub( /(\> +\<)/, " " );
+    $0 = gensub( /(\w) +(\w)/, "\\1 \\2", "g" );
+    $0 = gensub( /([^ 0-9a-z_]) +/, "\\1 ", "g" );
+    $0 = gensub( /(\w) +(\W)/, "\\1 \\2", "g" );
+
+    # space after brackets
+    $0 = gensub( /([\[{(,]) +/, "\\1", "g" );
+
+    # space before brackets
+    $0 = gensub( / +([\]})])/, "\\1", "g" );
+
+    # space at line end
+    $0 = gensub( / +$/, "", "g" );
+
+    print $0;
+}
+/['"]/ {
+    $0 = gensub( /^ *(\\ *'[^']+') *: */, "\\1:", "g" );
+    print $0;
+}
+
+# vim: tabstop=2
diff --git a/_script/build-d/formatindent.awk b/_script/build-d/formatindent.awk
new file mode 100644
index 00000000..33f50636
--- /dev/null
+++ b/_script/build-d/formatindent.awk
@@ -0,0 +1,10 @@
+{
+    $0 = gensub( /^    /, "	", "g" );
+    $0 = gensub( /^	    /, "		", "g" );
+    $0 = gensub( /^		    /, "			", "g" );
+    $0 = gensub( /^			    /, "				", "g" );
+    $0 = gensub( /^				    /, "					", "g" );
+    print $0;
+}
+
+# vim: tabstop=2
diff --git a/_script/build-d/joinlines.awk b/_script/build-d/joinlines.awk
new file mode 100644
index 00000000..dfb6c789
--- /dev/null
+++ b/_script/build-d/joinlines.awk
@@ -0,0 +1,14 @@
+$0 ~ /^ *\\/ {
+    t = $0;
+    gsub( /^ *\\ */, " ", t );
+    last = last t;
+}
+$0 !~ /^ *\\/ {
+    if ( last != "" ) {
+        print last;
+    }
+    last = $0;
+}
+END{
+    print last;
+}
diff --git a/_script/build-d/make-change-log b/_script/build-d/make-change-log
new file mode 100755
index 00000000..14ec7e5b
--- /dev/null
+++ b/_script/build-d/make-change-log
@@ -0,0 +1,55 @@
+#!/bin/sh
+
+onto_branch=dev
+from_branch=mix
+
+since_ts=$(git log -n1 --format="%at" $onto_branch)
+
+# <ts> <hash> <date> <time> +0008 <mes>
+git log --format="%at %h %ai %s" --no-merges $from_branch \
+    | sort -r \
+    | awk -v since=$since_ts '{
+        if ( int($1) > int(since) ) {
+            gsub(".", "", $1);
+            gsub(".", "", $4);
+            gsub(".", "", $5);
+            print $0;
+        }
+    }' \
+    | sed 's/^ //; s/  */ /g' \
+    | grep " Added: \| Changed: \| Deprecated: \| Removed: \| Fixed: " \
+    | python -c '
+import sys
+import datetime
+import time
+
+has_log = False
+logs = {"Added":{}, "Changed":{}, "Deprecated":{}, "Removed":{}, "Fixed":{}}
+for line in sys.stdin:
+    hsh, dt, tp, sec, mes = line.split(None, 4)
+    tp = tp[:-1]
+    sec = sec[:-1]
+    mes = mes.strip()
+    logs[tp][sec] = logs[tp].get(sec, []) + [mes]
+    has_log = True
+
+if not has_log:
+    sys.exit(0)
+
+now = datetime.datetime.utcfromtimestamp(int(time.time())).strftime("%Y-%m-%d")
+print now
+print "="*len(now)
+print ""
+for tp in ("Added", "Changed", "Deprecated", "Removed", "Fixed"):
+
+    if len(logs[tp]) == 0:
+        continue
+
+    print tp
+    print "-"*len(tp)
+    print ""
+    for sec in sorted(logs[tp].keys()):
+        for mes in logs[tp][sec]:
+            print "*   " + sec + ": " + mes
+        print ""
+'
diff --git a/_script/contributor.txt b/_script/contributor.txt
new file mode 100644
index 00000000..2cced299
--- /dev/null
+++ b/_script/contributor.txt
@@ -0,0 +1 @@
+@bstaint
diff --git a/_script/credit-update b/_script/credit-update
new file mode 100755
index 00000000..29c35e48
--- /dev/null
+++ b/_script/credit-update
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+fn=doc/xpt/credit.txt
+
+echo "Thanks to:\n" > $fn
+git log --all --no-merges --format="%an" \
+    | grep -v "drdr.\?xp\|xp\|zhang yanpo\|drmingdrmer\|no author" \
+    | sort | uniq \
+    >> $fn
+
+cat _script/contributor.txt >>$fn
diff --git a/_script/doc_merge.py b/_script/doc_merge.py
new file mode 100755
index 00000000..e5ff7789
--- /dev/null
+++ b/_script/doc_merge.py
@@ -0,0 +1,66 @@
+#!/usr/bin/env python
+# coding: utf-8
+
+import os
+
+def out( f, *msgs ):
+    for msg in msgs:
+        f.write(msg + "\n" )
+
+def fnlist( section ):
+    base = os.path.join( "doc", "xpt", section )
+    fns = os.listdir( base )
+    fns.sort()
+    anony = [x for x in fns
+             if x.startswith('_')]
+    chapters = [x for x in fns
+                if not x.startswith('_')]
+    return anony + chapters
+
+def fread( fn ):
+    with open( fn, 'r' ) as f:
+        cont = f.read()
+    lines = cont.split( "\n" )
+    lines = [ x for x in lines
+              if not x.startswith( '" vi''m:' ) ]
+    return '\n'.join( lines )
+
+def merge_doc( section, prefix ):
+
+    width = 78
+    title ='*xpt-' + section + '*'
+    title = title.rjust(width)
+    header = [
+            title,
+            '=' * width,
+            '',
+            'Table of Content ~',
+            '',
+    ]
+
+    fns = fnlist( section )
+
+    fn = os.path.join( "doc", "xpt", section + ".txt" )
+    with open( fn, "w" ) as f:
+
+        out( f, *header )
+
+        indent = "	"
+        for fn in fns:
+            optname = fn.split(".")[0]
+            if not optname.startswith('_'):
+                out( f, indent + "|" + prefix + optname + "|" )
+
+        out( f, "" )
+
+        for fn in fns:
+            cont = fread( os.path.join( "doc", "xpt", section, fn ) )
+            out( f, cont )
+
+        out( f, "" )
+        out( f, '" vi''m: tw='+str(width)+':ts=8:sw=8:sts=8:noet:ft=help:norl:' )
+
+if __name__ == "__main__":
+
+    merge_doc( 'option', 'g:xptemplate_' )
+    merge_doc( 'snippet-function', '' )
diff --git a/autoload/XPT.vim b/autoload/XPT.vim
index a6d667ea..9e75473f 100644
--- a/autoload/XPT.vim
+++ b/autoload/XPT.vim
@@ -8,19 +8,87 @@ let g:__XPT_VIM__ = 1
 let s:oldcpo = &cpo
 set cpo-=< cpo+=B
 
+" let XPT#ver = 3
 let XPT#ver = 2
 
 let XPT#let_sid = 'map <Plug>xsid <SID>|let s:sid=matchstr(maparg("<Plug>xsid"), "\\d\\+_")|unmap <Plug>xsid'
 
 let XPT#nullDict = {}
 let XPT#nullList = []
+
+let XPT#escapeHead   = '\v(\\*)\V'
+let XPT#unescapeHead = '\v(\\*)\1\\?\V'
 let XPT#nonEscaped =
       \   '\%('
       \ .     '\%(\[^\\]\|\^\)'
       \ .     '\%(\\\\\)\*'
       \ . '\)'
       \ . '\@<='
-
+let XPT#regEval     = '\V\w(\|$\w'
+let XPT#nonsafe     = '{$( '
+let XPT#nonsafeHint = '$('
+
+let XPT#item_var   = '\V' . '$\w\+'
+let XPT#item_qvar  = '\V' . '{$\w\+}'
+let XPT#item_func  = '\V' . '\w\+(\.\*)'
+let XPT#item_qfunc = '\V' . '{\w\+(\.\*)}'
+let XPT#ptnIncFull = '\V' . '\^Include:' . '\zs' . '\(\.\{-}\)\$'
+let XPT#ptnIncSimp = '\V' . '\^:' . '\zs' . '\(\.\{-}\)' . '\ze' . ':\$'
+let XPT#ptnRepetition = '\V'. '\^\w\*...\w\*\$'
+
+let XPT#ptnPreEvalFunc = '\v^%(Inc|Inline|ResetIndent|Pre)\('
+
+let XPT#BUILT = 0x001
+let XPT#NOTBUILT = 0x002
+
+let XPT#DONE   = 0x100
+let XPT#UNDONE = 0x200
+let XPT#GOON   = 0x300
+let XPT#AGAIN  = 0x400
+let XPT#BROKEN = -1
+
+
+
+
+" VIM bug, variables in form *#* can not be used inside function. Thus I have to
+" convert all them to script-local variables.
+let XPT#importConst = ''
+      \ . 'let s:escapeHead     = XPT#escapeHead | '
+      \ . 'let s:unescapeHead   = XPT#unescapeHead | '
+      \ . 'let s:nonEscaped     = XPT#nonEscaped | '
+      \ . 'let s:regEval        = XPT#regEval | '
+      \ . 'let s:nonsafe        = XPT#nonsafe | '
+      \ . 'let s:nonsafeHint    = XPT#nonsafeHint | '
+      \ . 'let s:nullDict       = XPT#nullDict | '
+      \ . 'let s:nullList       = XPT#nullList | '
+      \ . 'let s:item_var       = XPT#item_var   | '
+      \ . 'let s:item_qvar      = XPT#item_qvar  | '
+      \ . 'let s:item_func      = XPT#item_func  | '
+      \ . 'let s:item_qfunc     = XPT#item_qfunc | '
+      \ . 'let s:ptnIncFull     = XPT#ptnIncFull | '
+      \ . 'let s:ptnIncSimp     = XPT#ptnIncSimp | '
+      \ . 'let s:ptnRepetition  = XPT#ptnRepetition | '
+      \ . 'let s:ptnPreEvalFunc = XPT#ptnPreEvalFunc | '
+      \ . 'let s:DONE           = XPT#DONE | '
+      \ . 'let s:UNDONE         = XPT#UNDONE | '
+      \ . 'let s:GOON           = XPT#GOON | '
+      \ . 'let s:AGAIN          = XPT#AGAIN | '
+      \ . 'let s:BROKEN         = XPT#BROKEN | '
+      \ . 'let s:BUILT          = XPT#BUILT | '
+      \ . 'let s:NOTBUILT       = XPT#NOTBUILT | '
+      \
+      \ . 'let s:R_NEXT = 0x008 | '
+      \ . 'let s:R_OUT  = 0x009 | '
+      \ . 'let s:R_     = 0x00A | '
+      \ . 'let s:R_FOO  = 0x00B | '
+      \
+      \ . 'let s:G_CRESTED   = 0x010 | '
+      \ . 'let s:G_INITED    = 0x020 | '
+      \ . 'let s:G_PROCESSED = 0x030 | '
+      \ . 'let s:G_REFOCUSED = 0x040 | '
+
+let XPT#priorities = {'all' : 192, 'spec' : 160, 'like' : 128, 'lang' : 96, 'sub' : 64, 'personal' : 32}
+let XPT#skipPattern = 'synIDattr(synID(line("."), col("."), 0), "name") =~? "\\vstring|comment"'
 
 fun! XPT#setIfNotExist(k, v) "{{{
     if !exists( a:k )
@@ -75,6 +143,22 @@ fun! XPT#getIndentNr( ln, col ) "{{{
 
 endfunction "}}}
 
+fun! XPT#getPreferedIndentNr( ln ) "{{{
+    if &indentexpr != ''
+        let indentexpr = substitute( &indentexpr, '\Vv:lnum', a:ln, '' )
+        try
+            return  eval( indentexpr )
+        catch /.*/
+            return -1
+        endtry
+    elseif &cindent
+        return cindent( a:ln )
+    else
+        return -1
+    endif
+    
+endfunction "}}}
+
 fun! XPT#getCmdOutput( cmd ) "{{{
     let l:a = ""
 
@@ -85,26 +169,6 @@ fun! XPT#getCmdOutput( cmd ) "{{{
     return l:a
 endfunction "}}}
 
-
-fun! XPT#LeadingTabToSpace( str ) "{{{
-    if stridx( a:str, "	" ) < 0
-        return a:str
-    endif
-    
-    let str = "\n" . a:str
-
-    let tabspaces = repeat( ' ', &tabstop )
-
-    let last = ''
-    while str != last
-        let last = str
-        let str = substitute( str, '\n	*\zs	', tabspaces, 'g' )
-    endwhile
-
-    return str[ 1 : ]
-
-endfunction "}}}
-
 fun! XPT#convertSpaceToTab( text ) "{{{
     " NOTE: line-break followed by space
 
@@ -211,7 +275,15 @@ fun! XPT#class( sid, proto ) "{{{
     call map( funcs, 'matchstr( v:val, "' . a:sid . '\\zs.*\\ze(" )' )
 
     for name in funcs
-        if name !~ '\V\^_'
+        " with verbose mode on:
+        " $ vim -V9vimlog
+        "
+        " :silent function /xxx
+        " get:
+        " >   function <SNR>145_New() dict
+        " >       Last set from ~/bash.xp/vim.xp/plg-git/xptdev/plugin/classes/FiletypeScope.vim
+        " the second line does not match <SNR>_*, thus we empty string should be skipped
+        if name != "" && name !~ '\V\^_'
             let clz[ name ] = function( '<SNR>' . a:sid . name )
         endif
     endfor
@@ -234,4 +306,27 @@ fun! XPT#classVoidInit( ... ) dict "{{{
 endfunction "}}}
 
 
+fun! XPT#default(k, v) "{{{
+    if !exists( a:k )
+        exe "let" a:k "=" string( a:v )
+    endif
+endfunction "}}}
+
+fun! XPT#Strlen( s ) "{{{
+    return strlen(substitute(a:s, ".", "x", "g"))
+endfunction "}}}
+
+fun! XPT#Assert( toBeTrue, msg ) "{{{
+    if !a:toBeTrue
+        call XPT#warn( a:msg )
+        if g:xpt_test_on_error == 'stop'
+            throw "XPT_TEST: fail: " . a:msg
+        endif
+    endi
+endfunction "}}}
+
+fun! XPT#AssertEq( a, b, msg ) "{{{
+    call XPT#Assert( a:a == a:b, 'expect:' . string( a:a ) . ' but:' . string( a:b ) . ' message:' . a:msg )
+endfunction "}}}
+
 let &cpo = s:oldcpo
diff --git a/autoload/xpt/buf.vim b/autoload/xpt/buf.vim
new file mode 100644
index 00000000..a683e603
--- /dev/null
+++ b/autoload/xpt/buf.vim
@@ -0,0 +1,46 @@
+exec xpt#once#init
+
+let s:oldcpo = &cpo
+set cpo-=< cpo+=B
+
+fun! xpt#buf#New() "{{{
+
+    if exists( 'b:xptemplateData' )
+        return
+    endif
+
+    let b:xptemplateData = {
+          \     'filetypes'         : {},
+          \     'wrapStartPos'      : 0,
+          \     'wrap'              : '',
+          \     'savedReg'          : '',
+          \     'snippetToParse'    : [],
+          \     'abbrPrefix'        : {},
+          \     'fallbacks'         : [],
+          \     'posStack'          : [],
+          \     'stack'             : [],
+          \     'keyword'           : '\w',
+          \     'keywordList'       : [],
+          \     'snipFileScope'     : {},
+          \     'snipFileScopeStack': [],
+          \ }
+
+    let b:xptemplateData.renderContext = xpt#rctx#New( b:xptemplateData )
+
+    return b:xptemplateData
+
+endfunction "}}}
+
+fun! xpt#buf#Pushrctx() "{{{
+    let x = b:xptemplateData
+
+    call add( x.stack, x.renderContext )
+    let x.renderContext = xpt#rctx#New( x )
+endfunction "}}}
+
+fun! xpt#buf#Poprctx() "{{{
+    let x = b:xptemplateData
+    let x.renderContext = remove(x.stack, -1)
+endfunction "}}}
+
+let &cpo = s:oldcpo
diff --git a/autoload/xpt/cwd/snpt.vim b/autoload/xpt/cwd/snpt.vim
new file mode 100644
index 00000000..4a7653aa
--- /dev/null
+++ b/autoload/xpt/cwd/snpt.vim
@@ -0,0 +1,28 @@
+if exists( "g:__AUTOLOAD__XPT__CWC__SNPT_VIM__" )
+    finish
+endif
+let g:__AUTOLOAD__XPT__CWC__SNPT_VIM__ = 1
+
+let s:oldcpo = &cpo
+set cpo-=< cpo+=B
+
+fun! xpt#cwd#snpt#load() "{{{
+
+    if exists( 'b:xptemplate_cwd_snpt_loaded' )
+        return
+    endif
+
+    so .xpt.vim
+    exec "so ." . &filetype . ".xpt.vim"
+
+    let b:xptemplate_cwd_snpt_loaded = 1
+
+endfunction "}}}
+
+fun! xpt#cwd#snpt#clearFlag() "{{{
+    if exists( 'b:xptemplate_cwd_snpt_loaded' )
+        unlet b:xptemplate_cwd_snpt_loaded
+    endif
+endfunction "}}}
+
+let &cpo = s:oldcpo
diff --git a/autoload/xpt/debug.vim b/autoload/xpt/debug.vim
new file mode 100644
index 00000000..3a13da35
--- /dev/null
+++ b/autoload/xpt/debug.vim
@@ -0,0 +1,159 @@
+if exists( "g:__XPT_DEBUG_VIM__" ) && g:__XPT_DEBUG_VIM__ >= XPT#ver
+    finish
+endif
+let g:__XPT_DEBUG_VIM__ = XPT#ver
+
+let s:oldcpo = &cpo
+set cpo-=<
+set cpo+=B
+
+
+exe XPT#let_sid
+
+let s:globalLogLevel = 'debug'
+
+let s:logLevels = {
+      \ 'fatal' : 1,
+      \ 'error' : 2,
+      \ 'warn'  : 3,
+      \ 'info'  : 4,
+      \ 'log'   : 5,
+      \ 'debug' : 6,
+      \ }
+
+fun! xpt#debug#Logger( level ) "{{{
+
+  let level = s:logLevels[ a:level ]
+  let level = min( [ level, s:logLevels[ s:globalLogLevel ] ] )
+
+  let logger = copy( s:loggerPrototype )
+
+  if level < s:logLevels.fatal | let logger.Fatal = s:loggerPrototype.LogNothing | endif
+  if level < s:logLevels.error | let logger.Error = s:loggerPrototype.LogNothing | endif
+  if level < s:logLevels.warn  | let logger.Warn  = s:loggerPrototype.LogNothing | endif
+  if level < s:logLevels.info  | let logger.Info  = s:loggerPrototype.LogNothing | endif
+  if level < s:logLevels.log   | let logger.Log   = s:loggerPrototype.LogNothing | endif
+  if level < s:logLevels.debug | let logger.Debug = s:loggerPrototype.LogNothing | endif
+
+  return logger
+endfunction "}}}
+
+fun! xpt#debug#Assert( shouldBeTrue, msg ) "{{{
+    if !a:shouldBeTrue
+        throw a:msg
+    end
+endfunction "}}}
+
+fun! xpt#debug#List( l ) "{{{
+    let rst = '[' . "\n"
+    for e in a:l
+        let rst .= '--- ' . string( e ) . "\n"
+        unlet e
+    endfor
+
+    return rst . "\n" . ']'
+endfunction "}}}
+
+fun! xpt#debug#EchoList( l ) "{{{
+
+    echom '['
+    for e in a:l
+        echom '--- ' . string( e ) . "\n"
+        unlet e
+    endfor
+
+    echom  ']'
+
+endfunction "}}}
+
+
+fun! s:Fatal(...) dict "{{{
+    return call('Log_core', ['Fatal'] + a:000)
+endfunction "}}}
+
+fun! s:Error(...) dict "{{{
+    return call('Log_core', ['Error'] + a:000)
+endfunction "}}}
+
+fun! s:Warn(...) dict "{{{
+    return call('Log_core', ['Warn'] + a:000)
+endfunction "}}}
+
+fun! s:Info(...) dict "{{{
+    return call('Log_core', ['Info'] + a:000)
+endfunction "}}}
+
+fun! s:Log(...) dict "{{{
+    return call('Log_core', ['Log'] + a:000)
+endfunction "}}}
+
+fun! s:Debug(...) dict "{{{
+    return call('Log_core', ['Debug'] + a:000)
+endfunction "}}}
+
+fun! s:LogNothing(...) "{{{
+endfunction "}}}
+
+
+fun! Log_core(level, ...) "{{{
+
+    if s:logLocation == ''
+        return
+    end
+
+    " call stack printing
+    try
+        throw ''
+    catch /.*/
+        let stack = matchstr( v:throwpoint, 'function\s\+\zs.\{-}\ze\.\.\%(Fatal\|Error\|Warn\|Info\|Log\|Debug\).*' )
+        let stack = substitute( stack, '<SNR>\d\+_', '', 'g' )
+    endtry
+
+
+    exe 'redir! >> '.s:logLocation
+
+
+    silent echom a:level . ':::' . stack . ' cursor at=' . string( [ line("."), col(".") ] )
+
+    for msg in a:000
+        let l = split(';' . msg . ';', "\n")
+        let l[0] = l[0][1:]
+        let l[ -1 ] = l[ -1 ][ :-2 ]
+        for v in l
+            silent! echom v
+        endfor
+    endfor
+    redir END
+
+
+    if a:level =~ 'Fatal\|Error\|Warn'
+        echoerr string( a:000 )
+    endif
+
+endfunction "}}}
+
+
+" define script-private functions first and then make reference to them. Thus
+" in traceback function name can be shown.
+let s:loggerPrototype = {}
+let s:loggerPrototype.Fatal       = function( "<SNR>" . s:sid . "Fatal"      )
+let s:loggerPrototype.Error       = function( "<SNR>" . s:sid . "Error"      )
+let s:loggerPrototype.Warn        = function( "<SNR>" . s:sid . "Warn"       )
+let s:loggerPrototype.Info        = function( "<SNR>" . s:sid . "Info"       )
+let s:loggerPrototype.Log         = function( "<SNR>" . s:sid . "Log"        )
+let s:loggerPrototype.Debug       = function( "<SNR>" . s:sid . "Debug"      )
+let s:loggerPrototype.LogNothing  = function( "<SNR>" . s:sid . "LogNothing" )
+
+fun! s:MakeLogPath() "{{{
+    let path = g:xptemplate_debug_log
+    if path == ''
+        let s:logLocation = ''
+    else
+        let path = substitute( path, '\V\^~/', $HOME . '/', '' )
+        let s:logLocation = path
+        call delete(s:logLocation)
+    endif
+endfunction "}}}
+call s:MakeLogPath()
+
+let &cpo = s:oldcpo
diff --git a/autoload/xpt/eval.vim b/autoload/xpt/eval.vim
new file mode 100644
index 00000000..311d92e1
--- /dev/null
+++ b/autoload/xpt/eval.vim
@@ -0,0 +1,253 @@
+" File Description {{{
+" =============================================================================
+" Evaluation support for XPTemplate
+"                                                  by drdr.xp
+"                                                     drdr.xp@gmail.com
+" Usage :
+"
+" =============================================================================
+" }}}
+if exists( "g:__AL_XPT_EVAL_VIM__" ) && g:__AL_XPT_EVAL_VIM__ >= XPT#ver
+    finish
+endif
+let g:__AL_XPT_EVAL_VIM__ = XPT#ver
+
+
+let s:oldcpo = &cpo
+set cpo-=< cpo+=B
+
+
+let s:log = xpt#debug#Logger( 'warn' )
+let s:log = xpt#debug#Logger( 'debug' )
+
+exe XPT#importConst
+
+" TODO consistent cache
+let s:_evalCache = { 'strMask' : {}, 'compiledExpr' : {} }
+
+fun! xpt#eval#Eval( str, closures ) "{{{
+
+    if a:str == ''
+        return ''
+    endif
+
+    let globals = a:closures[0]
+    let x = b:xptemplateData
+
+    let expr = xpt#eval#Compile( a:str )
+    call s:log.Debug( 'expression to eval=' . string( expr ) )
+
+    let globals._ctx = {
+          \         'closures': a:closures,
+          \         'renderContext' : x.renderContext,
+          \ }
+
+    let xfunc = globals
+    try
+        return eval(expr)
+    catch /.*/
+        call s:log.Error( string( v:throwpoint ), string( v:exception ), 'expr=' . expr )
+        return ''
+    endtry
+
+endfunction "}}}
+
+fun! xpt#eval#Compile( s ) "{{{
+    " TODO consistent cache: evalTable
+
+    if a:s is ''
+        return ''
+    endif
+
+    let expr = get( s:_evalCache.compiledExpr, a:s, 0 )
+
+    if expr is 0
+        if a:s !~ s:item_var . '\|' . s:item_func
+            let expr = string( xpt#util#UnescapeChar(a:s, s:nonsafe) )
+
+        elseif a:s =~ '\V\^$\w\+\$'
+            let expr = 'xfunc.GetVar(' . string( a:s ) . ')'
+
+        else
+            let expr = s:DoCompile( a:s )
+        endif
+
+        let s:_evalCache.compiledExpr[ a:s ] = expr
+    endif
+
+    return expr
+
+endfunction "}}}
+
+fun! s:DoCompile(s) "{{{
+
+    " non-escaped prefix
+    let fptn = '\V' . '\w\+(\[^($]\{-})' . '\|' . s:nonEscaped . '{\w\+(\[^($]\{-})}'
+    let vptn = '\V' . s:nonEscaped . '$\w\+' . '\|' . s:nonEscaped . '{$\w\+}'
+    let sptn = '\V' . s:nonEscaped . '(\[^($]\{-})'
+
+    let patternVarOrFunc = fptn . '\|' . vptn . '\|' . sptn
+
+    " simple test
+    if a:s !~  s:regEval
+        return string(xpt#util#UnescapeChar(a:s, s:nonsafe))
+    endif
+
+    let stringMask = s:CreateStringMask( a:s )
+
+    if stringMask !~ patternVarOrFunc
+        return string(xpt#util#UnescapeChar(a:s, s:nonsafe))
+    endif
+
+    call s:log.Debug( 'string =' . a:s, 'strmask=' . stringMask )
+
+    let str = a:s
+    let evalMask = repeat('-', len(stringMask))
+
+    while 1
+
+        let matchedIndex = match(stringMask, patternVarOrFunc)
+        if matchedIndex == -1
+            break
+        endif
+
+
+        let matchedLen = len(matchstr(stringMask, patternVarOrFunc))
+        let matched = str[matchedIndex : matchedIndex + matchedLen - 1]
+
+
+        if matched =~ '^{.*}$'
+            let matched = matched[1:-2]
+        endif
+
+
+        if matched[0:0] == '(' && matched[-1:-1] == ')'
+            " ignore it
+            let contextedMatchedLen = len(matched)
+            let spaces = repeat(' ', contextedMatchedLen)
+            let stringMask = (matchedIndex == 0 ? "" : stringMask[:matchedIndex-1])
+                        \ . spaces
+                        \ . stringMask[matchedIndex + matchedLen :]
+
+            continue
+
+        elseif matched[-1:] == ')'
+
+            " Dynamic function look up make it consistent even when function
+            " added into function-container.
+            "
+            " Old way is to compile to xfunc.xx() call if function exist,
+            " otherwise xx() for native function. This does not work with
+            " caching when function added.
+
+            let funcname = matchstr(matched, '^\w\+')
+
+            " strip braces
+            let args = matched[ len(funcname) + 1 : -2 ]
+            let matched = "xfunc.Call('" . funcname . "',[" . args . '])'
+
+        elseif matched[0:0] == '$'
+            let matched = 'xfunc.GetVar(' . string( matched ) . ')'
+
+        endif
+
+
+        let contextedMatchedLen = len(matched)
+
+        let spaces = repeat(' ', contextedMatchedLen)
+
+        let evalMask = (matchedIndex == 0 ? "" : evalMask[:matchedIndex-1])
+                    \ . '+' . spaces[1:]
+                    \ . evalMask[matchedIndex + matchedLen :]
+
+        let stringMask = (matchedIndex == 0 ? "" : stringMask[:matchedIndex-1])
+                    \ . spaces
+                    \ . stringMask[matchedIndex + matchedLen :]
+
+        let str  = (matchedIndex == 0 ? "" :  str[:matchedIndex-1])
+                    \ . matched
+                    \ . str[matchedIndex + matchedLen :]
+
+    endwhile
+
+
+    let idx = 0
+    let expr = "''"
+    while 1
+        let matches = matchlist( evalMask, '\V\(-\*\)\(+ \*\)\?', idx )
+        if '' == matches[0]
+            break
+        endif
+
+        if '' != matches[1]
+            let part = str[ idx : idx + len(matches[1]) - 1 ]
+            let part = xpt#util#UnescapeChar(part, '{$( ')
+            let expr .= '.' . string(part)
+        endif
+
+        if '' != matches[2]
+            let expr .= '.' . str[ idx + len(matches[1]) : idx + len(matches[0]) - 1 ]
+        endif
+
+        let idx += len(matches[0])
+    endwhile
+
+    let expr = matchstr(expr, "\\V\\^''.\\zs\\.\\*")
+    call s:log.Log('expression to evaluate=' . string(expr))
+
+    return expr
+
+endfunction "}}}
+
+fun! s:CreateStringMask( str ) "{{{
+
+    if a:str == ''
+        return ''
+    endif
+
+    if has_key( s:_evalCache.strMask, a:str )
+        return s:_evalCache.strMask[ a:str ]
+    endif
+
+    " non-escaped prefix
+
+    " non-escaped quotation
+    let dqe = '\V\('. s:nonEscaped . '"\)'
+    let sqe = '\V\('. s:nonEscaped . "'\\)"
+
+    let dptn = dqe.'\_.\{-}\1'
+
+    " let sptn = sqe.'\_.\{-}\1'
+    " Note: only ' is escaped by doubling it: ''
+    " let sptn = sqe.'\_.\{-}\%(\^\|\[^'']\)\(''''\)\*'''
+    let sptn = sqe.'\%(\_[^'']\)\{-}'''
+
+    " create mask hiding all string literal with space
+    let mask = substitute(a:str, '[ *]', '+', 'g')
+    while 1 "{{{
+        let d = match(mask, dptn)
+        let s = match(mask, sptn)
+
+        if d == -1 && s == -1
+            break
+        endif
+
+        if d > -1 && (d < s || s == -1)
+            let sub = matchstr(mask, dptn)
+            let sub = repeat(' ', len(sub))
+            let mask = substitute(mask, dptn, sub, '')
+        elseif s > -1
+            let sub = matchstr(mask, sptn)
+            let sub = repeat(' ', len(sub))
+            let mask = substitute(mask, sptn, sub, '')
+        endif
+
+    endwhile "}}}
+
+    let s:_evalCache.strMask[ a:str ] = mask
+
+    return mask
+
+endfunction "}}}
+
+let &cpo = s:oldcpo
diff --git a/autoload/xpt/flt.vim b/autoload/xpt/flt.vim
new file mode 100644
index 00000000..da868248
--- /dev/null
+++ b/autoload/xpt/flt.vim
@@ -0,0 +1,142 @@
+exec xpt#once#init
+
+let s:oldcpo = &cpo
+set cpo-=< cpo+=B
+
+let s:log = xpt#debug#Logger( 'warn' )
+let s:log = xpt#debug#Logger( 'debug' )
+
+let g:EmptyFilter = {}
+
+" rc:       1: right status. 0 means nothing should be updated.
+let s:proto = {
+      \ 'marks'   : 'innerMarks',
+      \ 'force'   : 0,
+      \ }
+
+fun! xpt#flt#New( nIndent, text, ... ) "{{{
+    let flt = deepcopy( s:proto )
+
+    " force:    force using this.
+    call extend( flt, {
+          \ 'nIndent' : a:nIndent,
+          \ 'text'    : a:text,
+          \ 'force'   : a:0 == 1 && a:1,
+          \ }, 'force' )
+
+    return flt
+
+endfunction "}}}
+
+fun! xpt#flt#NewSimple( nIndent, text, ... ) "{{{
+
+    let flt = { 'nIndent' : a:nIndent, 'text' : a:text, }
+
+    if a:0 == 1 && a:1
+        let flt.force = 1
+    endif
+
+    return flt
+
+endfunction "}}}
+
+fun! xpt#flt#Extend( flt ) "{{{
+    " no reference existed in s:proto, no need to deepcopy it
+    call extend( a:flt, s:proto, 'keep' )
+endfunction "}}}
+
+fun! xpt#flt#Simplify( flt ) "{{{
+    " -987654 is assumed to be an pseudo NONE value
+    call filter( a:flt, 'v:val!=get(s:proto,v:key,-987654)' )
+endfunction "}}}
+
+fun! xpt#flt#Eval( flt, closures ) "{{{
+
+    let r = { 'rc' : 1 }
+    let rst = xpt#eval#Eval( a:flt.text, a:closures )
+
+    call s:log.Debug( 'filter eval result=' . string( rst ) )
+
+    if type( rst ) == type( 0 )
+
+        let r.rc = 0
+
+    elseif type( rst ) == type( '' )
+
+        call extend( r, { 'action': 'build', 'text' : rst } )
+
+    elseif type( rst ) == type( [] )
+
+        call extend( r, { 'action' : 'pum', 'pum' : rst } )
+
+    else
+        " rst is dictionary
+
+        if has_key( rst, 'action' )
+            call extend( r, rst, 'error' )
+        else
+            r.action = 'build'
+        endif
+
+        if ! has_key( r, 'marks' )
+            let r.marks = a:flt.marks
+        endif
+
+        " TODO fix cursor usage
+        if has_key( r, 'cursor' )
+            call xpt#flt#ParseCursorSpec( r )
+        endif
+
+    endif
+
+    return r
+
+endfunction "}}}
+
+fun! xpt#flt#ParseCursorSpec( flt_rst ) "{{{
+
+    let rst = a:flt_rst
+
+    if type( rst.cursor ) == type( [] )
+          \ && type( rst.cursor[ 0 ] ) == type( '' )
+
+        " convert [ '<mark>', [ <offset> ] ] format to standard format
+
+        let rst.cursor = { 'rel' : 1,
+              \ 'where' : rst.cursor[ 0 ],
+              \ 'offset' : get( rst.cursor, 1, [ 0, 0 ] ) }
+
+    endif
+
+    " TODO use has_key instead
+    " TODO this is always true?
+    let rst.isCursorRel = type( rst.cursor ) == type( {} )
+
+endfunction "}}}
+
+fun! s:AddIndentToPHs( flt ) "{{{
+
+    if a:flt.rst.nIndent == 0
+        return
+    endif
+
+
+    let nIndent = a:flt.rst.nIndent
+    let rst = []
+
+    for ph in a:flt.rst.phs
+        if type( ph ) == type( '' )
+            call add( rst, xpt#util#AddIndent( ph, nIndent ) )
+        else
+            call add( rst, ph )
+        endif
+
+        unlet ph
+    endfor
+
+
+    let a:flt.rst.phs = rst
+
+endfunction "}}}
+
+let &cpo = s:oldcpo
diff --git a/autoload/xpt/indent.vim b/autoload/xpt/indent.vim
new file mode 100644
index 00000000..e2af878a
--- /dev/null
+++ b/autoload/xpt/indent.vim
@@ -0,0 +1,122 @@
+exec xpt#once#init
+
+let s:oldcpo = &cpo
+set cpo-=< cpo+=B
+
+let s:log = xpt#debug#Logger( 'warn' )
+
+exe XPT#importConst
+
+
+" Converting indent to real space-chars( like spaces or tabs ) must be done at
+" runtime.
+" Here we only convert it to tabs, to ease further usage.
+let s:indent_convert_cmd = 'substitute(v:val, ''\v(^\s*)@<=    '', ''	'', "g" )'
+
+fun! xpt#indent#ParseStr( text, first_line_shift ) "{{{
+    let text = xpt#indent#IndentToTabStr(a:text)
+    return xpt#indent#ToActualIndentStr(text, a:first_line_shift)
+endfunction "}}}
+
+fun! xpt#indent#IndentToTabStr( text ) "{{{
+    let lines = split( a:text, '\n', 1 )
+    call xpt#indent#IndentToTab( lines )
+    return join(lines, "\n")
+endfunction "}}}
+
+fun! xpt#indent#ToActualIndentStr( text, first_line_shift ) "{{{
+    let lines = split( a:text, '\n', 1 )
+    call xpt#indent#ToActualIndent( lines, a:first_line_shift )
+    return join(lines, "\n")
+endfunction "}}}
+
+fun! xpt#indent#IndentToTab( lines ) "{{{
+    call map( a:lines, s:indent_convert_cmd )
+endfunction "}}}
+
+fun! xpt#indent#ToActualIndent( lines, first_line_shift ) "{{{
+    " Convert tab indent to actual indent according to vim setting
+    " 'shiftwidth' that defines width in char for each indent, and 'tabstop'
+    " that defines number of spaces a <tab> counts for.
+
+    let indent_spaces = repeat(' ', &shiftwidth)
+    let cmd = 'substitute(v:val, ''\v(^	*)@<=	'', ''' . indent_spaces . ''', "g" )'
+    call map( a:lines, cmd )
+
+    if a:first_line_shift != 0
+        let shift_spaces = repeat(' ', a:first_line_shift)
+        let i = 1
+        while i < len(a:lines)
+            " always add indent to last line
+            " because last line is followed by other content thus it is not empty
+            if a:lines[i] != '' || i == len(a:lines)-1
+                let a:lines[i] = shift_spaces . a:lines[i]
+            endif
+            let i += 1
+        endwhile
+    endif
+
+    if &expandtab
+        return
+    endif
+
+    let tabspaces = repeat( ' ',  &tabstop )
+    let cmd = 'substitute(v:val, ''\v(^\s*)@<=' . tabspaces . ''', ''	'', "g" )'
+    call map( a:lines, cmd )
+
+endfunction "}}}
+
+fun! xpt#indent#IndentBefore( pos ) "{{{
+
+    let [ln, col] = a:pos
+
+    let line = matchstr( getline(ln), '\V\^\s\*' )
+    let line = ( col == 1 ) ? '' : line[ 0 : col - 1 - 1 ]
+
+    let tabspaces = repeat( ' ', &tabstop )
+
+    return len( substitute( line, '	', tabspaces, 'g' ) )
+
+endfunction "}}}
+
+fun! xpt#indent#RemoveIndentStr(text, nIndent) "{{{
+    let reg = '\V\n \{,' . a:nIndent . '\}'
+    let text = substitute(a:text, reg, '\n', 'g')
+    return text
+endfunction "}}}
+
+fun! xpt#indent#ToSpace( text ) "{{{
+
+    if stridx( a:text, "	" ) < 0
+        return a:text
+    endif
+
+    let tabspaces = repeat( ' ', &tabstop )
+
+    " a all-space indent or a mixed space-tab indent
+    let reg = '\v' . tabspaces . '| {0,' . (&tabstop-1) . '}	'
+
+    let rst = []
+    let lines = split( a:text, '\n', 1 )
+    for line in lines
+
+        let leading_space = matchstr( line, '\v\s*' )
+        let left = line[ len(leading_space) : ]
+
+        let l = substitute( leading_space, reg, tabspaces, 'g' )
+
+        call add( rst, l . left )
+    endfor
+    return join(rst, "\n")
+endfunction "}}}
+
+fun! xpt#indent#SpaceToTab( text ) "{{{
+    let indent_spaces = repeat(' ', &shiftwidth)
+    let reg = 'substitute(v:val, ''\v(^\s*)@<='.indent_spaces.''', "	", "g" )'
+
+    let lines = split( a:text, '\n', 1 )
+    call map( lines, reg )
+    return join(lines, "\n")
+endfunction "}}}
+
+let &cpo = s:oldcpo
diff --git a/autoload/xpt/msvr.vim b/autoload/xpt/msvr.vim
new file mode 100644
index 00000000..ed38591e
--- /dev/null
+++ b/autoload/xpt/msvr.vim
@@ -0,0 +1,324 @@
+" File Description {{{
+" =============================================================================
+" Map Saver.
+" Saving and restoring key mappings.
+"                                                  by drdr.xp
+"                                                     drdr.xp@gmail.com
+" Usage :
+"
+" =============================================================================
+" }}}
+
+if exists( "g:__AL_XPT_MSVR_VIM__" ) && g:__AL_XPT_MSVR_VIM__ >= XPT#ver
+    finish
+endif
+let g:__AL_XPT_MSVR_VIM__ = XPT#ver
+
+
+let s:oldcpo = &cpo
+set cpo-=< cpo+=B
+
+
+
+let s:log = xpt#debug#Logger( 'warn' )
+" let s:log = xpt#debug#Logger( 'debug' )
+
+
+
+snoremap <Plug>selectToInsert d<BS>
+let g:globalStack = []
+
+
+" Critical implementation!!
+" Not sure whether it works well on any platform
+"
+" TODO Maybe using <script> mapping is better
+fun! s:_GetAlighWidth() "{{{
+    nmap <buffer> 1 2
+    let line = xpt#util#getCmdOutput("silent nmap <buffer> 1")
+    nunmap <buffer> 1
+
+    let line = split(line, "\n")[0]
+
+    return len(matchstr(line, '^n.*\ze2$'))
+endfunction "}}}
+
+let s:alignWidth = s:_GetAlighWidth()
+
+delfunction s:_GetAlighWidth
+
+
+
+fun! xpt#msvr#New( isLocal ) "{{{
+
+    " \ 'stackName' : s:GetStack( a:isLocal ),
+    return {
+          \ 'keys'      : [],
+          \ 'saved'     : [],
+          \ }
+
+endfunction "}}}
+
+fun! xpt#msvr#Add( inst, mode, key ) "{{{
+    if a:inst.saved != []
+        throw "keys are already saved and can not be added"
+    endif
+    let a:inst.keys += [ [ a:mode, a:key ] ]
+endfunction "}}}
+
+fun! xpt#msvr#AddList( inst, ... ) "{{{
+    if a:0 > 0 && type( a:1 ) == type( [] )
+        let list = a:1
+    else
+        let list = a:000
+    endif
+    for item in list
+        let [ mode, key ] = split( item, '^\w\zs_' )
+        call xpt#msvr#Add( a:inst, mode, key )
+    endfor
+
+endfunction "}}}
+
+fun! xpt#msvr#UnmapAll( inst ) "{{{
+    if a:inst.saved == []
+        throw "keys are not saved, can not unmap all"
+    endif
+
+    let localStr = '<buffer> '
+
+    for [ mode, key ] in a:inst.keys
+        exe 'silent! ' . mode . 'unmap ' . localStr . key
+    endfor
+
+endfunction "}}}
+
+fun! xpt#msvr#Save( inst ) "{{{
+
+    if a:inst.saved != []
+        " throw "keys are already saved and can not be save again"
+        return
+    endif
+
+
+    for [ mode, key ] in a:inst.keys
+        call insert( a:inst.saved, xpt#msvr#MapInfo( key, mode ) )
+    endfor
+
+    let stack = s:GetStack()
+    call add( stack, a:inst )
+
+    call s:log.Debug( "Saved stack:" . s:String( stack ) )
+
+endfunction "}}}
+
+fun! xpt#msvr#Literalize( inst, ... ) "{{{
+    if a:inst.saved == []
+        throw "keys are not saved yet, can not literalize"
+    endif
+
+    let option = a:0 == 1 ? a:1 : {}
+
+    let insertAsSelect = get(option, 'insertAsSelect', 0)
+
+    let localStr = '<buffer> '
+    let nowait = v:version >= 704 ? '<nowait>' : ''
+
+    for [ mode, key ] in a:inst.keys
+        if mode == 's' && insertAsSelect
+            " NOTE: do not use nore-map to enable original insert-mode key mapping
+            exe 'silent! ' . mode . 'map ' . nowait . localStr . key . ' <Plug>selectToInsert' . key
+        else
+            exe 'silent! ' . mode . 'noremap ' . nowait . localStr . key . ' ' . key
+        endif
+    endfor
+
+endfunction "}}}
+
+fun! xpt#msvr#Restore( inst ) "{{{
+
+    if a:inst.saved == []
+        return
+    endif
+
+
+    let stack = s:GetStack()
+    if empty( stack ) || stack[ -1 ] != a:inst
+        throw "MapSaver: Incorrect Restore of MapSaver:" . s:String( stack )
+              \ . ' but ' . string( a:inst.keys )
+    endif
+
+    for info in a:inst.saved
+        call s:MappingPop( info )
+    endfor
+
+    let a:inst.saved = []
+
+    call remove( stack, -1 )
+
+    call s:log.Debug( "Restored stack:" . s:String( stack ) )
+
+endfunction "}}}
+
+fun! s:GetStack() "{{{
+    if !exists( 'b:__map_saver_stack__' )
+        let b:__map_saver_stack__ = []
+    endif
+    return b:__map_saver_stack__
+endfunction "}}}
+
+
+if v:version >= 704
+" from vim7.4, maparg() returns full inforamtion of mapping. no more trick
+" is required.
+fun! xpt#msvr#MapInfo( key, mode ) "{{{
+    let arg = maparg( a:key, a:mode, 0, 1 )
+    if arg == {} || arg.buffer == 0
+        return { 'mode'  : a:mode,
+              \  'key'   : a:key,
+              \  'nore'  : '',
+              \  'isexpr': '',
+              \  'isscript': '',
+              \  'isbuf' : ' <buffer> ',
+              \  'cont'  : ''}
+    endif
+
+    " maparg() does not convert sid
+    let rhs = substitute( arg.rhs, '\V\C<SID>', '<SNR>' . arg.sid . '_', 'g' )
+
+    " maparg() still does not return script-local info. need to retreive it
+    " from command.
+    let line = s:GetMappingLine(a:key, a:mode)
+    let flag = line[0 : 1]
+
+    return { 'mode'  : a:mode,
+          \  'key'   : a:key,
+          \  'nore'  : arg.noremap ? 'nore' : '',
+          \  'isexpr': arg.expr ? '<expr>' : '',
+          \  'isscript': flag[0] == '&' ? ' <script> ' : '',
+          \  'isbuf' : arg.buffer ? '<buffer>' : '',
+          \  'cont'  : rhs }
+
+endfunction "}}}
+
+else
+
+fun! xpt#msvr#MapInfo( key, mode ) "{{{
+    let line = s:GetMappingLine(a:key, a:mode)
+    if line == ''
+        " unmap info
+        return { 'mode'  : a:mode,
+              \  'key'   : a:key,
+              \  'nore'  : '',
+              \  'isexpr': '',
+              \  'isscript': '',
+              \  'isbuf' : ' <buffer> ',
+              \  'cont'  : ''}
+    endif
+
+    let item = line[0:1] " the first 2 characters
+
+    " NOTE: guess it, no way to figure out whether a key is mapped with <expr> or not
+    let isexpr = ''
+    if a:mode == 'i' && line[2:] =~ '\V\w(\.\*)' && line[2:] !~? '\V<c-r>'
+          \ || a:mode != 'i' && line[2:] =~ '\V\w(\.\*)' 
+          \ || a:mode == 'i' && line[2:] =~ '\V\.\*?\.\*:\.\*'
+        let isexpr = '<expr> '
+    endif
+
+    let info =  {'mode' : a:mode,
+          \'key'   : a:key,
+          \'nore'  : item =~ '*' ? 'nore' : '',
+          \'isexpr': isexpr,
+          \'isscript': item[0] == '&' ? ' <script> ' : '',
+          \'isbuf' : ' <buffer> ',
+          \'cont'  : line[2:]}
+
+    call s:log.Debug( "map info=" . string( info ) )
+    return info
+
+endfunction "}}}
+
+endif
+
+fun! xpt#msvr#MapCommand( info ) "{{{
+
+    let i = a:info
+
+    if i.cont == ''
+        let cmd = i.mode . 'unmap <silent> '
+              \ . i.isbuf . i.key
+    else
+        let cmd = i.mode . i['nore'] . 'map <silent> '
+              \ . i.isscript . i.isexpr . i.isbuf . i.key
+              \ . ' ' . i.cont
+    endif
+
+    return "silent! " . cmd
+
+endfunction "}}}
+
+fun! s:GetMappingLine(key, mode) "{{{
+    let mcmd = "silent ".a:mode."map <buffer> ".a:key
+
+    " get fixed mapping
+    let str = xpt#util#getCmdOutput(mcmd)
+
+    let lines = split(str, "\n")
+
+
+    " Find out the line representing the expect mapping. Because mappings with
+    " the same prefix may all returned.
+    "
+    " *  norepeat
+    " &@ script local and buffer local
+    " [*& ][@ ]
+    "
+    " * indicates that it is not remappable
+    " & indicates that only script-local mappings are remappable
+    " @ indicates a buffer-local mapping
+    "
+    " The :map command format: if a mapped key length is less than s:alignWidth,
+    " the right hand part is aligned. Or 1 space separates the left part and the
+    " right part
+    let localmark = '@'
+    let ptn = '\V\c' . a:mode . '  ' . escape(a:key, '\') . '\s\{-}' . '\zs\[*& ]'
+          \. localmark . '\%>' . s:alignWidth . 'c\S\.\{-}\$'
+
+
+    for line in lines
+        if line =~? ptn
+            return matchstr(line, ptn)
+        endif
+    endfor
+
+    return ""
+
+endfunction "}}}
+
+fun! s:MappingPop( info ) "{{{
+
+    call s:log.Debug("map a:info:".string(a:info))
+
+    Assert !empty( a:info )
+
+    let cmd = xpt#msvr#MapCommand( a:info )
+
+    try
+        exe cmd
+    catch /.*/
+    endtry
+
+endfunction "}}}
+
+fun! s:String( stack ) "{{{
+    let rst = ''
+    for ms in a:stack
+        let rst .= " **** " . string( ms.keys )
+    endfor
+
+    return rst
+endfunction "}}}
+
+
+
+let &cpo = s:oldcpo
diff --git a/autoload/xpt/once.vim b/autoload/xpt/once.vim
new file mode 100644
index 00000000..494e7210
--- /dev/null
+++ b/autoload/xpt/once.vim
@@ -0,0 +1,56 @@
+let xpt#once#init = 'if xpt#once#SetAndGetLoaded(expand("<sfile>")) | finish | endif'
+
+fun! xpt#once#SetAndGetLoaded( fn ) "{{{
+
+    if ! exists('g:xptemplate_loaded')
+        let g:xptemplate_loaded = {}
+    endif
+
+    let fn = fnamemodify( a:fn, ':p' )
+    let fn = s:Norm(fn)
+
+    for p in split( &runtimepath, ',' )
+
+        let p = fnamemodify( p, ':p' )
+        let p = s:Norm(p) . '/'
+
+        let pref = fn[ 0 : len(p) - 1 ]
+
+        if pref == p
+
+            let relpath = fn[ len(pref) : ]
+
+            if has_key(g:xptemplate_loaded, relpath)
+                return 1
+            else
+                let g:xptemplate_loaded[relpath] = 1
+                return 0
+            endif
+        endif
+    endfor
+
+    echoerr a:fn . ' not found in any one of &runtimepath'
+    return 0
+
+endfunction "}}}
+
+fun! s:Norm(path) "{{{
+    " trailing slash
+    let path = substitute( a:path, '\V/\*\$', '', 'g' )
+
+    " multi slash
+    let path = substitute( path, '\V//\*', '/', 'g' )
+
+    while 1
+        " remove ref to parent
+        let p0 = path
+        let path = substitute( path, '\V/\[^/]\+/..', '', 'g' )
+        if p0 == path
+            break
+        endif
+    endwhile
+
+    return path
+endfunction "}}}
+
+exec xpt#once#init
diff --git a/autoload/xpt/parser.vim b/autoload/xpt/parser.vim
new file mode 100644
index 00000000..556b5fe7
--- /dev/null
+++ b/autoload/xpt/parser.vim
@@ -0,0 +1,752 @@
+exec xpt#once#init
+
+" Special XSET[m] Keys
+"   ComeFirst   : item names which come first before any other
+"               // XSET ComeFirst=i,len
+"
+"   ComeLast    : item names which come last after any other
+"               // XSET ComeLast=i,len
+"
+"   postQuoter  : Quoter to define repetition
+"               // XSET postQuoter=<{[,]}>
+"               // defulat : {{,}}
+"
+
+
+let s:oldcpo = &cpo
+set cpo-=< cpo+=B
+
+let s:log = xpt#debug#Logger( 'warn' )
+" let s:log = xpt#debug#Logger( 'debug' )
+
+
+exe XPT#importConst
+
+
+" TODO warning of deprecated keys.
+
+" Add each key a dot to avoid empty string as dictionary key.
+let s:KEYTYPE_MAP = {
+      \ '.'         : 'onfocus',
+      \ '.def'      : 'onfocus',
+      \ '.ontype'   : 'live',
+      \ '.onchange' : 'live',
+      \ }
+
+let s:KEYTYPE_TO_DICT = {
+      \ 'pre'     : 'preValues',
+      \ 'live'    : 'liveFilters',
+      \ 'onfocus' : 'onfocusFilters',
+      \}
+
+
+fun s:CompileSnippetFile( fn ) "{{{
+    if a:fn =~ '\V.xpt.vimc\$' || !filereadable( a:fn )
+        return
+    endif
+
+    let lines = readfile( a:fn )
+    let lines = xpt#parser#Compact( lines )
+    let lines = xpt#parser#CompileCompacted( lines )
+
+    call writefile( lines, a:fn . 'c' )
+
+endfunction "}}}
+
+fun! xpt#parser#Compile( fn ) "{{{
+
+    let compiledFn = a:fn . 'c'
+    let ctime = getftime( a:fn )
+
+    if !filereadable( compiledFn ) || getftime( compiledFn ) < ctime
+          \ || g:xptemplate_always_compile
+
+        call s:CompileSnippetFile( a:fn )
+
+        call s:log.Debug( 'Compiled file has written to: ' . string( compiledFn ) )
+    else
+        call s:log.Debug( 'No need to Compile: ' . string( compiledFn ) )
+
+    endif
+
+endfunction "}}}
+
+fun! xpt#parser#Compact( lines ) "{{{
+
+    let compacted = []
+
+    let iSnipPart = match( a:lines, '\V\^XPT\s' )
+    if iSnipPart < 0
+        let iSnipPart = len( a:lines )
+    endif
+
+
+    let [ i, len ] = [ 0 - 1, iSnipPart - 1 ]
+    while i < len | let i += 1
+        let l = a:lines[ i ]
+        if l != '' && l !~ '\v^"[^"]*$'
+            call add( compacted, l )
+        endif
+    endwhile
+
+
+    let [s, e, lastNonblank] = [-1, -1, 100000]
+
+    let [ i, len ] = [ iSnipPart - 1, len( a:lines ) - 1 ]
+    while i < len | let i += 1
+        let l = a:lines[ i ]
+
+        if l == '' || l =~ '\v^"[^"]*$'
+            let lastNonblank = min([lastNonblank, i - 1])
+            continue
+        endif
+
+
+        if l =~# '\V\^..XPT\>'
+
+            if s == -1
+                let [s, e, lastNonblank] = [-1, -1, 100000]
+                continue
+
+            else
+
+                let compacted += a:lines[ s : i - 1 ]
+                let [s, e, lastNonblank] = [-1, -1, 100000]
+
+            endif
+
+        elseif l =~# '\V\^XPT\>'
+
+            if s == -1
+                let [ s, lastNonblank ] = [ i, i ]
+            else
+                " template with no end
+                let e = min([i - 1, lastNonblank])
+                let compacted += a:lines[ s : e ]
+                let [s, e, lastNonblank] = [i, -1, 100000]
+            endif
+
+        else
+            let lastNonblank = i
+        endif
+
+    endwhile
+
+    if s != -1
+        let compacted += a:lines[ s : min([lastNonblank, i]) ]
+    endif
+
+    return compacted
+endfunction "}}}
+
+fun! xpt#parser#CompileCompacted( lines ) "{{{
+
+    let rst = []
+    let lines = a:lines
+
+    let iSnipPart = match( lines, '\V\^XPT\s' )
+
+    if iSnipPart < 0
+        return lines
+    endif
+
+    if iSnipPart > 0
+        let rst += lines[ : iSnipPart - 1 ]
+        let lines = lines[ iSnipPart : ]
+    endif
+
+
+    let [i, len] = [0, len(lines)]
+
+    call xpt#indent#IndentToTab( lines )
+
+    " parse lines
+    " start end and blank start
+    let s = i
+    while i < len-1 | let i += 1
+
+        let v = lines[i]
+
+        if v =~# '\V\^XPT\>'
+
+            " template with no end
+
+            let ll = xpt#parser#CompileSnippet( lines[ s : i - 1 ] )
+            let rst += [ ll ]
+
+            let s = i
+
+        elseif v =~# '\V\^\\XPT'
+            let lines[i] = v[ 1 : ]
+        endif
+
+    endwhile
+
+    if i >= s
+        let ll = xpt#parser#CompileSnippet( lines[ s : i ] )
+        let rst += [ ll ]
+    endif
+
+    return rst
+
+endfunction "}}}
+
+fun! xpt#parser#CompileSnippet( lines ) "{{{
+
+    let lines = a:lines
+
+    let snippetLines = []
+
+
+    let setting = xpt#st#New()
+
+
+    let l0 = lines[ 0 ]
+    let pos = match( l0, '\VXPT\s\+\S\+\.\{-}\zs\s' . s:nonEscaped . '"' )
+    if pos >= 0
+        " skip space, '"'
+        let [setting.rawHint, lines[0]] = [ matchstr( l0[ pos + 1 + 1 : ], '\v\S.*' ), l0[ : pos ] ]
+    endif
+
+
+
+    let [ x, snippetName; snippetParameters ] = split(lines[0], '\V'.s:nonEscaped.'\s\+')
+
+    for pair in snippetParameters
+        let name = matchstr(pair, '\V\^\[^=]\*')
+        let value = pair[ len(name) : ]
+
+        " flag setting need no value present
+        let value = value[0:0] == '=' ? xpt#util#UnescapeChar(value[1:], ' ') : 1
+
+        let setting[name] = value
+    endfor
+
+
+
+    " skip the title line
+    let start = 1
+    let len = len( lines )
+    while start < len
+        let command = matchstr( lines[ start ], '\V\^XSETm\?\ze\s' )
+        if command != ''
+
+            let [ key, val, start ] = s:GetXSETkeyAndValue( lines, start )
+            if key == ''
+                let start += 1
+                continue
+            endif
+            call s:log.Log("got value, start=".start)
+
+            let [ keyname, keytype ] = xpt#parser#GetKeyType( key )
+            call s:log.Log("parse XSET:" . keyname . "|" . keytype . '=' . val)
+
+            call s:HandleXSETcommand( setting, command, [ keyname, keytype, val ] )
+
+            " TODO can not input \XSET
+        elseif lines[start] =~# '^\\XSET' " escaped XSET or XSETm
+            let snippetLines += [ lines[ start ][1:] ]
+
+        else
+            call add( snippetLines, lines[ start ] )
+
+        endif
+
+        let start += 1
+    endwhile
+
+
+    call s:log.Log("start:".start)
+    call s:log.Log("to parse tmpl : snippetName=" . snippetName)
+
+    call xpt#st#Simplify( setting )
+
+    call s:log.Log("tmpl setting:".string(setting))
+
+    if has_key( setting, 'alias' )
+        " call XPTemplateAlias( snippetName, setting.alias, setting )
+        return printf( 'call XPTemplateAlias(%s,%s,%s)',
+              \ string( snippetName ), string( setting.alias ), string( setting ) )
+    else
+        " call XPTdefineSnippet(snippetName, setting, snippetLines)
+        " return printf( 'call xpt#snip#DefExt(%s,%s,%s)',
+        "       \ string( snippetName ), string( setting ), string( snippetLines ) )
+        return printf( 'call XPTdefineSnippet(%s,%s,%s)',
+              \ string( snippetName ), string( setting ), string( snippetLines ) )
+    endif
+
+endfunction "}}}
+
+
+fun! xpt#parser#Include(...) "{{{
+
+    let scope = b:xptemplateData.snipFileScope
+
+    let scope.inheritFT = 1
+
+    for v in a:000
+        if type(v) == type([])
+
+            for s in v
+                call xpt#parser#Include(s)
+            endfor
+
+        elseif type(v) == type('')
+
+            if xpt#ftsc#IsSnippetLoaded( b:xptemplateData.filetypes[ scope.filetype ], v )
+                continue
+            endif
+
+            call xpt#snipf#Push()
+            exe 'runtime! ftplugin/' . v . '.xpt.vim'
+            call xpt#parser#LoadFTSnippets(v)
+            call xpt#snipf#Pop()
+
+        endif
+    endfor
+endfunction "}}}
+
+fun! xpt#parser#Embed(...) "{{{
+
+    let scope = b:xptemplateData.snipFileScope
+
+    let scope.inheritFT = 0
+
+    for v in a:000
+        if type(v) == type([])
+
+            for s in v
+                call xpt#parser#Embed(s)
+            endfor
+
+        elseif type(v) == type('')
+
+            call xpt#snipf#Push()
+            exe 'runtime! ftplugin/' . v . '.xpt.vim'
+            call xpt#parser#LoadFTSnippets(v)
+            call xpt#snipf#Pop()
+
+        endif
+    endfor
+endfunction "}}}
+
+fun! xpt#parser#SetVar( nameSpaceValue ) "{{{
+    
+
+    let x = b:xptemplateData
+    let ftScope = x.filetypes[ x.snipFileScope.filetype ]
+
+    call s:log.Debug( 'xpt var raw data=' . string( a:nameSpaceValue ) )
+
+    let name = matchstr(a:nameSpaceValue, '^\S\+\ze')
+
+    if name == ''
+        return
+    endif
+
+
+    " TODO use s:nonEscaped to detect escape
+    let val  = matchstr(a:nameSpaceValue, '\s\+\zs.*')
+    if val =~ '^''.*''$'
+        let val = val[1:-2]
+    else
+        let val = substitute( val, '\\ ', " ", 'g' )
+    endif
+    let val = substitute( val, '\\n', "\n", 'g' )
+
+
+    let priority = x.snipFileScope.priority
+    call s:log.Log("name=".name.' value='.val.' priority='.priority)
+
+
+    if !has_key( ftScope.varPriority, name ) || priority <= ftScope.varPriority[ name ]
+        let [ ftScope.funcs[ name ], ftScope.varPriority[ name ] ] = [ val, priority ]
+    endif
+
+endfunction "}}}
+
+fun! xpt#parser#SnipSet( dictNameValue ) "{{{
+    let x = b:xptemplateData
+    let snipScope = x.snipFileScope
+
+    let [ dict, nameValue ] = split( a:dictNameValue, '\V.', 1 )
+    let name = matchstr( nameValue, '^.\{-}\ze=' )
+    let value = nameValue[ len( name ) + 1 :  ]
+
+    call s:log.Log( 'set snipScope:' . string( [ dict, name, value ] ) )
+    let snipScope[ dict ][ name ] = value
+
+endfunction "}}}
+
+
+
+fun! s:AssignSnipFT( filename ) "{{{
+
+    let x = b:xptemplateData
+
+    let filename = substitute( a:filename, '\\', '/', 'g' )
+
+    if filename =~ '\Vunknown.xpt.vimc\?\$'
+        return 'unknown'
+    endif
+
+
+    let ftFolder = matchstr( filename, '\V/ftplugin/\zs\[^\\]\+\ze/' )
+    if empty( x.snipFileScopeStack )
+
+        " Top Level snippet
+        "
+        " All cross filetype inclusions must be done with XPTinclude or
+        " XPTembed.
+        " But 'runtime' command is not allowed for inclusion or embed
+        "
+        " Unless it is a pseudo filename, which is for loading "_common"(or
+        " anything independent ) snippet into unsupported filetype.
+
+
+        if filename =~ '\V\<pseudo\>/'
+            return ftFolder
+        endif
+
+
+        if &filetype =~ '\<' . ftFolder . '\>' " sub type like 'xpt.vim'
+            let ft =  &filetype
+        else
+            let ft = 'NOT_ALLOWED'
+        endif
+
+    else
+
+        if x.snipFileScopeStack[ -1 ].inheritFT
+                \ || ftFolder =~ '\V\^_'
+
+            " Snippet is loaded with XPTinclude
+            " or it is an general snippet like "_common/common.xpt.vim"
+
+            if ! has_key( x.snipFileScopeStack[ -1 ], 'filetype' )
+
+                " no parent snippet file
+                " maybe parent snippet file has no XPTemplate command called
+
+                throw 'parent may has no XPTemplate command called :' . a:filename
+
+            endif
+
+            let ft = x.snipFileScopeStack[ -1 ].filetype
+
+        else
+
+            " Snippet is loaded with XPTembed which uses an independent
+            " filetype.
+
+            let ft = ftFolder
+
+        endif
+
+    endif
+
+    call s:log.Log( "filename=" . filename . ' filetype=' . &filetype . " ft=" . ft )
+
+    return ft
+
+endfunction "}}}
+
+fun! XPTDoSnippetFileInit( filename, ... ) "{{{
+
+    " This function is called before 'BufEnter' event which
+    " initialize XPTemplate
+
+    if !exists("b:xptemplateData")
+        call XPTemplateInit()
+    endif
+
+    call s:log.Debug( 'XPTDoSnippetFileInit is called' )
+
+    let x = b:xptemplateData
+    let filetypes = x.filetypes
+
+    let snipScope = xpt#snipf#New( a:filename )
+    let snipScope.filetype = s:AssignSnipFT( a:filename )
+
+
+    if snipScope.filetype == 'NOT_ALLOWED'
+        call s:log.Info(  "NOT_ALLOWED:" . a:filename )
+        return 'finish'
+    endif
+
+    if ! has_key( filetypes, snipScope.filetype )
+        let filetypes[ snipScope.filetype ] = xpt#ftsc#New()
+    endif
+
+    let ftScope = filetypes[ snipScope.filetype ]
+
+
+    if xpt#ftsc#CheckAndSetSnippetLoaded( ftScope,  a:filename )
+        return 'finish'
+    endif
+
+
+    for pair in a:000
+
+        let kv = split( pair, '=', 1 )
+
+        let key = kv[ 0 ]
+        let val = join( kv[ 1 : ], '=' )
+
+        call s:log.Log( "init:key=" . key . ' val=' . val )
+
+        if key =~ 'prio\%[rity]'
+            call XPTemplatePriority(val)
+
+        elseif key =~ 'mark'
+            call XPTemplateMark( val[ 0 : 0 ], val[ 1 : 1 ] )
+
+        endif
+
+    endfor
+
+    return 'doit'
+
+endfunction "}}}
+
+fun! xpt#parser#SnippetFileInit( filename, ... ) "{{{
+
+    call s:log.Debug( 'xpt#parser#SnippetFileInit is called. filename=' . string( a:filename ) )
+
+    if !filereadable( a:filename )
+        " Just init the pseudo snippet file.
+        " In most of these cases, a pseudo snippet file is used to initialize
+        " a context for inclusion, etc.
+        return call( function( 'XPTDoSnippetFileInit' ), [ a:filename ] + a:000 )
+    endif
+
+    if a:filename =~ '\V.xpt.vim\$'
+
+        call s:log.Debug( 'original file, to compile it' )
+
+        call xpt#parser#Compile( a:filename )
+        exe 'so' a:filename . 'c'
+
+        return 'finish'
+
+    else
+
+        call s:log.Debug( 'Compiled file: ' . string( a:filename ) )
+
+        return call( function( 'XPTDoSnippetFileInit' ), [ a:filename ] + a:000 )
+
+    endif
+
+endfunction "}}}
+
+
+
+fun! xpt#parser#LoadSnippets() "{{{
+    let fts = split( &filetype, '\V.', 1 )
+    call filter( fts, 'v:val!=""' )
+
+    for ft in fts
+        " call xpt#parser#LoadFtDetectors( ft )
+        call xpt#parser#LoadFTSnippets( ft )
+    endfor
+
+endfunction "}}}
+
+fun! s:RTP() "{{{
+    let rtps = split( &runtimepath, ',' )
+    call filter( rtps, 'v:val!=""' )
+
+    let rtps += [ g:XPT_PATH . '/xptsnippets',
+          \       g:XPT_PATH . '/personal' ]
+
+    let rtpath = join( rtps, ',' )
+    return rtpath
+endfunction "}}}
+
+fun! xpt#parser#LoadFtDetectors( ft ) "{{{
+    let namePattern = a:ft =~ '/' ? a:ft : a:ft . '/*'
+    let rtpath = s:RTP()
+
+    let ftdetectfiles = split( globpath( rtpath, 'ftplugin/' . namePattern . '.ftdetect.vim' ), "\n" )
+    for fn in ftdetectfiles
+        exe 'so' fn
+    endfor
+
+endfunction "}}}
+
+fun! xpt#parser#LoadFTSnippets( ft ) "{{{
+
+    let namePattern = a:ft =~ '/' ? a:ft : a:ft . '/*'
+    let rtpath = s:RTP()
+
+
+    let ftdetectfiles = split( globpath( rtpath, 'ftplugin/' . namePattern . '.ftdetect.vim' ), "\n" )
+    for fn in ftdetectfiles
+        exe 'so' fn
+    endfor
+
+
+    let snipfiles = split( globpath( rtpath, 'ftplugin/' . namePattern . '.xpt.vim' ), "\n" )
+    for fn in snipfiles
+
+        let compiled = fn . 'c'
+
+        if !filereadable( compiled ) || getftime( compiled ) < getftime( fn )
+              \ || g:xptemplate_always_compile
+
+            call xpt#parser#Compile( fn )
+            exe 'so' compiled
+
+        endif
+
+    endfor
+endfunction "}}}
+
+fun! xpt#parser#GetKeyType( rawKey ) "{{{
+
+    let keytype = matchstr(a:rawKey, '\V'.s:nonEscaped.'|\zs\.\{-}\$')
+    if keytype == ""
+        let keytype = matchstr(a:rawKey, '\V'.s:nonEscaped.'.\zs\.\{-}\$')
+    endif
+
+    let keyname = keytype == "" ? a:rawKey :  a:rawKey[ 0 : - len(keytype) - 2 ]
+    let keyname = substitute(keyname, '\V\\\(\[.|\\]\)', '\1', 'g')
+
+    return [ keyname, keytype ]
+
+endfunction "}}}
+
+
+
+
+let s:KEY_NAME = 0
+let s:KEY_TYPE = 1
+let s:VALUE    = 2
+
+let s:stHandler = {}
+
+fun! s:stHandler.ComeFirst( setting, cmdArgs ) "{{{
+    let a:setting.comeFirst = xpt#util#SplitWith( a:cmdArgs[ s:VALUE ], ' ' )
+endfunction "}}}
+
+fun! s:stHandler.ComeLast( setting, cmdArgs ) "{{{
+    let a:setting.comeLast = xpt#util#SplitWith( a:cmdArgs[ s:VALUE ], ' ' )
+endfunction "}}}
+
+fun! s:stHandler.postQuoter( setting, cmdArgs ) "{{{
+    let pq = split( a:cmdArgs[ s:VALUE ], ',' )
+    let a:setting.postQuoter = { 'start' : pq[0], 'end' : pq[1] }
+endfunction "}}}
+
+let s:stHandler.PostQuoter = s:stHandler.postQuoter
+
+
+
+let s:keytypeHandler = {}
+
+fun! s:keytypeHandler.repl( setting, cmdArgs ) "{{{
+    let a:setting.replacements[ a:cmdArgs[ s:KEY_NAME ] ] = a:cmdArgs[ s:VALUE ]
+endfunction "}}}
+
+fun! s:keytypeHandler.map( setting, cmdArgs ) "{{{
+
+    let [ kn, kt, val ] = a:cmdArgs
+    let mp = a:setting.mappings
+
+
+    if !has_key( mp, kn )
+        let mp[ kn ] = { 'saver' : xpt#msvr#New( 1 ), 'keys' : {} }
+    endif
+
+
+    let key = matchstr( val, '\V\^\S\+\ze\s' )
+    let mapping = matchstr( val, '\V\s\+\zs\.\*' )
+
+
+    call xpt#msvr#Add( mp[ kn ].saver, 'i', key )
+
+    let mp[ kn ].keys[ key ] = xpt#flt#NewSimple( 0, mapping )
+
+endfunction "}}}
+
+fun! s:keytypeHandler.post( setting, cmdArgs ) "{{{
+
+    let [ kn, kt, val ] = a:cmdArgs
+
+    " TODO not good, use another keytype to define 'buildIfNoChange' post filter
+    let val = xpt#ph#AlterFilterByPHName( kn, val )
+
+    let a:setting.postFilters[ kn ] = xpt#flt#NewSimple( 0, val )
+
+endfunction "}}}
+
+
+fun! s:HandleXSETcommand( setting, command, cmdArgs ) "{{{
+    " In the statement as below:
+    "    XSET phName|post=UpperCase( V() )
+    "
+    " 'XSET' is command
+    " 'phName' is keyname
+    " 'post' is kt
+    " 'UpperCase( V() )' is value
+
+    let [ kn, kt, val ] = a:cmdArgs
+
+    let kt = get( s:KEYTYPE_MAP, '.' . kt, kt )
+
+
+    let fcon = {}
+    if has_key( s:stHandler, kn )
+        let fcon.f = s:stHandler[ kn ]
+        call fcon.f( a:setting, [ kn, kt, val ] )
+
+    elseif has_key( s:KEYTYPE_TO_DICT, kt )
+        let dicName = s:KEYTYPE_TO_DICT[ kt ]
+        let a:setting[ dicName ][ kn ] = xpt#flt#NewSimple( 0, val )
+
+    elseif kn =~ '\V\^$'
+        let a:setting.variables[ kn ] = val
+
+    elseif has_key( s:keytypeHandler, kt )
+        let fcon.f = s:keytypeHandler[ kt ]
+        call fcon.f( a:setting, [ kn, kt, val ] )
+
+    else
+        throw "unknown key name or type:" . kn . ' ' . kt
+
+    endif
+
+endfunction "}}}
+
+fun! s:GetXSETkeyAndValue(lines, start) "{{{
+    let start = a:start
+
+    let XSETparam = matchstr(a:lines[start], '\V\^XSET\%[m]\s\+\zs\.\*')
+    let isMultiLine = a:lines[ start ] =~# '\V\^XSETm'
+
+    if isMultiLine
+        let key = XSETparam
+
+        let [ start, val ] = s:ParseMultiLineValues(a:lines, start)
+        call s:log.Log( 'multi line XSETm ends at:' . start )
+
+
+    else
+        let key = matchstr(XSETparam, '\V\[^=]\*\ze=')
+
+        if key == ''
+            return [ '', '', start + 1 ]
+        endif
+
+        let val = matchstr(XSETparam, '\V=\s\*\zs\.\*')
+
+        " TODO can not input '\\n'
+        let val = substitute(val, '\\n', "\n", 'g')
+
+    endif
+
+    return [ key, val, start ]
+
+endfunction "}}}
+
+let &cpo = s:oldcpo
diff --git a/autoload/xpt/ph.vim b/autoload/xpt/ph.vim
new file mode 100644
index 00000000..0e365e97
--- /dev/null
+++ b/autoload/xpt/ph.vim
@@ -0,0 +1,264 @@
+" Place holder with edge is the editable, it is also called the key place
+"   holder
+"
+" If none of place holders of one item has edge. The first place holder is the
+" key place holder.
+"
+" If more than one place holders with edge, the first one is the key place
+" holder.
+
+exec xpt#once#init
+let s:oldcpo = &cpo
+set cpo-=< cpo+=B
+
+let s:log = xpt#debug#Logger( 'warn' )
+" let s:log = xpt#debug#Logger( 'debug' )
+
+exe XPT#importConst
+
+fun! xpt#ph#CreateFromScreen( snipObject, nameInfo, valueInfo ) "{{{
+
+    let xp = a:snipObject.ptn
+    let toescape = xp.l . xp.r
+
+    " 1 is length of left mark
+    let leftEdge  = xpt#util#TextBetween( a:nameInfo[ 0 : 1 ] )
+    let name      = xpt#util#TextBetween( a:nameInfo[ 1 : 2 ] )
+    let rightEdge = xpt#util#TextBetween( a:nameInfo[ 2 : 3 ] )
+
+    let [ leftEdge, name, rightEdge ] = [ leftEdge[1 : ], name[1 : ], rightEdge[1 : ] ]
+
+    let leftEdge = xpt#util#UnescapeChar(leftEdge, toescape)
+    let name = xpt#util#UnescapeChar(name, toescape)
+    let rightEdge = xpt#util#UnescapeChar(rightEdge, toescape)
+
+    if a:valueInfo[1] != a:valueInfo[0]
+
+        let posList = [ a:valueInfo[ 0 ], a:valueInfo[ 2 ] ]
+        let val = xpt#util#TextBetween( posList )
+        let val = val[1:]
+
+
+        " TODO problem: indent() returns indent without mark consideration
+        let nIndent = indent( a:valueInfo[0][0] )
+
+
+        call s:log.Debug("placeHolder post filter:key=val : " . name . "=" . val)
+
+        let phFilter =  { 'text' : val, 'indent' : nIndent, }
+    else
+        let phFilter = 0
+    endif
+
+
+    return xpt#ph#New( a:snipObject,
+          \ { 'leftEdge'  : leftEdge,
+          \   'name'      : name,
+          \   'rightEdge' : rightEdge,
+          \   'isKey' : a:nameInfo[0] != a:nameInfo[1], }, phFilter )
+
+endfunction "}}}
+
+fun! xpt#ph#New( snipObject, pieces ) "{{{
+
+    let phptns = a:snipObject.ptn
+
+
+    let textPieces = deepcopy( a:pieces )
+    call map( textPieces, 'v:val.text' )
+
+    let iFilter = match( textPieces, '\V\^' . a:snipObject.ptn.r )
+
+    if iFilter > 1
+
+        let ph ={
+              \ 'leftEdge'    : a:pieces[ 0 ],
+              \ 'name'        : a:pieces[ 1 ].text,
+              \ 'displayText' : a:pieces[ 1 ],
+              \ 'rightEdge'   : iFilter > 2
+              \                   ? a:pieces[ 2 ]
+              \                   : { 'nIndent' : a:pieces[ 1 ].nIndent, 'text' : '' },
+              \   'isKey'     : 1 }
+
+        let ph.fullname = ph.leftEdge.text . ph.name . ph.rightEdge.text
+
+
+        for key in [ 'leftEdge', 'displayText', 'rightEdge' ]
+            call xpt#ph#CreateEvaluatablePHElt( a:snipObject, ph, key )
+        endfor
+
+    else
+
+        let ph ={
+              \ 'name'        : a:pieces[ 0 ].text,
+              \ 'displayText' : a:pieces[ 0 ],
+              \ 'fullname'    : a:pieces[ 0 ].text }
+
+        call xpt#ph#CreateEvaluatablePHElt( a:snipObject, ph, 'displayText' )
+
+    endif
+
+
+    call s:log.Log( "ph is :" . string( ph ) )
+
+    let spec = xpt#ph#CreateSpecial( a:snipObject, ph )
+    if spec isnot 0
+        return spec
+    endif
+
+
+    if len( a:pieces ) - iFilter == 1
+        return ph
+    endif
+
+
+    " NOTE: live filter makes leader PH impossible to type normal text
+    " NOTE: Only key PH live filter will be applied. In another word,
+    "       setting.liveFilters.xxx.
+    "       See XPTupdateTyping()
+    let ftype = len( a:pieces ) - iFilter > 2 ? 'postFilter' : 'liveFilter'
+
+    let fltPart = copy( a:pieces[ iFilter ] )
+    let fltPart.text = fltPart.text[ 1: ]
+
+    let fltPart.text =  xpt#ph#AlterFilterByPHName( ph.name, fltPart.text )
+
+
+    let flt = xpt#ph#CreatePHEltFilter( a:snipObject, fltPart )
+
+
+    " " non-function liveFilter is treated as on-focus filter and is only applied once
+    " if ftype == 'liveFilter' && flt.text =~ a:snipObject.ptn.item_func
+    "     let ftype = 'onfocusFilter'
+    " endif
+
+
+    " If it is a key PH, its follower PHs should share this filter
+    if has_key( ph, 'isKey' ) && ph.name != ''
+        let a:snipObject.setting[ ftype . 's' ][ ph.name ] = flt
+    else
+        let ph[ ftype ] = flt
+    endif
+
+
+    return ph
+
+
+endfunction "}}}
+
+" fun! xpt#ph#ManualCreate( name, leftEdge, displayText, rightEdge ) "{{{
+
+" endfunction "}}}
+
+" TODO rename me
+fun! xpt#ph#CreateEvaluatablePHElt( snipObject, ph, key ) "{{{
+
+    let phptns = a:snipObject.ptn
+
+    if a:ph[ a:key ].text =~ '\V' . phptns.item_var . '\|' . phptns.item_func . '\|\n'
+
+        let a:ph[ a:key ] = xpt#ph#CreatePHEltFilter( a:snipObject, a:ph[ a:key ] )
+
+    elseif a:ph[ a:key ].text =~ '\V' . s:ptnIncFull . '\|' . s:ptnIncSimp
+        " TODO backward compatible
+
+        let a:ph[ a:key ] = xpt#ph#CreatePHEltFilter( a:snipObject, a:ph[ a:key ] )
+
+    else
+        let a:ph[ a:key ] = xpt#util#UnescapeChar( a:ph[ a:key ].text, a:snipObject.ptn.lr )
+    endif
+
+endfunction "}}}
+
+fun! xpt#ph#CreateSpecial( snipObject, ph ) "{{{
+
+    let phptns = a:snipObject.ptn
+
+    " NOTE: Inclusion comes first
+
+
+    if type( a:ph.displayText ) == type( {} )
+        " It's a filter
+
+        if a:ph.displayText[ 'text' ] =~ s:ptnIncFull
+
+            let params = matchstr( a:ph.displayText[ 'text' ], s:ptnIncFull )
+            let [ name, args ] = xpt#snip#ParseInclusionStatement( a:snipObject, params )
+            let a:ph.displayText[ 'text' ] = 'Inc(' . string( name ) . ', 1,  ' . string( args ) .')'
+            return a:ph
+
+
+        elseif a:ph.displayText[ 'text' ] =~ s:ptnIncSimp
+
+            let params = matchstr( a:ph.displayText[ 'text' ], s:ptnIncSimp )
+            let [ name, args ] = xpt#snip#ParseInclusionStatement( a:snipObject, params )
+            let a:ph.displayText[ 'text' ] = 'Inc(' . string( name ) . ', 0,  ' . string( args ) .')'
+            return a:ph
+
+        endif
+
+        " It's only a instant place holder
+
+        let a:ph.value = 1
+        return a:ph
+
+
+    endif
+
+    return 0
+
+endfunction "}}}
+
+fun! xpt#ph#FilterEltKeys( ph ) "{{{
+    let phKeys = [ 'leftEdge', 'displayText', 'rightEdge' ]
+    call filter( phKeys, 'type( get( a:ph, v:val, 0 ) ) is ' . string( type( {} ) ) )
+    return phKeys
+endfunction "}}}
+
+fun! xpt#ph#GetPresetFilter( ph, setting ) "{{{
+
+    " Use g:EmptyFilter for Avoiding "Variable type mismatch" error
+    let phLive = get( a:ph, 'liveFilter', g:EmptyFilter )
+
+    if a:ph.name != ''
+        let pre = get( a:setting.preValues, a:ph.name, g:EmptyFilter )
+        if get( pre, 'force' )
+            return pre
+        endif
+
+        let live = get( a:setting.liveFilters, a:ph.name, g:EmptyFilter )
+        if get( live, 'force' )
+            return live
+        endif
+
+        let phLive = phLive is g:EmptyFilter || get( pre, 'force' ) ? pre : phLive
+        let phLive = phLive is g:EmptyFilter || get( live, 'force' ) ? live : phLive
+
+    endif
+
+    return phLive
+
+endfunction "}}}
+
+fun! xpt#ph#CreatePHEltFilter( snipObject, elt ) "{{{
+
+    let val = xpt#util#UnescapeChar( a:elt.text, a:snipObject.ptn.lr )
+
+    return xpt#flt#New( -a:elt.nIndent, val )
+
+endfunction "}}}
+
+fun! xpt#ph#AlterFilterByPHName( phname, fltText ) "{{{
+
+    if a:phname =~ '\V...\$'
+
+        let a:fltText = xpt#util#UnescapeChar( a:fltText, '$({' )
+        return 'BuildIfNoChange(' . string( a:fltText ) . ')'
+
+    endif
+
+    return a:fltText
+
+endfunction "}}}
+
+let &cpo = s:oldcpo
diff --git a/autoload/xpt/priority.vim b/autoload/xpt/priority.vim
new file mode 100644
index 00000000..696b77a1
--- /dev/null
+++ b/autoload/xpt/priority.vim
@@ -0,0 +1,34 @@
+if exists( "g:__AL_XPT_PRIORITY_f78d9s873942__" ) && g:__AL_XPT_PRIORITY_f78d9s873942__ >= XPT#ver
+    finish
+endif
+let g:__AL_XPT_PRIORITY_f78d9s873942__ = XPT#ver
+
+
+let s:oldcpo = &cpo
+set cpo-=< cpo+=B
+
+
+let s:priorities = { 'lowest': 9999999,
+      \              'all' : 64, 'spec' : 48, 'like' : 32, 'lang' : 16,
+      \              'sub' : 8, 'personal' : 0,
+      \              'highest': -1, }
+let s:priorities.default = s:priorities.lang
+
+fun! xpt#priority#Get( pstr ) "{{{
+    return s:priorities[ a:pstr ]
+endfunction "}}}
+
+fun! xpt#priority#Parse( pstr ) "{{{
+    let pstr = a:pstr
+    if pstr =~ '\V\[+-]\$'
+        let pstr .= '1'
+    endif
+
+    let reg = '\V\(\w\+\|\[+-]\)\zs'
+    let prioParts = split( pstr, reg )
+
+    let prioParts[ 0 ] = get( s:priorities, prioParts[ 0 ], prioParts[ 0 ] - 0 )
+    return eval( join( prioParts, '' ) )
+endfunction "}}}
+
+let &cpo = s:oldcpo
diff --git a/autoload/xpt/rctx.vim b/autoload/xpt/rctx.vim
new file mode 100644
index 00000000..b4e88cf1
--- /dev/null
+++ b/autoload/xpt/rctx.vim
@@ -0,0 +1,247 @@
+exec xpt#once#init
+
+let s:oldcpo = &cpo
+set cpo-=< cpo+=B
+
+let s:log = xpt#debug#Logger( 'warn' )
+" let s:log = xpt#debug#Logger( 'debug' )
+
+let s:phase = {
+      \ 'uninit'    : 'uninit'   ,
+      \ 'popup'     : 'popup'    ,
+      \ 'inited'    : 'inited'   ,
+      \ 'rendering' : 'rendering',
+      \ 'rendered'  : 'rendered' ,
+      \ 'iteminit'  : 'iteminit' ,
+      \ 'fillin'    : 'fillin'   ,
+      \ 'post'      : 'post'     ,
+      \ 'finished'  : 'finished' ,
+      \ }
+
+let xpt#rctx#phase = s:phase
+let p = s:phase
+let s:phaseGraph = {
+      \ p.uninit    : [ p.popup, p.inited ],
+      \ p.popup     : [ p.inited ],
+      \ p.inited    : [ p.rendering ],
+      \ p.rendering : [ p.rendered ],
+      \ p.rendered  : [ p.iteminit ],
+      \ p.iteminit  : [ p.iteminit, p.fillin, p.post ],
+      \ p.fillin    : [ p.post, p.finished ],
+      \ p.post      : [ p.finished, p.iteminit ],
+      \ p.finished  : [ p.uninit ],
+      \ }
+unlet p
+
+
+fun! xpt#rctx#New( x ) "{{{
+
+    let pre = "X" . len( a:x.stack ) . '_'
+
+    let inst = {
+          \   'ftScope'            : {},
+          \   'level'              : len( a:x.stack ),
+          \   'snipObject'         : {},
+          \   'snipSetting'        : {},
+          \   'phase'              : s:phase.uninit,
+          \   'nextStep'           : -1,
+          \   'action'             : '',
+          \   'userPostAction'     : '',
+          \   'wrap'               : {},
+          \   'userWrapped'        : {},
+          \   'markNamePre'        : pre,
+          \   'item'               : {},
+          \   'leadingPlaceHolder' : {},
+          \   'activeLeaderMarks'  : 'innerMarks',
+          \   'history'            : [],
+          \   'namedStep'          : {},
+          \   'processing'         : 0,
+          \   'marks'              : {
+          \      'tmpl'            : {
+          \         'start' : pre . '`tmpl`s',
+          \         'end'   : pre . '`tmpl`e' } },
+          \   'itemDict'           : {},
+          \   'itemList'           : [],
+          \   'groupList'          : [],
+          \   'lastContent'        : '',
+          \   'tmpmappings'        : {},
+          \   'oriIndentkeys'      : {},
+          \   'leadingCharToReindent' : {},
+          \ }
+
+    " for emulation of 'indentkeys'
+    "
+    " vim issue:
+    "   :set indentkeys=0\,,0}
+    "   :echo &indentkeys
+    "
+    " results in:
+    "   "0,,0}"
+    "
+    " The backslash escaped chars can not be read correctly.
+
+    let lst = split( &indentkeys, ',' )
+    let indentkeysList = []
+    for k in lst
+
+        " TRICK: Treat first of two continous comma as escaped.
+        if k == ""
+            let indentkeysList[ -1 ] .= ','
+        else
+            if k[ 0 ] == '0'
+                call add( indentkeysList, k )
+            endif
+        endif
+    endfor
+
+    for k in indentkeysList
+        " "0=" is not included
+        if k[ 1 ] == '=' && len( k ) > 2
+            let inst.oriIndentkeys[ k[ 2: ] ] = 1
+        else
+            let inst.leadingCharToReindent[ k[ 1: ] ] = 1
+        endif
+    endfor
+
+    return inst
+
+endfunction "}}}
+
+fun! xpt#rctx#SwitchPhase( inst, nextPhase ) "{{{
+    if -1 == match( s:phaseGraph[ a:inst.phase ], '\V\<' . a:nextPhase . '\>' )
+        throw 'XPT:RenderContext:switching from [' . a:inst.phase . '] to [' . a:nextPhase . '] is not allowed'
+    endif
+
+    let a:inst.phase = a:nextPhase
+
+endfunction "}}}
+
+" fun! xpt#rctx#InitGroupList( rctx ) "{{{
+"     let a:rctx.groupList = []
+
+"     call xpt#rctx#InitOrderedGroupList( a:rctx )
+" endfunction "}}}
+
+fun! xpt#rctx#InitOrderedGroupList( rctx ) "{{{
+    let a:rctx.firstList = copy( a:rctx.snipSetting.comeFirst )
+    let a:rctx.lastList = copy( a:rctx.snipSetting.comeLast )
+endfunction "}}}
+
+fun! xpt#rctx#AddDefaultPHFilters( rctx, ph ) "{{{
+
+    if a:ph.name == ''
+        return
+    endif
+
+    let pfs = a:rctx.snipSetting.postFilters
+    if !has_key( pfs, a:ph.name )
+
+        if a:ph.name =~ '\V\w\+?\$'
+            let pfs[ a:ph.name ] = xpt#flt#New( 0, "EchoIfNoChange('')" )
+        endif
+
+    endif
+
+endfunction "}}}
+
+fun! xpt#rctx#UserOut( rctx, text ) "{{{
+    let a:rctx.nextStep = s:R_NEXT
+    let a:rctx.userPostAction = a:text
+endfunction "}}}
+
+fun! xpt#rctx#UserOutAppend( rctx, text ) "{{{
+    call xpt#rctx#UserOut( a:rctx, a:rctx.userPostAction . a:text )
+endfunction "}}}
+
+" TODO remove me: unclear statement
+fun! xpt#rctx#AddPHToGroup( rctx, ph ) "{{{
+    throw "do not use me any more"
+    " anonymous g with empty name '' will never been added to a:rctx.itemDict
+
+    let g = xpt#rctx#GetGroup( a:rctx, a:ph.name )
+
+    call xpt#group#InsertPH( g, a:ph, len( g.placeHolders ) )
+
+    return g
+
+endfunction "}}}
+
+fun! xpt#rctx#GetGroup( rctx, name ) "{{{
+
+    " TODO rename it
+    if has_key(a:rctx.itemDict, a:name)
+
+        let g = a:rctx.itemDict[ a:name ]
+
+    else
+
+        let g = xpt#group#New( a:name, a:rctx.buildingSessionID )
+
+    endif
+
+    " NOTE: No matter new or old, always try to add. during render-time,
+    " dynamically generated PH need to be resorted
+    call xpt#rctx#AddGroup( a:rctx, g )
+
+    return g
+
+endfunction "}}}
+
+fun! xpt#rctx#AddGroup( rctx, g ) "{{{
+
+    let [rctx, g] = [ a:rctx, a:g ]
+
+    let exist = has_key( rctx.itemDict, g.name )
+
+    if g.name != ''
+        let rctx.itemDict[ g.name ] = g
+    endif
+
+    if rctx.phase != s:phase.rendering
+        call add( rctx.firstList, g )
+        call filter( ctx.groupList, 'v:val isnot g' )
+
+        call s:log.Log( 'group insert to the head of groupList:' . string( g ) )
+        return
+
+    endif
+
+    " rendering phase
+    if exist
+        return
+    endif
+
+    if g.name == ''
+
+        call add( rctx.groupList, g )
+
+    elseif s:AddToOrderList( rctx.firstList, g )
+          \ || s:AddToOrderList( rctx.lastList, g )
+
+        return
+
+    else
+
+        call add( rctx.groupList, g )
+        call s:log.Log( g.name . ' added to groupList' )
+
+    endif
+
+endfunction "}}}
+
+fun! s:AddToOrderList( list, g ) "{{{
+    let i = index( a:list, a:g.name )
+
+    if i != -1
+        let a:list[ i ] = a:g
+        call s:log.Log( a:g.name . ' added to ' . string( a:list ) )
+        call s:log.Debug( 'index:' . i )
+
+        return 1
+    else
+        return 0
+    endif
+
+endfunction "}}}
+
+let &cpo = s:oldcpo
diff --git a/autoload/xpt/snip.vim b/autoload/xpt/snip.vim
new file mode 100644
index 00000000..d1f0426f
--- /dev/null
+++ b/autoload/xpt/snip.vim
@@ -0,0 +1,437 @@
+if exists( "g:__AL_XPT_SNIP_VIM__" ) && g:__AL_XPT_SNIP_VIM__ >= XPT#ver
+    finish
+endif
+let g:__AL_XPT_SNIP_VIM__ = XPT#ver
+
+
+let s:oldcpo = &cpo
+set cpo-=< cpo+=B
+
+
+let s:log = xpt#debug#Logger( 'warn' )
+let s:log = xpt#debug#Logger( 'debug' )
+
+exe XPT#importConst
+
+
+fun! xpt#snip#DefExt( name, setting, lines ) "{{{
+
+    call xpt#st#Extend( a:setting )
+
+    call XPTdefineSnippet( a:name, a:setting, a:lines )
+
+endfunction "}}}
+
+fun! xpt#snip#New( name, ftScope, snipText, prio, setting, patterns ) "{{{
+
+    " compiledSnip      List of a mixture of plain text and PH
+    " parsedSnip        List with inclusion, repetition compiled
+    " lines             List of PH whose value are evaluated.
+    return {
+          \ 'name'        : a:name,
+          \ 'compiled'    : 0,
+          \ 'parsed'      : 0,
+          \ 'ftScope'     : a:ftScope,
+          \ 'rawSnipText' : a:snipText,
+          \ 'snipText'    : a:snipText,
+          \ 'priority'    : a:prio,
+          \ 'setting'     : a:setting,
+          \ 'ptn'         : a:patterns,
+          \ }
+
+
+endfunction "}}}
+
+fun! xpt#snip#NewSlave( master, snipText ) "{{{
+    return xpt#snip#New( '', a:master.ftScope, a:snipText, 0,
+          \ a:master.setting, a:master.ptn )
+endfunction "}}}
+
+fun! xpt#snip#CompileAndParse( so ) "{{{
+
+    if !a:so.parsed
+
+        if !a:so.compiled
+            call xpt#snip#Compile( a:so )
+        endif
+
+        call xpt#snip#Parse( a:so )
+
+    endif
+
+endfunction "}}}
+
+fun! xpt#snip#Compile( so ) "{{{
+
+    call xpt#ftsc#Init( a:so.ftScope )
+
+    if a:so.snipText == ''
+        let a:so.compiledSnip = [ '' ]
+        return
+    endif
+
+
+    let rawLines = s:SplitLines( a:so )
+
+    let nIndent = len( matchstr( rawLines[0][0], '\V\^\s\*' ) )
+
+
+    let [ l, r ] = [ a:so.ptn.l, a:so.ptn.r ]
+
+    let [ i, j, nlines, nitems ] = [ 0, 0, len( rawLines ), len( rawLines[ 0 ] ) ]
+
+    let [ st, linesCompiled ] = [ 'LeftEdge', [] ]
+    let buf = [ { 'nIndent' : 0, 'text' : '' } ]
+
+
+    while 1
+
+        let elt = rawLines[ i ][ j ]
+        let firstChar = matchstr( elt, '\v.' )
+
+        if firstChar == l
+            if st == 'LeftEdge'
+
+                let st = 'Name'
+                let texts = deepcopy( buf )
+                call map( texts, 'v:val.text' )
+
+                call extend( linesCompiled, texts )
+
+                let buf = [ { 'nIndent' : nIndent, 'text' : elt[ 1 : ] } ]
+
+            elseif st == 'Name'
+
+                call add( buf, { 'nIndent' : nIndent, 'text' : elt[ 1 : ] } )
+
+            elseif st == 'Filter'
+
+                let st = 'LeftEdge'
+
+                let followingText = buf[ -1 ].text[ 1 : ]
+                let buf[ -1 ].text = buf[ -1 ].text[ 0 : 0 ]
+
+                call add( linesCompiled, xpt#ph#New( a:so, buf ) )
+
+                let buf = [ { 'nIndent' : nIndent, 'text' : followingText } ]
+
+                continue
+
+            endif
+
+        elseif firstChar == r
+
+            " if st == 'LeftEdge'
+            "     " nothing to do
+
+            if st == 'Name'
+
+                let st = 'Filter'
+                continue
+
+            elseif st == 'Filter'
+
+                call add( buf, { 'nIndent' : nIndent, 'text' : elt } )
+
+            endif
+        else
+            let buf[ -1 ].text .= rawLines[ i ][ j ]
+        endif
+
+
+        let j += 1
+
+        if j >= nitems
+
+            let [ i, j ] = [ i + 1, 0 ]
+            if i >= nlines
+                break
+            endif
+            let buf[ -1 ].text .= "\n"
+
+            let [ nIndent, nitems ] = [
+                  \ len( matchstr( rawLines[ i ][ 0 ], '\V\^\s\*' ) ), len( rawLines[ i ] ) ]
+
+        endif
+
+    endwhile
+
+    " remove empty string, list and dictionary
+    call filter( linesCompiled, 'len(v:val) > 0' )
+
+
+    let rst = []
+    for e in linesCompiled
+        call add( rst,
+              \ type( e ) == type( {} )
+              \ ? e : xpt#util#UnescapeChar( e, a:so.ptn.lr ) )
+        unlet e
+    endfor
+
+    let a:so.compiledSnip = rst
+    let a:so.compiled = 1
+
+endfunction "}}}
+
+fun! xpt#snip#TextToPlaceholders(text, ptn) "{{{
+
+    let [ l, r ] = [ a:ptn.l, a:ptn.r ]
+    let lr = l . r
+
+    let toks = xpt#snip#Tokenize(a:text, a:ptn) + ["", "", ""]
+    let elts = []
+    let buf = []
+
+    let i = -1
+    while i < len(toks) - 1
+        let i += 1
+        let tok = toks[i]
+
+        " let a = '' a[0] is legal
+        let chr = tok[0]
+        if chr != l && chr != r
+            if tok != ""
+                call add(elts, {'text': xpt#util#UnescapeChar(tok, lr)})
+            endif
+            continue
+        endif
+
+        if chr == l
+            call add(buf, {'text': xpt#util#UnescapeChar(tok[1:], lr)})
+            continue
+        endif
+
+        " chr == r
+        let ph = s:EltsToPh(buf)
+        call add(elts, ph)
+        let buf = []
+
+        if toks[i+1][0] == l
+            continue
+        endif
+
+
+        if toks[i + 1] == r
+            let [flt, iFilterEnd] = [{'text': ''}, i + 1]
+        else
+            " toks[i+1] is text
+            if toks[i + 2] == r
+                let [flt, iFilterEnd] = [{'text': xpt#util#UnescapeChar(toks[i + 1], lr)}, i + 2]
+            else
+                continue
+            endif
+        end
+
+        if toks[iFilterEnd + 1] == r
+            let ph.postFilter = flt
+            let i = iFilterEnd + 1
+        else
+            let ph.liveFilter = flt
+            let i = iFilterEnd
+        endif
+
+    endwhile
+
+    return elts
+endfunction "}}}
+
+fun! s:EltsToPh(buf) "{{{
+    let buf = a:buf
+
+    if len(buf) == 0
+         throw 'xpt#snip#Unexpected: ' . r
+     elseif len(buf) == 1
+         let ph = { 'name': buf[0] }
+     elseif len(buf) == 2
+         let ph = { 'leftEdge': buf[0], 'name': buf[1] }
+     elseif len(buf) == 3
+         let ph = { 'leftEdge': buf[0], 'name': buf[1], 'rightEdge': buf[2] }
+     else
+         throw 'xpt#snip#TooMany: ' . string(buf)
+    endif
+    return ph
+endfunction "}}}
+
+fun! xpt#snip#Parse( so ) "{{{
+
+    " deepcopy is make by following parsers
+    let a:so.parsedSnip = a:so.compiledSnip
+
+    call s:log.Debug( 'before parse phs=' . xpt#debug#List( a:so.parsedSnip ) )
+
+
+    let a:so.parsedSnip = xpt#snip#ReplacePH( a:so, a:so.setting.replacements )
+    let a:so.parsedSnip = xpt#snip#EvalInstantFilters( a:so )
+    let a:so.parsedSnip = xpt#snip#PostQuote( a:so )
+    let a:so.parsedSnip = xpt#snip#Repetition( a:so )
+
+
+    let a:so.parsed = 1
+
+
+endfunction "}}}
+
+fun! xpt#snip#ReplacePH( so, repls ) "{{{
+
+    let phs = xpt#phfilter#Filter( a:so,
+          \ 'xpt#phfilter#ReplacePH',
+          \ { 'replParams' : a:repls } )
+
+
+    call s:log.Debug( 'after RelacePH phs=' . xpt#debug#List( phs ) )
+
+    return phs
+
+endfunction "}}}
+
+fun! xpt#snip#EvalInstantFilters( so ) "{{{
+
+    let phs = xpt#phfilter#Filter( a:so,
+          \ 'xpt#phfilter#EvalInstantFilters',
+          \ {'skip' : a:so.ptn.item_func . '\|$_x\w', 'forceNotSkip' : s:ptnPreEvalFunc } )
+
+    call s:log.Debug( 'after EvalInstantFilters phs=' . xpt#debug#List( phs ) )
+
+    return phs
+
+endfunction "}}}
+
+fun! xpt#snip#PostQuote( so ) "{{{
+
+    let pqContext = { 'pqStack' : [ [] ] }
+    let pqContext.rstPHs = pqContext.pqStack[ 0 ]
+
+    let phs = xpt#phfilter#Filter( a:so,
+          \  'xpt#phfilter#PostQuote', pqContext )
+
+    call s:log.Debug( 'after PostQuote phs=' . xpt#debug#List( phs ) )
+
+    return phs
+
+endfunction "}}}
+
+fun! xpt#snip#Repetition( so ) "{{{
+
+    let repContext = { 'repStack' : [ [] ], 'repHeads' : {} }
+    let repContext.rstPHs = repContext.repStack[ 0 ]
+
+    let phs = xpt#phfilter#Filter( a:so,
+          \  'xpt#phfilter#Repetition', repContext )
+
+    call s:log.Debug( 'after PostQuote phs=' . xpt#debug#List( phs ) )
+
+    return phs
+
+endfunction "}}}
+
+fun! xpt#snip#EvalPresetFilters( rctx, phs, ctx ) "{{{
+
+    let ctx = {
+          \ 'rctx' : a:rctx,
+          \   'srcPHs' : a:phs,
+          \   'snipSetting' : a:rctx.snipSetting,
+          \   'phEvalContext' : a:ctx, 
+          \ }
+
+    let phs = xpt#phfilter#Filter( a:rctx.snipObject,
+          \ 'xpt#phfilter#EvalPresetFilters', ctx )
+
+    call s:log.Debug( 'after PostQuote phs=' . xpt#debug#List( phs ) )
+
+    return phs
+
+endfunction "}}}
+
+fun! xpt#snip#DumbCursorInPlace( so, phs ) "{{{
+
+    for ph in a:phs
+
+        if type( ph ) == type( {} )
+              \ && ph.name is 'cursor'
+
+            let ph.name = ''
+            " TODO reseting displayText may be override pre-evaled value
+            let ph.displayText = ph.name
+
+        endif
+
+        unlet ph
+
+    endfor
+
+endfunction "}}}
+
+fun! xpt#snip#ParseInclusionStatement( so, statement ) "{{{
+
+    let phptns = a:so.ptn
+
+
+    let ptn = '\V\^\[^(]\{-}('
+    let statement = a:statement
+
+    if statement =~ ptn && statement[ -1 : -1 ] == ')'
+
+        let name = matchstr( statement, ptn )[ : -2 ]
+
+        let paramStr = statement[ len( name ) + 1 : -2 ]
+        let paramStr = xpt#util#UnescapeChar( paramStr, phptns.lr )
+
+        call s:log.Debug( 'name=' . string( name ) )
+        call s:log.Debug( 'paramStr' . string( paramStr ) )
+
+
+        let params = {}
+
+        try
+            let params = eval( paramStr )
+        catch /.*/
+            XPT#info( 'XPT: Invalid parameter: ' . string( paramStr ) . ' Error=' . v:exception )
+        endtry
+
+
+        call s:log.Debug( 'params=' . string( params ) )
+
+        return [ name, params ]
+
+    else
+        return [ statement, {} ]
+    endif
+
+endfunction "}}}
+
+fun! s:SplitLines( so ) "{{{
+
+    let delimiter = '\V\ze' . a:so.ptn.lft . '\|\ze' . a:so.ptn.rt
+
+    let lines = split( a:so.snipText, "\n", 1 )
+    call map( lines, 'split(v:val, delimiter, 1)' )
+
+
+    " add an additional left mark to finish the search
+    let lines[ -1 ] += [ a:so.ptn.l ]
+
+    return lines
+endfunction "}}}
+
+fun! xpt#snip#Tokenize(text, ptn) "{{{
+    let delimiter = '\V\ze' . a:ptn.lft . '\|\ze' . a:ptn.rt
+    let toks = split(a:text, delimiter, 0)
+    " NOTE: vim bug: 'a`' -> [ 'a', '', '`' ]
+    if len(toks) == 0
+        return ['']
+    end
+
+    let rst = []
+    for tok in toks
+        if tok == a:ptn.r
+            call add(rst, tok)
+        elseif tok[0] == a:ptn.r
+            call extend(rst, [a:ptn.r, tok[1:]])
+        else
+            call add(rst, tok)
+        end
+    endfor
+    return rst
+endfunction "}}}
+
+let &cpo = s:oldcpo
diff --git a/autoload/xpt/snipfuncs/evalhelper.vim b/autoload/xpt/snipfuncs/evalhelper.vim
new file mode 100644
index 00000000..a85c6d24
--- /dev/null
+++ b/autoload/xpt/snipfuncs/evalhelper.vim
@@ -0,0 +1,44 @@
+if exists( "g:__AL_XPT_EVALSUPPORT_f67523jhrk" ) && g:__AL_XPT_EVALSUPPORT_f67523jhrk >= 1
+    finish
+endif
+let g:__AL_XPT_EVALSUPPORT_f67523jhrk = 1
+
+let s:oldcpo = &cpo
+set cpo-=< cpo+=B
+
+let s:f = xpt#snipfunction#funcs
+
+fun! s:f.GetVar( name )
+
+    if a:name =~# '\V\^$_x'
+        let n = a:name[ 1 : ]
+        return self.Call( n, [] )
+    endif
+
+    let closures = self._ctx.closures
+    let i = len(closures)
+    while i > 0
+        let i = i - 1
+        let c = closures[ i ]
+
+        let v = get( c, a:name, 0 )
+        if v isnot 0
+            return v
+        endif
+    endwhile
+
+    return ''
+endfunction
+
+fun! s:f.Call( name, args )
+
+    let F = get(self, a:name, 0)
+
+    if type(F) == type(function('tr'))
+        return call(F, a:args, self)
+    else
+        return call(function(a:name), a:args)
+    endif
+endfunction
+
+let &cpo = s:oldcpo
diff --git a/autoload/xpt/snipfunction.vim b/autoload/xpt/snipfunction.vim
new file mode 100644
index 00000000..b1217d5f
--- /dev/null
+++ b/autoload/xpt/snipfunction.vim
@@ -0,0 +1,16 @@
+if exists( "g:__AL_XPT_EVAL_y732hj43k__" ) && g:__AL_XPT_EVAL_y732hj43k__ >= XPT#ver
+    finish
+endif
+let g:__AL_XPT_EVAL_y732hj43k__ = XPT#ver
+
+
+let s:oldcpo = &cpo
+set cpo-=< cpo+=B
+
+
+let s:f = {}
+let xpt#snipfunction#funcs = s:f
+
+runtime! autoload/xpt/snipfuncs/*
+
+let &cpo = s:oldcpo
diff --git a/autoload/xpt/unittest.vim b/autoload/xpt/unittest.vim
new file mode 100644
index 00000000..1955d7cc
--- /dev/null
+++ b/autoload/xpt/unittest.vim
@@ -0,0 +1,89 @@
+if exists("g:__AL_XPT_UNITTEST_2h3j4k89__") && g:__AL_XPT_UNITTEST_2h3j4k89__ >= XPT#ver
+    finish
+endif
+let g:__AL_XPT_UNITTEST_2h3j4k89__ = XPT#ver
+
+
+let s:oldcpo = &cpo
+set cpo-=< cpo+=B
+
+let s:log = xpt#debug#Logger( 'warn' )
+let s:ctx = {}
+
+fun! s:ctx.True( val, mes ) "{{{
+    if a:val
+        " ok
+    else
+        throw a:mes
+    endif
+endfunction "}}}
+fun! s:ctx.Eq( a, b, mes ) "{{{
+    call self.True( a:a == a:b,
+          \ "Expect " . string(a:a) . " But " . string(a:b) . " " .a:mes )
+endfunction "}}}
+fun! s:ctx.Ne( a, b, mes ) "{{{
+    call self.True( a:a != a:b,
+          \ "Expect not to be " . string(a:a) . " But " . string(a:b) . " " .a:mes )
+endfunction "}}}
+fun! s:ctx.Is( a, b, mes ) "{{{
+    call self.True( a:a is a:b,
+          \ "Expect is " . string(a:a) . " But " . string(a:b) . " " .a:mes )
+endfunction "}}}
+
+fun! xpt#unittest#Runall() "{{{
+    echom '...'
+    try
+        runtime! autoload/xpt/ut/*.vim
+        echom "All tests passed"
+    catch /.*/
+        " bla
+    endtry
+endfunction "}}}
+
+let xpt#unittest#run = 'exe XPT#let_sid | call xpt#unittest#Run(s:sid, expand("<sfile>"))'
+fun! xpt#unittest#Run( sid, fn ) "{{{
+
+    echom "Testing" . string(a:fn)
+
+    let ff = s:GetTestFuncs( a:sid )
+    let funcnames = keys( ff )
+    sort( funcnames )
+
+    for funcname in funcnames
+        if funcname !~ '\V\<Test'
+            continue
+        endif
+
+        echom 'Testing ' . funcname
+        let Func = ff[ funcname ]
+
+        try
+            call Func( s:ctx )
+        catch /.*/
+            echom "    " a:fn
+            echom "    " funcname
+            echom "    " v:throwpoint
+            echom "Failure" v:exception
+            throw "F"
+        endtry
+    endfor
+
+endfunction "}}}
+fun! s:GetTestFuncs( sid ) "{{{
+
+    let clz = {}
+
+    let funcs = split( XPT#getCmdOutput( 'silent function /' . a:sid ), "\n" )
+    call map( funcs, 'matchstr( v:val, "' . a:sid . '\\zs.*\\ze(" )' )
+
+    for name in funcs
+        if name !~ '\V\^_'
+            let clz[ name ] = function( '<SNR>' . a:sid . name )
+        endif
+    endfor
+
+    return clz
+
+endfunction "}}}
+
+let &cpo = s:oldcpo
diff --git a/autoload/xpt/ut/helper/loadonce.vim b/autoload/xpt/ut/helper/loadonce.vim
new file mode 100644
index 00000000..efa818c1
--- /dev/null
+++ b/autoload/xpt/ut/helper/loadonce.vim
@@ -0,0 +1,2 @@
+exec xpt#once#init
+let g:xptemplate_unittest_once_value = 1
diff --git a/autoload/xpt/ut/test_empty.vim b/autoload/xpt/ut/test_empty.vim
new file mode 100644
index 00000000..d623a624
--- /dev/null
+++ b/autoload/xpt/ut/test_empty.vim
@@ -0,0 +1,10 @@
+let s:oldcpo = &cpo
+set cpo-=< cpo+=B
+
+fun! s:TestNothing( t ) "{{{
+    call a:t.Eq( 'yes', 'yes', 'yes is yes' )
+endfunction "}}}
+
+exec xpt#unittest#run
+
+let &cpo = s:oldcpo
diff --git a/autoload/xpt/ut/test_eval.vim b/autoload/xpt/ut/test_eval.vim
new file mode 100644
index 00000000..bcc31270
--- /dev/null
+++ b/autoload/xpt/ut/test_eval.vim
@@ -0,0 +1,100 @@
+if exists( "g:__XPT_UT_TEST_EVAL_f78d9s6fds__" )
+    finish
+endif
+let g:__XPT_UT_TEST_EVAL_f78d9s6fds__ = 1
+
+let s:oldcpo = &cpo
+set cpo-=< cpo+=B
+
+let s:funcs = xpt#snipfunction#funcs
+
+fun! s:TestEval( t ) "{{{
+    let cases = [
+          \ [ [ '', {}, {} ], '' ],
+          \ [ [ 'a', {}, {} ], 'a' ],
+          \ [ [ 'a bc', {}, {} ], 'a bc' ],
+          \ [ [ 'a "bc"', {}, {} ], 'a "bc"' ],
+          \ [ [ 'a ''bc''', {}, {} ], 'a ''bc''' ],
+          \
+          \ [ [ '"$a"', {}, {} ], '"$a"' ],
+          \ [ [ '"$abc"', {}, {} ], '"$abc"' ],
+          \
+          \ [ [ 'tr("abc", "a", "X")', {}, {} ], 'Xbc' ],
+          \ [ [ 'tr("abc", "a", "X")', {"tr":"tr"}, {} ], 'fake tr' ],
+          \
+          \ [ [ '$', {}, {} ], '$' ],
+          \ [ [ '$$', {}, {} ], '$$' ],
+          \ [ [ 'aa$', {}, {} ], 'aa$' ],
+          \ [ [ '$a', {}, {} ], '' ],
+          \ [ [ '$abcd', {}, {} ], '' ],
+          \ [ [ 'xx$abcd', {}, {} ], 'xx' ],
+          \
+          \ [ [ '{}', {}, {} ], '{}' ],
+          \ [ [ '{$}', {}, {} ], '{$}' ],
+          \ [ [ '{$_}', {}, {} ], '' ],
+          \
+          \ [ [ '$a', {"$a" : "var-a"}, {} ], 'var-a' ],
+          \ [ [ '$ a', {"$a" : "var-a"}, {} ], '$ a' ],
+          \ [ [ '$\a', {"$a" : "var-a"}, {} ], '$\a' ],
+          \ [ [ '\$a', {"$a" : "var-a"}, {} ], '$a' ],
+          \ [ [ 'cc$a', {"$a" : "var-a"}, {} ], 'ccvar-a' ],
+          \ [ [ '{$a}b', {"$a" : "var-a"}, {} ], 'var-ab' ],
+          \
+          \ [ [ '{$a}b', {"$a" : "var-a"}, {"$a": "var-A2"} ], 'var-A2b' ],
+          \
+          \ [ [ 'a()', {}, {} ], '' ],
+          \ [ [ 'a()', {'a' : 'a'}, {} ], 'a-' ],
+          \ [ [ '()', {}, {} ], '()' ],
+          \ [ [ '()a()', {}, {} ], '' ],
+          \ [ [ '()a("xx")', {'a' : 'a'}, {} ], '()a-xx' ],
+          \ [ [ '()a("xx")()', {'a' : 'a'}, {} ], '()a-xx()' ],
+          \
+          \ [ [ 'a()a\()', {'a' : 'a'}, {} ], 'a-a()' ],
+          \ [ [ 'a\\()', {'a' : 'a'}, {} ], 'a\()' ],
+          \ [ [ 'a\\\()', {'a' : 'a'}, {} ], 'a\()' ],
+          \ [ [ 'a ()', {'a' : 'a'}, {} ], 'a ()' ],
+          \ [ [ 'a (', {'a' : 'a'}, {} ], 'a (' ],
+          \ [ [ '"a()"', {'a' : 'a'}, {} ], '"a()"' ],
+          \ [ [ 'a("b")', {'a' : 'a'}, {} ], 'a-b' ],
+          \ [ [ 'a(b("c"))', {'a' : 'a', 'b' : 'b'}, {} ], 'a-b-c' ],
+          \
+          \ [ [ 'd($x)', {"d" : "dictfunc", "$x": 123}, {} ], 'dictfunc-123' ],
+          \ ]
+          " \ [ [ '', {}, {} ], '' ],
+
+    for [inp,outp] in cases
+        let [ str, scope, scope2 ] = inp
+        let inp = deepcopy(inp)
+
+        for k in keys(scope)
+            if k !~# '\V\^$'
+                let scope[k] = function( 'xpt#ut#test_eval#' . scope[k] )
+            endif
+        endfor
+        call extend(scope, s:funcs, 'keep')
+
+        let rst = xpt#eval#Eval( str, [scope, scope2] )
+        call a:t.Eq( outp, rst, string([ inp,  outp ] ) )
+    endfor
+
+endfunction "}}}
+
+fun! xpt#ut#test_eval#a( ... ) "{{{
+    return 'a-' . join(a:000, '')
+endfunction "}}}
+fun! xpt#ut#test_eval#b( ... ) "{{{
+    return 'b-' . join(a:000, '')
+endfunction "}}}
+
+fun! xpt#ut#test_eval#dictfunc( ... ) dict "{{{
+    return 'dictfunc-' . join(a:000, '')
+endfunction "}}}
+
+fun! xpt#ut#test_eval#tr(...) "{{{
+    return 'fake tr'
+endfunction "}}}
+
+exec xpt#unittest#run
+
+let &cpo = s:oldcpo
+
diff --git a/autoload/xpt/ut/test_indent.vim b/autoload/xpt/ut/test_indent.vim
new file mode 100644
index 00000000..a08cc519
--- /dev/null
+++ b/autoload/xpt/ut/test_indent.vim
@@ -0,0 +1,202 @@
+let s:oldcpo = &cpo
+set cpo-=< cpo+=B
+
+fun! s:TestConvertIndentToTab( t ) "{{{
+    let cases = [
+          \ [ [ '', '' ],       [ '', '' ] ],
+          \ [ [ ' ', '' ],      [ ' ', '' ] ],
+          \ [ [ '   ', '' ],    [ '   ', '' ] ],
+          \ [ [ '    ', '' ],   [ '	', '' ] ],
+          \ [ [ '     ', '' ],  [ '	 ', '' ] ],
+          \ [ [ '        ', '' ],  [ '		', '' ] ],
+          \ [ [ '         ', '' ],  [ '		 ', '' ] ],
+          \ [ [ '	', '' ],  [ '	', '' ] ],
+          \ [ [ 'x     ', '' ],  [ 'x     ', '' ] ],
+          \ [ [ 'x	', '' ],  [ 'x	', '' ] ],
+          \ [ [ ' 	x	', '' ],  [ ' 	x	', '' ] ],
+          \ [ [ '    	x	', '' ],  [ '		x	', '' ] ],
+          \ ]
+
+    for [inp,outp] in cases
+        let lines = deepcopy(inp)
+        " 2 same lines should both be converted
+        let lines[1] = lines[0]
+        let outp[1] = outp[0]
+        call xpt#indent#IndentToTab(lines)
+        call a:t.Eq( outp, lines, string([ inp,  outp ] ) )
+
+        let lines = deepcopy(inp)
+        let lines[1] = lines[0]
+        let text = join(lines, "\n")
+        let text = xpt#indent#IndentToTabStr(text)
+        call a:t.Eq(join(outp, "\n"), text, string([inp, outp]))
+    endfor
+
+endfunction "}}}
+
+fun! s:TestToActualIndent( t ) "{{{
+    let old = [ &shiftwidth, &tabstop, &expandtab ]
+
+    for sw in [ 2, 4, 8 ]
+        for ts in [ 2, 4, 8 ]
+
+            let cases = [
+                  \ [ '', '', '' ],
+                  \ [ '	', repeat('	',  sw / ts) . repeat(' ', sw % ts),
+                  \        repeat(' ', sw) ],
+                  \ [ '		', repeat('	',  sw*2 / ts) . repeat(' ', sw*2 % ts),
+                  \                repeat(' ', sw*2)],
+                  \ [ 'x		', 'x		', 'x		' ],
+                  \ ]
+
+            for [input_line,out_0, out_1] in cases
+                let out = [out_0, out_1]
+                for et in [0, 1]
+                    let lines = [input_line, input_line]
+                    let &shiftwidth = sw
+                    let &tabstop = ts
+                    let &expandtab = et
+
+                    let out_lines = [out[et], out[et]]
+
+                    call xpt#indent#ToActualIndent(lines, 0)
+                    call a:t.Eq( out_lines, lines,
+                          \      'sw=' . sw . ' ts=' . ts . ' et=' . et . ' '
+                          \      . string([ input_line,  out[et] ] ) )
+
+                    let lines = [input_line, input_line]
+                    let text = xpt#indent#ToActualIndentStr(join(lines, "\n"), 0)
+                    call a:t.Eq( join(out_lines, "\n"), text,
+                          \      'sw=' . sw . ' ts=' . ts . ' et=' . et . ' '
+                          \      . string([ input_line,  out[et] ] ) )
+                endfor
+
+            endfor
+
+        endfor
+    endfor
+
+    let [ &shiftwidth, &tabstop, &expandtab ] = old
+
+endfunction "}}}
+
+fun! s:TestToActualIndentShift( t ) "{{{
+    let old = [ &shiftwidth, &tabstop, &expandtab ]
+
+    let &shiftwidth = 4
+    let &tabstop = 4
+    let &expandtab = 0
+
+    let cases = [
+          \ [ '', "\n ", "\n	" ],
+          \ [ 'a', "a\n a", "a\n	a" ],
+          \ [ '	a', "	a\n	 a", "	a\n		a" ],
+          \ ]
+
+    for [input_line, out1, out4] in cases
+        let inp = input_line . "\n" . input_line
+        let text = xpt#indent#ToActualIndentStr( inp, 1 )
+        call a:t.Eq( out1, text, string([inp, out1]))
+
+        let text = xpt#indent#ToActualIndentStr( inp, 4 )
+        call a:t.Eq( out4, text, string([inp, out4]))
+    endfor
+
+
+    let [ &shiftwidth, &tabstop, &expandtab ] = old
+endfunction "}}}
+
+fun! s:TestToSpace( t ) "{{{
+    let old = [ &shiftwidth, &tabstop, &expandtab ]
+
+    let &shiftwidth = 4
+    let &tabstop = 4
+    let &expandtab = 0
+
+    let cases = [
+          \ [ '', '', ],
+          \ [ ' ', ' ', ],
+          \ [ '  ', '  ', ],
+          \ [ '   ', '   ', ],
+          \ [ '    ', '    ', ],
+          \ [ ' 	', '    ', ],
+          \ [ ' 	a', '    a', ],
+          \ [ " 	a\n 	", "    a\n    ", ],
+          \ [ "	a\n	b", "    a\n    b", ],
+          \ [ " 	a\n 	b", "    a\n    b", ],
+          \ [ "  	a\n  	b", "    a\n    b", ],
+          \ [ "   	a\n   	b", "    a\n    b", ],
+          \ [ "    	a\n    	b", "        a\n        b", ],
+          \ [ "	 a\n	 b", "     a\n     b", ],
+          \ [ "		 a\n		 	b",
+          \   "         a\n            b", ],
+          \ ]
+
+    for [inp, out] in cases
+        let text = xpt#indent#ToSpace( inp )
+        call a:t.Eq( out, text, string([inp, out]))
+    endfor
+
+    let [ &shiftwidth, &tabstop, &expandtab ] = old
+endfunction "}}}
+
+fun! s:TestSpaceToTab( t ) "{{{
+    let old = [ &shiftwidth, &tabstop, &expandtab ]
+
+    let &shiftwidth = 4
+
+    let cases = [
+          \ [ '', '', ],
+          \ [ ' ', ' ', ],
+          \ [ '  ', '  ', ],
+          \ [ '   ', '   ', ],
+          \ [ '    ', '	', ],
+          \ [ '     ', '	 ', ],
+          \ [ '      ', '	  ', ],
+          \ [ '       ', '	   ', ],
+          \ [ '        ', '		', ],
+          \
+          \ [ ' 	', ' 	', ],
+          \ [ ' 	a', ' 	a', ],
+          \ [ "     a\n     ", "	 a\n	 ", ],
+          \ [ "	a\n	b", "	a\n	b", ],
+          \ [ "    a\n    b", "	a\n	b", ],
+          \ [ "     a\n     b", "	 a\n	 b", ],
+          \ [ "      a\n      b", "	  a\n	  b", ],
+          \ [ "       a\n       b", "	   a\n	   b", ],
+          \ [ "        a\n        b", "		a\n		b", ],
+          \ ]
+
+    for [inp, out] in cases
+        let text = xpt#indent#SpaceToTab( inp )
+        call a:t.Eq( out, text, string([inp, out]))
+    endfor
+
+    let [ &shiftwidth, &tabstop, &expandtab ] = old
+endfunction "}}}
+
+fun! s:TestRemoveIndentStr(t) "{{{
+    let cases = [
+          \  ['', 0, ''],
+          \  ['', 1, ''],
+          \  ['   ', 1, '   '],
+          \  ["   ", 1, "   "],
+          \  ["   \n ", 1, "   \n"],
+          \  ["   \n ", 2, "   \n"],
+          \  ["   \n   a", 2, "   \n a"],
+          \
+          \  ["   \n	a", 2, "   \n	a"],
+          \  ["   \n  a", 2, "   \na"],
+          \  ["   \n  a", 3, "   \na"],
+          \  ["   \n   \n a", 2, "   \n \na"],
+          \ ]
+
+    for [txt, n, outp] in cases
+        let act = xpt#indent#RemoveIndentStr(txt, n)
+        call a:t.Eq(outp, act, string([txt, n, outp]))
+    endfor
+endfunction "}}}
+
+exec xpt#unittest#run
+
+let &cpo = s:oldcpo
diff --git a/autoload/xpt/ut/test_once.vim b/autoload/xpt/ut/test_once.vim
new file mode 100644
index 00000000..10304705
--- /dev/null
+++ b/autoload/xpt/ut/test_once.vim
@@ -0,0 +1,52 @@
+let s:oldcpo = &cpo
+set cpo-=< cpo+=B
+
+fun! s:TestSetLoaded( t ) "{{{
+
+    let k = 'autoload/xpt/ut/helper/loadonce.vim'
+
+    exec 'runtime' k
+    call a:t.Eq( 1, g:xptemplate_loaded[k], "should have been loaded: " . k )
+    call a:t.Eq( 1, g:xptemplate_unittest_once_value, 'autoload value init' )
+
+    let g:xptemplate_unittest_once_value = 0
+
+    exec 'runtime' k
+    call a:t.Eq( 0, g:xptemplate_unittest_once_value, 'autoload value should not initiated again' )
+
+    call remove(g:xptemplate_loaded, k)
+    unlet g:xptemplate_unittest_once_value
+
+endfunction "}}}
+
+fun! s:TestRelativePath( t ) "{{{
+
+    let old = &runtimepath
+
+    let fn = fnamemodify( ".", ":p" ) . 'a'
+    let &runtimepath .= ",."
+
+    call xpt#once#SetAndGetLoaded( fn )
+    call a:t.Eq( 1, g:xptemplate_loaded[ 'a' ], 'a is loaded' )
+
+    let &runtimepath = old
+
+endfunction "}}}
+
+fun! s:TestUnnormalized( t ) "{{{
+
+    let old = &runtimepath
+
+    let fn = '/x//b/aa/bb/../y.z'
+    let &runtimepath .= ",/x//b/c/d/../..///"
+
+    call xpt#once#SetAndGetLoaded( fn )
+    call a:t.Eq( 1, g:xptemplate_loaded[ 'aa/y.z' ], 'aa/y.z is loaded' )
+
+    let &runtimepath = old
+
+endfunction "}}}
+
+exec xpt#unittest#run
+
+let &cpo = s:oldcpo
diff --git a/autoload/xpt/ut/test_snip.vim b/autoload/xpt/ut/test_snip.vim
new file mode 100644
index 00000000..02c027bc
--- /dev/null
+++ b/autoload/xpt/ut/test_snip.vim
@@ -0,0 +1,145 @@
+let s:oldcpo = &cpo
+set cpo-=< cpo+=B
+
+exec XPT#importConst
+
+let s:ptn = {
+      \   'lft' : s:nonEscaped . '`',
+      \   'rt'  : s:nonEscaped . '^',
+      \   'l': '`',
+      \   'r': '^',
+      \ }
+
+fun! s:TestTokenize(t) "{{{
+
+    let cases = [
+          \ ['', ['']],
+          \ ['1', ['1']],
+          \ ["\n", ["\n"]],
+          \ ["a\nb", ["a\nb"]],
+          \ ["a`", ['a', '`']],
+          \ ["`", ['`']],
+          \ ["`a", ['`a']],
+          \ ["a`", ['a', '`']],
+          \ ['a`b`c`', ['a', '`b', '`c', '`']],
+          \ ['`a`b', ['`a', '`b']],
+          \ ['`a`b^', ['`a', '`b', '^']],
+          \ ['`a`b^^^', ['`a', '`b', '^', '^', '^']],
+          \ ['`a`b^xx^', ['`a', '`b', '^', 'xx', '^']],
+          \ ['`a`b^xx^^', ['`a', '`b', '^', 'xx', '^', '^']],
+          \ ['^a`b^^`', ['^', 'a', '`b', '^', '^', '`']],
+          \ ["^a`x\nb^^`", ['^', 'a', "`x\nb", '^', '^', '`']],
+          \ ]
+
+    for [inp, outp] in cases
+        let act = xpt#snip#Tokenize(inp, s:ptn)
+        call a:t.Eq(outp, act, string([inp, outp]))
+    endfor
+
+endfunction "}}}
+
+fun! s:TestTextToPlaceholders(t) "{{{
+    let cases = [
+          \ ['', []],
+          \ ['a', [{'text': 'a'}]],
+          \ [' a', [{'text': ' a'}]],
+          \ [' a ', [{'text': ' a '}]],
+          \ ['a b', [{'text': 'a b'}]],
+          \
+          \ ['\', [{'text': '\'}]],
+          \ ['\\', [{'text': '\\'}]],
+          \
+          \ ['\`', [{'text': '`'}]],
+          \ ['\\\`', [{'text': '\`'}]],
+          \ ['\\\\\`', [{'text': '\\`'}]],
+          \
+          \ ['\^', [{'text': '^'}]],
+          \ ['\\\^', [{'text': '\^'}]],
+          \ ['\\\\\^', [{'text': '\\^'}]],
+          \
+          \ ['	a	b', [{'text': '	a	b'}]],
+          \ ['	a	b	', [{'text': '	a	b	'}]],
+          \
+          \ ["\na	b	", [{"text": "\na	b	"}]],
+          \ ["\na\nb	", [{"text": "\na\nb	"}]],
+          \ ["\na\nb\n", [{"text": "\na\nb\n"}]],
+          \
+          \ ["a`b^c", [ {"text": "a"}, {"name": { "text": "b" }}, {"text": "c"} ]],
+          \ ["a``b^c", [ { "text": "a" },
+          \              { "leftEdge": {"text":""},
+          \                "name": {"text": "b"} },
+          \              { "text": "c" }]],
+          \ ["a```b^c", [ { "text": "a"},
+          \               { "leftEdge": {"text":""},
+          \                 "name": {"text": ""},
+          \                 "rightEdge": {"text": "b"}},
+          \               { "text": "c" }]],
+          \ ["a``b`^c", [ { "text": "a"},
+          \               { "leftEdge": {"text":""},
+          \                 "name": {"text": "b"},
+          \                 "rightEdge": {"text": ""}},
+          \               { "text": "c" }]],
+          \ ["a`b``^c", [ { "text": "a"},
+          \               { "leftEdge": {"text":"b"},
+          \                 "name": {"text": ""},
+          \                 "rightEdge": {"text": ""}},
+          \               { "text": "c" }]],
+          \
+          \ ["a``b`^^^c", [ { "text": "a"},
+          \                 { "leftEdge": {"text":""},
+          \                   "name": {"text": "b"},
+          \                   "rightEdge": {"text": ""},
+          \                   "postFilter": {"text": ""},
+          \                 },
+          \                 { "text": "c" }]],
+          \ ["a``b`^c^^", [ { "text": "a"},
+          \                 { "leftEdge": {"text":""},
+          \                   "name": {"text": "b"},
+          \                   "rightEdge": {"text": ""},
+          \                   "postFilter": {"text": "c"},
+          \                 }]],
+          \ ["a``b`^^c", [ { "text": "a"},
+          \                { "leftEdge": {"text":""},
+          \                  "name": {"text": "b"},
+          \                  "rightEdge": {"text": ""},
+          \                  "liveFilter": {"text": ""},
+          \                },
+          \                { "text": "c" }]],
+          \ ["a``b`^w^c", [ { "text": "a"},
+          \                 { "leftEdge": {"text":""},
+          \                   "name": {"text": "b"},
+          \                   "rightEdge": {"text": ""},
+          \                   "liveFilter": {"text": "w"},
+          \                 },
+          \                 { "text": "c" }]],
+          \
+          \ ["a\n`\n	`tr($A, 'a', 'b')`    ^\nEcho(0)^\n`Inc('t')^",
+          \               [ { "text": "a\n"},
+          \                 { "leftEdge": {"text": "\n	"},
+          \                   "name": {"text": "tr($A, 'a', 'b')"},
+          \                   "rightEdge": {"text": "    "},
+          \                   "liveFilter": {"text": "\nEcho(0)"},
+          \                 },
+          \                 { "text": "\n" },
+          \                 { "name": { "text": "Inc('t')" } }]],
+          \
+          \ ["a\n`\\\n\\`	\\\\`tr($A, 'a', 'b')`    \\^^\nEcho(0)^\n`Inc('t')^",
+          \               [ { "text": "a\n"},
+          \                 { "leftEdge": {"text": "\\\n`	\\\\"},
+          \                   "name": {"text": "tr($A, 'a', 'b')"},
+          \                   "rightEdge": {"text": "    ^"},
+          \                   "liveFilter": {"text": "\nEcho(0)"},
+          \                 },
+          \                 { "text": "\n" },
+          \                 { "name": { "text": "Inc('t')" } }]],
+          \ ]
+
+    for [inp, outp] in cases
+        let act = xpt#snip#TextToPlaceholders(inp, s:ptn)
+        call a:t.Eq(outp, act, string([inp, outp]))
+    endfor
+endfunction "}}}
+
+exec xpt#unittest#run
+
+let &cpo = s:oldcpo
diff --git a/autoload/xpt/ut/test_util.vim b/autoload/xpt/ut/test_util.vim
new file mode 100644
index 00000000..47ea704d
--- /dev/null
+++ b/autoload/xpt/ut/test_util.vim
@@ -0,0 +1,74 @@
+let s:oldcpo = &cpo
+set cpo-=< cpo+=B
+
+fun! s:TestUnescapeChar( t ) "{{{
+    let cases = [
+          \ [ [ '', '' ], '' ],
+          \ [ [ '\1', '1' ], '1' ],
+          \ [ [ '\\1', '1' ], '\1' ],
+          \ [ [ '\\\1', '1' ], '\1' ],
+          \ [ [ '\\\11', '1' ], '\11' ],
+          \ [ [ '\\\12', '1' ], '\12' ],
+          \ [ [ '2\\\1', '1' ], '2\1' ],
+          \ [ [ '2\\\1\\1', '1' ], '2\1\1' ],
+          \ [ [ '\\\12', '2' ], '\\\12' ],
+          \ ]
+
+    " add all ascii char to test
+    let [ i, len ] = [ 11 - 1, 127 - 1 ]
+    while i < len | let i += 1
+
+        let c = nr2char(i)
+
+        " skip '\'
+        if c == '\'
+            continue
+        endif
+        call add( cases, [ [ '\\\' . c, c ], '\' . c ] )
+    endwhile
+
+
+    for [inp,outp] in cases
+        let rst = xpt#util#UnescapeChar( inp[0], inp[1] )
+        call a:t.Eq( outp, rst, string([ inp,  outp ] ) )
+    endfor
+
+endfunction "}}}
+
+fun! s:TestSplitWith( t ) "{{{
+    let cases = [
+          \ [ [ '',          '`' ], [ '' ] ],
+          \ [ [ '1',         '`' ], [ '1' ] ],
+          \ [ [ '\1',        '`' ], [ '\1' ] ],
+          \ [ [ '\\1',       '`' ], [ '\\1' ] ],
+          \ [ [ '\\\1',      '`' ], [ '\\\1' ] ],
+          \
+          \ [ [ '1',         '`' ], [ '1' ] ],
+          \ [ [ '1\',        '`' ], [ '1\' ] ],
+          \ [ [ '1\\',       '`' ], [ '1\\' ] ],
+          \ [ [ '1\\\',      '`' ], [ '1\\\' ] ],
+          \
+          \ [ [ '1`',        '`' ], [ '1', '' ] ],
+          \ [ [ '1\`',       '`' ], [ '1\`' ] ],
+          \ [ [ '1\\`',      '`' ], [ '1\\', '' ] ],
+          \ [ [ '1\\\`',     '`' ], [ '1\\\`' ] ],
+          \
+          \ [ [ '`1',        '`' ], [ '', '1' ] ],
+          \ [ [ '\`1',       '`' ], [ '\`1' ] ],
+          \ [ [ '\\`1',      '`' ], [ '\\', '1' ] ],
+          \ [ [ '\\\`1',     '`' ], [ '\\\`1' ] ],
+          \
+          \ [ [ '\\`\\^\\`', '^' ], [ '\\`\\', '\\`' ] ],
+          \ ]
+
+    for [inp,outp] in cases
+        let rst = xpt#util#SplitWith( inp[0], inp[1] )
+        call a:t.Eq( outp, rst, string([ inp,  outp ] ) )
+    endfor
+
+endfunction "}}}
+
+exec xpt#unittest#run
+
+let &cpo = s:oldcpo
+
diff --git a/autoload/xpt/util.vim b/autoload/xpt/util.vim
new file mode 100644
index 00000000..f87100b3
--- /dev/null
+++ b/autoload/xpt/util.vim
@@ -0,0 +1,378 @@
+" File Description {{{
+" =============================================================================
+" Low level utilities which depend on nothing else
+"
+"                                                  by drdr.xp
+"                                                     drdr.xp@gmail.com
+" Usage :
+"
+" =============================================================================
+" }}}
+if exists("g:__UTIL_VIM__") && g:__UTIL_VIM__ >= XPT#ver
+    finish
+endif
+let g:__UTIL_VIM__ = XPT#ver
+
+
+
+let s:oldcpo = &cpo
+set cpo-=< cpo+=B
+
+
+
+let s:log = xpt#debug#Logger( 'warn' )
+" let s:log = xpt#debug#Logger( 'debug' )
+
+
+
+exe XPT#importConst
+
+let s:charsPatternTable = {}
+
+
+
+fun! xpt#util#SplitWith( str, char ) "{{{
+    let s = split( a:str, '\V' . s:nonEscaped . a:char, 1 )
+    return s
+endfunction "}}}
+
+fun! xpt#util#UnescapeChar( str, chars ) "{{{
+    " unescape only chars started with several '\' 
+
+    if a:chars == ""
+        return a:str
+    endif
+
+    if has_key( s:charsPatternTable, a:chars )
+        " let pattern = s:charsPatternTable[ a:chars ]
+        return substitute( a:str, s:charsPatternTable[ a:chars ], '\1', 'g' )
+    else
+        return substitute( a:str, s:GetUnescapeCharPattern( a:chars ), '\1', 'g' )
+    endif
+
+    " return substitute( a:str, pattern, '\1\2', 'g' )
+    " return substitute( a:str, pattern, '\1', 'g' )
+
+endfunction "}}}
+
+fun! xpt#util#DeepExtend( to, from ) "{{{
+    for key in keys( a:from )
+
+        if type( a:from[ key ] ) == 4
+            " dict 
+            if has_key( a:to, key )
+                call xpt#util#DeepExtend( a:to[ key ], a:from[ key ] )
+            else
+                let a:to[ key ] = a:from[key]
+            endif
+
+        elseif type( a:from[key] ) == 3
+            " list 
+
+            if has_key( a:to, key )
+                call extend( a:to[ key ], a:from[key] )
+            else
+                let a:to[ key ] = a:from[key]
+            endif
+        else
+            let a:to[ key ] = a:from[key]
+        endif
+
+    endfor
+endfunction "}}}
+
+fun! xpt#util#RemoveDuplicate( list ) "{{{
+    let dict = {}
+    let newList = []
+    for e in a:list
+        if !has_key( dict, e )
+            call add( newList, e )
+        endif
+        let dict[ e ] = 1
+    endfor
+
+    return newList
+endfunction "}}}
+
+
+
+fun! xpt#util#ExpandTab( text, n ) "{{{
+    if stridx( a:text, "	" ) < 0
+        return a:text
+    endif
+
+    let str = "\n" . a:text
+
+    let tabspaces = repeat( ' ', a:n )
+
+    let last = ''
+    while str != last
+        let last = str
+        let str = substitute( str, '\n	*\zs	', tabspaces, 'g' )
+    endwhile
+
+    return str[ 1 : ]
+
+endfunction "}}}
+
+fun! xpt#util#convertSpaceToTab( text ) "{{{
+    " NOTE: line-break followed by space
+
+    if ( "\n" . a:text ) !~ '\V\n ' || &expandtab
+        return a:text
+    else
+
+        let tabspaces = repeat( ' ',  &tabstop )
+        let lines = split( a:text, '\V\n', 1 )
+        let newlines = []
+        for line in lines
+            let newline = join( split( line, '\V\^\%(' . tabspaces . '\)', 1 ), '	' )
+            let newlines += [ newline ]
+        endfor
+
+        return join( newlines, "\n" )
+
+    endif
+endfunction "}}}
+
+fun! xpt#util#SpaceToTab( lines ) "{{{
+    " NOTE: line-break followed by space
+
+    if ! &expandtab && match( a:lines, '\v^ ' ) > -1
+
+        let cmd = 'join( split( v:val, ''\v^%('' . repeat( '' '',  &tabstop ) . '')'', 1 ), ''	'' )'
+        call map( a:lines, cmd )
+
+    endif
+
+    return a:lines
+
+endfunction "}}}
+
+fun! xpt#util#SpaceToTabExceptFirstLine( lines ) "{{{
+    " NOTE: line-break followed by space
+
+    if ! &expandtab && len( a:lines ) > 1 && match( a:lines, '\v^ ', 1 ) > -1
+
+        let line0 = a:lines[ 0 ]
+
+        let cmd = 'join( split( v:val, ''\v^%('' . repeat( '' '',  &tabstop ) . '')'', 1 ), ''	'' )'
+        call map( a:lines, cmd )
+
+        let a:lines[ 0 ] = line0
+
+    endif
+
+    return a:lines
+
+endfunction "}}}
+
+
+fun! xpt#util#AddIndent( text, nIndent ) "{{{
+
+    let baseIndent = repeat( " ", a:nIndent )
+
+    return substitute(a:text, '\n', '&' . baseIndent, 'g')
+
+endfunction "}}}
+
+fun! xpt#util#AddIndent2( text, nIndent ) "{{{
+
+    let baseIndent = repeat( " ", a:nIndent )
+
+
+    if type( a:text ) == type( '' )
+
+        return substitute(a:text, '\n', '&' . baseIndent, 'g')
+
+    else
+
+        call map( a:text, string( baseIndent ) . '.v:val' )
+        let a:text[ 0 ] = a:text[ 0 ][ a:nIndent : ]
+
+        return a:text
+
+    endif
+
+endfunction "}}}
+
+" fun! xpt#util#VirtCol() "{{{
+    
+" endfunction "}}}
+
+" TODO Capitalize it 
+fun! xpt#util#getIndentNr( pos ) "{{{
+
+    " NOTE: virtcol() returns the most right virtual column of current
+    "       multi-byte char.
+
+    let [ ln, col ] = a:pos
+    let line = matchstr( getline( ln ), '\V\^\s\*' )
+
+    " TODO in developing implementation.
+    if 1
+
+        if col == 1
+            return 0
+        else
+            let line = line[ 0 : col - 1 - 1 ]
+            return virtcol( [ ln, len( line ) ] )
+        endif
+
+    else
+
+        let line = ( col == 1 ) ? '' : line[ 0 : col - 1 - 1 ]
+
+        " TODO why not vritcol()?
+        let tabspaces = repeat( ' ', &tabstop )
+
+        return len( substitute( line, '	', tabspaces, 'g' ) )
+
+    endif
+
+endfunction "}}}
+
+fun! xpt#util#LastIndent( text ) "{{{
+    if a:text is ''
+        return 0
+    endif
+
+    let text = split( a:text, '\V\n', 1 )[ -1 ]
+    return len( matchstr( text, '\V\^\s\+' ) )
+
+endfunction "}}}
+
+fun! xpt#util#GetPreferedIndentNr( ln ) "{{{
+    if &indentexpr == ''
+        return -1
+    else
+        let indentexpr = substitute( &indentexpr, '\Vv:lnum', a:ln, '' )
+        try
+            return eval( indentexpr )
+        catch /.*/
+            return -1
+        endtry
+    endif
+
+endfunction "}}}
+
+
+
+fun! xpt#util#TextBetween( posList ) "{{{
+    return join(xpt#util#LinesBetween( a:posList ), "\n")
+endfunction " }}}
+
+fun! xpt#util#TextInLine( ln, s, e ) "{{{
+
+    if a:s >= a:e
+        return ""
+    endif
+
+    return getline(a:ln)[ a:s - 1 : a:e - 2 ]
+
+endfunction "}}}
+
+fun! xpt#util#LinesBetween( posList ) "{{{
+
+    let [ s, e ] = a:posList
+
+    if s[0] > e[0] || e[0] == 0
+        return [""]
+    endif
+
+    let r = getline(s[0], e[0])
+    let r[-1] = strpart(r[-1], 0, e[1] - 1)
+    let r[0] = strpart(r[0], s[1] - 1)
+
+    return r
+
+endfunction "}}}
+
+
+
+fun! xpt#util#SynNameStack(l, c) "{{{
+    if exists( '*synstack' )
+        let ids = synstack(a:l, a:c)
+
+        if empty(ids)
+            return []
+        endif
+
+        let names = []
+        for id in ids
+            let names = names + [synIDattr(id, "name")]
+        endfor
+        return names
+
+    else
+        return [synIDattr( synID( a:l, a:c, 0 ), "name" )]
+
+    endif
+endfunction "}}}
+
+fun! xpt#util#NearestSynName() "{{{
+    let pos = [ line( "." ), col( "." ) ]
+    let synName = synIDattr(synID(pos[0], pos[1], 1), "name")
+
+    if synName == ''
+        let prevPos = searchpos( '\S', 'bWn' )
+        if prevPos == [0, 0]
+            return synName
+        endif
+
+        let synName = synIDattr(synID(prevPos[0], prevPos[1], 1), "name")
+        if synName == ''
+            " an empty syntax char
+            return &filetype
+        endif
+    endif
+
+    return synName
+
+endfunction "}}}
+
+
+
+fun! s:GetUnescapeCharPattern( chars ) "{{{
+    " remove all '\'.
+    let chars = substitute( a:chars, '\\', '', 'g' )
+
+    " let pattern = s:unescapeHead . '\(\[' . escape( chars, '\]-^' ) . ']\)'
+    let pattern = s:unescapeHead . '\ze\[' . escape( chars, '\]-^' ) . ']'
+    let s:charsPatternTable[ a:chars ] = pattern
+
+    return pattern
+endfunction "}}}
+
+
+
+
+fun! xpt#util#getCmdOutput( cmd ) "{{{
+    let l:a = ""
+
+    redir => l:a
+    exe a:cmd
+    redir END
+
+    return l:a
+endfunction "}}}
+
+fun! xpt#util#Fallback( fbs ) "{{{
+    let fbs = a:fbs
+    if len( fbs ) > 0
+        let [ key, flag ] = fbs[ 0 ]
+        call remove( fbs, 0 )
+        if flag == 'feed'
+            call feedkeys( key, 'mt' )
+            return ''
+        else
+            " flag == 'expr'
+            return key
+        endif
+    else
+        return ''
+    endif
+endfunction "}}}
+
+
+let &cpo = s:oldcpo
diff --git a/doc/tags b/doc/tags
index c295793f..8ea87208 100644
--- a/doc/tags
+++ b/doc/tags
@@ -1,6 +1,9 @@
 <Plug>XPTrawKey	xptemplate.txt	/*<Plug>XPTrawKey*
+Build()	xpt/snippet-function/Build.txt	/*Build()*
+BuildSnippet()	xpt/snippet-function/BuildSnippet.txt	/*BuildSnippet()*
 C()	xpt-function.txt	/*C()*
 E({expr})	xpt-function.txt	/*E({expr})*
+Echo()	xpt/snippet-function/Echo.txt	/*Echo()*
 Include:	xpt.snippet.syn.txt	/*Include:*
 N()	xpt-function.txt	/*N()*
 R({name})	xpt-function.txt	/*R({name})*
@@ -30,28 +33,34 @@ XPTvar	xpt.snippet.syn.txt	/*XPTvar*
 ```	xpt.snippet.syn.txt	/*```*
 `cursor^	xpt.snippet.syn.txt	/*`cursor^*
 g:XPTaddBundle()	xpt.api.txt	/*g:XPTaddBundle()*
-g:xptemplate_always_show_pum	xptemplate.txt	/*g:xptemplate_always_show_pum*
-g:xptemplate_brace_complete	xptemplate.txt	/*g:xptemplate_brace_complete*
-g:xptemplate_bundle	xptemplate.txt	/*g:xptemplate_bundle*
+g:xptemplate_always_show_pum	xpt/option/always_show_pum.txt	/*g:xptemplate_always_show_pum*
+g:xptemplate_brace_complete	xpt/option/brace_complete.txt	/*g:xptemplate_brace_complete*
+g:xptemplate_break_undo	xpt/option/break_undo.txt	/*g:xptemplate_break_undo*
+g:xptemplate_bundle	xpt/option/bundle.txt	/*g:xptemplate_bundle*
+g:xptemplate_close_pum	xpt/option/close_pum.txt	/*g:xptemplate_close_pum*
+g:xptemplate_cwd_snippet	xpt/option/cwd_snippet.txt	/*g:xptemplate_cwd_snippet*
+g:xptemplate_debug_log	xpt/option/debug_log.txt	/*g:xptemplate_debug_log*
 g:xptemplate_fallback	xptemplate.txt	/*g:xptemplate_fallback*
 g:xptemplate_goback	xptemplate.txt	/*g:xptemplate_goback*
-g:xptemplate_highlight	xptemplate.txt	/*g:xptemplate_highlight*
-g:xptemplate_highlight_nested	xptemplate.txt	/*g:xptemplate_highlight_nested*
+g:xptemplate_highlight	xpt/option/highlight.txt	/*g:xptemplate_highlight*
+g:xptemplate_highlight_nested	xpt/option/highlight_nested.txt	/*g:xptemplate_highlight_nested*
+g:xptemplate_hook_before_cr	xpt/option/hook_before_cr.txt	/*g:xptemplate_hook_before_cr*
 g:xptemplate_key	xptemplate.txt	/*g:xptemplate_key*
 g:xptemplate_key_force_pum	xptemplate.txt	/*g:xptemplate_key_force_pum*
 g:xptemplate_key_pum_only	xptemplate.txt	/*g:xptemplate_key_pum_only*
-g:xptemplate_minimal_prefix	xptemplate.txt	/*g:xptemplate_minimal_prefix*
-g:xptemplate_move_even_with_pum	xptemplate.txt	/*g:xptemplate_move_even_with_pum*
+g:xptemplate_minimal_prefix	xpt/option/minimal_prefix.txt	/*g:xptemplate_minimal_prefix*
+g:xptemplate_move_even_with_pum	xpt/option/move_even_with_pum.txt	/*g:xptemplate_move_even_with_pum*
 g:xptemplate_nav_cancel	xptemplate.txt	/*g:xptemplate_nav_cancel*
 g:xptemplate_nav_next	xptemplate.txt	/*g:xptemplate_nav_next*
 g:xptemplate_nav_prev	xptemplate.txt	/*g:xptemplate_nav_prev*
-g:xptemplate_ph_pum_accept_empty	xptemplate.txt	/*g:xptemplate_ph_pum_accept_empty*
-g:xptemplate_pum_tab_nav	xptemplate.txt	/*g:xptemplate_pum_tab_nav*
-g:xptemplate_snippet_folders	xptemplate.txt	/*g:xptemplate_snippet_folders*
-g:xptemplate_strict	xptemplate.txt	/*g:xptemplate_strict*
-g:xptemplate_strip_left	xptemplate.txt	/*g:xptemplate_strip_left*
+g:xptemplate_ph_pum_accept_empty	xpt/option/ph_pum_accept_empty.txt	/*g:xptemplate_ph_pum_accept_empty*
+g:xptemplate_pum_quick_back	xpt/option/pum_quick_back.txt	/*g:xptemplate_pum_quick_back*
+g:xptemplate_pum_tab_nav	xpt/option/pum_tab_nav.txt	/*g:xptemplate_pum_tab_nav*
+g:xptemplate_snippet_folders	xpt/option/snippet_folders.txt	/*g:xptemplate_snippet_folders*
+g:xptemplate_strict	xpt/option/strict.txt	/*g:xptemplate_strict*
+g:xptemplate_strip_left	xpt/option/strip_left.txt	/*g:xptemplate_strip_left*
 g:xptemplate_to_right	xptemplate.txt	/*g:xptemplate_to_right*
-g:xptemplate_vars	xptemplate.txt	/*g:xptemplate_vars*
+g:xptemplate_vars	xpt/option/vars.txt	/*g:xptemplate_vars*
 i_<C-\>	xptemplate.txt	/*i_<C-\\>*
 i_<C-g>	xptemplate.txt	/*i_<C-g>*
 i_<C-r><C-r><C-\>	xptemplate.txt	/*i_<C-r><C-r><C-\\>*
@@ -87,12 +96,12 @@ xpt-key-goto-right	xptemplate.txt	/*xpt-key-goto-right*
 xpt-key-navigate	xptemplate.txt	/*xpt-key-navigate*
 xpt-key-pum	xptemplate.txt	/*xpt-key-pum*
 xpt-key-trigger	xptemplate.txt	/*xpt-key-trigger*
+xpt-key-visual	xptemplate.txt	/*xpt-key-visual*
 xpt-mixed	xpt.snippet.syn.txt	/*xpt-mixed*
 xpt-name-matching	xptemplate.txt	/*xpt-name-matching*
 xpt-nested	xptemplate.txt	/*xpt-nested*
-xpt-option	xptemplate.txt	/*xpt-option*
 xpt-personal-folder	xptemplate.txt	/*xpt-personal-folder*
-xpt-personal-var	xptemplate.txt	/*xpt-personal-var*
+xpt-personal-var	xpt/option/vars.txt	/*xpt-personal-var*
 xpt-placeholder-cursor	xpt.snippet.syn.txt	/*xpt-placeholder-cursor*
 xpt-placeholder-default-value	xpt.snippet.syn.txt	/*xpt-placeholder-default-value*
 xpt-placeholder-edge	xpt.snippet.syn.txt	/*xpt-placeholder-edge*
@@ -121,7 +130,6 @@ xpt-snippet-default-value	xpt.snippet.syn.txt	/*xpt-snippet-default-value*
 xpt-snippet-embed	xpt.snippet.syn.txt	/*xpt-snippet-embed*
 xpt-snippet-expandable	xpt.snippet.syn.txt	/*xpt-snippet-expandable*
 xpt-snippet-expression	xpt.snippet.syn.txt	/*xpt-snippet-expression*
-xpt-snippet-function	xpt.snippet.syn.txt	/*xpt-snippet-function*
 xpt-snippet-function-ctx	xpt.api.txt	/*xpt-snippet-function-ctx*
 xpt-snippet-header	xpt.snippet.syn.txt	/*xpt-snippet-header*
 xpt-snippet-hidden	xpt.snippet.syn.txt	/*xpt-snippet-hidden*
diff --git a/doc/xpt.snippet.syn.txt b/doc/xpt.snippet.syn.txt
index 0526613a..e2de6773 100644
--- a/doc/xpt.snippet.syn.txt
+++ b/doc/xpt.snippet.syn.txt
@@ -217,28 +217,6 @@
 	NOTE	Override control of |xpt-snippet-variable| is affected by
 		|xpt-snippet-priority|.
 
-							*xpt-snippet-function*
-	|xpt-snippet-function| can be used in :
-		|xpt-snippet-instant-value|
-		|xpt-snippet-preset-value|
-		|xpt-snippet-default-value|
-		|xpt-snippet-post-filter|
-		|xpt-placeholder-ontime-filter|
-	To define |xpt-snippet-function|, the function container must be
-	fetched by using |XPTfuncs()|. For example : >
-		let s:f = XPTfuncs()
-		fun! s:f.c_printfElts( v )
-			...
-		endfunction
-<	Then function 'c_printfElts' can be used in the snippet : >
-		XPT printf	hint=printf\(...)
-		XSET elts=c_printfElts( R( 'pattern' ) )
-		printf( "`pattern^"`elts^ )
-<
-	NOTE	By convention the names of |xpt-snippet-function|s supplied by
-		XPTemplate start with an upper-case letter. User defined
-		function names should starts with a lower-case letter.
-
 								  *XPTinclude*
 						      *xpt-snippet-XPTinclude*
 	Syntax : >
diff --git a/doc/xpt/option/always_show_pum.txt b/doc/xpt/option/always_show_pum.txt
new file mode 100644
index 00000000..fdc32cea
--- /dev/null
+++ b/doc/xpt/option/always_show_pum.txt
@@ -0,0 +1,17 @@
+						*g:xptemplate_always_show_pum*
+								   {default:0}
+	If set to 1, snippets is not triggered but popup menu shows even when
+	text user typed before cursor matches a snippet name.
+
+	For example, you have three snippets defined of names: "for", "forever"
+	and "forr". Typing "for<C-\>" results in a popup menu if
+	|g:xptemplate_always_show_pum| set to 1: >
+		for
+	       |for      |
+	       |forloop  |
+	       |forr     |
+<	Otherwise, "for<C-\>" triggers snippet "for".
+
+	See also: |g:xptemplate_key_force_pum|.
+
+" vim:tw=78:ts=8:sw=8:sts=8:noet:ft=help:norl:
diff --git a/doc/xpt/option/brace_complete.txt b/doc/xpt/option/brace_complete.txt
new file mode 100644
index 00000000..851a1bfc
--- /dev/null
+++ b/doc/xpt/option/brace_complete.txt
@@ -0,0 +1,14 @@
+						 *g:xptemplate_brace_complete*
+								   {default:1}
+	If set to 1, bracket characters are automatically expanded to bracket
+	pairs. For example typing "(" results in: >
+		(  )
+	          \______| cursor stops in mid of pairs of bracket
+<	"(", "[", "{", "'" and '"' are affected by this setting.
+	
+	If set to string, only bracket or quote chars included in this setting
+	will be mapped. For example: >
+		let g:xptemplate_brace_complete = '([{'
+<	With this setting, quotes are not mapped.
+
+" vim:tw=78:ts=8:sw=8:sts=8:noet:ft=help:norl:
diff --git a/doc/xpt/option/break_undo.txt b/doc/xpt/option/break_undo.txt
new file mode 100644
index 00000000..ea4915aa
--- /dev/null
+++ b/doc/xpt/option/break_undo.txt
@@ -0,0 +1,7 @@
+						     *g:xptemplate_break_undo*
+								   {default:0}
+	If set to 1, undo sequence will be broken with |i_CTRL-G_u| before
+	snippet triggered. This would help on rolling back when mistake was
+	made.
+
+" vim:tw=78:ts=8:sw=8:sts=8:noet:ft=help:norl:
diff --git a/doc/xpt/option/bundle.txt b/doc/xpt/option/bundle.txt
new file mode 100644
index 00000000..91873901
--- /dev/null
+++ b/doc/xpt/option/bundle.txt
@@ -0,0 +1,14 @@
+							 *g:xptemplate_bundle*
+
+	This option specifies what libraries will always be load to its file
+	type. For example: >
+		let g:xptemplate_bundle = 'javascript_jquery'
+<	This tells XPT to load jquery snippet to javascript language.
+	Or: >
+		let g:xptemplate_bundle = 'javascript_jquery,c_*'
+<	It tells XPT to load jquery, and all supplied library snippets for C
+	language.
+
+	Another way to load bundles is |g:XPTaddBundle()|.
+
+" vim:tw=78:ts=8:sw=8:sts=8:noet:ft=help:norl:
diff --git a/doc/xpt/option/close_pum.txt b/doc/xpt/option/close_pum.txt
new file mode 100644
index 00000000..4feeb24a
--- /dev/null
+++ b/doc/xpt/option/close_pum.txt
@@ -0,0 +1,6 @@
+						      *g:xptemplate_close_pum*
+								   {default:0}
+	If set to 1, when trigger key(|g:xptemplate_key|) is pressed, before
+	doing anything, popup menu will be closed.
+
+" vim:tw=78:ts=8:sw=8:sts=8:noet:ft=help:norl:
diff --git a/doc/xpt/option/cwd_snippet.txt b/doc/xpt/option/cwd_snippet.txt
new file mode 100644
index 00000000..fc2ca9fd
--- /dev/null
+++ b/doc/xpt/option/cwd_snippet.txt
@@ -0,0 +1,12 @@
+						    *g:xptemplate_cwd_snippet*
+								   {default:0}
+	Set this to 1 to enable each vim buffer to automatically load file
+	".xpt.vim" from current working directory, as snippet file specific to
+	current directory( or project ).
+
+	Current ".xpt.vim" accepts only the most simple form of snippet, the
+	function call form: >
+		call XPTemplate( 'foo', '`foo^ says hello' )
+<
+
+" vim:tw=78:ts=8:sw=8:sts=8:noet:ft=help:norl:
diff --git a/doc/xpt/option/debug_log.txt b/doc/xpt/option/debug_log.txt
new file mode 100644
index 00000000..12213bad
--- /dev/null
+++ b/doc/xpt/option/debug_log.txt
@@ -0,0 +1,16 @@
+						      *g:xptemplate_debug_log*
+								  {default:''}
+
+	This option specifies whether and where to store debug log emitted
+	during xptemplate running. Unless you are a developer of xptempalte,
+	do not touch it.
+
+	Empty string disables any logging.
+
+	Non-empty string is interpreted as log file path. "~/" at start will
+	be replaced with "$HOME/".
+
+	Example: >
+		let g:xptemplate_debug_log = '~/.xpt.log'
+<
+" vim:tw=78:ts=8:sw=8:sts=8:noet:ft=help:norl:
diff --git a/doc/xpt/option/highlight.txt b/doc/xpt/option/highlight.txt
new file mode 100644
index 00000000..06860495
--- /dev/null
+++ b/doc/xpt/option/highlight.txt
@@ -0,0 +1,29 @@
+						      *g:xptemplate_highlight*
+							      {default:'next'}
+	Specifies which place holders are high lighted. The value of
+	|g:xptemplate_highlight| is a comma separated string.
+
+	Possible values are: "current", "following" and "next". Example: >
+		let g:xptemplate_highlight = 'following,next'
+<
+	"current" lets XPTemplate highlight the place holder you are currently
+	editing. See |XPTcurrentPH|.
+	For example the first "i" in "for" snippet of C language: >
+		for ( i = 0; i < len; ++i ) {
+		       \__________________________ highlighted
+<
+	"following" lets XPTemplate highlight slave place holders which are
+	updated automatically. See |XPTfollowingPH|.
+	For example the second and third "i" in "for" snippet of C language: >
+		for ( i = 0; i < len; ++i ) {
+			      \__________\________ highlighted
+<
+	"next" lets XPTemplate highlight the place holders you are going to
+	edit. See |XPTnextItem|.
+	For example the "0" and "len" if "for" snippet of C language: >
+		for ( i = 0; i < len; ++i ) {
+			   \______\\\_____________ highlighted
+<
+	Set |g:xptemplate_highlight| to '' to disable highlight.
+
+" vim:tw=78:ts=8:sw=8:sts=8:noet:ft=help:norl:
diff --git a/doc/xpt/option/highlight_nested.txt b/doc/xpt/option/highlight_nested.txt
new file mode 100644
index 00000000..2fbb319d
--- /dev/null
+++ b/doc/xpt/option/highlight_nested.txt
@@ -0,0 +1,15 @@
+					       *g:xptemplate_highlight_nested*
+								   {default:0}
+	If set to 1, highlight is also applied to outer snippet, not only the
+	deepest nested one. For example, If set to 1, the following positions
+	are highlighted: >
+				  ________________________| highlighted
+			        _/ _/        ___/
+		for ( call( me ) = 0; call < len; call++ ) {
+		    /* cursor */
+		    ~~~~~~~~~~~\__________________________| highlighted
+		}
+<	The first highlight position is from nested snippet "(". Others are
+	from outer snippet "for".
+
+" vim:tw=78:ts=8:sw=8:sts=8:noet:ft=help:norl:
diff --git a/doc/xpt/option/hook_before_cr.txt b/doc/xpt/option/hook_before_cr.txt
new file mode 100644
index 00000000..f9123e28
--- /dev/null
+++ b/doc/xpt/option/hook_before_cr.txt
@@ -0,0 +1,30 @@
+						 *g:xptemplate_hook_before_cr*
+								  {default:''}
+	Add additional action before default xptemplate action when <CR>
+	pressed.
+
+	By default, xptemplate override key mapping of <CR>(local to
+	buffer)every time starting to applying a snippet. This might change
+	user prefered <CR> behavior if user has his own key mapping of <CR>
+	defined.
+	This conf let user to fix issues like this.
+
+	The following line in .vimrc appends "abc" every time <CR> pressed
+	during applying snippet: >
+		let g:xptemplate_hook_before_cr = 'abc'
+<
+	And this appends current time every time <CR> pressed: >
+		fun! s:OutputDate()
+		    return strftime('%c')
+		endfunction
+		inoremap <expr> <Plug>do_my_work <SID>OutputDate()
+		let g:xptemplate_hook_before_cr = '<Plug>do_my_work'
+<
+	NOTE:
+		|g:xptemplate_hook_before_cr| does not accept <SID>.
+
+		And if you want to use <expr> mapping with
+		|g:xptemplate_hook_before_cr| , you need a in-the-middle
+		mapping like it does in the second example.
+
+" vim:tw=78:ts=8:sw=8:sts=8:noet:ft=help:norl:
diff --git a/doc/xpt/option/minimal_prefix.txt b/doc/xpt/option/minimal_prefix.txt
new file mode 100644
index 00000000..fb3dce74
--- /dev/null
+++ b/doc/xpt/option/minimal_prefix.txt
@@ -0,0 +1,21 @@
+						 *g:xptemplate_minimal_prefix*
+								   {default:0}
+	Posssible values: number or "full".
+
+	If set it to a number( N ), it means snippet is triggered( or pum
+	shows ) only when there are at least N |word| letters before cursor.
+
+	If set to "full", |g:xptemplate_key| searches for a snippet of name
+	matching exactly the word before cursor.
+
+	For example, you have only one snippet defined with name "xpt". The
+	following input will trigger "xpt" snippet, if
+	|g:xptemplate_minimal_prefix| set to 0 ( it also works with value 1 and
+	2, but not with 3 ): >
+		xp<C-\>
+<	"<C-\>" is the default trigger key.
+
+	If |g:xptemplate_minimal_prefix| set to "full", the above input can not
+	trigger "xpt" snippet.
+
+" vim:tw=78:ts=8:sw=8:sts=8:noet:ft=help:norl:
diff --git a/doc/xpt/option/move_even_with_pum.txt b/doc/xpt/option/move_even_with_pum.txt
new file mode 100644
index 00000000..b1ceb49a
--- /dev/null
+++ b/doc/xpt/option/move_even_with_pum.txt
@@ -0,0 +1,9 @@
+					     *g:xptemplate_move_even_with_pum*
+								   {default:0}
+	If set to 1, |g:xptemplate_nav_next| does not care whether pop up menu
+	shown or not. It will always move cursor to next item.
+
+	Otherwise, |g:xptemplate_nav_next| fall back to original mapping. This
+	could be helpfull for xpt working with supertab together.
+
+" vim:tw=78:ts=8:sw=8:sts=8:noet:ft=help:norl:
diff --git a/doc/xpt/option/ph_pum_accept_empty.txt b/doc/xpt/option/ph_pum_accept_empty.txt
new file mode 100644
index 00000000..ba8d2265
--- /dev/null
+++ b/doc/xpt/option/ph_pum_accept_empty.txt
@@ -0,0 +1,9 @@
+					    *g:xptemplate_ph_pum_accept_empty*
+								   {default:1}
+	When set to 1 popup menus for place holders accepts an empty input. So
+	when nothing typed pressing <Tab> closes the popup menu and sends the
+	cursor to the next place holder.
+	When not set <Tab> expands the text to the longest match and keeps the
+	popup menu open.
+
+" vim:tw=78:ts=8:sw=8:sts=8:noet:ft=help:norl:
diff --git a/doc/xpt/option/pum_quick_back.txt b/doc/xpt/option/pum_quick_back.txt
new file mode 100644
index 00000000..324f1b94
--- /dev/null
+++ b/doc/xpt/option/pum_quick_back.txt
@@ -0,0 +1,25 @@
+						 *g:xptemplate_pum_quick_back*
+								   {default:1}
+	With popup menu, pressing "<BS>" removes minimal chars to reveil
+	more options.
+	If this is set to 0, pressing "<BS>" removes only 1 char.
+
+	For example, popup menu created with 3 options: >
+		"foo", "fooba", "foobar"
+<
+	Typing "fooba" shrinks menu to: >
+		fooba
+		foobar
+<	Now pressing "<BS>" will remove 2 chars: "ba", and leave "foo", the
+	longest prefix that has 3 options.
+
+	Pressing "<BS>" again will remove "foo".
+
+	NOTE:	Very large list might hang VIM for seconds. In this case set
+		this to 0 to get better performance.
+
+		This feature depends on a prefix dictionary of all of the
+		options.  The prefix dictionary will be created every time
+		popup menu is called.
+
+" vim:tw=78:ts=8:sw=8:sts=8:noet:ft=help:norl:
diff --git a/doc/xpt/option/pum_tab_nav.txt b/doc/xpt/option/pum_tab_nav.txt
new file mode 100644
index 00000000..22940be7
--- /dev/null
+++ b/doc/xpt/option/pum_tab_nav.txt
@@ -0,0 +1,7 @@
+						    *g:xptemplate_pum_tab_nav*
+								   {default:0}
+	Set to 1 to use <tab>/<S-tab>( shift + tab ) to navigate through pop
+	up menu. <tab> behaves like <C-n> and <S-tab> behaves like <C-p>. And
+	<CR> expands snippet.
+
+" vim:tw=78:ts=8:sw=8:sts=8:noet:ft=help:norl:
diff --git a/doc/xpt/option/snippet_folders.txt b/doc/xpt/option/snippet_folders.txt
new file mode 100644
index 00000000..5f1c0406
--- /dev/null
+++ b/doc/xpt/option/snippet_folders.txt
@@ -0,0 +1,19 @@
+						*g:xptemplate_snippet_folders*
+								  {default:[]}
+	NOTE:	Unless you really want XPTemplate to touch your 'runtimepath',
+		do NOT use this. This setting changes 'runtimepath' and is
+		less recommended to use than 'runtimepath'. As you may already
+		know well about 'runtimepath' and 'ftplugin', it is better for
+		you to organize snippet files yourself, with 'runtimepath'.
+
+	A list to specify which other folders are used as snippet folders.
+	For example: >
+		let g:xptemplate_snippet_folders = [
+			\ $HOME . '/my_snippets',
+			\ '/all_user_snippets' ]
+<	Thus the snippet file "$HOME/my_snippets/ftplugin/c/my.c.xpt.vim" can
+	be loaded to C files.
+	And "/all_user_snippets/ftplugins/html/all.html.xpt.vim" can be loaded
+	to HTML files.
+
+" vim:tw=78:ts=8:sw=8:sts=8:noet:ft=help:norl:
diff --git a/doc/xpt/option/strict.txt b/doc/xpt/option/strict.txt
new file mode 100644
index 00000000..d827ea45
--- /dev/null
+++ b/doc/xpt/option/strict.txt
@@ -0,0 +1,16 @@
+							 *g:xptemplate_strict*
+								   {default:2}
+	Set to 0 to let XPTemplate do the best maintaining snippet rendering,
+	even if you have changed text outside of place holders.
+
+	Set to 1 to prevent incautious changing text outside place holders.
+	Otherwise you are free to change text outside of place holders.
+
+	Set to 2 to let XPTemplate stop rendering if ANY changes taken to text
+	outside of place holders.
+
+	Example : >
+		let g:xptemplate_strict = 1
+<
+
+" vim:tw=78:ts=8:sw=8:sts=8:noet:ft=help:norl:
diff --git a/doc/xpt/option/strip_left.txt b/doc/xpt/option/strip_left.txt
new file mode 100644
index 00000000..8d7dbc28
--- /dev/null
+++ b/doc/xpt/option/strip_left.txt
@@ -0,0 +1,6 @@
+						     *g:xptemplate_strip_left*
+								   {default:1}
+	When set to 1 wrapper snippets |xpt-wrapper-snippet| remove space
+	before the first line.
+
+" vim:tw=78:ts=8:sw=8:sts=8:noet:ft=help:norl:
diff --git a/doc/xpt/option/vars.txt b/doc/xpt/option/vars.txt
new file mode 100644
index 00000000..823b7804
--- /dev/null
+++ b/doc/xpt/option/vars.txt
@@ -0,0 +1,26 @@
+				      *xpt-personal-var*   *g:xptemplate_vars*
+	g:xptemplate_vars sets personal information variables used in
+	snippets, like "author" and "email", see |xpt-snippet-variable|.
+
+	Variables set with g:xptemplate_vars have the highest priority and
+	override any other variables set in *.xpt.vim. Syntax: >
+	let g:xptemplate_vars = 'name=value&name=value...'
+<	Example: >
+	let g:xptemplate_vars = '$author=xp\ \&\\\&123&$email=bal@bla'
+	let g:xptemplate_vars = 'author=xp\ \&\\\&123&email=bal@bla'
+
+<	Both the 2 lines above result in: >
+		'xp\ &\&123' and 'bal@bla'
+
+<	Or: >
+		let g:xptemplate_vars = exists('g:xptemplate_vars') ?
+			\ g:xptemplate_vars . '&' . '$other=bla'
+			\ : '$other=bla'
+<
+	Entries are separated with '&'.
+
+	You can also set these settings in ftplugin/_common/personal.xpt.vim
+	in your runtime path using XPTvar |xpt-snippet-variable| (see also
+	|xpt-customize-variable|).
+
+" vim:tw=78:ts=8:sw=8:sts=8:noet:ft=help:norl:
diff --git a/doc/xpt/snippet-function/Build.txt b/doc/xpt/snippet-function/Build.txt
new file mode 100644
index 00000000..4d48de38
--- /dev/null
+++ b/doc/xpt/snippet-function/Build.txt
@@ -0,0 +1,17 @@
+							      *Build()*
+Build({snippet_text})
+	Build a piece of snippet text to replace the place holder on which
+	Build() is called.
+
+	Argument {snippet_text} is the content of snippet to build.
+
+	After calling it, place holder is removed and the first place holder
+	in this piece of snippet built is selected.
+
+	Context: >
+		XSET ph=Build('`a^ = `0^')
+		XSET ph|post=Build('`a^ = `0^')
+<
+	See also: |BuildSnippet()|
+
+" vim:tw=78:ts=8:sw=8:sts=8:noet:ft=help:norl:
diff --git a/doc/xpt/snippet-function/BuildSnippet.txt b/doc/xpt/snippet-function/BuildSnippet.txt
new file mode 100644
index 00000000..202198da
--- /dev/null
+++ b/doc/xpt/snippet-function/BuildSnippet.txt
@@ -0,0 +1,31 @@
+							      *BuildSnippet()*
+BuildSnippet({snippet})
+	Build an existent snippet to replace the place holder on which
+	BuildSnippet() is called.
+
+	Argument {snippet} is the name of snippet to build.
+
+	After calling it, place holder is removed and the first place holder
+	in this piece of snippet is selected.
+
+	Example snippets: >
+		XPT parent
+		XSET x=BuildSnippet( "child" )
+		-`x^=
+
+		XPT child
+		(`a^, `b^)
+<
+	Type: >
+		parent<C-\>
+<	Got: >
+		-(a, b)=
+<	{a} and {b} is place holder
+	
+	Context: >
+		XSET ph=BuildSnippet('a')
+		XSET ph|post=BuildSnippet('a')
+<
+	See also: |Build()|
+
+" vim:tw=78:ts=8:sw=8:sts=8:noet:ft=help:norl:
diff --git a/doc/xpt/snippet-function/Echo.txt b/doc/xpt/snippet-function/Echo.txt
new file mode 100644
index 00000000..4eefdaf3
--- /dev/null
+++ b/doc/xpt/snippet-function/Echo.txt
@@ -0,0 +1,23 @@
+								      *Echo()*
+Echo({string})
+	Put literal text {string} where it is called.
+
+	{string} can be any valid expression.
+
+	Place holders in {string} will not be built.
+
+	Context it works in: >
+		`Echo('a')^
+		XSET ph=Echo('a')
+		XSET ph|def=Echo('a')
+		XSET ph|pre=Echo('a')
+		XSET ph|post=Echo('a')
+<
+	Example: >
+		XPT now
+		`Echo( strftime("%c") )^
+<
+	See also: |Build()| |BuildSnippet()|
+	See also: |xpt-snippet-XSET|
+
+" vim:tw=78:ts=8:sw=8:sts=8:noet:ft=help:norl:
diff --git a/doc/xpt/snippet-function/_head.txt b/doc/xpt/snippet-function/_head.txt
new file mode 100644
index 00000000..79820d00
--- /dev/null
+++ b/doc/xpt/snippet-function/_head.txt
@@ -0,0 +1,24 @@
+------------------------------------------------------------------------------
+
+	|xpt-snippet-function| can be used in :
+		|xpt-snippet-instant-value|
+		|xpt-snippet-preset-value|
+		|xpt-snippet-default-value|
+		|xpt-snippet-post-filter|
+		|xpt-placeholder-ontime-filter|
+	To define |xpt-snippet-function|, the function container must be
+	fetched by using |XPTfuncs()|. For example : >
+		let s:f = XPTfuncs()
+		fun! s:f.c_printfElts( v )
+			...
+		endfunction
+<	Then function 'c_printfElts' can be used in the snippet : >
+		XPT printf	" printf\(...)
+		XSET elts=c_printfElts( R( 'pattern' ) )
+		printf( "`pattern^"`elts^ )
+<
+	NOTE	By convention the names of |xpt-snippet-function|s supplied by
+		XPTemplate start with an upper-case letter. User defined
+		function names should starts with a lower-case letter.
+
+------------------------------------------------------------------------------
diff --git a/doc/xptemplate.txt b/doc/xptemplate.txt
index fba51d9c..e9f42904 100644
--- a/doc/xptemplate.txt
+++ b/doc/xptemplate.txt
@@ -258,7 +258,7 @@
 
 ==============================================================================
 
-						   *xpt-key-bind* *xpt-option*
+								*xpt-key-bind*
 	Options can be set in |.vimrc| to modify XPTemplate's behaviors.
 
 	Key mappings:
@@ -267,6 +267,7 @@
 		|g:xptemplate_key|
 		|g:xptemplate_key_pum_only|
 		|g:xptemplate_key_force_pum|
+		|g:xptemplate_key_visual|
 		|g:xptemplate_nav_next|
 		|g:xptemplate_nav_prev|
 		|g:xptemplate_nav_cancel|
@@ -274,29 +275,16 @@
 		|g:xptemplate_to_right|
 		|g:xptemplate_fallback|
 
-	Options:
-		|g:xptemplate_move_even_with_pum|
-		|g:xptemplate_always_show_pum|
-		|g:xptemplate_brace_complete|
-		|g:xptemplate_bundle|
-		|g:xptemplate_highlight|
-		|g:xptemplate_highlight_nested|
-		|g:xptemplate_minimal_prefix|
-		|g:xptemplate_ph_pum_accept_empty|
-		|g:xptemplate_pum_tab_nav|
-		|g:xptemplate_snippet_folders|
-		|g:xptemplate_strict|
-		|g:xptemplate_strip_left|
-		|g:xptemplate_vars|
+	See also: |xpt-option|.
 
 							     *<Plug>XPTrawKey*
 	Key mapping defined as: >
 		exe "inoremap <silent> <Plug>XPTrawKey " g:xptemplate_key
 <
 
-	    *i_<C-\>* *s_<C-\>* *v_<C-\>* *xpt-key-trigger* *g:xptemplate_key*
+	    *i_<C-\>* *v_<C-\>* *xpt-key-trigger* *g:xptemplate_key*
 							       {default:<C-\>}
-	The key to trigger snippets, in insert or visual mode.
+	The key to trigger snippets in insert mode.
 	Use |g:xptemplate_key| to change this mapping. Example: >
 		let g:xptemplate_key = '<Tab>'
 <
@@ -326,6 +314,14 @@
 	See also: |g:xptemplate_always_show_pum|.
 
 
+			 *s_<C-\>* *xpt-key-visual* *g:xptemplate_visual
+					  {default:g:xptemplate_key}
+	The key to trigger snippets in visual mode.
+	Use |g:xptemplate_key_visual| to change this mapping. Example: >
+		let g:xptemplate_key_visual = '<Tab>'
+<
+
+
 	       *i_<tab>*  *s_<tab>* *xpt-key-navigate* *g:xptemplate_nav_next*
 							       {default:<Tab>}
 	After a snippet was triggered, this key navigates to the next item.
@@ -372,45 +368,6 @@
 		let g:xptemplate_fallback = '<C-n>'
 <
 
-					     *g:xptemplate_move_even_with_pum*
-								   {default:0}
-	If set to 1, |g:xptemplate_nav_next| does not care whether pop up menu
-	shown or not. It will always move cursor to next item.
-
-	Otherwise, |g:xptemplate_nav_next| fall back to original mapping. This
-	could be helpfull for xpt working with supertab together.
-
-
-						*g:xptemplate_always_show_pum*
-								   {default:0}
-	If set to 1, snippets is not triggered but popup menu shows even when
-	text user typed before cursor matches a snippet name.
-
-	For example, you have three snippets defined of names: "for", "forever"
-	and "forr". Typing "for<C-\>" results in a popup menu if
-	|g:xptemplate_always_show_pum| set to 1: >
-		for
-	       |for      |
-	       |forloop  |
-	       |forr     |
-<	Otherwise, "for<C-\>" triggers snippet "for".
-
-	See also: |g:xptemplate_key_force_pum|.
-
-
-						 *g:xptemplate_brace_complete*
-								   {default:1}
-	If set to 1, bracket characters are automatically expanded to bracket
-	pairs. For example typing "(" results in: >
-		(  )
-	          \______| cursor stops in mid of pairs of bracket
-<	"(", "[", "{", "'" and '"' are affected by this setting.
-	
-	If set to string, only bracket or quote chars included in this setting
-	will be mapped. For example: >
-		let g:xptemplate_brace_complete = '([{'
-<	With this setting, quotes are not mapped.
-
 
 		    *n_<C-g>* *i_<C-g>* *xpt-key-goback* *g:xptemplate_goback*
 							       {default:<C-g>}
@@ -421,92 +378,6 @@
 	Use |g:xptemplate_goback| to change this mapping. Example: >
 		let g:xptemplate_goback = '<C-g>'
 <
-						 *g:xptemplate_minimal_prefix*
-								   {default:0}
-	Posssible values: number or "full".
-
-	If set it to a number( N ), it means snippet is triggered( or pum
-	shows ) only when there are at least N |word| letters before cursor.
-
-	If set to "full", |g:xptemplate_key| searches for a snippet of name
-	matching exactly the word before cursor.
-
-	For example, you have only one snippet defined with name "xpt". The
-	following input will trigger "xpt" snippet, if
-	|g:xptemplate_minimal_prefix| set to 0 ( it also works with value 1 and
-	2, but not with 3 ): >
-		xp<C-\>
-<	"<C-\>" is the default trigger key.
-
-	If |g:xptemplate_minimal_prefix| set to "full", the above input can not
-	trigger "xpt" snippet.
-
-
-						    *g:xptemplate_pum_tab_nav*
-								   {default:0}
-	Set to 1 to use <tab>/<S-tab>( shift + tab ) to navigate through pop
-	up menu. <tab> behaves like <C-n> and <S-tab> behaves like <C-p>. And
-	<CR> expands snippet.
-
-
-							 *g:xptemplate_strict*
-								   {default:2}
-	Set to 0 to let XPTemplate do the best maintaining snippet rendering,
-	even if you have changed text outside of place holders.
-
-	Set to 1 to prevent incautious changing text outside place holders.
-	Otherwise you are free to change text outside of place holders.
-
-	Set to 2 to let XPTemplate stop rendering if ANY changes taken to text
-	outside of place holders.
-
-	Example : >
-		let g:xptemplate_strict = 1
-<
-
-						      *g:xptemplate_highlight*
-							      {default:'next'}
-	Specifies which place holders are high lighted. The value of
-	|g:xptemplate_highlight| is a comma separated string.
-
-	Possible values are: "current", "following" and "next". Example: >
-		let g:xptemplate_highlight = 'following,next'
-<
-	"current" lets XPTemplate highlight the place holder you are currently
-	editing. See |XPTcurrentPH|.
-	For example the first "i" in "for" snippet of C language: >
-		for ( i = 0; i < len; ++i ) {
-		       \__________________________ highlighted
-<
-	"following" lets XPTemplate highlight slave place holders which are
-	updated automatically. See |XPTfollowingPH|.
-	For example the second and third "i" in "for" snippet of C language: >
-		for ( i = 0; i < len; ++i ) {
-			      \__________\________ highlighted
-<
-	"next" lets XPTemplate highlight the place holders you are going to
-	edit. See |XPTnextItem|.
-	For example the "0" and "len" if "for" snippet of C language: >
-		for ( i = 0; i < len; ++i ) {
-			   \______\\\_____________ highlighted
-<
-	Set |g:xptemplate_highlight| to '' to disable highlight.
-
-
-					       *g:xptemplate_highlight_nested*
-								   {default:0}
-	If set to 1, highlight is also applied to outer snippet, not only the
-	deepest nested one. For example, If set to 1, the following positions
-	are highlighted: >
-				  ________________________| highlighted
-			        _/ _/        ___/
-		for ( call( me ) = 0; call < len; call++ ) {
-		    /* cursor */
-		    ~~~~~~~~~~~\__________________________| highlighted
-		}
-<	The first highlight position is from nested snippet "(". Others are
-	from outer snippet "for".
-
 
 						     *xpt-customize-highlight*
 	You can specify which highlight Group to use for each kind of
@@ -535,46 +406,6 @@
 	|XPTcurrentPH|.
 
 
-					    *g:xptemplate_ph_pum_accept_empty*
-								   {default:1}
-	When set to 1 popup menus for place holders accepts an empty input. So
-	when nothing typed pressing <Tab> closes the popup menu and sends the
-	cursor to the next place holder.
-	When not set <Tab> expands the text to the longest match and keeps the
-	popup menu open.
-
-
-						     *g:xptemplate_strip_left*
-								   {default:1}
-	When set to 1 wrapper snippets |xpt-wrapper-snippet| remove space
-	before the first line.
-
-
-				      *xpt-personal-var*   *g:xptemplate_vars*
-	g:xptemplate_vars sets personal information variables used in
-	snippets, like "author" and "email", see |xpt-snippet-variable|.
-
-	Variables set with g:xptemplate_vars have the highest priority and
-	override any other variables set in *.xpt.vim. Syntax: >
-	let g:xptemplate_vars = 'name=value&name=value...'
-<	Example: >
-	let g:xptemplate_vars = '$author=xp\ \&\\\&123&$email=bal@bla'
-	let g:xptemplate_vars = 'author=xp\ \&\\\&123&email=bal@bla'
-
-<	Both the 2 lines above result in: >
-		'xp\ &\&123' and 'bal@bla'
-
-<	Or: >
-		let g:xptemplate_vars = exists('g:xptemplate_vars') ?
-			\ g:xptemplate_vars . '&' . '$other=bla'
-			\ : '$other=bla'
-<
-	Entries are separated with '&'.
-
-	You can also set these settings in ftplugin/_common/personal.xpt.vim
-	in your runtime path using XPTvar |xpt-snippet-variable| (see also
-	|xpt-customize-variable|).
-
 								  *xpt-bundle*
 	A bundle is a collection of snippets for a certain purpose. For
 	example a library support bundle like
@@ -583,21 +414,6 @@
 	and |g:XPTaddBundle()|.
 
 
-							 *g:xptemplate_bundle*
-
-	This option specifies what libraries will always be load to its file
-	type. For example: >
-		let g:xptemplate_bundle = 'javascript_jquery'
-<	This tells XPT to load jquery snippet to javascript language.
-	Or: >
-		let g:xptemplate_bundle = 'javascript_jquery,c_*'
-<	It tells XPT to load jquery, and all supplied library snippets for C
-	language.
-
-	Another way to load bundles is |g:XPTaddBundle()|.
-
-
-
 ==============================================================================
 
 								    *xpt-tips*
@@ -608,9 +424,6 @@
 							   *xpt-with-supertab*
 	If you want to use supertab's <TAB> but you have also set XPT to use
 	<TAB>.
-==============================================================================
-	NOTE: TODO 
-==============================================================================
 
 ==============================================================================
 
@@ -743,24 +556,6 @@
 
 	
 
-						*g:xptemplate_snippet_folders*
-								  {default:[]}
-	NOTE:	Unless you really want XPTemplate to touch your 'runtimepath',
-		do NOT use this. This setting changes 'runtimepath' and is
-		less recommended to use than 'runtimepath'. As you may already
-		know well about 'runtimepath' and 'ftplugin', it is better for
-		you to organize snippet files yourself, with 'runtimepath'.
-
-	A list to specify which other folders are used as snippet folders.
-	For example: >
-		let g:xptemplate_snippet_folders = [
-			\ $HOME . '/my_snippets',
-			\ '/all_user_snippets' ]
-<	Thus the snippet file "$HOME/my_snippets/ftplugin/c/my.c.xpt.vim" can
-	be loaded to C files.
-	And "/all_user_snippets/ftplugins/html/all.html.xpt.vim" can be loaded
-	to HTML files.
-
 
 				   *xpt-personal-folder*   *xpt-write-snippet*
 	Snippet file is actually |ftplugin| and with file extension
@@ -830,6 +625,5 @@
 
 <	See |xpt-snippet-syntax| and |xpt-snippet-tutorial|.
 
-
 ==============================================================================
 " vim:tw=78:ts=8:sw=8:sts=8:noet:ft=help:norl:
diff --git a/ftdetect/xptlog.detect.vim b/ftdetect/xptlog.detect.vim
new file mode 100644
index 00000000..89c65bff
--- /dev/null
+++ b/ftdetect/xptlog.detect.vim
@@ -0,0 +1,5 @@
+augroup XPTLogFiletype
+    au!
+    au BufRead,BufNewFile xpt-debug.log set filetype=xptlog
+augroup END
+
diff --git a/ftplugin/README b/ftplugin/README
new file mode 100644
index 00000000..8e9d6017
--- /dev/null
+++ b/ftplugin/README
@@ -0,0 +1,7 @@
+
+You should *NOT* be here.
+
+Please keep in mind that you should *NEVER* modify files in this folder.
+
+I supposed you are here to add new snippets or refine some of them.
+Please do it in ./personal folder. See :h xpt-personal-folder .
diff --git a/ftplugin/_common/common.bracketcmpl.xpt.vim b/ftplugin/_common/common.bracketcmpl.xpt.vim
index 9229ce24..9c87c624 100644
--- a/ftplugin/_common/common.bracketcmpl.xpt.vim
+++ b/ftplugin/_common/common.bracketcmpl.xpt.vim
@@ -19,7 +19,7 @@ let s:crIndent = 0
 
 fun! s:f.BracketRightPart( leftReg )
 
-    if has_key( self.renderContext, 'bracketComplete' )
+    if has_key( self._ctx.renderContext, 'bracketComplete' )
         return ''
     endif
 
@@ -44,11 +44,11 @@ fun! s:f.BracketRightPart( leftReg )
 endfunction
 
 fun! s:f.bkt_cmpl()
-    return self.BracketRightPart( self.renderContext.leftReg )
+    return self.BracketRightPart( self._ctx.renderContext.leftReg )
 endfunction
 
 fun! s:f.quote_cmpl()
-    let r = self.renderContext
+    let r = self._ctx.renderContext
     let v = self.V()
     let v = matchstr( v, r.leftReg )
 
@@ -62,7 +62,7 @@ fun! s:f.quote_cmpl()
 endfunction
 
 fun! s:f.quote_ontype()
-    let r = self.renderContext
+    let r = self._ctx.renderContext
 
     let v = self.V()
 
@@ -115,7 +115,7 @@ fun! s:f.bkt_ontype()
 endfunction
 
 fun! s:f.bkt_init( followingChar )
-    let r = self.renderContext
+    let r = self._ctx.renderContext
 
     let r.char = self.GetVar( '$_xSnipName' )
     let r.followingChar = a:followingChar
@@ -137,7 +137,7 @@ endfunction
 
 fun! s:f.bkt_finish( keyPressed )
 
-    let r = self.renderContext
+    let r = self._ctx.renderContext
 
     if a:keyPressed != r.charRight
         " may be outer snippet key bind
diff --git a/ftplugin/_common/common.xpt.vim b/ftplugin/_common/common.xpt.vim
index f0e8a496..cf0d481c 100644
--- a/ftplugin/_common/common.xpt.vim
+++ b/ftplugin/_common/common.xpt.vim
@@ -70,52 +70,17 @@ XPTinclude
       \ _common/inlineComplete
       \ _common/common.*
 
-" XPTinclude
-      " \ _common/cmn.counter
+let s:f_prototype = xpt#snipfunction#funcs
+call extend( s:f, s:f_prototype, 'error' )
 
-" ========================= Function and Variables =============================
-
-
-fun! s:f.GetDict( ... )
-    return 
-endfunction
-
-" TODO bad, this function should not depends on phase of rendering
-fun! s:f.GetVar( name )
-    if a:name =~# '\V\^$_x'
-        try
-            let n = a:name[ 1 : ]
-            return self[ n ]()
-        catch /.*/
-            return a:name
-        endtry
-    endif
-
-    let r = self.renderContext
-
-    let ev = get( r.evalCtx, 'variables', {} )
-    let rv = get( r.snipSetting, 'variables', {} )
-
-    return get( ev, a:name,
-          \     get( rv, a:name,
-          \         get( self, a:name, a:name ) ) )
-
-    " if self.renderContext.phase == g:xptRenderPhase.uninit
-    "     return get( self.renderContext.evalCtx.variables, a:name,
-    "           \ get( self, a:name, a:name ) )
-    " else
-    "     return get( get( self.renderContext.snipSetting, 'variables', {} ), a:name,
-    "           \     get( self, a:name, a:name ) )
-    " endif
-endfunction
 
 fun! s:f._xSnipName()
-    return self.renderContext.snipObject.name
+    return self._ctx.renderContext.snipObject.name
 endfunction
 
 
 fun! s:f.GetWrappedText()
-    let wrap = self.renderContext.wrap
+    let wrap = self._ctx.renderContext.wrap
 
     let [ l, r ] = self.ItemEdges()
 
@@ -125,6 +90,7 @@ fun! s:f.GetWrappedText()
 
     if l == '' && r == ''
         return { 'nIndent'  : wrap.indent,
+              \  'action'   : 'text',
               \  'text'     : wrap.text }
     else
 
@@ -136,19 +102,19 @@ fun! s:f.GetWrappedText()
 endfunction
 
 fun! s:f.WrapAlignAfter( min )
-    let wrap = self.renderContext.wrap
+    let wrap = self._ctx.renderContext.wrap
     let n = max( [ a:min, wrap.max ] ) - len( wrap.curline )
     return repeat( ' ', n )
 endfunction
 
 fun! s:f.WrapAlignBefore( min )
-    let wrap = self.renderContext.wrap
+    let wrap = self._ctx.renderContext.wrap
     let n = max( [ a:min, wrap.max ] ) - len( wrap.lines[ 0 ] )
     return repeat( ' ', n )
 endfunction
 
 fun! s:f.Item()
-    return get( self.renderContext, 'item', {} )
+    return get( self._ctx.renderContext, 'item', {} )
 endfunction
 
 " current name
@@ -165,12 +131,12 @@ let s:f.NN = s:f.ItemFullname
 
 " current value user typed
 fun! s:f.ItemValue() dict "{{{
-    return get( self.renderContext.evalCtx, 'userInput', '' )
+    return self.GetVar( '$UserInput' )
 endfunction "}}}
 let s:f.V = s:f.ItemValue
 
 fun! s:f.PrevItem( n )
-    let hist = get( self.renderContext, 'history', [] )
+    let hist = get( self._ctx.renderContext, 'history', [] )
     return get( hist, a:n, {} )
 endfunction
 
@@ -191,7 +157,7 @@ let s:f.VS = s:f.ItemValueStripped
 
 
 fun! s:f.ItemPos()
-    return XPMposStartEnd( self.renderContext.leadingPlaceHolder.mark )
+    return XPMposStartEnd( self._ctx.renderContext.leadingPlaceHolder.mark )
 endfunction
 
 fun! s:f.ItemInitValueWithEdge()
@@ -231,7 +197,7 @@ endfunction
 let s:f.V0 = s:f.ItemStrippedValue
 
 fun! s:f.Phase() dict
-    return get( self.renderContext, 'phase', '' )
+    return get( self._ctx.renderContext, 'phase', '' )
 endfunction
 
 " TODO this is not needed at all except as a shortcut.
@@ -243,7 +209,7 @@ endfunction "}}}
 
 " return the context
 fun! s:f.Context() "{{{
-  return self.renderContext
+  return self._ctx.renderContext
 endfunction "}}}
 let s:f.C = s:f.Context
 
@@ -264,19 +230,19 @@ let s:f.SV = s:f.SubstituteWithValue
 
 
 fun! s:f.HasStep( name )
-    let namedStep = get( self.renderContext, 'namedStep', {} )
+    let namedStep = get( self._ctx.renderContext, 'namedStep', {} )
     return has_key( namedStep, a:name )
 endfunction
 
 " reference to another finished item value
 fun! s:f.Reference(name) "{{{
-    let namedStep = get( self.renderContext, 'namedStep', {} )
+    let namedStep = get( self._ctx.renderContext, 'namedStep', {} )
     return get( namedStep, a:name, '' )
 endfunction "}}}
 let s:f.R = s:f.Reference
 
 fun! s:f.Snippet( name )
-    return get( self.renderContext.ftScope.allTemplates, a:name, { 'tmpl' : '' } )[ 'tmpl' ]
+    return get( self._ctx.renderContext.ftScope.allTemplates, a:name, { 'tmpl' : '' } )[ 'tmpl' ]
 endfunction
 
 " black hole
@@ -288,12 +254,11 @@ let s:f.VOID = s:f.Void
 " Echo several expression and concat them.
 " That's the way to use normal vim script expression instead of mixed string
 fun! s:f.Echo( ... )
+    let text = ''
     if a:0 > 0
-        return a:1
-    else
-        return ''
+        let text = a:1
     endif
-    " return join( a:000, '' )
+    return { 'action': 'text', 'text': text }
 endfunction
 
 fun! s:f.EchoIf( isTrue, ... )
@@ -342,13 +307,18 @@ fun! s:f.Build( ... )
   return { 'action' : 'build', 'text' : join( a:000, '' ) }
 endfunction
 
+let s:f.Embed = s:f.Build
+
+fun! s:f.BuildSnippet( snipname )
+    return { 'action' : 'build', 'snippet' : a:snipname }
+endfunction
+
 fun! s:f.BuildIfChanged( ... )
   let v = substitute( self.V(), "\\V\n\\|\\s", '', 'g')
   " let fn = substitute( self.ItemFullname(), "\\V\n\\|\\s", '', 'g')
   let fn = substitute( self.ItemInitValueWithEdge(), "\\V\n\\|\\s", '', 'g')
 
   if v ==# fn || v == ''
-      " return { 'action' : 'keepIndent', 'text' : self.V() }
       return ''
   else
       return { 'action' : 'build', 'text' : join( a:000, '' ) }
@@ -376,7 +346,7 @@ endfunction "}}}
 
 fun! s:f.Finish(...)
 
-    if empty( self.renderContext.itemList )
+    if empty( self._ctx.renderContext.itemList )
 
         let o = { 'action' : 'finishTemplate' }
 
@@ -393,7 +363,7 @@ endfunction
 
 fun! s:f.FinishOuter( ... )
 
-    if empty( self.renderContext.itemList )
+    if empty( self._ctx.renderContext.itemList )
 
         let o = { 'action' : 'finishTemplate', 'marks' : 'mark' }
 
@@ -409,10 +379,6 @@ fun! s:f.FinishOuter( ... )
 
 endfunction
 
-fun! s:f.Embed( snippet )
-  return { 'action' : 'embed', 'text' : a:snippet }
-endfunction
-
 fun! s:f.Next( ... )
   if a:0 == 0
     return { 'action' : 'next' }
@@ -443,17 +409,6 @@ fun! s:f.ChooseStr(...) "{{{
   return copy( a:000 )
 endfunction "}}}
 
-fun! s:f.Complete( key, ... )
-
-    let val = { 'action' : 'complete', 'pum' : a:key }
-
-    if a:0 == 1
-        let val.acceptEmpty = a:1 != 0
-    endif
-
-    return val
-endfunction
-
 " XXX
 " Fill in postType, and finish template rendering at once.
 " This make nested template rendering go back to upper level, top-level
@@ -469,7 +424,7 @@ endfunction
 
 " TODO test me
 fun! s:f.UnescapeMarks(string) dict
-  let patterns = self.renderContext.snipObject.ptn
+  let patterns = self._ctx.renderContext.snipObject.ptn
   let charToEscape = '\(\[' . patterns.l . patterns.r . ']\)'
 
   let r = substitute( a:string,  '\v(\\*)\1\\?\V' . charToEscape, '\1\2', 'g')
@@ -527,7 +482,7 @@ endfunction
 
 " Return Item Edges
 fun! s:f.ItemEdges() "{{{
-    let leader =  get( self.renderContext, 'leadingPlaceHolder', {} )
+    let leader =  get( self._ctx.renderContext, 'leadingPlaceHolder', {} )
     if has_key( leader, 'leftEdge' )
         return [ leader.leftEdge, leader.rightEdge ]
     else
diff --git a/ftplugin/_condition/c.like.xpt.vim b/ftplugin/_condition/c.like.xpt.vim
index 3367280e..2ad6dc8f 100644
--- a/ftplugin/_condition/c.like.xpt.vim
+++ b/ftplugin/_condition/c.like.xpt.vim
@@ -81,7 +81,7 @@ switch (`$SParg^`var^`$SParg^)`$BRif^{
 ..XPT
 
 XPT case wrap	" case ..:
-case `constant^`$SPcmd^:
+case `constant^:
     `cursor^
     break;
 
diff --git a/ftplugin/actionscript/test.page b/ftplugin/actionscript/test.page
index 730a86d6..1e8f3947 100644
--- a/ftplugin/actionscript/test.page
+++ b/ftplugin/actionscript/test.page
@@ -151,24 +151,6 @@ case constant :
                 break;
 
 
-    /*  -------------comment--------------- */
-    /* `$CS `cursor^                        */
-
-
-
-// WRAPPED_TEXT
-// WRAPPED_TEXT_line2
-
-                // WRAPPED_TEXT
-                // WRAPPED_TEXT_line2 b
-
-                `// WRAPPED_TEXT
-                 // WRAPPED_TEXT_line2^
-
-                a // WRAPPED_TEXT
-                  // WRAPPED_TEXT_line2
-
-
     /*  -------------commentBlock--------------- */
     /* `$CS `cursor^                             */
 
@@ -215,6 +197,24 @@ case constant :
                  */
 
 
+    /*  -------------commentLine2--------------- */
+    /* `$CL `what` $CR^`^                        */
+
+
+
+/* WRAPPED_TEXT */
+/* WRAPPED_TEXT_line2 */
+
+                /* WRAPPED_TEXT */
+                /* WRAPPED_TEXT_line2 */ b
+
+                `/* WRAPPED_TEXT */
+                 /* WRAPPED_TEXT_line2 */^
+
+                 a /* WRAPPED_TEXT */
+                   /* WRAPPED_TEXT_line2 */
+
+
     /*  -------------commentLine--------------- */
     /* `$CS `cursor^                            */
 
@@ -223,32 +223,32 @@ case constant :
 // WRAPPED_TEXT
 // WRAPPED_TEXT_line2
 
-                // WRAPPED_TEXT
-                // WRAPPED_TEXT_line2 b
+                 // WRAPPED_TEXT
+                 // WRAPPED_TEXT_line2 b
 
-                `// WRAPPED_TEXT
-                 // WRAPPED_TEXT_line2^
+                 `// WRAPPED_TEXT
+                  // WRAPPED_TEXT_line2^
 
-                a // WRAPPED_TEXT
-                  // WRAPPED_TEXT_line2
+                 a // WRAPPED_TEXT
+                   // WRAPPED_TEXT_line2
 
 
-    /*  -------------commentLine2--------------- */
-    /* `$CL `what` $CR^`^                        */
+    /*  -------------comment--------------- */
+    /* `$CS `cursor^                        */
 
 
 
-/* WRAPPED_TEXT */
-/* WRAPPED_TEXT_line2 */
+// WRAPPED_TEXT
+// WRAPPED_TEXT_line2
 
-                /* WRAPPED_TEXT */
-                /* WRAPPED_TEXT_line2 */ b
+                 // WRAPPED_TEXT
+                 // WRAPPED_TEXT_line2 b
 
-                `/* WRAPPED_TEXT */
-                 /* WRAPPED_TEXT_line2 */^
+                 `// WRAPPED_TEXT
+                  // WRAPPED_TEXT_line2^
 
-                 a /* WRAPPED_TEXT */
-                   /* WRAPPED_TEXT_line2 */
+                 a // WRAPPED_TEXT
+                   // WRAPPED_TEXT_line2
 
 
     /*  -------------default--------------- */
@@ -380,53 +380,53 @@ a function name () {
 }
 
 
-    /*  -------------if--------------- */
-    /* `Include:_if^                   */
+    /*  -------------if0--------------- */
+    /* `Include:_if^                    */
 
 
 
-if ( condition ) {
+if ( 0 == var ) {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }
 
-if ( condition_TYPED ) {
+if ( 0 == var_TYPED ) {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 } b
 
-`if ( condition ) {
+`if ( 0 == var ) {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }^
 
-a if ( condition ) {
+a if ( 0 == var ) {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }
 
 
-    /*  -------------if0--------------- */
-    /* `Include:_if^                    */
+    /*  -------------if--------------- */
+    /* `Include:_if^                   */
 
 
 
-if ( 0 == var ) {
+if ( condition ) {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }
 
-if ( 0 == var_TYPED ) {
+if ( condition_TYPED ) {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 } b
 
-`if ( 0 == var ) {
+`if ( condition ) {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }^
 
-a if ( 0 == var ) {
+a if ( condition ) {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }
@@ -481,53 +481,53 @@ else if ( condition ) {
 }
 
 
-    /*  -------------ifn--------------- */
-    /* `Include:_if^                    */
+    /*  -------------ifn0--------------- */
+    /* `Include:_if^                     */
 
 
 
-if ( NULL == var ) {
+if ( 0 != var ) {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }
 
-if ( NULL == var_TYPED ) {
+if ( 0 != var_TYPED ) {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 } b
 
-`if ( NULL == var ) {
+`if ( 0 != var ) {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }^
 
-a if ( NULL == var ) {
+a if ( 0 != var ) {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }
 
 
-    /*  -------------ifn0--------------- */
-    /* `Include:_if^                     */
+    /*  -------------ifn--------------- */
+    /* `Include:_if^                    */
 
 
 
-if ( 0 != var ) {
+if ( NULL == var ) {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }
 
-if ( 0 != var_TYPED ) {
+if ( NULL == var_TYPED ) {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 } b
 
-`if ( 0 != var ) {
+`if ( NULL == var ) {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }^
 
-a if ( 0 != var ) {
+a if ( NULL == var ) {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }
diff --git a/ftplugin/c/test.page b/ftplugin/c/test.page
index 94b4ebf8..3d27ab1e 100644
--- a/ftplugin/c/test.page
+++ b/ftplugin/c/test.page
@@ -19,60 +19,60 @@ a "WRAPPED_TEXT
 WRAPPED_TEXT_line2"
 
 
-    /*  -------------#if--------------- */
-    /* #if `0^                          */
-    /* `cursor^                         */
-    /* #endif                           */
+    /*  -------------#ifdef--------------- */
+    /* #ifdef `symbol^                     */
+    /* `cursor^                            */
+    /* #endif `$CL^ `symbol^ `$CR^         */
 
 
 
-#if 0
+#ifdef symbol
 WRAPPED_TEXT
 WRAPPED_TEXT_line2
-#endif
+#endif /* symbol */
 
-#if 0_TYPED
+#ifdef symbol_TYPED
 WRAPPED_TEXT
 WRAPPED_TEXT_line2
-#endif b
+#endif /* symbol_TYPED */ b
 
-`#if 0
+`#ifdef symbol
 WRAPPED_TEXT
 WRAPPED_TEXT_line2
-#endif^
+#endif /* symbol */^
 
-a #if 0
+a #ifdef symbol
 WRAPPED_TEXT
 WRAPPED_TEXT_line2
-#endif
+#endif /* symbol */
 
 
-    /*  -------------#ifdef--------------- */
-    /* #ifdef `symbol^                     */
-    /* `cursor^                            */
-    /* #endif `$CL^ `symbol^ `$CR^         */
+    /*  -------------#if--------------- */
+    /* #if `0^                          */
+    /* `cursor^                         */
+    /* #endif                           */
 
 
 
-#ifdef symbol
+#if 0
 WRAPPED_TEXT
 WRAPPED_TEXT_line2
-#endif /* symbol */
+#endif
 
-#ifdef symbol_TYPED
+#if 0_TYPED
 WRAPPED_TEXT
 WRAPPED_TEXT_line2
-#endif /* symbol_TYPED */ b
+#endif b
 
-`#ifdef symbol
+`#if 0
 WRAPPED_TEXT
 WRAPPED_TEXT_line2
-#endif /* symbol */^
+#endif^
 
-a #ifdef symbol
+a #if 0
 WRAPPED_TEXT
 WRAPPED_TEXT_line2
-#endif /* symbol */
+#endif
 
 
     /*  -------------#ifndef--------------- */
@@ -103,32 +103,32 @@ WRAPPED_TEXT_line2
 #endif /* symbol */
 
 
-    /*  -------------#inc--------------- */
-    /* #include <`^.h>                   */
+    /*  -------------#include_user--------------- */
+    /* #include "`me^.h"                          */
 
 
 
-#include <.h>
+#include "test.h"
 
-#include <_TYPED.h> b
+#include "me_TYPED.h" b
 
-`#include <.h>^
+`#include "test.h"^
 
-a #include <.h>
+a #include "test.h"
 
 
-    /*  -------------#include_user--------------- */
-    /* #include "`me^.h"                          */
+    /*  -------------#inc--------------- */
+    /* #include <`^.h>                   */
 
 
 
-#include "test.h"
+#include <.h>
 
-#include "me_TYPED.h" b
+#include <_TYPED.h> b
 
-`#include "test.h"^
+`#include <.h>^
 
-a #include "test.h"
+a #include <.h>
 
 
     /*  -------------#ind--------------- */
@@ -574,20 +574,6 @@ a /**
  */
 
 
-    /*  -------------File--------------- */
-    /* `file()^                          */
-
-
-
-test.page
-
-test.page b
-
-`test.page^
-
-a test.page
-
-
     /*  -------------filehead---------------                                  */
     /* _CMT_*-------------------------/// `sum^ \\\--------------------------- */
     /*  *                                                                     */
@@ -676,32 +662,18 @@ a test.page
  
 
 
-    /*  -------------for---------------                                                                                  */
-    /* for`$SPcmd^(`$SParg^`$FOR_SCOPE^`$VAR_PRE`i^`$SPop^=`$SPop^`0^; `i^`$SPop^<`$SPop^`len^; `i^++`$SParg^)`$BRloop^{ */
-    /*     `cursor^                                                                                                      */
-    /* }                                                                                                                 */
+    /*  -------------File--------------- */
+    /* `file()^                          */
 
 
 
-for ( i = 0; i < len; i++ ) {
-    WRAPPED_TEXT
-    WRAPPED_TEXT_line2
-}
+ test.page
 
-for ( i_TYPED = 0_TYPED; i_TYPED < len_TYPED; i_TYPED++ ) {
-    WRAPPED_TEXT
-    WRAPPED_TEXT_line2
-} b
+ test.page b
 
-`for ( i = 0; i < len; i++ ) {
-    WRAPPED_TEXT
-    WRAPPED_TEXT_line2
-}^
+ `test.page^
 
-a for ( i = 0; i < len; i++ ) {
-    WRAPPED_TEXT
-    WRAPPED_TEXT_line2
-}
+ a test.page
 
 
     /*  -------------forever--------------- */
@@ -709,13 +681,13 @@ a for ( i = 0; i < len; i++ ) {
 
 
 
-for (;;) 
+ for (;;) 
 
-for (;;)  b
+ for (;;)  b
 
-`for (;;) ^
+ `for (;;) ^
 
-a for (;;) 
+ a for (;;) 
 
 
     /*  -------------fornn---------------                                                                                                */
@@ -774,6 +746,34 @@ a for ( i = 0; i >= end; i-- ) {
 }
 
 
+    /*  -------------for---------------                                                                                  */
+    /* for`$SPcmd^(`$SParg^`$FOR_SCOPE^`$VAR_PRE`i^`$SPop^=`$SPop^`0^; `i^`$SPop^<`$SPop^`len^; `i^++`$SParg^)`$BRloop^{ */
+    /*     `cursor^                                                                                                      */
+    /* }                                                                                                                 */
+
+
+
+for ( i = 0; i < len; i++ ) {
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+}
+
+for ( i_TYPED = 0_TYPED; i_TYPED < len_TYPED; i_TYPED++ ) {
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+} b
+
+`for ( i = 0; i < len; i++ ) {
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+}^
+
+a for ( i = 0; i < len; i++ ) {
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+}
+
+
     /*  -------------fprintf---------------                     */
     /* fprintf(`$SParg^`stream^,`$SPop^`:_printfElts:^`$SParg^) */
 
@@ -820,58 +820,6 @@ name()
 }
 
 
-    /*  -------------if--------------- */
-    /* `Include:_if^                   */
-
-
-
-if ( condition ) {
-    WRAPPED_TEXT
-    WRAPPED_TEXT_line2
-}
-
-if ( condition_TYPED ) {
-    WRAPPED_TEXT
-    WRAPPED_TEXT_line2
-} b
-
-`if ( condition ) {
-    WRAPPED_TEXT
-    WRAPPED_TEXT_line2
-}^
-
-a if ( condition ) {
-    WRAPPED_TEXT
-    WRAPPED_TEXT_line2
-}
-
-
-    /*  -------------if0--------------- */
-    /* `Include:_if^                    */
-
-
-
-if ( 0 == var ) {
-    WRAPPED_TEXT
-    WRAPPED_TEXT_line2
-}
-
-if ( 0 == var_TYPED ) {
-    WRAPPED_TEXT
-    WRAPPED_TEXT_line2
-} b
-
-`if ( 0 == var ) {
-    WRAPPED_TEXT
-    WRAPPED_TEXT_line2
-}^
-
-a if ( 0 == var ) {
-    WRAPPED_TEXT
-    WRAPPED_TEXT_line2
-}
-
-
     /*  -------------ifee---------------                              */
     /* `:_if:^` `else_if...{{^`$BRel^`Include:elif^` `else_if...^`}}^ */
 
@@ -947,6 +895,58 @@ a if ( NULL == var ) {
 }
 
 
+    /*  -------------if--------------- */
+    /* `Include:_if^                   */
+
+
+
+if ( condition ) {
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+}
+
+if ( condition_TYPED ) {
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+} b
+
+`if ( condition ) {
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+}^
+
+a if ( condition ) {
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+}
+
+
+    /*  -------------if0--------------- */
+    /* `Include:_if^                    */
+
+
+
+if ( 0 == var ) {
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+}
+
+if ( 0 == var_TYPED ) {
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+} b
+
+`if ( 0 == var ) {
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+}^
+
+a if ( 0 == var ) {
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+}
+
+
     /*  -------------ifn0--------------- */
     /* `Include:_if^                     */
 
@@ -1218,34 +1218,6 @@ a switch ( var ) {
 }
 
 
-    /*  -------------while---------------                   */
-    /* while`$SPcmd^(`$SParg^`condition^`$SParg^)`$BRloop^{ */
-    /*     `cursor^                                         */
-    /* }                                                    */
-
-
-
-while ( condition ) {
-    WRAPPED_TEXT
-    WRAPPED_TEXT_line2
-}
-
-while ( condition_TYPED ) {
-    WRAPPED_TEXT
-    WRAPPED_TEXT_line2
-} b
-
-`while ( condition ) {
-    WRAPPED_TEXT
-    WRAPPED_TEXT_line2
-}^
-
-a while ( condition ) {
-    WRAPPED_TEXT
-    WRAPPED_TEXT_line2
-}
-
-
     /*  -------------while0---------------                   */
     /* do`$BRloop^{                                          */
     /*     `cursor^                                          */
@@ -1302,6 +1274,34 @@ a while ( 1 ) {
 }
 
 
+    /*  -------------while---------------                   */
+    /* while`$SPcmd^(`$SParg^`condition^`$SParg^)`$BRloop^{ */
+    /*     `cursor^                                         */
+    /* }                                                    */
+
+
+
+while ( condition ) {
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+}
+
+while ( condition_TYPED ) {
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+} b
+
+`while ( condition ) {
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+}^
+
+a while ( condition ) {
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+}
+
+
     /*  -------------whilenn---------------                 */
     /* while`$SPcmd^(`$SParg^`condition^`$SParg^)`$BRloop^{ */
     /*     `cursor^                                         */
diff --git a/ftplugin/cg/test.page b/ftplugin/cg/test.page
index 323dc5b4..cad093eb 100644
--- a/ftplugin/cg/test.page
+++ b/ftplugin/cg/test.page
@@ -19,6 +19,34 @@ a "WRAPPED_TEXT
 WRAPPED_TEXT_line2"
 
 
+    /*  -------------#ifndef--------------- */
+    /* #ifndef `symbol^                     */
+    /* `cursor^                             */
+    /* #endif `$CL^ `symbol^ `$CR^          */
+
+
+
+#ifndef symbol
+WRAPPED_TEXT
+WRAPPED_TEXT_line2
+#endif /* symbol */
+
+#ifndef symbol_TYPED
+WRAPPED_TEXT
+WRAPPED_TEXT_line2
+#endif /* symbol_TYPED */ b
+
+`#ifndef symbol
+WRAPPED_TEXT
+WRAPPED_TEXT_line2
+#endif /* symbol */^
+
+a #ifndef symbol
+WRAPPED_TEXT
+WRAPPED_TEXT_line2
+#endif /* symbol */
+
+
     /*  -------------#if--------------- */
     /* #if `0^                          */
     /* `cursor^                         */
@@ -75,34 +103,6 @@ WRAPPED_TEXT_line2
 #endif /* symbol */
 
 
-    /*  -------------#ifndef--------------- */
-    /* #ifndef `symbol^                     */
-    /* `cursor^                             */
-    /* #endif `$CL^ `symbol^ `$CR^          */
-
-
-
-#ifndef symbol
-WRAPPED_TEXT
-WRAPPED_TEXT_line2
-#endif /* symbol */
-
-#ifndef symbol_TYPED
-WRAPPED_TEXT
-WRAPPED_TEXT_line2
-#endif /* symbol_TYPED */ b
-
-`#ifndef symbol
-WRAPPED_TEXT
-WRAPPED_TEXT_line2
-#endif /* symbol */^
-
-a #ifndef symbol
-WRAPPED_TEXT
-WRAPPED_TEXT_line2
-#endif /* symbol */
-
-
     /*  -------------#inc--------------- */
     /* #include <`^.h>                   */
 
@@ -577,60 +577,60 @@ a type name(
 }
 
 
-    /*  -------------if--------------- */
-    /* `Include:_if^                   */
+    /*  -------------if0--------------- */
+    /* `Include:_if^                    */
 
 
 
-if ( condition )
+if ( 0 == var )
 {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }
 
-if ( condition_TYPED )
+if ( 0 == var_TYPED )
 {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 } b
 
-`if ( condition )
+`if ( 0 == var )
 {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }^
 
-a if ( condition )
+a if ( 0 == var )
 {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }
 
 
-    /*  -------------if0--------------- */
-    /* `Include:_if^                    */
+    /*  -------------if--------------- */
+    /* `Include:_if^                   */
 
 
 
-if ( 0 == var )
+if ( condition )
 {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }
 
-if ( 0 == var_TYPED )
+if ( condition_TYPED )
 {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 } b
 
-`if ( 0 == var )
+`if ( condition )
 {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }^
 
-a if ( 0 == var )
+a if ( condition )
 {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
@@ -699,90 +699,90 @@ else if ( condition )
 }
 
 
-    /*  -------------ifn--------------- */
-    /* `Include:_if^                    */
+    /*  -------------ifn0--------------- */
+    /* `Include:_if^                     */
 
 
 
-if ( NULL == var )
+if ( 0 != var )
 {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }
 
-if ( NULL == var_TYPED )
+if ( 0 != var_TYPED )
 {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 } b
 
-`if ( NULL == var )
+`if ( 0 != var )
 {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }^
 
-a if ( NULL == var )
+a if ( 0 != var )
 {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }
 
 
-    /*  -------------ifn0--------------- */
+    /*  -------------ifnn--------------- */
     /* `Include:_if^                     */
 
 
 
-if ( 0 != var )
+if ( NULL != var )
 {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }
 
-if ( 0 != var_TYPED )
+if ( NULL != var_TYPED )
 {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 } b
 
-`if ( 0 != var )
+`if ( NULL != var )
 {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }^
 
-a if ( 0 != var )
+a if ( NULL != var )
 {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }
 
 
-    /*  -------------ifnn--------------- */
-    /* `Include:_if^                     */
+    /*  -------------ifn--------------- */
+    /* `Include:_if^                    */
 
 
 
-if ( NULL != var )
+if ( NULL == var )
 {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }
 
-if ( NULL != var_TYPED )
+if ( NULL == var_TYPED )
 {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 } b
 
-`if ( NULL != var )
+`if ( NULL == var )
 {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }^
 
-a if ( NULL != var )
+a if ( NULL == var )
 {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
@@ -1035,100 +1035,100 @@ a void main(  floatn name : POSITION,
 }
 
 
-    /*  -------------while---------------                   */
-    /* while`$SPcmd^(`$SParg^`condition^`$SParg^)`$BRloop^{ */
-    /*     `cursor^                                         */
-    /* }                                                    */
+    /*  -------------while0---------------                   */
+    /* do`$BRloop^{                                          */
+    /*     `cursor^                                          */
+    /* }`$BRloop^while`$SPcmd^(`$SParg^`condition^`$SParg^); */
 
 
 
-while ( condition )
+do
 {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }
+while ( 0 );
 
-while ( condition_TYPED )
+do
 {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
-} b
+}
+while ( 0 ); b
 
-`while ( condition )
+`do
 {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
-}^
+}
+while ( 0 );^
 
-a while ( condition )
+a do
 {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }
+while ( 0 );
 
 
-    /*  -------------while0---------------                   */
-    /* do`$BRloop^{                                          */
-    /*     `cursor^                                          */
-    /* }`$BRloop^while`$SPcmd^(`$SParg^`condition^`$SParg^); */
+    /*  -------------while1---------------                  */
+    /* while`$SPcmd^(`$SParg^`condition^`$SParg^)`$BRloop^{ */
+    /*     `cursor^                                         */
+    /* }                                                    */
 
 
 
-do
+while ( 1 )
 {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }
-while ( 0 );
 
-do
+while ( 1 )
 {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
-}
-while ( 0 ); b
+} b
 
-`do
+`while ( 1 )
 {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
-}
-while ( 0 );^
+}^
 
-a do
+a while ( 1 )
 {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }
-while ( 0 );
 
 
-    /*  -------------while1---------------                  */
+    /*  -------------while---------------                   */
     /* while`$SPcmd^(`$SParg^`condition^`$SParg^)`$BRloop^{ */
     /*     `cursor^                                         */
     /* }                                                    */
 
 
 
-while ( 1 )
+while ( condition )
 {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }
 
-while ( 1 )
+while ( condition_TYPED )
 {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 } b
 
-`while ( 1 )
+`while ( condition )
 {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }^
 
-a while ( 1 )
+a while ( condition )
 {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
diff --git a/ftplugin/cmake/cmake.xpt.vim b/ftplugin/cmake/cmake.xpt.vim
index 6a5d4569..ac60b138 100644
--- a/ftplugin/cmake/cmake.xpt.vim
+++ b/ftplugin/cmake/cmake.xpt.vim
@@ -12,3 +12,29 @@ if ( `cond^ )
 `}}^endif( `cond^ )
 ..XPT
 
+XPT foreach " foreach\(...) ... endofreach\( ... )
+foreach (`varname^ `collection^)
+    `cursor^
+endforeach(`varname^)
+
+XPT set " set\(... ...)
+set(`varname^ `cursor^)
+
+XPT msg " message\("...")
+message("`cursor^")
+
+XPT function " function\(...) ... endfunction\(...)
+function(`funcName^ `params^)
+    `cursor^
+endfunction(`funcName^)
+
+XPT macro " macro\(...) ... endmacro\(...)
+macro( `macroName^ `params^ )
+    `cursor^
+endmacro( `macroName^ )
+
+XPT while " while\(...) ... endwhile\(...)
+while( `condition^ )
+    `cursor^
+enwhile( `condition^ )
+
diff --git a/ftplugin/cpp/cpp.xpt.vim b/ftplugin/cpp/cpp.xpt.vim
index 6ac77641..306af761 100755
--- a/ftplugin/cpp/cpp.xpt.vim
+++ b/ftplugin/cpp/cpp.xpt.vim
@@ -62,28 +62,23 @@ XPT map " std::map<..,..> ..;
 std::map<`typeKey^,`val^>   `name^;
 `cursor^
 
-
 XPT class   " class ..
-class `className^
-{
+class `className^`$BRfun^{
 public:
-    `className^( `ctorParam^ );
+    `className^(`$SParg`ctorParam?`$SParg^);
     ~`className^();
-    `className^( const `className^ &cpy );
+    `className^(`$SParg^const `className^ &cpy`$SParg^);
     `cursor^
 private:
 };
 
-`className^::`className^( `ctorParam^ )
-{
+`className^::`className^(`ctorParam?^)`$BRfun^{
 }
 
-`className^::~`className^()
-{
+`className^::~`className^()`$BRfun^{
 }
 
-`className^::`className^( const `className^ &cpy )
-{
+`className^::`className^(`$SParg^gconst `className^ &cpy`$SParg^)`$BRfun^{
 }
 ..XPT
 
@@ -121,8 +116,7 @@ operator `typename^ ();
 ..XPT
 
 XPT iop " t operator .. ()
-`type^ operator `opName^ ( `args^ )
-{
+`type^ operator `opName^ ( `args^ )`$BRfun^{
     `cursor^
 }
 ..XPT
@@ -130,37 +124,32 @@ XPT iop " t operator .. ()
 XPT op " t operator .. ()
 `type^ operator `opName^ ( `args^ );
 
-`type^ `className^::operator `opName^ ( `args^ )
-{
+`type^ `className^::operator `opName^ ( `args^ )`$BRfun^{
 }
 ..XPT
 
 XPT templateclass   " template <> class
 template
     <`templateParam^>
-class `className^
-{
+class `className^`$BRfun^{
 public:
-    `className^( `ctorParam^ );
+    `className^(`$SParg`ctorParam?`$SParg^);
     ~`className^();
-    `className^( const `className^ &cpy );
+    `className^(`$SParg^const `className^ &cpy`$SParg^);
     `cursor^
 private:
 };
 
 template <`templateParam^>
-`className^<`_^cleanTempl(R('templateParam'))^^>::`className^( `ctorParam^ )
-{
+`className^<`_^cleanTempl(R('templateParam'))^^>::`className^(`ctorParam?^)`$BRfun^{
 }
 
 template <`templateParam^>
-`className^<`_^cleanTempl(R('templateParam'))^^>::~`className^()
-{
+`className^<`_^cleanTempl(R('templateParam'))^^>::~`className^()`$BRfun^{
 }
 
 template <`templateParam^>
-`className^<`_^cleanTempl(R('templateParam'))^^>::`className^( const `className^ &cpy )
-{
+`className^<`_^cleanTempl(R('templateParam'))^^>::`className^(`$SParg^gconst `className^ &cpy`$SParg^)`$BRfun^{
 }
 ..XPT
 
diff --git a/ftplugin/cpp/test.page b/ftplugin/cpp/test.page
index 74a48b58..5b61d75c 100644
--- a/ftplugin/cpp/test.page
+++ b/ftplugin/cpp/test.page
@@ -19,60 +19,60 @@ a "WRAPPED_TEXT
 WRAPPED_TEXT_line2"
 
 
-    /*  -------------#if--------------- */
-    /* #if `0^                          */
-    /* `cursor^                         */
-    /* #endif                           */
+    /*  -------------#ifdef--------------- */
+    /* #ifdef `symbol^                     */
+    /* `cursor^                            */
+    /* #endif `$CL^ `symbol^ `$CR^         */
 
 
 
-#if 0
+#ifdef symbol
 WRAPPED_TEXT
 WRAPPED_TEXT_line2
-#endif
+#endif /* symbol */
 
-#if 0_TYPED
+#ifdef symbol_TYPED
 WRAPPED_TEXT
 WRAPPED_TEXT_line2
-#endif b
+#endif /* symbol_TYPED */ b
 
-`#if 0
+`#ifdef symbol
 WRAPPED_TEXT
 WRAPPED_TEXT_line2
-#endif^
+#endif /* symbol */^
 
-a #if 0
+a #ifdef symbol
 WRAPPED_TEXT
 WRAPPED_TEXT_line2
-#endif
+#endif /* symbol */
 
 
-    /*  -------------#ifdef--------------- */
-    /* #ifdef `symbol^                     */
-    /* `cursor^                            */
-    /* #endif `$CL^ `symbol^ `$CR^         */
+    /*  -------------#if--------------- */
+    /* #if `0^                          */
+    /* `cursor^                         */
+    /* #endif                           */
 
 
 
-#ifdef symbol
+#if 0
 WRAPPED_TEXT
 WRAPPED_TEXT_line2
-#endif /* symbol */
+#endif
 
-#ifdef symbol_TYPED
+#if 0_TYPED
 WRAPPED_TEXT
 WRAPPED_TEXT_line2
-#endif /* symbol_TYPED */ b
+#endif b
 
-`#ifdef symbol
+`#if 0
 WRAPPED_TEXT
 WRAPPED_TEXT_line2
-#endif /* symbol */^
+#endif^
 
-a #ifdef symbol
+a #if 0
 WRAPPED_TEXT
 WRAPPED_TEXT_line2
-#endif /* symbol */
+#endif
 
 
     /*  -------------#ifndef--------------- */
@@ -103,32 +103,32 @@ WRAPPED_TEXT_line2
 #endif /* symbol */
 
 
-    /*  -------------#inc--------------- */
-    /* #include <`^.h>                   */
+    /*  -------------#include_user--------------- */
+    /* #include "`me^.h"                          */
 
 
 
-#include <.h>
+#include "test.h"
 
-#include <_TYPED.h> b
+#include "me_TYPED.h" b
 
-`#include <.h>^
+`#include "test.h"^
 
-a #include <.h>
+a #include "test.h"
 
 
-    /*  -------------#include_user--------------- */
-    /* #include "`me^.h"                          */
+    /*  -------------#inc--------------- */
+    /* #include <`^.h>                   */
 
 
 
-#include "test.h"
+#include <.h>
 
-#include "me_TYPED.h" b
+#include <_TYPED.h> b
 
-`#include "test.h"^
+`#include <.h>^
 
-a #include "test.h"
+a #include <.h>
 
 
     /*  -------------#ind--------------- */
@@ -500,24 +500,6 @@ className::className( const className &cpy )
 }
 
 
-    /*  -------------comment--------------- */
-    /* `$CS `cursor^                        */
-
-
-
-// WRAPPED_TEXT
-// WRAPPED_TEXT_line2
-
-// WRAPPED_TEXT
-// WRAPPED_TEXT_line2 b
-
-`// WRAPPED_TEXT
- // WRAPPED_TEXT_line2^
-
-a // WRAPPED_TEXT
-  // WRAPPED_TEXT_line2
-
-
     /*  -------------commentBlock--------------- */
     /* `$CS `cursor^                             */
 
@@ -600,6 +582,24 @@ a // WRAPPED_TEXT
    /* WRAPPED_TEXT_line2 */
 
 
+    /*  -------------comment--------------- */
+    /* `$CS `cursor^                        */
+
+
+
+// WRAPPED_TEXT
+// WRAPPED_TEXT_line2
+
+ // WRAPPED_TEXT
+ // WRAPPED_TEXT_line2 b
+
+ `// WRAPPED_TEXT
+  // WRAPPED_TEXT_line2^
+
+ a // WRAPPED_TEXT
+   // WRAPPED_TEXT_line2
+
+
     /*  -------------default--------------- */
     /* default:                             */
     /*     `cursor^                         */
@@ -1064,38 +1064,6 @@ fprintf( stream_TYPED, "pattern_TYPED" ) b
 a fprintf( stream, "pattern" )
 
 
-    /*  -------------fun---------------                                                       */
-    /* `c_fun_type_indent()^`int^`c_fun_body_indent()^`name^(`$SParg`param?`$SParg^)`$BRfun^{ */
-    /*     `cursor^                                                                           */
-    /* }                                                                                      */
-
-
-
-    int
-name()
-{
-    
-}
-
-    int_TYPED
-name_TYPED( param_TYPED )
-{
-    
-} b
-
-`    int
-name()
-{
-    
-}^
-
-a     int
-name()
-{
-    
-}
-
-
     /*  -------------functor---------------                            */
     /* struct `className^                                              */
     /* {                                                               */
@@ -1152,6 +1120,38 @@ a struct className
 };
 
 
+    /*  -------------fun---------------                                                       */
+    /* `c_fun_type_indent()^`int^`c_fun_body_indent()^`name^(`$SParg`param?`$SParg^)`$BRfun^{ */
+    /*     `cursor^                                                                           */
+    /* }                                                                                      */
+
+
+
+    int
+name()
+{
+    
+}
+
+    int_TYPED
+name_TYPED( param_TYPED )
+{
+    
+} b
+
+`    int
+name()
+{
+    
+}^
+
+a     int
+name()
+{
+    
+}
+
+
     /*  -------------icastop--------------- */
     /* operator `typename^ ()               */
     /*     { return `cursor^; }             */
@@ -1928,104 +1928,104 @@ std::vector<type_TYPED> var_TYPED;
  
 
 
-    /*  -------------while---------------                   */
+    /*  -------------while1---------------                  */
     /* while`$SPcmd^(`$SParg^`condition^`$SParg^)`$BRloop^{ */
     /*     `cursor^                                         */
     /* }                                                    */
 
 
 
-while ( condition )
+while ( true )
 {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }
 
-while ( condition_TYPED )
+while ( true )
 {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 } b
 
-`while ( condition )
+`while ( true )
 {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }^
 
-a while ( condition )
+a while ( true )
 {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }
 
 
-    /*  -------------while0---------------                   */
-    /* do`$BRloop^{                                          */
-    /*     `cursor^                                          */
-    /* }`$BRloop^while`$SPcmd^(`$SParg^`condition^`$SParg^); */
+    /*  -------------while---------------                   */
+    /* while`$SPcmd^(`$SParg^`condition^`$SParg^)`$BRloop^{ */
+    /*     `cursor^                                         */
+    /* }                                                    */
 
 
 
-do
+while ( condition )
 {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }
-while ( false );
 
-do
+while ( condition_TYPED )
 {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
-}
-while ( false ); b
+} b
 
-`do
+`while ( condition )
 {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
-}
-while ( false );^
+}^
 
-a do
+a while ( condition )
 {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }
-while ( false );
 
 
-    /*  -------------while1---------------                  */
-    /* while`$SPcmd^(`$SParg^`condition^`$SParg^)`$BRloop^{ */
-    /*     `cursor^                                         */
-    /* }                                                    */
+    /*  -------------while0---------------                   */
+    /* do`$BRloop^{                                          */
+    /*     `cursor^                                          */
+    /* }`$BRloop^while`$SPcmd^(`$SParg^`condition^`$SParg^); */
 
 
 
-while ( true )
+do
 {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }
+while ( false );
 
-while ( true )
+do
 {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
-} b
+}
+while ( false ); b
 
-`while ( true )
+`do
 {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
-}^
+}
+while ( false );^
 
-a while ( true )
+a do
 {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }
+while ( false );
 
 
     /*  -------------whilenn---------------                 */
diff --git a/ftplugin/cs/test.page b/ftplugin/cs/test.page
index fe3f25de..27acb6de 100644
--- a/ftplugin/cs/test.page
+++ b/ftplugin/cs/test.page
@@ -19,34 +19,6 @@ a "WRAPPED_TEXT
 WRAPPED_TEXT_line2"
 
 
-    /*  -------------#if--------------- */
-    /* #if `0^                          */
-    /* `cursor^                         */
-    /* #endif                           */
-
-
-
-#if 0
-WRAPPED_TEXT
-WRAPPED_TEXT_line2
-#endif
-
-#if 0_TYPED
-WRAPPED_TEXT
-WRAPPED_TEXT_line2
-#endif b
-
-`#if 0
-WRAPPED_TEXT
-WRAPPED_TEXT_line2
-#endif^
-
-a #if 0
-WRAPPED_TEXT
-WRAPPED_TEXT_line2
-#endif
-
-
     /*  -------------#ifdef--------------- */
     /* #ifdef `symbol^                     */
     /* `cursor^                            */
@@ -103,18 +75,32 @@ WRAPPED_TEXT_line2
 #endif /* symbol */
 
 
-    /*  -------------#inc--------------- */
-    /* #include <`^.h>                   */
+    /*  -------------#if--------------- */
+    /* #if `0^                          */
+    /* `cursor^                         */
+    /* #endif                           */
 
 
 
-#include <.h>
+#if 0
+WRAPPED_TEXT
+WRAPPED_TEXT_line2
+#endif
 
-#include <_TYPED.h> b
+#if 0_TYPED
+WRAPPED_TEXT
+WRAPPED_TEXT_line2
+#endif b
 
-`#include <.h>^
+`#if 0
+WRAPPED_TEXT
+WRAPPED_TEXT_line2
+#endif^
 
-a #include <.h>
+a #if 0
+WRAPPED_TEXT
+WRAPPED_TEXT_line2
+#endif
 
 
     /*  -------------#include_user--------------- */
@@ -131,6 +117,20 @@ a #include <.h>
 a #include "test.h"
 
 
+    /*  -------------#inc--------------- */
+    /* #include <`^.h>                   */
+
+
+
+#include <.h>
+
+#include <_TYPED.h> b
+
+`#include <.h>^
+
+a #include <.h>
+
+
     /*  -------------#ind--------------- */
     /* #include "`me^.h"                 */
 
@@ -638,20 +638,6 @@ a /**
  */
 
 
-    /*  -------------File--------------- */
-    /* `file()^                          */
-
-
-
-test.page
-
-test.page b
-
-`test.page^
-
-a test.page
-
-
     /*  -------------filehead---------------                                  */
     /* _CMT_*-------------------------/// `sum^ \\\--------------------------- */
     /*  *                                                                     */
@@ -740,6 +726,34 @@ a test.page
  
 
 
+    /*  -------------File--------------- */
+    /* `file()^                          */
+
+
+
+ test.page
+
+ test.page b
+
+ `test.page^
+
+ a test.page
+
+
+    /*  -------------forever--------------- */
+    /* for`$SPcmd^(;;) `cursor^             */
+
+
+
+ for (;;) 
+
+ for (;;)  b
+
+ `for (;;) ^
+
+ a for (;;) 
+
+
     /*  -------------for---------------                                                                   */
     /* for`$SPcmd^(`$SParg^`int^ `i^`$SPop^=`$SPop^`0^; `i^`$SPop^<`$SPop^`len^; ++`i^`$SParg^)`$BRloop^{ */
     /*     `cursor^                                                                                       */
@@ -796,20 +810,6 @@ a foreach ( var e in what )
 }
 
 
-    /*  -------------forever--------------- */
-    /* for`$SPcmd^(;;) `cursor^             */
-
-
-
-for (;;) 
-
-for (;;)  b
-
-`for (;;) ^
-
-a for (;;) 
-
-
     /*  -------------fornn---------------                                                                                                */
     /* for`$SPcmd^(`$SParg^`$FOR_SCOPE^`$VAR_PRE`ptr^`$SPop^=`$SPop^`init^; `$NULL^`$SPop^!=`$SPop^`ptr^; `^R('ptr')^`$SParg^)`$BRloop^{ */
     /*     `cursor^                                                                                                                      */
@@ -916,36 +916,6 @@ name()
 }
 
 
-    /*  -------------if--------------- */
-    /* `Include:_if^                   */
-
-
-
-if ( condition )
-{
-    WRAPPED_TEXT
-    WRAPPED_TEXT_line2
-}
-
-if ( condition_TYPED )
-{
-    WRAPPED_TEXT
-    WRAPPED_TEXT_line2
-} b
-
-`if ( condition )
-{
-    WRAPPED_TEXT
-    WRAPPED_TEXT_line2
-}^
-
-a if ( condition )
-{
-    WRAPPED_TEXT
-    WRAPPED_TEXT_line2
-}
-
-
     /*  -------------if0--------------- */
     /* `Include:_if^                    */
 
@@ -1038,6 +1008,36 @@ else if ( condition )
 }
 
 
+    /*  -------------ifn0--------------- */
+    /* `Include:_if^                     */
+
+
+
+if ( 0 != var )
+{
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+}
+
+if ( 0 != var_TYPED )
+{
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+} b
+
+`if ( 0 != var )
+{
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+}^
+
+a if ( 0 != var )
+{
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+}
+
+
     /*  -------------ifn--------------- */
     /* `Include:_if^                    */
 
@@ -1068,60 +1068,60 @@ a if ( null == var )
 }
 
 
-    /*  -------------ifn0--------------- */
+    /*  -------------ifnn--------------- */
     /* `Include:_if^                     */
 
 
 
-if ( 0 != var )
+if ( null != var )
 {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }
 
-if ( 0 != var_TYPED )
+if ( null != var_TYPED )
 {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 } b
 
-`if ( 0 != var )
+`if ( null != var )
 {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }^
 
-a if ( 0 != var )
+a if ( null != var )
 {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }
 
 
-    /*  -------------ifnn--------------- */
-    /* `Include:_if^                     */
+    /*  -------------if--------------- */
+    /* `Include:_if^                   */
 
 
 
-if ( null != var )
+if ( condition )
 {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }
 
-if ( null != var_TYPED )
+if ( condition_TYPED )
 {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 } b
 
-`if ( null != var )
+`if ( condition )
 {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }^
 
-a if ( null != var )
+a if ( condition )
 {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
@@ -1550,38 +1550,6 @@ finally
 }
 
 
-    /*  -------------while---------------                   */
-    /* while`$SPcmd^(`$SParg^`condition^`$SParg^)`$BRloop^{ */
-    /*     `cursor^                                         */
-    /* }                                                    */
-
-
-
-while ( condition )
-{
-    WRAPPED_TEXT
-    WRAPPED_TEXT_line2
-}
-
-while ( condition_TYPED )
-{
-    WRAPPED_TEXT
-    WRAPPED_TEXT_line2
-} b
-
-`while ( condition )
-{
-    WRAPPED_TEXT
-    WRAPPED_TEXT_line2
-}^
-
-a while ( condition )
-{
-    WRAPPED_TEXT
-    WRAPPED_TEXT_line2
-}
-
-
     /*  -------------while0---------------                   */
     /* do`$BRloop^{                                          */
     /*     `cursor^                                          */
@@ -1682,6 +1650,38 @@ a while ( null != x )
 }
 
 
+    /*  -------------while---------------                   */
+    /* while`$SPcmd^(`$SParg^`condition^`$SParg^)`$BRloop^{ */
+    /*     `cursor^                                         */
+    /* }                                                    */
+
+
+
+while ( condition )
+{
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+}
+
+while ( condition_TYPED )
+{
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+} b
+
+`while ( condition )
+{
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+}^
+
+a while ( condition )
+{
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+}
+
+
     /*  -------------{_--------------- */
     /* {`w^}                           */
 
diff --git a/ftplugin/css/test.page b/ftplugin/css/test.page
index 85727fdb..19b13058 100644
--- a/ftplugin/css/test.page
+++ b/ftplugin/css/test.page
@@ -137,32 +137,32 @@ azimuth: left-side; b
 a azimuth: left-side;
 
 
-    /*  -------------background--------------- */
-    /* background:` `selec^;                   */
+    /*  -------------backgroundattachment--------------- */
+    /* background-attachment: `selec^;                   */
 
 
 
-background: url();
+background-attachment: scroll;
 
-background: url(_TYPED); b
+background-attachment: scroll; b
 
-`background: url();^
+`background-attachment: scroll;^
 
-a background: url();
+a background-attachment: scroll;
 
 
-    /*  -------------backgroundattachment--------------- */
-    /* background-attachment: `selec^;                   */
+    /*  -------------background--------------- */
+    /* background:` `selec^;                   */
 
 
 
-background-attachment: scroll;
+background: url();
 
-background-attachment: scroll; b
+background: url(_TYPED); b
 
-`background-attachment: scroll;^
+`background: url();^
 
-a background-attachment: scroll;
+a background: url();
 
 
     /*  -------------backgroundcolor--------------- */
@@ -235,20 +235,6 @@ background-repeat: repeat; b
 a background-repeat: repeat;
 
 
-    /*  -------------border---------------     */
-    /* border`pos^:` `thick^` `kind^` `color^; */
-
-
-
-border-top: thin none rgb();
-
-border-top: thin none rgb(_TYPED); b
-
-`border-top: thin none rgb();^
-
-a border-top: thin none rgb();
-
-
     /*  -------------borderbottomcolor--------------- */
     /* border-bottom-color:` `col^;                   */
 
@@ -333,6 +319,20 @@ border-left-color: rgb(_TYPED); b
 a border-left-color: rgb();
 
 
+    /*  -------------border---------------     */
+    /* border`pos^:` `thick^` `kind^` `color^; */
+
+
+
+border-top: thin none rgb();
+
+border-top: thin none rgb(_TYPED); b
+
+`border-top: thin none rgb();^
+
+a border-top: thin none rgb();
+
+
     /*  -------------borderleftstyle--------------- */
     /* border-left-style: `col^;                    */
 
@@ -770,20 +770,6 @@ float: left; b
 a float: left;
 
 
-    /*  -------------font--------------- */
-    /* font:` `kind`^` `size`^` `font`^; */
-
-
-
-font: normal xx-small sans-serif;
-
-font: normal xx-small sans-serif; b
-
-`font: normal xx-small sans-serif;^
-
-a font: normal xx-small sans-serif;
-
-
     /*  -------------fontfamily--------------- */
     /* font-family: `selec^;                   */
 
@@ -854,6 +840,228 @@ font-weight: normal; b
 a font-weight: normal;
 
 
+    /*  -------------font--------------- */
+    /* font:` `kind`^` `size`^` `font`^; */
+
+
+
+font: normal xx-small sans-serif;
+
+font: normal xx-small sans-serif; b
+
+`font: normal xx-small sans-serif;^
+
+a font: normal xx-small sans-serif;
+
+
+    /*  -------------globalcn---------------                                                          */
+    /* body,ul,ol,li,p,h1,h2,h3,h4,h5,h6,form,fieldset,table,td,img,div{margin:0;padding:0;border:0;} */
+    /* body{background:#fff;color:#333;font-size:12px; margin-top:5px;font-family:"宋体";}          */
+    /*                                                                                                */
+    /* ul,ol{list-style-type:none;}                                                                   */
+    /* select,input,img,select{vertical-align:middle;}                                                */
+    /*                                                                                                */
+    /* a{text-decoration:underline;}                                                                  */
+    /* a:link{color:#009;}                                                                            */
+    /* a:visited{color:#800080;}                                                                      */
+    /* a:hover,a:active,a:focus{color:#c00;}                                                          */
+    /*                                                                                                */
+    /* .clearit{clear:both;}                                                                          */
+
+
+
+body,ul,ol,li,p,h1,h2,h3,h4,h5,h6,form,fieldset,table,td,img,div{margin:0;padding:0;border:0;}
+body{background:#fff;color:#333;font-size:12px; margin-top:5px;font-family:"宋体";}
+
+ul,ol{list-style-type:none;}
+select,input,img,select{vertical-align:middle;}
+
+a{text-decoration:underline;}
+a:link{color:#009;}
+a:visited{color:#800080;}
+a:hover,a:active,a:focus{color:#c00;}
+
+.clearit{clear:both;}
+
+body,ul,ol,li,p,h1,h2,h3,h4,h5,h6,form,fieldset,table,td,img,div{margin:0;padding:0;border:0;}
+body{background:#fff;color:#333;font-size:12px; margin-top:5px;font-family:"宋体";}
+
+ul,ol{list-style-type:none;}
+select,input,img,select{vertical-align:middle;}
+
+a{text-decoration:underline;}
+a:link{color:#009;}
+a:visited{color:#800080;}
+a:hover,a:active,a:focus{color:#c00;}
+
+.clearit{clear:both;} b
+
+`body,ul,ol,li,p,h1,h2,h3,h4,h5,h6,form,fieldset,table,td,img,div{margin:0;padding:0;border:0;}
+body{background:#fff;color:#333;font-size:12px; margin-top:5px;font-family:"宋体";}
+
+ul,ol{list-style-type:none;}
+select,input,img,select{vertical-align:middle;}
+
+a{text-decoration:underline;}
+a:link{color:#009;}
+a:visited{color:#800080;}
+a:hover,a:active,a:focus{color:#c00;}
+
+.clearit{clear:both;}^
+
+a body,ul,ol,li,p,h1,h2,h3,h4,h5,h6,form,fieldset,table,td,img,div{margin:0;padding:0;border:0;}
+body{background:#fff;color:#333;font-size:12px; margin-top:5px;font-family:"宋体";}
+
+ul,ol{list-style-type:none;}
+select,input,img,select{vertical-align:middle;}
+
+a{text-decoration:underline;}
+a:link{color:#009;}
+a:visited{color:#800080;}
+a:hover,a:active,a:focus{color:#c00;}
+
+.clearit{clear:both;}
+
+
+    /*  -------------globalen---------------                                                                                            */
+    /* html{color:#000;background:#FFF}                                                                                                 */
+    /* body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,textarea,p,blockquote,th,td{margin:0;padding:0} */
+    /* table{border-collapse:collapse;border-spacing:0}                                                                                 */
+    /* fieldset,img{border:0}                                                                                                           */
+    /* address,caption,cite,code,dfn,em,strong,th,var{font-style:normal;font-weight:normal}                                             */
+    /* li{list-style:none}                                                                                                              */
+    /* caption,th{text-align:left}                                                                                                      */
+    /* h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal}                                                                             */
+    /* q:before,q:after{content:''}                                                                                                     */
+    /* abbr,acronym{border:0;font-variant:normal}                                                                                       */
+    /* sup{vertical-align:text-top}                                                                                                     */
+    /* sub{vertical-align:text-bottom}                                                                                                  */
+    /* input,textarea,select{font-family:inherit;font-size:inherit;font-weight:inherit}                                                 */
+    /* input,textarea,select{*font-size:100%}                                                                                           */
+    /* legend{color:#000}                                                                                                               */
+    /*                                                                                                                                  */
+    /* body{font:13px/1.231 arial,helvetica,clean,sans-serif;*font-size:small;*font:x-small}                                            */
+    /* select,input,button,textarea{font:99% arial,helvetica,clean,sans-serif}                                                          */
+    /* table{font-size:inherit;font:100%}                                                                                               */
+    /* pre,code,kbd,samp,tt{font-family:monospace;*font-size:108%;line-height:100%}                                                     */
+    /*                                                                                                                                  */
+    /* a{text-decoration:none}                                                                                                          */
+    /* a:hover,a:focus{text-decoration:underline}                                                                                       */
+    /* strong{font-weight:bold}                                                                                                         */
+    /* input[type=submit]{cursor:pointer}                                                                                               */
+    /* button{cursor:pointer}                                                                                                           */
+
+
+
+html{color:#000;background:#FFF}
+body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,textarea,p,blockquote,th,td{margin:0;padding:0}
+table{border-collapse:collapse;border-spacing:0}
+fieldset,img{border:0}
+address,caption,cite,code,dfn,em,strong,th,var{font-style:normal;font-weight:normal}
+li{list-style:none}
+caption,th{text-align:left}
+h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal}
+q:before,q:after{content:''}
+abbr,acronym{border:0;font-variant:normal}
+sup{vertical-align:text-top}
+sub{vertical-align:text-bottom}
+input,textarea,select{font-family:inherit;font-size:inherit;font-weight:inherit}
+input,textarea,select{*font-size:100%}
+legend{color:#000}
+
+body{font:13px/1.231 arial,helvetica,clean,sans-serif;*font-size:small;*font:x-small}
+select,input,button,textarea{font:99% arial,helvetica,clean,sans-serif}
+table{font-size:inherit;font:100%}
+pre,code,kbd,samp,tt{font-family:monospace;*font-size:108%;line-height:100%}
+
+a{text-decoration:none}
+a:hover,a:focus{text-decoration:underline}
+strong{font-weight:bold}
+input[type=submit]{cursor:pointer}
+button{cursor:pointer}
+
+html{color:#000;background:#FFF}
+body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,textarea,p,blockquote,th,td{margin:0;padding:0}
+table{border-collapse:collapse;border-spacing:0}
+fieldset,img{border:0}
+address,caption,cite,code,dfn,em,strong,th,var{font-style:normal;font-weight:normal}
+li{list-style:none}
+caption,th{text-align:left}
+h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal}
+q:before,q:after{content:''}
+abbr,acronym{border:0;font-variant:normal}
+sup{vertical-align:text-top}
+sub{vertical-align:text-bottom}
+input,textarea,select{font-family:inherit;font-size:inherit;font-weight:inherit}
+input,textarea,select{*font-size:100%}
+legend{color:#000}
+
+body{font:13px/1.231 arial,helvetica,clean,sans-serif;*font-size:small;*font:x-small}
+select,input,button,textarea{font:99% arial,helvetica,clean,sans-serif}
+table{font-size:inherit;font:100%}
+pre,code,kbd,samp,tt{font-family:monospace;*font-size:108%;line-height:100%}
+
+a{text-decoration:none}
+a:hover,a:focus{text-decoration:underline}
+strong{font-weight:bold}
+input[type=submit]{cursor:pointer}
+button{cursor:pointer} b
+
+`html{color:#000;background:#FFF}
+body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,textarea,p,blockquote,th,td{margin:0;padding:0}
+table{border-collapse:collapse;border-spacing:0}
+fieldset,img{border:0}
+address,caption,cite,code,dfn,em,strong,th,var{font-style:normal;font-weight:normal}
+li{list-style:none}
+caption,th{text-align:left}
+h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal}
+q:before,q:after{content:''}
+abbr,acronym{border:0;font-variant:normal}
+sup{vertical-align:text-top}
+sub{vertical-align:text-bottom}
+input,textarea,select{font-family:inherit;font-size:inherit;font-weight:inherit}
+input,textarea,select{*font-size:100%}
+legend{color:#000}
+
+body{font:13px/1.231 arial,helvetica,clean,sans-serif;*font-size:small;*font:x-small}
+select,input,button,textarea{font:99% arial,helvetica,clean,sans-serif}
+table{font-size:inherit;font:100%}
+pre,code,kbd,samp,tt{font-family:monospace;*font-size:108%;line-height:100%}
+
+a{text-decoration:none}
+a:hover,a:focus{text-decoration:underline}
+strong{font-weight:bold}
+input[type=submit]{cursor:pointer}
+button{cursor:pointer}^
+
+a html{color:#000;background:#FFF}
+body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,textarea,p,blockquote,th,td{margin:0;padding:0}
+table{border-collapse:collapse;border-spacing:0}
+fieldset,img{border:0}
+address,caption,cite,code,dfn,em,strong,th,var{font-style:normal;font-weight:normal}
+li{list-style:none}
+caption,th{text-align:left}
+h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal}
+q:before,q:after{content:''}
+abbr,acronym{border:0;font-variant:normal}
+sup{vertical-align:text-top}
+sub{vertical-align:text-bottom}
+input,textarea,select{font-family:inherit;font-size:inherit;font-weight:inherit}
+input,textarea,select{*font-size:100%}
+legend{color:#000}
+
+body{font:13px/1.231 arial,helvetica,clean,sans-serif;*font-size:small;*font:x-small}
+select,input,button,textarea{font:99% arial,helvetica,clean,sans-serif}
+table{font-size:inherit;font:100%}
+pre,code,kbd,samp,tt{font-family:monospace;*font-size:108%;line-height:100%}
+
+a{text-decoration:none}
+a:hover,a:focus{text-decoration:underline}
+strong{font-weight:bold}
+input[type=submit]{cursor:pointer}
+button{cursor:pointer}
+
+
     /*  -------------height--------------- */
     /* height: `^;                         */
 
@@ -1008,60 +1216,60 @@ min-width: selec_TYPED; b
 a min-width: none;
 
 
-    /*  -------------outline---------------    */
-    /* outline:` `width`^` `style`^` `color`^; */
+    /*  -------------outlinestyle--------------- */
+    /* outline-style: `selec^;                   */
 
 
 
-outline: thin none rgb();
+outline-style: none;
 
-outline: thin none rgb(_TYPED); b
+outline-style: none; b
 
-`outline: thin none rgb();^
+`outline-style: none;^
 
-a outline: thin none rgb();
+a outline-style: none;
 
 
-    /*  -------------outlinecolor--------------- */
-    /* outline-color:` `selec^;                  */
+    /*  -------------outlinewidth--------------- */
+    /* outline-width: `selec^;                   */
 
 
 
-outline-color: rgb();
+outline-width: thin;
 
-outline-color: rgb(_TYPED); b
+outline-width: thin; b
 
-`outline-color: rgb();^
+`outline-width: thin;^
 
-a outline-color: rgb();
+a outline-width: thin;
 
 
-    /*  -------------outlinestyle--------------- */
-    /* outline-style: `selec^;                   */
+    /*  -------------outline---------------    */
+    /* outline:` `width`^` `style`^` `color`^; */
 
 
 
-outline-style: none;
+outline: thin none rgb();
 
-outline-style: none; b
+outline: thin none rgb(_TYPED); b
 
-`outline-style: none;^
+`outline: thin none rgb();^
 
-a outline-style: none;
+a outline: thin none rgb();
 
 
-    /*  -------------outlinewidth--------------- */
-    /* outline-width: `selec^;                   */
+    /*  -------------outlinecolor--------------- */
+    /* outline-color:` `selec^;                  */
 
 
 
-outline-width: thin;
+outline-color: rgb();
 
-outline-width: thin; b
+outline-color: rgb(_TYPED); b
 
-`outline-width: thin;^
+`outline-color: rgb();^
 
-a outline-width: thin;
+a outline-color: rgb();
 
 
     /*  -------------overflow--------------- */
diff --git a/ftplugin/dot/test.page b/ftplugin/dot/test.page
index 5a73d7f2..80b51980 100644
--- a/ftplugin/dot/test.page
+++ b/ftplugin/dot/test.page
@@ -177,24 +177,6 @@ node_TYPED [shape=box label_TYPED]
    
 
 
-    /*  -------------comment--------------- */
-    /* `$CL^ `what^^ `$CR^`^                */
-
-
-
-/* WRAPPED_TEXT
-WRAPPED_TEXT_line2 */
-
-   /* WRAPPED_TEXT
-   WRAPPED_TEXT_line2 */ b
-
-   `/* WRAPPED_TEXT
-   WRAPPED_TEXT_line2 */^
-
-   a /* WRAPPED_TEXT
-   WRAPPED_TEXT_line2 */
-
-
     /*  -------------commentBlock--------------- */
     /* `$_xCommentLeftWithoutMid^`$CM `cursor^   */
     /* `$_xCommentMidIndent$CR^                  */
@@ -264,6 +246,24 @@ WRAPPED_TEXT_line2 */
       /* WRAPPED_TEXT_line2 */
 
 
+    /*  -------------comment--------------- */
+    /* `$CL^ `what^^ `$CR^`^                */
+
+
+
+/* WRAPPED_TEXT
+WRAPPED_TEXT_line2 */
+
+    /* WRAPPED_TEXT
+    WRAPPED_TEXT_line2 */ b
+
+    `/* WRAPPED_TEXT
+    WRAPPED_TEXT_line2 */^
+
+    a /* WRAPPED_TEXT
+    WRAPPED_TEXT_line2 */
+
+
     /*  -------------diamond---------------                    */
     /* `node^ [shape=`shape^` `label...{{^, label="`lbl^"`}}^] */
 
diff --git a/ftplugin/eruby/eruby.ftdetect.vim b/ftplugin/eruby/eruby.ftdetect.vim
index 6007ea93..8d9ad42d 100644
--- a/ftplugin/eruby/eruby.ftdetect.vim
+++ b/ftplugin/eruby/eruby.ftdetect.vim
@@ -37,7 +37,7 @@ let s:topFT = 'eruby'
 fun! XPT_erubyFiletypeDetect() "{{{
     let pos = [ line( "." ), col( "." ) ]
 
-    let synName = g:xptutil.XPTgetCurrentOrPreviousSynName()
+    let synName = xpt#util#NearestSynName()
 
     if synName == ''
         " top level ft is html
diff --git a/ftplugin/eruby/test.page b/ftplugin/eruby/test.page
index 1a027ab3..0a1b6281 100644
--- a/ftplugin/eruby/test.page
+++ b/ftplugin/eruby/test.page
@@ -109,6 +109,20 @@ a `WRAPPED_TEXT
 WRAPPED_TEXT_line2`
 
 
+    <%#  -------------Author--------------- %>
+    <%# `$author^                           %>
+
+
+
+    drdr.xp
+
+    drdr.xp b
+
+    `drdr.xp^
+
+    a drdr.xp
+
+
     <%#  -------------a--------------- %>
     <%# <a href="`href^">`cursor^</a>  %>
 
@@ -127,20 +141,6 @@ a <a href="href">WRAPPED_TEXT
 WRAPPED_TEXT_line2</a>
 
 
-    <%#  -------------Author--------------- %>
-    <%# `$author^                           %>
-
-
-
-    drdr.xp
-
-    drdr.xp b
-
-    `drdr.xp^
-
-    a drdr.xp
-
-
     <%#  -------------body--------------- %>
     <%# <body>                            %>
     <%#     `cursor^                      %>
@@ -636,6 +636,48 @@ WRAPPED_TEXT_line2
     </html>
 
 
+    <%#  -------------ibutton---------------                                   %>
+    <%# <input type="`Echo($_xSnipName[1:])^" name="`name^" value="`value^" /> %>
+
+
+
+    <input type="button" name="name" value="value" />
+
+    <input type="button" name="name_TYPED" value="value_TYPED" /> b
+
+    `<input type="button" name="name" value="value" />^
+
+    a <input type="button" name="name" value="value" />
+
+
+    <%#  -------------icheckbox---------------                                 %>
+    <%# <input type="`Echo($_xSnipName[1:])^" name="`name^" value="`value^" /> %>
+
+
+
+    <input type="checkbox" name="name" value="value" />
+
+    <input type="checkbox" name="name_TYPED" value="value_TYPED" /> b
+
+    `<input type="checkbox" name="name" value="value" />^
+
+    a <input type="checkbox" name="name" value="value" />
+
+
+    <%#  -------------ifile---------------                                     %>
+    <%# <input type="`Echo($_xSnipName[1:])^" name="`name^" value="`value^" /> %>
+
+
+
+    <input type="file" name="name" value="value" />
+
+    <input type="file" name="name_TYPED" value="value_TYPED" /> b
+
+    `<input type="file" name="name" value="value" />^
+
+    a <input type="file" name="name" value="value" />
+
+
     <%#  -------------iframe---------------                                           %>
     <%# <`$_xSnipName^` `att?^>`content^^`content^html_cont_helper()^</`$_xSnipName^> %>
 
@@ -658,6 +700,34 @@ WRAPPED_TEXT_line2
 </iframe>
 
 
+    <%#  -------------ihidden---------------                                   %>
+    <%# <input type="`Echo($_xSnipName[1:])^" name="`name^" value="`value^" /> %>
+
+
+
+    <input type="hidden" name="name" value="value" />
+
+    <input type="hidden" name="name_TYPED" value="value_TYPED" /> b
+
+    `<input type="hidden" name="name" value="value" />^
+
+    a <input type="hidden" name="name" value="value" />
+
+
+    <%#  -------------iimage---------------                                    %>
+    <%# <input type="`Echo($_xSnipName[1:])^" name="`name^" value="`value^" /> %>
+
+
+
+    <input type="image" name="name" value="value" />
+
+    <input type="image" name="name_TYPED" value="value_TYPED" /> b
+
+    `<input type="image" name="name" value="value" />^
+
+    a <input type="image" name="name" value="value" />
+
+
     <%#  -------------img--------------- %>
     <%# <`$_xSnipName^` `att?^/>         %>
 
@@ -686,6 +756,76 @@ WRAPPED_TEXT_line2
     a <input type="text" name="name" value="value"/>
 
 
+    <%#  -------------ipassword---------------                                 %>
+    <%# <input type="`Echo($_xSnipName[1:])^" name="`name^" value="`value^" /> %>
+
+
+
+    <input type="password" name="name" value="value" />
+
+    <input type="password" name="name_TYPED" value="value_TYPED" /> b
+
+    `<input type="password" name="name" value="value" />^
+
+    a <input type="password" name="name" value="value" />
+
+
+    <%#  -------------iradio---------------                                    %>
+    <%# <input type="`Echo($_xSnipName[1:])^" name="`name^" value="`value^" /> %>
+
+
+
+    <input type="radio" name="name" value="value" />
+
+    <input type="radio" name="name_TYPED" value="value_TYPED" /> b
+
+    `<input type="radio" name="name" value="value" />^
+
+    a <input type="radio" name="name" value="value" />
+
+
+    <%#  -------------ireset---------------                                    %>
+    <%# <input type="`Echo($_xSnipName[1:])^" name="`name^" value="`value^" /> %>
+
+
+
+    <input type="reset" name="name" value="value" />
+
+    <input type="reset" name="name_TYPED" value="value_TYPED" /> b
+
+    `<input type="reset" name="name" value="value" />^
+
+    a <input type="reset" name="name" value="value" />
+
+
+    <%#  -------------isubmit---------------                                   %>
+    <%# <input type="`Echo($_xSnipName[1:])^" name="`name^" value="`value^" /> %>
+
+
+
+    <input type="submit" name="name" value="value" />
+
+    <input type="submit" name="name_TYPED" value="value_TYPED" /> b
+
+    `<input type="submit" name="name" value="value" />^
+
+    a <input type="submit" name="name" value="value" />
+
+
+    <%#  -------------itext---------------                                     %>
+    <%# <input type="`Echo($_xSnipName[1:])^" name="`name^" value="`value^" /> %>
+
+
+
+    <input type="text" name="name" value="value" />
+
+    <input type="text" name="name_TYPED" value="value_TYPED" /> b
+
+    `<input type="text" name="name" value="value" />^
+
+    a <input type="text" name="name" value="value" />
+
+
     <%#  -------------label---------------                                            %>
     <%# <`$_xSnipName^` `att?^>`content^^`content^html_cont_helper()^</`$_xSnipName^> %>
 
@@ -824,32 +964,32 @@ WRAPPED_TEXT_line2
 </p>
 
 
-    <%#  -------------r--------------- %>
-    <%# <% `cursor^ _cmt_              %>
+    <%#  -------------rc--------------- %>
+    <%# _CMT_ `cursor^ _cmt_            %>
 
 
 
-    <%  %>
+    <%#  %>
 
-    <%  %> b
+    <%#  %> b
 
-    `<%  %>^
+    `<%#  %>^
 
-    a <%  %>
+    a <%#  %>
 
 
-    <%#  -------------rc--------------- %>
-    <%# _CMT_ `cursor^ _cmt_            %>
+    <%#  -------------r--------------- %>
+    <%# <% `cursor^ _cmt_              %>
 
 
 
-    <%#  %>
+    <%  %>
 
-    <%#  %> b
+    <%  %> b
 
-    `<%#  %>^
+    `<%  %>^
 
-    a <%#  %>
+    a <%  %>
 
 
     <%#  -------------re--------------- %>
diff --git a/ftplugin/factor/test.page b/ftplugin/factor/test.page
index af13ed58..895ebfcf 100644
--- a/ftplugin/factor/test.page
+++ b/ftplugin/factor/test.page
@@ -379,16 +379,16 @@ a [  ] map
 
 
 USING: kernel sequences accessors ;
-IN: src..home.xp.VCS.hg.bash.xp.vim.xp.plugins.extern.xpt.gitsvn.src.ftplugin.test
+IN: src..Users.drmingdrmer.bash.xp.vim.xp.plugins.extern.xpt.gitsvn.src.ftplugin.test
 
 USING: kernel sequences accessors ;
-IN: src..home.xp.VCS.hg.bash.xp.vim.xp.plugins.extern.xpt.gitsvn.src.ftplugin.test b
+IN: src..Users.drmingdrmer.bash.xp.vim.xp.plugins.extern.xpt.gitsvn.src.ftplugin.test b
 
 `USING: kernel sequences accessors ;
-IN: src..home.xp.VCS.hg.bash.xp.vim.xp.plugins.extern.xpt.gitsvn.src.ftplugin.test^
+IN: src..Users.drmingdrmer.bash.xp.vim.xp.plugins.extern.xpt.gitsvn.src.ftplugin.test^
 
 a USING: kernel sequences accessors ;
-IN: src..home.xp.VCS.hg.bash.xp.vim.xp.plugins.extern.xpt.gitsvn.src.ftplugin.test
+IN: src..Users.drmingdrmer.bash.xp.vim.xp.plugins.extern.xpt.gitsvn.src.ftplugin.test
 
 
     /*  -------------quote--------------- */
diff --git a/ftplugin/go/go.xpt.vim b/ftplugin/go/go.xpt.vim
new file mode 100644
index 00000000..454cc25c
--- /dev/null
+++ b/ftplugin/go/go.xpt.vim
@@ -0,0 +1,179 @@
+XPTemplate priority=lang
+
+let s:f = g:XPTfuncs()
+
+fun! s:f.MakeIntType( n )
+    let n = a:n
+    return matchstr(n, '\v^u') . "int" . matchstr(n, '\v\d+$' )
+endfunction
+
+XPTvar $TRUE          true
+XPTvar $FALSE         false
+XPTvar $NULL          nil
+XPTvar $UNDEFINED     nil
+
+XPTvar $SParg      ''
+
+XPTinclude
+      \ _common/common
+      \ _comment/c.like
+
+
+XPT _dec hidden " $_xSnipName
+`$_xSnipName^ 
+
+XPT package alias=_dec
+XPT import alias=_dec
+XPT type alias=_dec
+XPT const alias=_dec
+XPT var alias=_dec
+
+XPT _int " MakeIntType($_xSnipName)
+`MakeIntType($_xSnipName)^
+
+XPT i8  alias=_int
+XPT i16 alias=_int
+XPT i32 alias=_int
+XPT i64 alias=_int
+XPT u8  alias=_int
+XPT u16 alias=_int
+XPT u32 alias=_int
+XPT u64 alias=_int
+
+XPT struct " struct {
+struct {
+    `cursor^
+}
+
+XPT func wrap " func () int {
+func `n^(`p?^)` `int?^ {
+    `cursor^
+}
+XPT meth wrap " func (*T) () int {
+func (`^) `n^(`p?^)` `int?^ {
+    `cursor^
+}
+XPT go " go func (){}()
+go func (`p?^) {
+    `cursor^
+}()
+XPT tfunc " func Test
+func Test`^(t *testing.T) {
+    `cursor^
+}
+XPT bfunc " func Test
+func Benchmark`^(b *testing.B) {
+    `cursor^
+
+    for ii := 0; i < b.N; i++ {
+    }
+}
+XPT main " func main\()
+func main() {
+    `cursor^
+}
+
+XPT println " fmt.Println\()
+fmt.Println( `^ )
+XPT sprintf " fmt.Sprintf\()
+fmt.Sprintf( `^ )
+
+XPT forever " for ;;
+for ;; {
+    `cursor^
+}
+XPT for wrap " for i=0; i<10; i++
+for `i^ := `0^; `i^ < `10^; `i^++ {
+    `cursor^
+}
+XPT forr wrap " for i=10; i>=0; i--
+for `i^ := `10^; `i^ >= `0^; `i^-- {
+    `cursor^
+}
+XPT forrange wrap " for range
+for `_^, `^ := range `^ {
+    `cursor^
+}
+XPT forin wrap alias=forrange
+
+XPT if wrap " if {
+if `^ {
+    `cursor^
+}
+XPT iftype wrap " if _, ok := x.(type); ok { ... }
+if _, ok := `x^.( `tp^ ); ok {
+    `cursor^
+}
+XPT _ifeq wrap hidden " if x == $v {
+XSET $v=0
+if `^ == `$v^ {
+    `cursor^
+}
+XPT _ifne wrap hidden " if x != $v {
+XSET $v=0
+if `x^ != `$v^ {
+    `cursor^
+}
+XPT iferr " if err != nil {
+if err != nil {
+    `cursor^
+}
+XPT ifn alias=_ifeq
+XSET $v=nil
+XPT ifnn alias=_ifne
+XSET $v=nil
+XPT if0 alias=_ifeq
+XSET $v=0
+XPT ifn0 alias=_ifne
+XSET $v=0
+XPT else
+else {
+    `cursor^
+}
+
+XPT mps " map[string]
+map[`string^]`T^
+XPT mpi " map[string]
+map[`int^]`T^
+
+XPT mkc " make\(chan X, n, capa?)
+make(chan `bool^, `0^`, `capa?^)
+XPT mks " make\([]X, n, capa?)
+make([]`bool^, `0^`, `capa?^)
+XPT mkm " make\(map[X]Y, n, capa?)
+make(map[`string^]`bool^`, `capa?^)
+XPT mkms " make\(map[string]Y, n, capa?)
+make(map[string]`bool^`, `capa?^)
+
+XPT sel " select
+select {
+case `^:
+    `cursor^
+}
+XPT selc " select x <-ch
+select {
+case ``x?` := ^<-`ch^:
+    `cursor^
+}
+
+XPT switch " switch x {
+switch `^ {
+case `^:
+    `cursor^
+}
+XPT default " default:
+default:
+    `cursor^
+
+XPT test " if .. t.Errorf
+if `^ {} else {
+    t.Errorf( `^ )
+}
+XPT ttype " if _, ok := x.(type); ok { ... }
+if _, ok := `x^.( `tp^ ); ok {} else {
+    t.Errorf( "Expect `x^ to be `tp^ but: %v", `x^ )
+}
+XPT assert " if .. t.Errorf
+if `^ {} else {
+    t.Fatalf( `^ )
+}
diff --git a/ftplugin/haskell/test.page b/ftplugin/haskell/test.page
index 061fd64c..591e717c 100644
--- a/ftplugin/haskell/test.page
+++ b/ftplugin/haskell/test.page
@@ -431,51 +431,6 @@ WRAPPED_TEXT_line2`
      
 
 
-    --   -------------datasum---------------                         
-    --  data `context...{{~(`ctxt~) => `}}~`typename~`typeParams~ ~= 
-    --      `Constructor~ `ctorParams~VOID()~`                       
-    --    `...~                                                      
-    --      | `Ctor~ `params~VOID()~                                 
-    --      `...~                                                    
-    --      `deriving...{{~deriving (`Eq,Show~)`}}~                  
-    --  `cursor~                                                     
-
-
-
-    data (ctxt) => typename =
-        Constructor 
-        | Ctor 
-        
-        | Ctor 
-        
-        deriving (Eq,Show)
-    
-
-    data context_TYPEDtypename_TYPEDtypeParams_TYPED=
-        Constructor_TYPED ctorParams_TYPED
-      _TYPED
-        deriving_TYPED
-     b
-
-     `data (ctxt) => typename =
-         Constructor 
-         | Ctor 
-         
-         | Ctor 
-         
-         deriving (Eq,Show)
-     ^
-
-     a data (ctxt) => typename =
-         Constructor 
-         | Ctor 
-         
-         | Ctor 
-         
-         deriving (Eq,Show)
-     
-
-
     --   -------------datasumcom---------------                        
     --  _CMT_| `typeDescr~VOID()~                                      
     --  data `context...{{~(`ctxt~) => `}}~`typename~` `typeParams~ ~= 
@@ -532,6 +487,51 @@ WRAPPED_TEXT_line2`
      
 
 
+    --   -------------datasum---------------                         
+    --  data `context...{{~(`ctxt~) => `}}~`typename~`typeParams~ ~= 
+    --      `Constructor~ `ctorParams~VOID()~`                       
+    --    `...~                                                      
+    --      | `Ctor~ `params~VOID()~                                 
+    --      `...~                                                    
+    --      `deriving...{{~deriving (`Eq,Show~)`}}~                  
+    --  `cursor~                                                     
+
+
+
+    data (ctxt) => typename =
+        Constructor 
+        | Ctor 
+        
+        | Ctor 
+        
+        deriving (Eq,Show)
+    
+
+    data context_TYPEDtypename_TYPEDtypeParams_TYPED=
+        Constructor_TYPED ctorParams_TYPED
+      _TYPED
+        deriving_TYPED
+     b
+
+     `data (ctxt) => typename =
+         Constructor 
+         | Ctor 
+         
+         | Ctor 
+         
+         deriving (Eq,Show)
+     ^
+
+     a data (ctxt) => typename =
+         Constructor 
+         | Ctor 
+         
+         | Ctor 
+         
+         deriving (Eq,Show)
+     
+
+
     --   -------------deriving---------------        
     --  deriving (`classname~`...~,`classname~`...~) 
 
@@ -616,65 +616,65 @@ WRAPPED_TEXT_line2`
     a foldr (\ e acc -> expr) init lst
 
 
-    --   -------------fun---------------       
-    --  `funName~ `pattern~ = `def~`           
+    --   -------------funcom---------------    
+    --  _CMT_| `function_description~          
+    --  `funName~ :: `type~                    
+    --  `name~R("funName")~ `pattern~ = `def~` 
     --  `...{{~                                
     --  `name~R("funName")~ `pattern~ = `def~` 
     --  `...~`}}~                              
 
 
 
+    -- | function_description
+    funName :: type
     funName pattern = def
     funName pattern = def
     funName pattern = def
     funName pattern = def
 
-    funName_TYPED pattern_TYPED = def_TYPED
+    -- | function_description_TYPED
+    funName_TYPED :: type_TYPED
+    name_TYPED pattern_TYPED = def_TYPED
     _TYPED b
 
-    `funName pattern = def
+    `-- | function_description
+    funName :: type
+    funName pattern = def
     funName pattern = def
     funName pattern = def
     funName pattern = def^
 
-    a funName pattern = def
+    a -- | function_description
+    funName :: type
+    funName pattern = def
     funName pattern = def
     funName pattern = def
     funName pattern = def
 
 
-    --   -------------funcom---------------    
-    --  _CMT_| `function_description~          
-    --  `funName~ :: `type~                    
-    --  `name~R("funName")~ `pattern~ = `def~` 
+    --   -------------fun---------------       
+    --  `funName~ `pattern~ = `def~`           
     --  `...{{~                                
     --  `name~R("funName")~ `pattern~ = `def~` 
     --  `...~`}}~                              
 
 
 
-    -- | function_description
-    funName :: type
     funName pattern = def
     funName pattern = def
     funName pattern = def
     funName pattern = def
 
-    -- | function_description_TYPED
-    funName_TYPED :: type_TYPED
-    name_TYPED pattern_TYPED = def_TYPED
+    funName_TYPED pattern_TYPED = def_TYPED
     _TYPED b
 
-    `-- | function_description
-    funName :: type
-    funName pattern = def
+    `funName pattern = def
     funName pattern = def
     funName pattern = def
     funName pattern = def^
 
-    a -- | function_description
-    funName :: type
-    funName pattern = def
+    a funName pattern = def
     funName pattern = def
     funName pattern = def
     funName pattern = def
@@ -838,15 +838,15 @@ WRAPPED_TEXT_line2`
 
 
 
-    module .Home.Xp.VCS.Hg.Bash.xp.Vim.xp.Plugins.extern.Xpt.gitsvn.Src.Ftplugin.Haskell.Test ( 
+    module .Users.Drmingdrmer.Bash.xp.Vim.xp.Plugins.extern.Xpt.gitsvn.Src.Ftplugin.Haskell.Test ( 
         ) where
 
     module moduleName_TYPED exports_TYPEDwhere b
 
-    `module .Home.Xp.VCS.Hg.Bash.xp.Vim.xp.Plugins.extern.Xpt.gitsvn.Src.Ftplugin.Haskell.Test ( 
+    `module .Users.Drmingdrmer.Bash.xp.Vim.xp.Plugins.extern.Xpt.gitsvn.Src.Ftplugin.Haskell.Test ( 
         ) where^
 
-    a module .Home.Xp.VCS.Hg.Bash.xp.Vim.xp.Plugins.extern.Xpt.gitsvn.Src.Ftplugin.Haskell.Test ( 
+    a module .Users.Drmingdrmer.Bash.xp.Vim.xp.Plugins.extern.Xpt.gitsvn.Src.Ftplugin.Haskell.Test ( 
         ) where
 
 
diff --git a/ftplugin/html/html.ftdetect.vim b/ftplugin/html/html.ftdetect.vim
index 7b3869c5..958a0f63 100644
--- a/ftplugin/html/html.ftdetect.vim
+++ b/ftplugin/html/html.ftdetect.vim
@@ -29,7 +29,7 @@ let s:pattern = {
 
 fun! XPT_htmlFiletypeDetect() "{{{
     let pos = [ line( "." ), col( "." ) ]
-    let synName = g:xptutil.XPTgetCurrentOrPreviousSynName()
+    let synName = xpt#util#NearestSynName()
 
     if synName == ''
         " no character at current position or before curernt position
diff --git a/ftplugin/html/test.page b/ftplugin/html/test.page
index 5ed41daf..cfe12917 100644
--- a/ftplugin/html/test.page
+++ b/ftplugin/html/test.page
@@ -109,6 +109,20 @@ a `WRAPPED_TEXT
 WRAPPED_TEXT_line2`
 
 
+    <!--  -------------Author--------------- -->
+    <!-- `$author^                           -->
+
+
+
+    drdr.xp
+
+    drdr.xp b
+
+    `drdr.xp^
+
+    a drdr.xp
+
+
     <!--  -------------a--------------- -->
     <!-- <a href="`href^">`cursor^</a>  -->
 
@@ -127,20 +141,6 @@ a <a href="href">WRAPPED_TEXT
 WRAPPED_TEXT_line2</a>
 
 
-    <!--  -------------Author--------------- -->
-    <!-- `$author^                           -->
-
-
-
-    drdr.xp
-
-    drdr.xp b
-
-    `drdr.xp^
-
-    a drdr.xp
-
-
     <!--  -------------body--------------- -->
     <!-- <body>                            -->
     <!--     `cursor^                      -->
@@ -636,6 +636,48 @@ a <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.
 </html>
 
 
+    <!--  -------------ibutton---------------                                   -->
+    <!-- <input type="`Echo($_xSnipName[1:])^" name="`name^" value="`value^" /> -->
+
+
+
+    <input type="button" name="name" value="value" />
+
+    <input type="button" name="name_TYPED" value="value_TYPED" /> b
+
+    `<input type="button" name="name" value="value" />^
+
+    a <input type="button" name="name" value="value" />
+
+
+    <!--  -------------icheckbox---------------                                 -->
+    <!-- <input type="`Echo($_xSnipName[1:])^" name="`name^" value="`value^" /> -->
+
+
+
+    <input type="checkbox" name="name" value="value" />
+
+    <input type="checkbox" name="name_TYPED" value="value_TYPED" /> b
+
+    `<input type="checkbox" name="name" value="value" />^
+
+    a <input type="checkbox" name="name" value="value" />
+
+
+    <!--  -------------ifile---------------                                     -->
+    <!-- <input type="`Echo($_xSnipName[1:])^" name="`name^" value="`value^" /> -->
+
+
+
+    <input type="file" name="name" value="value" />
+
+    <input type="file" name="name_TYPED" value="value_TYPED" /> b
+
+    `<input type="file" name="name" value="value" />^
+
+    a <input type="file" name="name" value="value" />
+
+
     <!--  -------------iframe---------------                                           -->
     <!-- <`$_xSnipName^` `att?^>`content^^`content^html_cont_helper()^</`$_xSnipName^> -->
 
@@ -658,6 +700,34 @@ WRAPPED_TEXT_line2
 </iframe>
 
 
+    <!--  -------------ihidden---------------                                   -->
+    <!-- <input type="`Echo($_xSnipName[1:])^" name="`name^" value="`value^" /> -->
+
+
+
+    <input type="hidden" name="name" value="value" />
+
+    <input type="hidden" name="name_TYPED" value="value_TYPED" /> b
+
+    `<input type="hidden" name="name" value="value" />^
+
+    a <input type="hidden" name="name" value="value" />
+
+
+    <!--  -------------iimage---------------                                    -->
+    <!-- <input type="`Echo($_xSnipName[1:])^" name="`name^" value="`value^" /> -->
+
+
+
+    <input type="image" name="name" value="value" />
+
+    <input type="image" name="name_TYPED" value="value_TYPED" /> b
+
+    `<input type="image" name="name" value="value" />^
+
+    a <input type="image" name="name" value="value" />
+
+
     <!--  -------------img--------------- -->
     <!-- <`$_xSnipName^` `att?^/>         -->
 
@@ -686,6 +756,76 @@ WRAPPED_TEXT_line2
     a <input type="text" name="name" value="value"/>
 
 
+    <!--  -------------ipassword---------------                                 -->
+    <!-- <input type="`Echo($_xSnipName[1:])^" name="`name^" value="`value^" /> -->
+
+
+
+    <input type="password" name="name" value="value" />
+
+    <input type="password" name="name_TYPED" value="value_TYPED" /> b
+
+    `<input type="password" name="name" value="value" />^
+
+    a <input type="password" name="name" value="value" />
+
+
+    <!--  -------------iradio---------------                                    -->
+    <!-- <input type="`Echo($_xSnipName[1:])^" name="`name^" value="`value^" /> -->
+
+
+
+    <input type="radio" name="name" value="value" />
+
+    <input type="radio" name="name_TYPED" value="value_TYPED" /> b
+
+    `<input type="radio" name="name" value="value" />^
+
+    a <input type="radio" name="name" value="value" />
+
+
+    <!--  -------------ireset---------------                                    -->
+    <!-- <input type="`Echo($_xSnipName[1:])^" name="`name^" value="`value^" /> -->
+
+
+
+    <input type="reset" name="name" value="value" />
+
+    <input type="reset" name="name_TYPED" value="value_TYPED" /> b
+
+    `<input type="reset" name="name" value="value" />^
+
+    a <input type="reset" name="name" value="value" />
+
+
+    <!--  -------------isubmit---------------                                   -->
+    <!-- <input type="`Echo($_xSnipName[1:])^" name="`name^" value="`value^" /> -->
+
+
+
+    <input type="submit" name="name" value="value" />
+
+    <input type="submit" name="name_TYPED" value="value_TYPED" /> b
+
+    `<input type="submit" name="name" value="value" />^
+
+    a <input type="submit" name="name" value="value" />
+
+
+    <!--  -------------itext---------------                                     -->
+    <!-- <input type="`Echo($_xSnipName[1:])^" name="`name^" value="`value^" /> -->
+
+
+
+    <input type="text" name="name" value="value" />
+
+    <input type="text" name="name_TYPED" value="value_TYPED" /> b
+
+    `<input type="text" name="name" value="value" />^
+
+    a <input type="text" name="name" value="value" />
+
+
     <!--  -------------label---------------                                            -->
     <!-- <`$_xSnipName^` `att?^>`content^^`content^html_cont_helper()^</`$_xSnipName^> -->
 
@@ -708,6 +848,20 @@ WRAPPED_TEXT_line2
 </label>
 
 
+    <!--  -------------link---------------                               -->
+    <!-- <link rel="`stylesheet^" type="`type^text/css^" href="`url^" /> -->
+
+
+
+    <link rel="stylesheet" type="text/css" href="url" />
+
+    <link rel="stylesheet_TYPED" type="type_TYPED" href="url_TYPED" /> b
+
+    `<link rel="stylesheet" type="text/css" href="url" />^
+
+    a <link rel="stylesheet" type="text/css" href="url" />
+
+
     <!--  -------------li---------------                                       -->
     <!-- <`$_xSnipName^>`content^^`content^html_cont_helper()^</`$_xSnipName^> -->
 
@@ -730,20 +884,6 @@ WRAPPED_TEXT_line2
 </li>
 
 
-    <!--  -------------link---------------                               -->
-    <!-- <link rel="`stylesheet^" type="`type^text/css^" href="`url^" /> -->
-
-
-
-    <link rel="stylesheet" type="text/css" href="url" />
-
-    <link rel="stylesheet_TYPED" type="type_TYPED" href="url_TYPED" /> b
-
-    `<link rel="stylesheet" type="text/css" href="url" />^
-
-    a <link rel="stylesheet" type="text/css" href="url" />
-
-
     <!--  -------------meta---------------                    -->
     <!-- <meta name="`meta_name^" content="`meta_content^" /> -->
 
diff --git a/ftplugin/htmldjango/htmldjango.ftdetect.vim b/ftplugin/htmldjango/htmldjango.ftdetect.vim
index 52d5b350..52880ed3 100644
--- a/ftplugin/htmldjango/htmldjango.ftdetect.vim
+++ b/ftplugin/htmldjango/htmldjango.ftdetect.vim
@@ -43,7 +43,7 @@ let s:topFT = 'htmldjango'
 fun! XPT_htmldjangoFiletypeDetect() "{{{
     let pos = [ line( "." ), col( "." ) ]
 
-    let synName = g:xptutil.XPTgetCurrentOrPreviousSynName()
+    let synName = xpt#util#NearestSynName()
 
     if synName == ''
 
diff --git a/ftplugin/htmldjango/test.page b/ftplugin/htmldjango/test.page
index 7d795ff2..ffb02267 100644
--- a/ftplugin/htmldjango/test.page
+++ b/ftplugin/htmldjango/test.page
@@ -91,6 +91,46 @@ a [WRAPPED_TEXT
 WRAPPED_TEXT_line2]
 
 
+    <!--  -------------_if--------------- -->
+    <!-- {% `$_xSnipName^ `param^ %}      -->
+    <!--     `content^                    -->
+    <!-- `else...{{^{% else %}            -->
+    <!--     `content^`}}^                -->
+    <!-- {% end`$_xSnipName^ %}           -->
+
+
+
+{% _if param %}
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+{% else %}
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+{% end_if %}
+
+{% _if param_TYPED %}
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+else_TYPED
+{% end_if %} b
+
+`{% _if param %}
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+{% else %}
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+{% end_if %}^
+
+a {% _if param %}
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+{% else %}
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+{% end_if %}
+
+
     <!--  -------------`_--------------- -->
     <!-- \``w^\`                         -->
 
@@ -109,6 +149,24 @@ a `WRAPPED_TEXT
 WRAPPED_TEXT_line2`
 
 
+    <!--  -------------a--------------- -->
+    <!-- <a href="`href^">`cursor^</a>  -->
+
+
+
+<a href="href">WRAPPED_TEXT
+WRAPPED_TEXT_line2</a>
+
+<a href="href_TYPED">WRAPPED_TEXT
+WRAPPED_TEXT_line2</a> b
+
+`<a href="href">WRAPPED_TEXT
+WRAPPED_TEXT_line2</a>^
+
+a <a href="href">WRAPPED_TEXT
+WRAPPED_TEXT_line2</a>
+
+
     <!--  -------------Author--------------- -->
     <!-- `$author^                           -->
 
@@ -123,6 +181,307 @@ WRAPPED_TEXT_line2`
     a drdr.xp
 
 
+    <!--  -------------autoescape--------------- -->
+    <!-- {% `$_xSnipName^ `params^ %}            -->
+    <!--     `content^                           -->
+    <!-- {% end`$_xSnipName^ %}                  -->
+
+
+
+{% autoescape params %}
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+{% endautoescape %}
+
+{% autoescape params_TYPED %}
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+{% endautoescape %} b
+
+`{% autoescape params %}
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+{% endautoescape %}^
+
+a {% autoescape params %}
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+{% endautoescape %}
+
+
+    <!--  -------------block--------------- -->
+    <!-- {% `$_xSnipName^ `params^ %}       -->
+    <!--     `content^                      -->
+    <!-- {% end`$_xSnipName^ %}             -->
+
+
+
+{% block params %}
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+{% endblock %}
+
+{% block params_TYPED %}
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+{% endblock %} b
+
+`{% block params %}
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+{% endblock %}^
+
+a {% block params %}
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+{% endblock %}
+
+
+    <!--  -------------body--------------- -->
+    <!-- <body>                            -->
+    <!--     `cursor^                      -->
+    <!-- </body>                           -->
+
+
+
+<body>
+    
+</body>
+
+<body>
+    
+</body> b
+
+`<body>
+    
+</body>^
+
+a <body>
+    
+</body>
+
+
+    <!--  -------------br--------------- -->
+    <!-- <`$_xSnipName^ />               -->
+
+
+
+    <br />
+
+    <br /> b
+
+    `<br />^
+
+    a <br />
+
+
+    <!--  -------------cdata--------------- -->
+    <!-- <![CDATA[`cursor^]]>               -->
+
+
+
+<![CDATA[WRAPPED_TEXT
+WRAPPED_TEXT_line2]]>
+
+<![CDATA[WRAPPED_TEXT
+WRAPPED_TEXT_line2]]> b
+
+`<![CDATA[WRAPPED_TEXT
+WRAPPED_TEXT_line2]]>^
+
+a <![CDATA[WRAPPED_TEXT
+WRAPPED_TEXT_line2]]>
+
+
+    <!--  -------------commentBlock--------------- -->
+    <!-- `$_xCommentLeftWithoutMid^`$CM `cursor^   -->
+    <!-- `$_xCommentMidIndent$CR^                  -->
+
+
+
+<!-- WRAPPED_TEXT
+     WRAPPED_TEXT_line2
+    -->
+
+    <!-- WRAPPED_TEXT
+         WRAPPED_TEXT_line2
+        --> b
+
+        `<!-- WRAPPED_TEXT
+              WRAPPED_TEXT_line2
+            -->^
+
+            a <!-- WRAPPED_TEXT
+                   WRAPPED_TEXT_line2
+                -->
+
+
+    <!--  -------------commentDoc--------------- -->
+    <!-- `$CL^`$CM^                              -->
+    <!-- `$_xCommentMidIndent$CM `cursor^        -->
+    <!-- `$_xCommentMidIndent$CR^                -->
+
+
+
+<!--
+     WRAPPED_TEXT
+     WRAPPED_TEXT_line2
+    -->
+
+    <!--
+         WRAPPED_TEXT
+         WRAPPED_TEXT_line2
+        --> b
+
+        `<!--
+             WRAPPED_TEXT
+             WRAPPED_TEXT_line2
+            -->^
+
+            a <!--
+                 WRAPPED_TEXT
+                 WRAPPED_TEXT_line2
+                -->
+
+
+    <!--  -------------commentLine--------------- -->
+    <!-- `$CL `what` $CR^`^                       -->
+
+
+
+<!-- WRAPPED_TEXT -->
+<!-- WRAPPED_TEXT_line2 -->
+
+<!-- WRAPPED_TEXT -->
+<!-- WRAPPED_TEXT_line2 --> b
+
+`<!-- WRAPPED_TEXT -->
+ <!-- WRAPPED_TEXT_line2 -->^
+
+ a <!-- WRAPPED_TEXT -->
+   <!-- WRAPPED_TEXT_line2 -->
+
+
+    <!--  -------------comment---------------               -->
+    <!-- {% `$_xSnipName^ %}`content^{% end`$_xSnipName^ %} -->
+
+
+
+    {% comment %}content{% endcomment %}
+
+    {% comment %}content_TYPED{% endcomment %} b
+
+    `{% comment %}content{% endcomment %}^
+
+    a {% comment %}content{% endcomment %}
+
+
+    <!--  -------------contenttype---------------                                             -->
+    <!-- <meta http-equiv="Content-Type" content="text/html; charset=`encoding^html_enc()^"/> -->
+
+
+
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+
+    <meta http-equiv="Content-Type" content="text/html; charset=encoding_TYPED"/> b
+
+    `<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>^
+
+    a <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+
+
+    <!--  -------------csrf_token--------------- -->
+    <!-- {% `$_xSnipName^ %}                     -->
+
+
+
+    {% csrf_token %}
+
+    {% csrf_token %} b
+
+    `{% csrf_token %}^
+
+    a {% csrf_token %}
+
+
+    <!--  -------------cycle--------------- -->
+    <!-- {% `$_xSnipName^ `params^ %}       -->
+
+
+
+    {% cycle params %}
+
+    {% cycle params_TYPED %} b
+
+    `{% cycle params %}^
+
+    a {% cycle params %}
+
+
+    <!--  -------------debug--------------- -->
+    <!-- {% `$_xSnipName^ %}                -->
+
+
+
+    {% debug %}
+
+    {% debug %} b
+
+    `{% debug %}^
+
+    a {% debug %}
+
+
+    <!--  -------------div---------------                                      -->
+    <!-- <`$_xSnipName^>`content^^`content^html_cont_helper()^</`$_xSnipName^> -->
+
+
+
+<div>WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</div>
+
+<div>WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</div> b
+
+`<div>WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</div>^
+
+a <div>WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</div>
+
+
+    <!--  -------------doctype--------------- -->
+    <!-- <!DOCTYPE `doctype^>                 -->
+
+
+
+    <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+
+    <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> b
+
+    `<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">^
+
+    a <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+
+
+    <!--  -------------else--------------- -->
+    <!-- {% `$_xSnipName^ %}               -->
+
+
+
+    {% else %}
+
+    {% else %} b
+
+    `{% else %}^
+
+    a {% else %}
+
+
     <!--  -------------Email--------------- -->
     <!-- `$email^                           -->
 
@@ -137,6 +496,63 @@ WRAPPED_TEXT_line2`
     a drdr.xp@gmail.com
 
 
+    <!--  -------------empty--------------- -->
+    <!-- {% `$_xSnipName^ %}                -->
+
+
+
+    {% empty %}
+
+    {% empty %} b
+
+    `{% empty %}^
+
+    a {% empty %}
+
+
+    <!--  -------------extends--------------- -->
+    <!-- {% `$_xSnipName^ "`params^" %}       -->
+
+
+
+    {% extends "params" %}
+
+    {% extends "params_TYPED" %} b
+
+    `{% extends "params" %}^
+
+    a {% extends "params" %}
+
+
+    <!--  -------------fieldset--------------- -->
+    <!-- <fieldset>                            -->
+    <!--     <legend></legend>                 -->
+    <!--     `cursor^                          -->
+    <!-- </fieldset>                           -->
+
+
+
+<fieldset>
+    <legend></legend>
+    
+</fieldset>
+
+<fieldset>
+    <legend></legend>
+    
+</fieldset> b
+
+`<fieldset>
+    <legend></legend>
+    
+</fieldset>^
+
+a <fieldset>
+    <legend></legend>
+    
+</fieldset>
+
+
     <!--  -------------File--------------- -->
     <!-- `file()^                          -->
 
@@ -151,6 +567,1193 @@ WRAPPED_TEXT_line2`
     a test.page
 
 
+    <!--  -------------filter--------------- -->
+    <!-- {% `$_xSnipName^ `params^ %}        -->
+    <!--     `content^                       -->
+    <!-- {% end`$_xSnipName^ %}              -->
+
+
+
+{% filter params %}
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+{% endfilter %}
+
+{% filter params_TYPED %}
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+{% endfilter %} b
+
+`{% filter params %}
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+{% endfilter %}^
+
+a {% filter params %}
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+{% endfilter %}
+
+
+    <!--  -------------firstof--------------- -->
+    <!-- {% `$_xSnipName^ `params^ %}         -->
+
+
+
+    {% firstof params %}
+
+    {% firstof params_TYPED %} b
+
+    `{% firstof params %}^
+
+    a {% firstof params %}
+
+
+    <!--  -------------for--------------- -->
+    <!-- {% `$_xSnipName^ `params^ %}     -->
+    <!--     `content^                    -->
+    <!-- {% end`$_xSnipName^ %}           -->
+
+
+
+{% for params %}
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+{% endfor %}
+
+{% for params_TYPED %}
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+{% endfor %} b
+
+`{% for params %}
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+{% endfor %}^
+
+a {% for params %}
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+{% endfor %}
+
+
+    <!--  -------------form---------------                                                                      -->
+    <!-- <form action="`action^" method="`method^" accept-charset="`html_enc()^" enctype="multipart/form-data"> -->
+    <!--     `cursor^                                                                                           -->
+    <!-- </form>                                                                                                -->
+
+
+
+<form action="action" method="GET" accept-charset="utf-8" enctype="multipart/form-data">
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+</form>
+
+<form action="action_TYPED" method="GET" accept-charset="utf-8" enctype="multipart/form-data">
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+</form> b
+
+`<form action="action" method="GET" accept-charset="utf-8" enctype="multipart/form-data">
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+</form>^
+
+a <form action="action" method="GET" accept-charset="utf-8" enctype="multipart/form-data">
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+</form>
+
+
+    <!--  -------------h1---------------                                       -->
+    <!-- <`$_xSnipName^>`content^^`content^html_cont_helper()^</`$_xSnipName^> -->
+
+
+
+<h1>WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</h1>
+
+<h1>WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</h1> b
+
+`<h1>WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</h1>^
+
+a <h1>WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</h1>
+
+
+    <!--  -------------h2---------------                                       -->
+    <!-- <`$_xSnipName^>`content^^`content^html_cont_helper()^</`$_xSnipName^> -->
+
+
+
+<h2>WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</h2>
+
+<h2>WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</h2> b
+
+`<h2>WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</h2>^
+
+a <h2>WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</h2>
+
+
+    <!--  -------------h3---------------                                       -->
+    <!-- <`$_xSnipName^>`content^^`content^html_cont_helper()^</`$_xSnipName^> -->
+
+
+
+<h3>WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</h3>
+
+<h3>WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</h3> b
+
+`<h3>WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</h3>^
+
+a <h3>WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</h3>
+
+
+    <!--  -------------h4---------------                                       -->
+    <!-- <`$_xSnipName^>`content^^`content^html_cont_helper()^</`$_xSnipName^> -->
+
+
+
+<h4>WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</h4>
+
+<h4>WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</h4> b
+
+`<h4>WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</h4>^
+
+a <h4>WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</h4>
+
+
+    <!--  -------------h5---------------                                       -->
+    <!-- <`$_xSnipName^>`content^^`content^html_cont_helper()^</`$_xSnipName^> -->
+
+
+
+<h5>WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</h5>
+
+<h5>WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</h5> b
+
+`<h5>WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</h5>^
+
+a <h5>WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</h5>
+
+
+    <!--  -------------h6---------------                                       -->
+    <!-- <`$_xSnipName^>`content^^`content^html_cont_helper()^</`$_xSnipName^> -->
+
+
+
+<h6>WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</h6>
+
+<h6>WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</h6> b
+
+`<h6>WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</h6>^
+
+a <h6>WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</h6>
+
+
+    <!--  -------------head--------------- -->
+    <!-- <head>                            -->
+    <!--     `:contenttype:^               -->
+    <!--     `:title:^                     -->
+    <!-- </head>                           -->
+
+
+
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title>test</title>
+</head>
+
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=encoding_TYPED"/>
+    <title>title_TYPED</title>
+</head> b
+
+`<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title>test</title>
+</head>^
+
+a <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title>test</title>
+</head>
+
+
+    <!--  -------------html---------------                                                                                         -->
+    <!-- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -->
+    <!-- <html>                                                                                                                    -->
+    <!--     `:head:^                                                                                                              -->
+    <!--     <body>                                                                                                                -->
+    <!--         `cursor^                                                                                                          -->
+    <!--     </body>                                                                                                               -->
+    <!-- </html>                                                                                                                   -->
+
+
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+        <title>test</title>
+    </head>
+    <body>
+        
+    </body>
+</html>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=encoding_TYPED"/>
+        <title>title_TYPED</title>
+    </head>
+    <body>
+        
+    </body>
+</html> b
+
+`<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+        <title>test</title>
+    </head>
+    <body>
+        
+    </body>
+</html>^
+
+a <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+        <title>test</title>
+    </head>
+    <body>
+        
+    </body>
+</html>
+
+
+    <!--  -------------ibutton---------------                                   -->
+    <!-- <input type="`Echo($_xSnipName[1:])^" name="`name^" value="`value^" /> -->
+
+
+
+    <input type="button" name="name" value="value" />
+
+    <input type="button" name="name_TYPED" value="value_TYPED" /> b
+
+    `<input type="button" name="name" value="value" />^
+
+    a <input type="button" name="name" value="value" />
+
+
+    <!--  -------------icheckbox---------------                                 -->
+    <!-- <input type="`Echo($_xSnipName[1:])^" name="`name^" value="`value^" /> -->
+
+
+
+    <input type="checkbox" name="name" value="value" />
+
+    <input type="checkbox" name="name_TYPED" value="value_TYPED" /> b
+
+    `<input type="checkbox" name="name" value="value" />^
+
+    a <input type="checkbox" name="name" value="value" />
+
+
+    <!--  -------------if--------------- -->
+    <!-- {% `$_xSnipName^ `param^ %}     -->
+    <!--     `content^                   -->
+    <!-- `else...{{^{% else %}           -->
+    <!--     `content^`}}^               -->
+    <!-- {% end`$_xSnipName^ %}          -->
+
+
+
+{% if param %}
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+{% else %}
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+{% endif %}
+
+{% if param_TYPED %}
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+else_TYPED
+{% endif %} b
+
+`{% if param %}
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+{% else %}
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+{% endif %}^
+
+a {% if param %}
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+{% else %}
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+{% endif %}
+
+
+    <!--  -------------ifchanged--------------- -->
+    <!-- {% `$_xSnipName^ `param^ %}            -->
+    <!--     `content^                          -->
+    <!-- `else...{{^{% else %}                  -->
+    <!--     `content^`}}^                      -->
+    <!-- {% end`$_xSnipName^ %}                 -->
+
+
+
+{% ifchanged param %}
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+{% else %}
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+{% endifchanged %}
+
+{% ifchanged param_TYPED %}
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+else_TYPED
+{% endifchanged %} b
+
+`{% ifchanged param %}
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+{% else %}
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+{% endifchanged %}^
+
+a {% ifchanged param %}
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+{% else %}
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+{% endifchanged %}
+
+
+    <!--  -------------ifequal--------------- -->
+    <!-- {% `$_xSnipName^ `param^ %}          -->
+    <!--     `content^                        -->
+    <!-- `else...{{^{% else %}                -->
+    <!--     `content^`}}^                    -->
+    <!-- {% end`$_xSnipName^ %}               -->
+
+
+
+{% ifequal param %}
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+{% else %}
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+{% endifequal %}
+
+{% ifequal param_TYPED %}
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+else_TYPED
+{% endifequal %} b
+
+`{% ifequal param %}
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+{% else %}
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+{% endifequal %}^
+
+a {% ifequal param %}
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+{% else %}
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+{% endifequal %}
+
+
+    <!--  -------------ifile---------------                                     -->
+    <!-- <input type="`Echo($_xSnipName[1:])^" name="`name^" value="`value^" /> -->
+
+
+
+    <input type="file" name="name" value="value" />
+
+    <input type="file" name="name_TYPED" value="value_TYPED" /> b
+
+    `<input type="file" name="name" value="value" />^
+
+    a <input type="file" name="name" value="value" />
+
+
+    <!--  -------------ifnotequal--------------- -->
+    <!-- {% `$_xSnipName^ `param^ %}             -->
+    <!--     `content^                           -->
+    <!-- `else...{{^{% else %}                   -->
+    <!--     `content^`}}^                       -->
+    <!-- {% end`$_xSnipName^ %}                  -->
+
+
+
+{% ifnotequal param %}
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+{% else %}
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+{% endifnotequal %}
+
+{% ifnotequal param_TYPED %}
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+else_TYPED
+{% endifnotequal %} b
+
+`{% ifnotequal param %}
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+{% else %}
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+{% endifnotequal %}^
+
+a {% ifnotequal param %}
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+{% else %}
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+{% endifnotequal %}
+
+
+    <!--  -------------iframe---------------                                           -->
+    <!-- <`$_xSnipName^` `att?^>`content^^`content^html_cont_helper()^</`$_xSnipName^> -->
+
+
+
+<iframe name="name">WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</iframe>
+
+<iframe name="name_TYPED">WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</iframe> b
+
+`<iframe name="name">WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</iframe>^
+
+a <iframe name="name">WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</iframe>
+
+
+    <!--  -------------ihidden---------------                                   -->
+    <!-- <input type="`Echo($_xSnipName[1:])^" name="`name^" value="`value^" /> -->
+
+
+
+    <input type="hidden" name="name" value="value" />
+
+    <input type="hidden" name="name_TYPED" value="value_TYPED" /> b
+
+    `<input type="hidden" name="name" value="value" />^
+
+    a <input type="hidden" name="name" value="value" />
+
+
+    <!--  -------------iimage---------------                                    -->
+    <!-- <input type="`Echo($_xSnipName[1:])^" name="`name^" value="`value^" /> -->
+
+
+
+    <input type="image" name="name" value="value" />
+
+    <input type="image" name="name_TYPED" value="value_TYPED" /> b
+
+    `<input type="image" name="name" value="value" />^
+
+    a <input type="image" name="name" value="value" />
+
+
+    <!--  -------------img--------------- -->
+    <!-- <`$_xSnipName^` `att?^/>         -->
+
+
+
+    <img src="where" alt="alt"/>
+
+    <img src="where_TYPED" alt="alt_TYPED"/> b
+
+    `<img src="where" alt="alt"/>^
+
+    a <img src="where" alt="alt"/>
+
+
+    <!--  -------------include--------------- -->
+    <!-- {% `$_xSnipName^ "`params^" %}       -->
+
+
+
+    {% include "params" %}
+
+    {% include "params_TYPED" %} b
+
+    `{% include "params" %}^
+
+    a {% include "params" %}
+
+
+    <!--  -------------input--------------- -->
+    <!-- <`$_xSnipName^` `att?^/>           -->
+
+
+
+    <input type="text" name="name" value="value"/>
+
+    <input type="text" name="name_TYPED" value="value_TYPED"/> b
+
+    `<input type="text" name="name" value="value"/>^
+
+    a <input type="text" name="name" value="value"/>
+
+
+    <!--  -------------ipassword---------------                                 -->
+    <!-- <input type="`Echo($_xSnipName[1:])^" name="`name^" value="`value^" /> -->
+
+
+
+    <input type="password" name="name" value="value" />
+
+    <input type="password" name="name_TYPED" value="value_TYPED" /> b
+
+    `<input type="password" name="name" value="value" />^
+
+    a <input type="password" name="name" value="value" />
+
+
+    <!--  -------------iradio---------------                                    -->
+    <!-- <input type="`Echo($_xSnipName[1:])^" name="`name^" value="`value^" /> -->
+
+
+
+    <input type="radio" name="name" value="value" />
+
+    <input type="radio" name="name_TYPED" value="value_TYPED" /> b
+
+    `<input type="radio" name="name" value="value" />^
+
+    a <input type="radio" name="name" value="value" />
+
+
+    <!--  -------------ireset---------------                                    -->
+    <!-- <input type="`Echo($_xSnipName[1:])^" name="`name^" value="`value^" /> -->
+
+
+
+    <input type="reset" name="name" value="value" />
+
+    <input type="reset" name="name_TYPED" value="value_TYPED" /> b
+
+    `<input type="reset" name="name" value="value" />^
+
+    a <input type="reset" name="name" value="value" />
+
+
+    <!--  -------------isubmit---------------                                   -->
+    <!-- <input type="`Echo($_xSnipName[1:])^" name="`name^" value="`value^" /> -->
+
+
+
+    <input type="submit" name="name" value="value" />
+
+    <input type="submit" name="name_TYPED" value="value_TYPED" /> b
+
+    `<input type="submit" name="name" value="value" />^
+
+    a <input type="submit" name="name" value="value" />
+
+
+    <!--  -------------itext---------------                                     -->
+    <!-- <input type="`Echo($_xSnipName[1:])^" name="`name^" value="`value^" /> -->
+
+
+
+    <input type="text" name="name" value="value" />
+
+    <input type="text" name="name_TYPED" value="value_TYPED" /> b
+
+    `<input type="text" name="name" value="value" />^
+
+    a <input type="text" name="name" value="value" />
+
+
+    <!--  -------------label---------------                                            -->
+    <!-- <`$_xSnipName^` `att?^>`content^^`content^html_cont_helper()^</`$_xSnipName^> -->
+
+
+
+<label for="which">WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</label>
+
+<label for="which_TYPED">WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</label> b
+
+`<label for="which">WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</label>^
+
+a <label for="which">WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</label>
+
+
+    <!--  -------------li---------------                                       -->
+    <!-- <`$_xSnipName^>`content^^`content^html_cont_helper()^</`$_xSnipName^> -->
+
+
+
+<li>WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</li>
+
+<li>WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</li> b
+
+`<li>WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</li>^
+
+a <li>WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</li>
+
+
+    <!--  -------------link---------------                               -->
+    <!-- <link rel="`stylesheet^" type="`type^text/css^" href="`url^" /> -->
+
+
+
+    <link rel="stylesheet" type="text/css" href="url" />
+
+    <link rel="stylesheet_TYPED" type="type_TYPED" href="url_TYPED" /> b
+
+    `<link rel="stylesheet" type="text/css" href="url" />^
+
+    a <link rel="stylesheet" type="text/css" href="url" />
+
+
+    <!--  -------------load--------------- -->
+    <!-- {% `$_xSnipName^ `params^ %}      -->
+
+
+
+    {% load params %}
+
+    {% load params_TYPED %} b
+
+    `{% load params %}^
+
+    a {% load params %}
+
+
+    <!--  -------------meta---------------                    -->
+    <!-- <meta name="`meta_name^" content="`meta_content^" /> -->
+
+
+
+    <meta name="meta_name" content="meta_content" />
+
+    <meta name="meta_name_TYPED" content="meta_content_TYPED" /> b
+
+    `<meta name="meta_name" content="meta_content" />^
+
+    a <meta name="meta_name" content="meta_content" />
+
+
+    <!--  -------------now--------------- -->
+    <!-- {% `$_xSnipName^ `params^ %}     -->
+
+
+
+    {% now params %}
+
+    {% now params_TYPED %} b
+
+    `{% now params %}^
+
+    a {% now params %}
+
+
+    <!--  -------------ol---------------                                       -->
+    <!-- <`$_xSnipName^>`content^^`content^html_cont_helper()^</`$_xSnipName^> -->
+
+
+
+<ol>WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</ol>
+
+<ol>WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</ol> b
+
+`<ol>WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</ol>^
+
+a <ol>WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</ol>
+
+
+    <!--  -------------option---------------                                           -->
+    <!-- <`$_xSnipName^` `att?^>`content^^`content^html_cont_helper()^</`$_xSnipName^> -->
+
+
+
+<option value="value">WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</option>
+
+<option value="value_TYPED">WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</option> b
+
+`<option value="value">WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</option>^
+
+a <option value="value">WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</option>
+
+
+    <!--  -------------p---------------                                        -->
+    <!-- <`$_xSnipName^>`content^^`content^html_cont_helper()^</`$_xSnipName^> -->
+
+
+
+<p>WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</p>
+
+<p>WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</p> b
+
+`<p>WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</p>^
+
+a <p>WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</p>
+
+
+    <!--  -------------regroup--------------- -->
+    <!-- {% `$_xSnipName^ `params^ %}         -->
+
+
+
+    {% regroup params %}
+
+    {% regroup params_TYPED %} b
+
+    `{% regroup params %}^
+
+    a {% regroup params %}
+
+
+    <!--  -------------script---------------                   -->
+    <!-- <script language="javascript" type="text/javascript"> -->
+    <!--     `cursor^                                          -->
+    <!-- </script>                                             -->
+
+
+
+<script language="javascript" type="text/javascript">
+    
+</script>
+
+<script language="javascript" type="text/javascript">
+    
+</script> b
+
+`<script language="javascript" type="text/javascript">
+    
+</script>^
+
+a <script language="javascript" type="text/javascript">
+    
+</script>
+
+
+    <!--  -------------scriptsrc---------------                                    -->
+    <!-- <script language="javascript" type="text/javascript" src="`js^"></script> -->
+
+
+
+    <script language="javascript" type="text/javascript" src="js"></script>
+
+    <script language="javascript" type="text/javascript" src="js_TYPED"></script> b
+
+    `<script language="javascript" type="text/javascript" src="js"></script>^
+
+    a <script language="javascript" type="text/javascript" src="js"></script>
+
+
+    <!--  -------------select---------------                                           -->
+    <!-- <`$_xSnipName^` `att?^>`content^^`content^html_cont_helper()^</`$_xSnipName^> -->
+
+
+
+<select name="name">WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</select>
+
+<select name="name_TYPED">WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</select> b
+
+`<select name="name">WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</select>^
+
+a <select name="name">WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</select>
+
+
+    <!--  -------------spaceless---------------             -->
+    <!-- {% `$_xSnipName^ %}`content^{% end`$_xSnipName^ %} -->
+
+
+
+    {% spaceless %}content{% endspaceless %}
+
+    {% spaceless %}content_TYPED{% endspaceless %} b
+
+    `{% spaceless %}content{% endspaceless %}^
+
+    a {% spaceless %}content{% endspaceless %}
+
+
+    <!--  -------------ssi--------------- -->
+    <!-- {% `$_xSnipName^ `params^ %}     -->
+
+
+
+    {% ssi params %}
+
+    {% ssi params_TYPED %} b
+
+    `{% ssi params %}^
+
+    a {% ssi params %}
+
+
+    <!--  -------------style---------------     -->
+    <!-- <style type="text/css" media="screen"> -->
+    <!--     `cursor^                           -->
+    <!-- </style>                               -->
+
+
+
+<style type="text/css" media="screen">
+    
+</style>
+
+<style type="text/css" media="screen">
+    
+</style> b
+
+`<style type="text/css" media="screen">
+    
+</style>^
+
+a <style type="text/css" media="screen">
+    
+</style>
+
+
+    <!--  -------------table---------------                                    -->
+    <!-- <`$_xSnipName^>`content^^`content^html_cont_helper()^</`$_xSnipName^> -->
+
+
+
+<table>WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</table>
+
+<table>WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</table> b
+
+`<table>WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</table>^
+
+a <table>WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</table>
+
+
+    <!--  -------------td---------------                                       -->
+    <!-- <`$_xSnipName^>`content^^`content^html_cont_helper()^</`$_xSnipName^> -->
+
+
+
+<td>WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</td>
+
+<td>WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</td> b
+
+`<td>WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</td>^
+
+a <td>WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</td>
+
+
+    <!--  -------------textarea---------------                                         -->
+    <!-- <`$_xSnipName^` `att?^>`content^^`content^html_cont_helper()^</`$_xSnipName^> -->
+
+
+
+<textarea name="name">WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</textarea>
+
+<textarea name="name_TYPED">WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</textarea> b
+
+`<textarea name="name">WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</textarea>^
+
+a <textarea name="name">WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</textarea>
+
+
+    <!--  -------------th---------------                                       -->
+    <!-- <`$_xSnipName^>`content^^`content^html_cont_helper()^</`$_xSnipName^> -->
+
+
+
+<th>WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</th>
+
+<th>WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</th> b
+
+`<th>WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</th>^
+
+a <th>WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</th>
+
+
+    <!--  -------------title---------------     -->
+    <!-- <title>`title^expand('%:t:r')^</title> -->
+
+
+
+    <title>test</title>
+
+    <title>title_TYPED</title> b
+
+    `<title>test</title>^
+
+    a <title>test</title>
+
+
+    <!--  -------------tr---------------                                       -->
+    <!-- <`$_xSnipName^>`content^^`content^html_cont_helper()^</`$_xSnipName^> -->
+
+
+
+<tr>WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</tr>
+
+<tr>WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</tr> b
+
+`<tr>WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</tr>^
+
+a <tr>WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</tr>
+
+
+    <!--  -------------ul---------------                                       -->
+    <!-- <`$_xSnipName^>`content^^`content^html_cont_helper()^</`$_xSnipName^> -->
+
+
+
+<ul>WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</ul>
+
+<ul>WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</ul> b
+
+`<ul>WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</ul>^
+
+a <ul>WRAPPED_TEXT
+WRAPPED_TEXT_line2
+</ul>
+
+
+    <!--  -------------url--------------- -->
+    <!-- {% `$_xSnipName^ `params^ %}     -->
+
+
+
+    {% url params %}
+
+    {% url params_TYPED %} b
+
+    `{% url params %}^
+
+    a {% url params %}
+
+
+    <!--  -------------var--------------- -->
+    <!-- {{ `var^ }}                      -->
+
+
+
+    {{ var }}
+
+    {{ var_TYPED }} b
+
+    `{{ var }}^
+
+    a {{ var }}
+
+
+    <!--  -------------ver---------------                    -->
+    <!-- <?xml version="`ver^1.0^" encoding="`enc^utf-8^" ?> -->
+
+
+
+    <?xml version="1.0" encoding="utf-8" ?>
+
+    <?xml version="ver_TYPED" encoding="enc_TYPED" ?> b
+
+    `<?xml version="1.0" encoding="utf-8" ?>^
+
+    a <?xml version="1.0" encoding="utf-8" ?>
+
+
+    <!--  -------------with--------------- -->
+    <!-- {% `$_xSnipName^ `params^ %}      -->
+    <!--     `content^                     -->
+    <!-- {% end`$_xSnipName^ %}            -->
+
+
+
+{% with params %}
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+{% endwith %}
+
+{% with params_TYPED %}
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+{% endwith %} b
+
+`{% with params %}
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+{% endwith %}^
+
+a {% with params %}
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+{% endwith %}
+
+
     <!--  -------------{_--------------- -->
     <!-- {`w^}                           -->
 
diff --git a/ftplugin/java/test.page b/ftplugin/java/test.page
index 4617bc84..4d4fc8f5 100644
--- a/ftplugin/java/test.page
+++ b/ftplugin/java/test.page
@@ -618,53 +618,53 @@ else if ( condition ) {
 }
 
 
-    //  -------------ifn--------------- 
-    // `Include:_if^                    
+    //  -------------ifn0--------------- 
+    // `Include:_if^                     
 
 
 
-if ( null == var ) {
+if ( 0 != var ) {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }
 
-if ( null == var_TYPED ) {
+if ( 0 != var_TYPED ) {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 } b
 
-`if ( null == var ) {
+`if ( 0 != var ) {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }^
 
-a if ( null == var ) {
+a if ( 0 != var ) {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }
 
 
-    //  -------------ifn0--------------- 
-    // `Include:_if^                     
+    //  -------------ifn--------------- 
+    // `Include:_if^                    
 
 
 
-if ( 0 != var ) {
+if ( null == var ) {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }
 
-if ( 0 != var_TYPED ) {
+if ( null == var_TYPED ) {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 } b
 
-`if ( 0 != var ) {
+`if ( null == var ) {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }^
 
-a if ( 0 != var ) {
+a if ( null == var ) {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }
diff --git a/ftplugin/javascript/test.page b/ftplugin/javascript/test.page
index a36e6908..a2bc0251 100644
--- a/ftplugin/javascript/test.page
+++ b/ftplugin/javascript/test.page
@@ -120,17 +120,17 @@ assertObjectEquals(mess
                   , arr
                   , expr)
 
-assertObjectEquals(mess_TYPED
-                  , arr_TYPED
-                  , expr_TYPED) b
+                  assertObjectEquals(mess_TYPED
+                                    , arr_TYPED
+                                    , expr_TYPED) b
 
-`assertObjectEquals(mess
-                  , arr
-                  , expr)^
+                                    `assertObjectEquals(mess
+                                                      , arr
+                                                      , expr)^
 
-a assertObjectEquals(mess
-                  , arr
-                  , expr)
+                                                      a assertObjectEquals(mess
+                                                                        , arr
+                                                                        , expr)
 
 
     //  -------------Author--------------- 
@@ -138,13 +138,13 @@ a assertObjectEquals(mess
 
 
 
-drdr.xp
+                                                                        drdr.xp
 
-drdr.xp b
+                                                                    drdr.xp b
 
-`drdr.xp^
+                                                                    `drdr.xp^
 
-a drdr.xp
+                                                                    a drdr.xp
 
 
     //  -------------bench--------------- 
@@ -161,53 +161,53 @@ a drdr.xp
 
 
 
-var t0 = new Date().getTime();
-for (var i = 0; i < times; ++i){
-    /* void */;
-}
-var t1 = new Date().getTime();
-for (var i = 0; i < times; ++i){
-    /* void */;
-}
-var t2 = new Date().getTime();
-console.log(t1-t0, t2-t1);
-
-
-var t0 = new Date().getTime();
-for (var i = 0; i < times_TYPED; ++i){
-    job_TYPED
-}
-var t1 = new Date().getTime();
-for (var i = 0; i < times_TYPED; ++i){
-    jobn_TYPED
-}
-var t2 = new Date().getTime();
-log_TYPED(t1-t0, t2-t1);
- b
-
- `var t0 = new Date().getTime();
- for (var i = 0; i < times; ++i){
-     /* void */;
- }
- var t1 = new Date().getTime();
- for (var i = 0; i < times; ++i){
-     /* void */;
- }
- var t2 = new Date().getTime();
- console.log(t1-t0, t2-t1);
- ^
-
- a var t0 = new Date().getTime();
- for (var i = 0; i < times; ++i){
-     /* void */;
- }
- var t1 = new Date().getTime();
- for (var i = 0; i < times; ++i){
-     /* void */;
- }
- var t2 = new Date().getTime();
- console.log(t1-t0, t2-t1);
- 
+                                                                    var t0 = new Date().getTime();
+                                                                    for (var i = 0; i < times; ++i){
+                                                                        /* void */;
+                                                                    }
+                                                                    var t1 = new Date().getTime();
+                                                                    for (var i = 0; i < times; ++i){
+                                                                        /* void */;
+                                                                    }
+                                                                    var t2 = new Date().getTime();
+                                                                    console.log(t1-t0, t2-t1);
+                                                                    
+
+                                                                    var t0 = new Date().getTime();
+                                                                    for (var i = 0; i < times_TYPED; ++i){
+                                                                        job_TYPED
+                                                                    }
+                                                                    var t1 = new Date().getTime();
+                                                                    for (var i = 0; i < times_TYPED; ++i){
+                                                                        jobn_TYPED
+                                                                    }
+                                                                    var t2 = new Date().getTime();
+                                                                    log_TYPED(t1-t0, t2-t1);
+                                                                     b
+
+                                                                     `var t0 = new Date().getTime();
+                                                                     for (var i = 0; i < times; ++i){
+                                                                         /* void */;
+                                                                     }
+                                                                     var t1 = new Date().getTime();
+                                                                     for (var i = 0; i < times; ++i){
+                                                                         /* void */;
+                                                                     }
+                                                                     var t2 = new Date().getTime();
+                                                                     console.log(t1-t0, t2-t1);
+                                                                     ^
+
+                                                                     a var t0 = new Date().getTime();
+                                                                     for (var i = 0; i < times; ++i){
+                                                                         /* void */;
+                                                                     }
+                                                                     var t1 = new Date().getTime();
+                                                                     for (var i = 0; i < times; ++i){
+                                                                         /* void */;
+                                                                     }
+                                                                     var t2 = new Date().getTime();
+                                                                     console.log(t1-t0, t2-t1);
+                                                                     
 
 
     //  -------------bench_--------------- 
@@ -352,13 +352,13 @@ WRAPPED_TEXT_line2 */
                  * WRAPPED_TEXT_line2
                  */ b
 
-                `/* WRAPPED_TEXT
-                  * WRAPPED_TEXT_line2
-                 */^
-
-                a /* WRAPPED_TEXT
+                 `/* WRAPPED_TEXT
                    * WRAPPED_TEXT_line2
-                 */
+                  */^
+
+                  a /* WRAPPED_TEXT
+                     * WRAPPED_TEXT_line2
+                   */
 
 
     //  -------------commentDoc--------------- 
@@ -373,20 +373,20 @@ WRAPPED_TEXT_line2 */
  * WRAPPED_TEXT_line2
  */
 
-                /**
-                 * WRAPPED_TEXT
-                 * WRAPPED_TEXT_line2
-                 */ b
+                  /**
+                   * WRAPPED_TEXT
+                   * WRAPPED_TEXT_line2
+                   */ b
 
-                `/**
-                 * WRAPPED_TEXT
-                 * WRAPPED_TEXT_line2
-                 */^
+                   `/**
+                    * WRAPPED_TEXT
+                    * WRAPPED_TEXT_line2
+                    */^
 
-                a /**
-                 * WRAPPED_TEXT
-                 * WRAPPED_TEXT_line2
-                 */
+                    a /**
+                     * WRAPPED_TEXT
+                     * WRAPPED_TEXT_line2
+                     */
 
 
     //  -------------commentLine--------------- 
@@ -397,14 +397,14 @@ WRAPPED_TEXT_line2 */
 /* WRAPPED_TEXT */
 /* WRAPPED_TEXT_line2 */
 
-                /* WRAPPED_TEXT */
-                /* WRAPPED_TEXT_line2 */ b
+                    /* WRAPPED_TEXT */
+                    /* WRAPPED_TEXT_line2 */ b
 
-                `/* WRAPPED_TEXT */
-                 /* WRAPPED_TEXT_line2 */^
+                    `/* WRAPPED_TEXT */
+                     /* WRAPPED_TEXT_line2 */^
 
-                 a /* WRAPPED_TEXT */
-                   /* WRAPPED_TEXT_line2 */
+                     a /* WRAPPED_TEXT */
+                       /* WRAPPED_TEXT_line2 */
 
 
     //  -------------cpr--------------- 
@@ -412,13 +412,13 @@ WRAPPED_TEXT_line2 */
 
 
 
-                 @param {Object} name desc
+                       @param {Object} name desc
 
-                 @param {Object_TYPED} name_TYPED desc b
+                       @param {Object_TYPED} name_TYPED desc b
 
-                 `@param {Object} name desc^
+                       `@param {Object} name desc^
 
-                 a @param {Object} name desc
+                       a @param {Object} name desc
 
 
     //  -------------default--------------- 
@@ -427,17 +427,17 @@ WRAPPED_TEXT_line2 */
 
 
 
-                 default:
-                     
+                       default:
+                           
 
-                 default:
-                      b
+                           default:
+                                b
 
-                      `default:
-                          ^
+                                `default:
+                                    ^
 
-                          a default:
-                              
+                                    a default:
+                                        
 
 
     //  -------------elif--------------- 
@@ -559,37 +559,37 @@ a drdr.xp@gmail.com
  *
  *--------------------------\\\ sum_TYPED ///---------------------------*/ b
 
-`/**-------------------------/// sum \\\---------------------------
- *
- * <b>function</b>
- * @version : 1.0
- * @since : date
- *
- * @description :
- *   
- * @usage :
- *
- * @author : drdr.xp | drdr.xp@gmail.com
- * @copyright :
- * @TODO :
- *
- *--------------------------\\\ sum ///---------------------------*/^
-
-a /**-------------------------/// sum \\\---------------------------
- *
- * <b>function</b>
- * @version : 1.0
- * @since : date
- *
- * @description :
- *   
- * @usage :
- *
- * @author : drdr.xp | drdr.xp@gmail.com
- * @copyright :
- * @TODO :
- *
- *--------------------------\\\ sum ///---------------------------*/
+ `/**-------------------------/// sum \\\---------------------------
+  *
+  * <b>function</b>
+  * @version : 1.0
+  * @since : date
+  *
+  * @description :
+  *   
+  * @usage :
+  *
+  * @author : drdr.xp | drdr.xp@gmail.com
+  * @copyright :
+  * @TODO :
+  *
+  *--------------------------\\\ sum ///---------------------------*/^
+
+  a /**-------------------------/// sum \\\---------------------------
+   *
+   * <b>function</b>
+   * @version : 1.0
+   * @since : date
+   *
+   * @description :
+   *   
+   * @usage :
+   *
+   * @author : drdr.xp | drdr.xp@gmail.com
+   * @copyright :
+   * @TODO :
+   *
+   *--------------------------\\\ sum ///---------------------------*/
 
 
     //  -------------File--------------- 
@@ -597,13 +597,13 @@ a /**-------------------------/// sum \\\---------------------------
 
 
 
-test.page
+  test.page
 
-test.page b
+  test.page b
 
-`test.page^
+  `test.page^
 
-a test.page
+  a test.page
 
 
     //  -------------for---------------                                                                                  
@@ -641,7 +641,7 @@ a for ( var i = 0; i < len; i++ ) {
 
 for (;;) 
 
-for (;;)  b
+    for (;;)  b
 
 `for (;;) ^
 
@@ -858,105 +858,105 @@ else if ( condition ) {
 }
 
 
-    //  -------------ifn--------------- 
-    // `Include:_if^                    
+    //  -------------ifn0--------------- 
+    // `Include:_if^                     
 
 
 
-if ( null == var ) {
+if ( 0 != var ) {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }
 
-if ( null == var_TYPED ) {
+if ( 0 != var_TYPED ) {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 } b
 
-`if ( null == var ) {
+`if ( 0 != var ) {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }^
 
-a if ( null == var ) {
+a if ( 0 != var ) {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }
 
 
-    //  -------------ifn0--------------- 
+    //  -------------ifnn--------------- 
     // `Include:_if^                     
 
 
 
-if ( 0 != var ) {
+if ( null != var ) {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }
 
-if ( 0 != var_TYPED ) {
+if ( null != var_TYPED ) {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 } b
 
-`if ( 0 != var ) {
+`if ( null != var ) {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }^
 
-a if ( 0 != var ) {
+a if ( null != var ) {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }
 
 
-    //  -------------ifnn--------------- 
+    //  -------------ifnu--------------- 
     // `Include:_if^                     
 
 
 
-if ( null != var ) {
+if ( undefined != var ) {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }
 
-if ( null != var_TYPED ) {
+if ( undefined != var_TYPED ) {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 } b
 
-`if ( null != var ) {
+`if ( undefined != var ) {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }^
 
-a if ( null != var ) {
+a if ( undefined != var ) {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }
 
 
-    //  -------------ifnu--------------- 
-    // `Include:_if^                     
+    //  -------------ifn--------------- 
+    // `Include:_if^                    
 
 
 
-if ( undefined != var ) {
+if ( null == var ) {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }
 
-if ( undefined != var_TYPED ) {
+if ( null == var_TYPED ) {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 } b
 
-`if ( undefined != var ) {
+`if ( null == var ) {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }^
 
-a if ( undefined != var ) {
+a if ( null == var ) {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }
@@ -995,11 +995,11 @@ a if ( undefined == var ) {
 
 var instant = new Constructor()
 
-    var instant_TYPED = new Constructor_TYPED(arg_TYPED, arg_TYPED, arg_TYPED) b
+var instant_TYPED = new Constructor_TYPED(arg_TYPED, arg_TYPED, arg_TYPED) b
 
-    `var instant = new Constructor()^
+`var instant = new Constructor()^
 
-    a var instant = new Constructor()
+a var instant = new Constructor()
 
 
     //  -------------proto---------------                     
@@ -1009,9 +1009,9 @@ var instant = new Constructor()
 
 
 
-    Class.prototype.method = function() {
-    
-    }
+Class.prototype.method = function() {
+
+}
 
 Class_TYPED.prototype.method_TYPED = function(arg_TYPED, arg_TYPED, arg_TYPED) {
 
diff --git a/ftplugin/json/test.page b/ftplugin/json/test.page
new file mode 100644
index 00000000..be03954a
--- /dev/null
+++ b/ftplugin/json/test.page
@@ -0,0 +1,227 @@
+
+
+
+    /*  -------------"_--------------- */
+    /* "`w^"                           */
+
+
+
+"WRAPPED_TEXT
+WRAPPED_TEXT_line2"
+
+"WRAPPED_TEXT
+WRAPPED_TEXT_line2" b
+
+`"WRAPPED_TEXT
+WRAPPED_TEXT_line2"^
+
+a "WRAPPED_TEXT
+WRAPPED_TEXT_line2"
+
+
+    /*  -------------'_--------------- */
+    /* '`w^'                           */
+
+
+
+'WRAPPED_TEXT
+WRAPPED_TEXT_line2'
+
+'WRAPPED_TEXT
+WRAPPED_TEXT_line2' b
+
+`'WRAPPED_TEXT
+WRAPPED_TEXT_line2'^
+
+a 'WRAPPED_TEXT
+WRAPPED_TEXT_line2'
+
+
+    /*  -------------(_--------------- */
+    /* (`w^)                           */
+
+
+
+(WRAPPED_TEXT
+WRAPPED_TEXT_line2)
+
+(WRAPPED_TEXT
+WRAPPED_TEXT_line2) b
+
+`(WRAPPED_TEXT
+WRAPPED_TEXT_line2)^
+
+a (WRAPPED_TEXT
+WRAPPED_TEXT_line2)
+
+
+    /*  -------------<_--------------- */
+    /* <`w^>                           */
+
+
+
+<WRAPPED_TEXT
+WRAPPED_TEXT_line2>
+
+<WRAPPED_TEXT
+WRAPPED_TEXT_line2> b
+
+`<WRAPPED_TEXT
+WRAPPED_TEXT_line2>^
+
+a <WRAPPED_TEXT
+WRAPPED_TEXT_line2>
+
+
+    /*  -------------[_--------------- */
+    /* [`w^]                           */
+
+
+
+[WRAPPED_TEXT
+WRAPPED_TEXT_line2]
+
+[WRAPPED_TEXT
+WRAPPED_TEXT_line2] b
+
+`[WRAPPED_TEXT
+WRAPPED_TEXT_line2]^
+
+a [WRAPPED_TEXT
+WRAPPED_TEXT_line2]
+
+
+    /*  -------------`_--------------- */
+    /* \``w^\`                         */
+
+
+
+`WRAPPED_TEXT
+WRAPPED_TEXT_line2`
+
+`WRAPPED_TEXT
+WRAPPED_TEXT_line2` b
+
+``WRAPPED_TEXT
+WRAPPED_TEXT_line2`^
+
+a `WRAPPED_TEXT
+WRAPPED_TEXT_line2`
+
+
+    /*  -------------array--------------- */
+    /* [ `val^`...^, `val^`...^ ]         */
+
+
+
+[ val, val, val, val ]
+
+[ val_TYPED_TYPED ] b
+
+`[ val, val, val, val ]^
+
+a [ val, val, val, val ]
+
+
+    /*  -------------Author--------------- */
+    /* `$author^                           */
+
+
+
+drdr.xp
+
+drdr.xp b
+
+`drdr.xp^
+
+a drdr.xp
+
+
+    /*  -------------dic--------------- */
+    /* { "`key^":`val^`...^,            */
+    /*   "`key^":`val^`...^             */
+    /* }                                */
+
+
+
+{ "key":val,
+  "key":val,
+    "key":val,
+      "key":val
+}
+
+{ "key_TYPED":val_TYPED_TYPED
+} b
+
+`{ "key":val,
+  "key":val,
+    "key":val,
+      "key":val
+}^
+
+a { "key":val,
+  "key":val,
+    "key":val,
+      "key":val
+}
+
+
+    /*  -------------Email--------------- */
+    /* `$email^                           */
+
+
+
+drdr.xp@gmail.com
+
+drdr.xp@gmail.com b
+
+`drdr.xp@gmail.com^
+
+a drdr.xp@gmail.com
+
+
+    /*  -------------File--------------- */
+    /* `file()^                          */
+
+
+
+test.page
+
+test.page b
+
+`test.page^
+
+a test.page
+
+
+    /*  -------------obj---------------           */
+    /* { "`key^":`val^`...^, "`key^":`val^`...^ } */
+
+
+
+{ "key":val, "key":val, "key":val, "key":val }
+
+{ "key_TYPED":val_TYPED_TYPED } b
+
+`{ "key":val, "key":val, "key":val, "key":val }^
+
+a { "key":val, "key":val, "key":val, "key":val }
+
+
+    /*  -------------{_--------------- */
+    /* {`w^}                           */
+
+
+
+{WRAPPED_TEXT
+WRAPPED_TEXT_line2}
+
+{WRAPPED_TEXT
+WRAPPED_TEXT_line2} b
+
+`{WRAPPED_TEXT
+WRAPPED_TEXT_line2}^
+
+a {WRAPPED_TEXT
+WRAPPED_TEXT_line2}
+
diff --git a/ftplugin/lex/test.page b/ftplugin/lex/test.page
index fad9dc4f..70b40d79 100644
--- a/ftplugin/lex/test.page
+++ b/ftplugin/lex/test.page
@@ -19,34 +19,6 @@ a "WRAPPED_TEXT
 WRAPPED_TEXT_line2"
 
 
-    /*  -------------#if--------------- */
-    /* #if `0^                          */
-    /* `cursor^                         */
-    /* #endif                           */
-
-
-
-#if 0
-WRAPPED_TEXT
-WRAPPED_TEXT_line2
-#endif
-
-#if 0_TYPED
-WRAPPED_TEXT
-WRAPPED_TEXT_line2
-#endif b
-
-`#if 0
-WRAPPED_TEXT
-WRAPPED_TEXT_line2
-#endif^
-
-a #if 0
-WRAPPED_TEXT
-WRAPPED_TEXT_line2
-#endif
-
-
     /*  -------------#ifdef--------------- */
     /* #ifdef `symbol^                     */
     /* `cursor^                            */
@@ -103,18 +75,32 @@ WRAPPED_TEXT_line2
 #endif /* symbol */
 
 
-    /*  -------------#inc--------------- */
-    /* #include <`^.h>                   */
+    /*  -------------#if--------------- */
+    /* #if `0^                          */
+    /* `cursor^                         */
+    /* #endif                           */
 
 
 
-#include <.h>
+#if 0
+WRAPPED_TEXT
+WRAPPED_TEXT_line2
+#endif
 
-#include <_TYPED.h> b
+#if 0_TYPED
+WRAPPED_TEXT
+WRAPPED_TEXT_line2
+#endif b
 
-`#include <.h>^
+`#if 0
+WRAPPED_TEXT
+WRAPPED_TEXT_line2
+#endif^
 
-a #include <.h>
+a #if 0
+WRAPPED_TEXT
+WRAPPED_TEXT_line2
+#endif
 
 
     /*  -------------#include_user--------------- */
@@ -131,6 +117,20 @@ a #include <.h>
 a #include "test.h"
 
 
+    /*  -------------#inc--------------- */
+    /* #include <`^.h>                   */
+
+
+
+#include <.h>
+
+#include <_TYPED.h> b
+
+`#include <.h>^
+
+a #include <.h>
+
+
     /*  -------------#ind--------------- */
     /* #include "`me^.h"                 */
 
@@ -309,24 +309,6 @@ case constant :
                 break;
 
 
-    /*  -------------comment--------------- */
-    /* `$CL^ `what^^ `$CR^`^                */
-
-
-
-/* WRAPPED_TEXT
-WRAPPED_TEXT_line2 */
-
-                /* WRAPPED_TEXT
-                WRAPPED_TEXT_line2 */ b
-
-                `/* WRAPPED_TEXT
-                WRAPPED_TEXT_line2 */^
-
-                a /* WRAPPED_TEXT
-                WRAPPED_TEXT_line2 */
-
-
     /*  -------------commentBlock--------------- */
     /* `$_xCommentLeftWithoutMid^`$CM `cursor^   */
     /* `$_xCommentMidIndent$CR^                  */
@@ -378,6 +360,24 @@ WRAPPED_TEXT_line2 */
                  */
 
 
+    /*  -------------comment--------------- */
+    /* `$CL^ `what^^ `$CR^`^                */
+
+
+
+/* WRAPPED_TEXT
+WRAPPED_TEXT_line2 */
+
+                /* WRAPPED_TEXT
+                WRAPPED_TEXT_line2 */ b
+
+                `/* WRAPPED_TEXT
+                WRAPPED_TEXT_line2 */^
+
+                a /* WRAPPED_TEXT
+                WRAPPED_TEXT_line2 */
+
+
     /*  -------------commentLine--------------- */
     /* `$CL `what` $CR^`^                       */
 
@@ -812,58 +812,6 @@ a int name() {
 }
 
 
-    /*  -------------if--------------- */
-    /* `Include:_if^                   */
-
-
-
-if ( condition ) {
-    WRAPPED_TEXT
-    WRAPPED_TEXT_line2
-}
-
-if ( condition_TYPED ) {
-    WRAPPED_TEXT
-    WRAPPED_TEXT_line2
-} b
-
-`if ( condition ) {
-    WRAPPED_TEXT
-    WRAPPED_TEXT_line2
-}^
-
-a if ( condition ) {
-    WRAPPED_TEXT
-    WRAPPED_TEXT_line2
-}
-
-
-    /*  -------------if0--------------- */
-    /* `Include:_if^                    */
-
-
-
-if ( 0 == var ) {
-    WRAPPED_TEXT
-    WRAPPED_TEXT_line2
-}
-
-if ( 0 == var_TYPED ) {
-    WRAPPED_TEXT
-    WRAPPED_TEXT_line2
-} b
-
-`if ( 0 == var ) {
-    WRAPPED_TEXT
-    WRAPPED_TEXT_line2
-}^
-
-a if ( 0 == var ) {
-    WRAPPED_TEXT
-    WRAPPED_TEXT_line2
-}
-
-
     /*  -------------ifee---------------                              */
     /* `:_if:^` `else_if...{{^`$BRel^`Include:elif^` `else_if...^`}}^ */
 
@@ -939,6 +887,58 @@ a if ( NULL == var ) {
 }
 
 
+    /*  -------------if--------------- */
+    /* `Include:_if^                   */
+
+
+
+if ( condition ) {
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+}
+
+if ( condition_TYPED ) {
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+} b
+
+`if ( condition ) {
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+}^
+
+a if ( condition ) {
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+}
+
+
+    /*  -------------if0--------------- */
+    /* `Include:_if^                    */
+
+
+
+if ( 0 == var ) {
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+}
+
+if ( 0 == var_TYPED ) {
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+} b
+
+`if ( 0 == var ) {
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+}^
+
+a if ( 0 == var ) {
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+}
+
+
     /*  -------------ifn0--------------- */
     /* `Include:_if^                     */
 
@@ -1275,60 +1275,60 @@ a switch ( var ) {
 }
 
 
-    /*  -------------while---------------                   */
-    /* while`$SPcmd^(`$SParg^`condition^`$SParg^)`$BRloop^{ */
-    /*     `cursor^                                         */
-    /* }                                                    */
+    /*  -------------while0---------------                   */
+    /* do`$BRloop^{                                          */
+    /*     `cursor^                                          */
+    /* }`$BRloop^while`$SPcmd^(`$SParg^`condition^`$SParg^); */
 
 
 
-while ( condition ) {
+do {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
-}
+} while ( 0 );
 
-while ( condition_TYPED ) {
+do {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
-} b
+} while ( 0 ); b
 
-`while ( condition ) {
+`do {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
-}^
+} while ( 0 );^
 
-a while ( condition ) {
+a do {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
-}
+} while ( 0 );
 
 
-    /*  -------------while0---------------                   */
-    /* do`$BRloop^{                                          */
-    /*     `cursor^                                          */
-    /* }`$BRloop^while`$SPcmd^(`$SParg^`condition^`$SParg^); */
+    /*  -------------while---------------                   */
+    /* while`$SPcmd^(`$SParg^`condition^`$SParg^)`$BRloop^{ */
+    /*     `cursor^                                         */
+    /* }                                                    */
 
 
 
-do {
+while ( condition ) {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
-} while ( 0 );
+}
 
-do {
+while ( condition_TYPED ) {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
-} while ( 0 ); b
+} b
 
-`do {
+`while ( condition ) {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
-} while ( 0 );^
+}^
 
-a do {
+a while ( condition ) {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
-} while ( 0 );
+}
 
 
     /*  -------------while1---------------                  */
diff --git a/ftplugin/lua/test.page b/ftplugin/lua/test.page
index d222bd4e..05176403 100644
--- a/ftplugin/lua/test.page
+++ b/ftplugin/lua/test.page
@@ -123,24 +123,6 @@ WRAPPED_TEXT_line2`
     a drdr.xp
 
 
-    --  _CMT__CMT__CMT__CMT__CMT__CMT_-comment_CMT__CMT__CMT__CMT__CMT__CMT__CMT_- 
-    -- `$CS `cursor^                        
-
-
-
--- WRAPPED_TEXT
--- WRAPPED_TEXT_line2
-
--- WRAPPED_TEXT
--- WRAPPED_TEXT_line2 b
-
-`-- WRAPPED_TEXT
- -- WRAPPED_TEXT_line2^
-
- a -- WRAPPED_TEXT
-   -- WRAPPED_TEXT_line2
-
-
     --  _CMT__CMT__CMT__CMT__CMT__CMT_-commentBlock_CMT__CMT__CMT__CMT__CMT__CMT__CMT_- 
     -- `$CS `cursor^                             
 
@@ -192,6 +174,24 @@ a --
 
 
 
+-- WRAPPED_TEXT
+-- WRAPPED_TEXT_line2
+
+-- WRAPPED_TEXT
+-- WRAPPED_TEXT_line2 b
+
+`-- WRAPPED_TEXT
+ -- WRAPPED_TEXT_line2^
+
+ a -- WRAPPED_TEXT
+   -- WRAPPED_TEXT_line2
+
+
+    --  _CMT__CMT__CMT__CMT__CMT__CMT_-comment_CMT__CMT__CMT__CMT__CMT__CMT__CMT_- 
+    -- `$CS `cursor^                        
+
+
+
 -- WRAPPED_TEXT
 -- WRAPPED_TEXT_line2
 
@@ -391,116 +391,116 @@ a --
     end
 
 
-    --  _CMT__CMT__CMT__CMT__CMT__CMT_-if_CMT__CMT__CMT__CMT__CMT__CMT__CMT_- 
-    -- if `cond^ then                  
-    --     `cursor^                    
-    -- end                             
+    --  _CMT__CMT__CMT__CMT__CMT__CMT_-ifei_CMT__CMT__CMT__CMT__CMT__CMT__CMT_- 
+    -- if `cond^ then`                   
+    --     `job^                         
+    -- ``elseif...`                      
+    -- {{^elseif `comparison^ then       
+    --     `job^                         
+    -- ``elseif...`                      
+    -- ^`}}^``else...`                   
+    -- {{^else                           
+    --     `cursor^                      
+    -- `}}^end                           
 
 
 
     if cond then
+        -- job
+    elseif comparison then
+        -- job
+    elseif comparison then
+        -- job
+    elseif comparison then
+        -- job
+    else
         
     end
 
     if cond_TYPED then
-        
+        job_TYPED
+    elseif_TYPED
+else_TYPED
     end b
 
     `if cond then
+        -- job
+    elseif comparison then
+        -- job
+    elseif comparison then
+        -- job
+    elseif comparison then
+        -- job
+    else
         
     end^
 
     a if cond then
+        -- job
+    elseif comparison then
+        -- job
+    elseif comparison then
+        -- job
+    elseif comparison then
+        -- job
+    else
         
     end
 
 
-    --  _CMT__CMT__CMT__CMT__CMT__CMT_-ife_CMT__CMT__CMT__CMT__CMT__CMT__CMT_- 
-    -- if `cond^ then                   
-    --     `job^                        
-    -- else                             
-    --     `cursor^                     
-    -- end                              
+    --  _CMT__CMT__CMT__CMT__CMT__CMT_-if_CMT__CMT__CMT__CMT__CMT__CMT__CMT_- 
+    -- if `cond^ then                  
+    --     `cursor^                    
+    -- end                             
 
 
 
     if cond then
-        -- job
-    else
         
     end
 
     if cond_TYPED then
-        job_TYPED
-    else
         
     end b
 
     `if cond then
-        -- job
-    else
         
     end^
 
     a if cond then
-        -- job
-    else
         
     end
 
 
-    --  _CMT__CMT__CMT__CMT__CMT__CMT_-ifei_CMT__CMT__CMT__CMT__CMT__CMT__CMT_- 
-    -- if `cond^ then`                   
-    --     `job^                         
-    -- ``elseif...`                      
-    -- {{^elseif `comparison^ then       
-    --     `job^                         
-    -- ``elseif...`                      
-    -- ^`}}^``else...`                   
-    -- {{^else                           
-    --     `cursor^                      
-    -- `}}^end                           
+    --  _CMT__CMT__CMT__CMT__CMT__CMT_-ife_CMT__CMT__CMT__CMT__CMT__CMT__CMT_- 
+    -- if `cond^ then                   
+    --     `job^                        
+    -- else                             
+    --     `cursor^                     
+    -- end                              
 
 
 
     if cond then
         -- job
-    elseif comparison then
-        -- job
-    elseif comparison then
-        -- job
-    elseif comparison then
-        -- job
     else
         
     end
 
     if cond_TYPED then
         job_TYPED
-    elseif_TYPED
-else_TYPED
+    else
+        
     end b
 
     `if cond then
         -- job
-    elseif comparison then
-        -- job
-    elseif comparison then
-        -- job
-    elseif comparison then
-        -- job
     else
         
     end^
 
     a if cond then
         -- job
-    elseif comparison then
-        -- job
-    elseif comparison then
-        -- job
-    elseif comparison then
-        -- job
     else
         
     end
diff --git a/ftplugin/markdown/markdown.xpt.vim b/ftplugin/markdown/markdown.xpt.vim
index e5cc6857..e78cd0df 100644
--- a/ftplugin/markdown/markdown.xpt.vim
+++ b/ftplugin/markdown/markdown.xpt.vim
@@ -2,18 +2,28 @@ XPTemplate priority=lang mark=~^
 
 let s:f = g:XPTfuncs()
 
-" use snippet 'varConst' to generate contant variables
-" use snippet 'varFormat' to generate formatting variables
-" use snippet 'varSpaces' to generate spacing variables
-
-fun! s:f.ExpandMarkdownTitle( char )
-    let txt = self.R( 'sectionName' )
-    let bar = repeat( a:char, len( txt ) )
-    return txt . "\n" . bar . "\n"
+fun! s:f.HeaderPref()
+    let snipname = self.GetVar('$_xSnipName')
+    let nr = snipname[ 1 : 1 ] * 1
+    return repeat('#', nr)
 endfunction
 
-fun! s:f.ExpandMarkdownSubSection()
-    return "### " . self.R( 'sectionName' )
+fun! s:f.UnderLine(char)
+    let v = self.ItemValue()
+    if v == ''
+        return ''
+    else
+        " line break before "===" and after "==="
+        return "\n" . repeat(a:char, len(v)) . "\n"
+    endif
+endfunction
+
+fun! s:f.QuitContition()
+    let v = self.ItemValue()
+    if v == '' || v =~ '\V\n'
+        let q = self.Next(substitute(v, '\V\n', '', 'g'))
+        return q
+    endif
 endfunction
 
 fun! s:f.Reminder( field )
@@ -42,24 +52,38 @@ endfunction
 XPTinclude
       \ _common/common
 
+XPT sharp_header hidden " HeaderPref() title
+~HeaderPref() ~t^
+
+XPT h1 alias=sharp_header
+XPT h2 alias=sharp_header
+XPT h3 alias=sharp_header
+XPT h4 alias=sharp_header
+XPT h5 alias=sharp_header
+XPT h6 alias=sharp_header
 
-XPT title synonym=h1 " ... ===
-XSET sectionName|post=ExpandMarkdownTitle('=')
-~sectionName^
+XPT header_alt hidden " ... repeat($decoration,3)
+XSET $decoration==
+XSET t|ontype=QuitContition()
+~t^~t^UnderLine($decoration)^~^
 
-XPT section synonym=h2 " ... ---
-XSET sectionName|post=ExpandMarkdownTitle('-')
-~sectionName^
+XPT ha1 alias=header_alt
+XSET $decoration==
 
-XPT subsection synonym=h3 " ### ...
-XSET sectionName|post=ExpandMarkdownSubSection()
-~sectionName^
+XPT ha2 alias=header_alt
+XSET $decoration=-
 
-XPT link synonym=lnk " [...](...)
-[~textLink^](~url^~ title...{{^ ~title^~}}^)
+XPT title alias=ha1
+XPT section alias=ha2
+XPT subsection alias=h3
+
+
+XPT link " [...](...)
+[~text^](~url^~ ~title?^)
 
 XPT img " ![...](...)
-![~alt text^](~url^~ title...{{^ ~title^~}}^)
+![~alt-text^](~url^~ ~title?^)
+
 
 XPT ref " [...][...]
 XSET url|post=Reminder('url')
@@ -67,6 +91,8 @@ XSET title|post=Reminder('title')
 XSET cursor=BuildRef()
 [~text^][~refId^]~url^~ title...{{^ ~title^~}}^~cursor^
 
-XPT ruler synonym=hr " -----------------
----------------------------------------
+
+XPT hr " -----
+
+XPT ruler alias=hr
 
diff --git a/ftplugin/markdown/test.page b/ftplugin/markdown/test.page
index c1e8d2b3..3e6e41ff 100644
--- a/ftplugin/markdown/test.page
+++ b/ftplugin/markdown/test.page
@@ -1,8 +1,8 @@
 
 
 
-    /*  -------------"_--------------- */
-    /* "`w^"                           */
+    >   -------------"_--------------- 
+    >  "`w^"                           
 
 
 
@@ -19,8 +19,8 @@ a "WRAPPED_TEXT
 WRAPPED_TEXT_line2"
 
 
-    /*  -------------'_--------------- */
-    /* '`w^'                           */
+    >   -------------'_--------------- 
+    >  '`w^'                           
 
 
 
@@ -37,8 +37,8 @@ a 'WRAPPED_TEXT
 WRAPPED_TEXT_line2'
 
 
-    /*  -------------(_--------------- */
-    /* (`w^)                           */
+    >   -------------(_--------------- 
+    >  (`w^)                           
 
 
 
@@ -55,8 +55,8 @@ a (WRAPPED_TEXT
 WRAPPED_TEXT_line2)
 
 
-    /*  -------------<_--------------- */
-    /* <`w^>                           */
+    >   -------------<_--------------- 
+    >  <`w^>                           
 
 
 
@@ -73,8 +73,8 @@ a <WRAPPED_TEXT
 WRAPPED_TEXT_line2>
 
 
-    /*  -------------[_--------------- */
-    /* [`w^]                           */
+    >   -------------[_--------------- 
+    >  [`w^]                           
 
 
 
@@ -91,8 +91,8 @@ a [WRAPPED_TEXT
 WRAPPED_TEXT_line2]
 
 
-    /*  -------------`_--------------- */
-    /* \``w^\`                         */
+    >   -------------`_--------------- 
+    >  \``w^\`                         
 
 
 
@@ -109,126 +109,126 @@ a `WRAPPED_TEXT
 WRAPPED_TEXT_line2`
 
 
-    /*  -------------Author--------------- */
-    /* `$author^                           */
+    >   -------------Author--------------- 
+    >  `$author^                           
 
 
 
-drdr.xp
+    drdr.xp
 
-drdr.xp b
+    drdr.xp b
 
-`drdr.xp^
+    `drdr.xp^
 
-a drdr.xp
+    a drdr.xp
 
 
-    /*  -------------Email--------------- */
-    /* `$email^                           */
+    >   -------------Email--------------- 
+    >  `$email^                           
 
 
 
-drdr.xp@gmail.com
+    drdr.xp@gmail.com
 
-drdr.xp@gmail.com b
+    drdr.xp@gmail.com b
 
-`drdr.xp@gmail.com^
+    `drdr.xp@gmail.com^
 
-a drdr.xp@gmail.com
+    a drdr.xp@gmail.com
 
 
-    /*  -------------File--------------- */
-    /* `file()^                          */
+    >   -------------File--------------- 
+    >  `file()^                          
 
 
 
-test.page
+    test.page
 
-test.page b
+    test.page b
 
-`test.page^
+    `test.page^
 
-a test.page
+    a test.page
 
 
-    /*  -------------h1--------------- */
-    /* ~sectionName^                   */
+    >   -------------h1--------------- 
+    >  ~sectionName^                   
 
 
 
-sectionName
-===========
+    sectionName
+    ===========
+    
 
+    sectionName_TYPED
+    =================
+     b
 
-sectionName_TYPED
-=================
- b
+     `sectionName
+     ===========
+     ^
 
- `sectionName
- ===========
- ^
+     a sectionName
+     ===========
+     
 
- a sectionName
- ===========
- 
 
+    >   -------------h2--------------- 
+    >  ~sectionName^                   
 
-    /*  -------------h2--------------- */
-    /* ~sectionName^                   */
 
 
+    sectionName
+    -----------
+    
 
- sectionName
- -----------
- 
+    sectionName_TYPED
+    -----------------
+     b
 
- sectionName_TYPED
- -----------------
-  b
+     `sectionName
+     -----------
+     ^
 
-  `sectionName
-  -----------
-  ^
+     a sectionName
+     -----------
+     
 
-  a sectionName
-  -----------
-  
 
+    >   -------------h3--------------- 
+    >  ~sectionName^                   
 
-    /*  -------------h3--------------- */
-    /* ~sectionName^                   */
 
 
+    ### sectionName
 
-  ### sectionName
+    ### sectionName_TYPED b
 
-  ### sectionName_TYPED b
+    `### sectionName^
 
-  `### sectionName^
+    a ### sectionName
 
-  a ### sectionName
 
+    >   -------------hr---------------         
+    >  --------------------------------------- 
 
-    /*  -------------hr---------------         */
-    /* --------------------------------------- */
 
 
+    ---------------------------------------
 
-  ---------------------------------------
+    --------------------------------------- b
 
-  --------------------------------------- b
+    `---------------------------------------^
 
-  `---------------------------------------^
+    a ---------------------------------------
 
-  a ---------------------------------------
 
+    >   -------------img---------------              
+    >  ![~alt text^](~url^~ title...{{^ ~title^~}}^) 
 
-    /*  -------------img---------------              */
-    /* ![~alt text^](~url^~ title...{{^ ~title^~}}^) */
 
 
-
-  ![alt text](url title)
+    ![alt text](url title)
 
     ![alttext_TYPED](url_TYPEDtitle_TYPED) b
 
@@ -237,8 +237,8 @@ sectionName_TYPED
     a ![alt text](url title)
 
 
-    /*  -------------link---------------            */
-    /* [~textLink^](~url^~ title...{{^ ~title^~}}^) */
+    >   -------------link---------------            
+    >  [~textLink^](~url^~ title...{{^ ~title^~}}^) 
 
 
 
@@ -251,8 +251,8 @@ sectionName_TYPED
     a [textLink](url title)
 
 
-    /*  -------------lnk---------------             */
-    /* [~textLink^](~url^~ title...{{^ ~title^~}}^) */
+    >   -------------lnk---------------             
+    >  [~textLink^](~url^~ title...{{^ ~title^~}}^) 
 
 
 
@@ -265,8 +265,8 @@ sectionName_TYPED
     a [textLink](url title)
 
 
-    /*  -------------ref---------------                        */
-    /* [~text^][~refId^]~url^~ title...{{^ ~title^~}}^~cursor^ */
+    >   -------------ref---------------                        
+    >  [~text^][~refId^]~url^~ title...{{^ ~title^~}}^~cursor^ 
 
 
 
@@ -283,80 +283,80 @@ a [text][refId] \n
 [refId]: <url> "title"
 
 
-    /*  -------------ruler---------------      */
-    /* --------------------------------------- */
-
+    >   -------------ruler---------------      
+    >  --------------------------------------- 
 
 
----------------------------------------
 
---------------------------------------- b
+    ---------------------------------------
 
-`---------------------------------------^
+    --------------------------------------- b
 
-a ---------------------------------------
+    `---------------------------------------^
 
+    a ---------------------------------------
 
-    /*  -------------section--------------- */
-    /* ~sectionName^                        */
 
+    >   -------------section--------------- 
+    >  ~sectionName^                        
 
 
-sectionName
------------
 
+    sectionName
+    -----------
+    
 
-sectionName_TYPED
------------------
- b
+    sectionName_TYPED
+    -----------------
+     b
 
- `sectionName
- -----------
- ^
+     `sectionName
+     -----------
+     ^
 
- a sectionName
- -----------
- 
+     a sectionName
+     -----------
+     
 
 
-    /*  -------------subsection--------------- */
-    /* ~sectionName^                           */
+    >   -------------subsection--------------- 
+    >  ~sectionName^                           
 
 
 
- ### sectionName
+    ### sectionName
 
- ### sectionName_TYPED b
+    ### sectionName_TYPED b
 
- `### sectionName^
+    `### sectionName^
 
- a ### sectionName
+    a ### sectionName
 
 
-    /*  -------------title--------------- */
-    /* ~sectionName^                      */
+    >   -------------title--------------- 
+    >  ~sectionName^                      
 
 
 
- sectionName
- ===========
- 
+    sectionName
+    ===========
+    
 
- sectionName_TYPED
- =================
-  b
+    sectionName_TYPED
+    =================
+     b
 
-  `sectionName
-  ===========
-  ^
+     `sectionName
+     ===========
+     ^
 
-  a sectionName
-  ===========
-  
+     a sectionName
+     ===========
+     
 
 
-    /*  -------------{_--------------- */
-    /* {`w^}                           */
+    >   -------------{_--------------- 
+    >  {`w^}                           
 
 
 
diff --git a/ftplugin/objc/objc.xpt.vim b/ftplugin/objc/objc.xpt.vim
index ad2dcc74..db8ebcb6 100644
--- a/ftplugin/objc/objc.xpt.vim
+++ b/ftplugin/objc/objc.xpt.vim
@@ -9,11 +9,25 @@ XPTinclude
       \ c/c
 
 XPT msg " [to ...]
-[`to^ `msg^`...^ `argName^:`argVal^`...^]
+[`to^ `msg^`args...{{^:`arg^`...{{^ `argName^:`argVal^`...^`}}^`}}^]
+
+XPT forin " for (... in ...) { ... }
+for (`type^id^ `var^ in `collection^)
+{
+    `cursor^
+}
+
+XPT import " #import "..."
+#import "`hfile^"
 
 XPT #import " #import <...>
 #import <`hfile^>
 
+XPT protocol " @protocol ... @end
+@protocol `protocolName^
+`cursor^
+@end
+
 XPT interface " @interface ... : ... ...
 @interface `interfaceName^ `inherit...{{^ : `father^ `}}^{
     // put instances variable here
@@ -37,6 +51,9 @@ XPT catimplem " @implementation ... (...) ... @end
 `cursor^
 @end
 
+XPT alloc " [[... alloc] ...]
+[[`className^ alloc] `cursor^]
+
 XPT method " - (...) ....: ...
 - (`retType^void^) `methodName^`args...{{^`...^ (`type^)name`...^`}}^;
 
diff --git a/ftplugin/objc/test.page b/ftplugin/objc/test.page
index 9db0dc3b..3e2be937 100644
--- a/ftplugin/objc/test.page
+++ b/ftplugin/objc/test.page
@@ -117,32 +117,32 @@ WRAPPED_TEXT_line2
 a #import <hfile>
 
 
-    /*  -------------#inc--------------- */
-    /* #include <`^.h>                   */
+    /*  -------------#include_user--------------- */
+    /* #include "`me^.h"                          */
 
 
 
-#include <.h>
+#include "test.h"
 
-#include <_TYPED.h> b
+#include "me_TYPED.h" b
 
-`#include <.h>^
+`#include "test.h"^
 
-a #include <.h>
+a #include "test.h"
 
 
-    /*  -------------#include_user--------------- */
-    /* #include "`me^.h"                          */
+    /*  -------------#inc--------------- */
+    /* #include <`^.h>                   */
 
 
 
-#include "test.h"
+#include <.h>
 
-#include "me_TYPED.h" b
+#include <_TYPED.h> b
 
-`#include "test.h"^
+`#include <.h>^
 
-a #include "test.h"
+a #include <.h>
 
 
     /*  -------------#ind--------------- */
@@ -752,46 +752,18 @@ a test.page
  
 
 
-    /*  -------------for---------------                                                                                  */
-    /* for`$SPcmd^(`$SParg^`$FOR_SCOPE^`$VAR_PRE`i^`$SPop^=`$SPop^`0^; `i^`$SPop^<`$SPop^`len^; `i^++`$SParg^)`$BRloop^{ */
-    /*     `cursor^                                                                                                      */
-    /* }                                                                                                                 */
-
-
-
-for ( i = 0; i < len; i++ ) {
-    WRAPPED_TEXT
-    WRAPPED_TEXT_line2
-}
-
-for ( i_TYPED = 0_TYPED; i_TYPED < len_TYPED; i_TYPED++ ) {
-    WRAPPED_TEXT
-    WRAPPED_TEXT_line2
-} b
-
-`for ( i = 0; i < len; i++ ) {
-    WRAPPED_TEXT
-    WRAPPED_TEXT_line2
-}^
-
-a for ( i = 0; i < len; i++ ) {
-    WRAPPED_TEXT
-    WRAPPED_TEXT_line2
-}
-
-
     /*  -------------forever--------------- */
     /* for`$SPcmd^(;;) `cursor^             */
 
 
 
-for (;;) 
+ for (;;) 
 
-for (;;)  b
+ for (;;)  b
 
-`for (;;) ^
+ `for (;;) ^
 
-a for (;;) 
+ a for (;;) 
 
 
     /*  -------------fornn---------------                                                                                                */
@@ -850,6 +822,34 @@ a for ( i = 0; i >= end; i-- ) {
 }
 
 
+    /*  -------------for---------------                                                                                  */
+    /* for`$SPcmd^(`$SParg^`$FOR_SCOPE^`$VAR_PRE`i^`$SPop^=`$SPop^`0^; `i^`$SPop^<`$SPop^`len^; `i^++`$SParg^)`$BRloop^{ */
+    /*     `cursor^                                                                                                      */
+    /* }                                                                                                                 */
+
+
+
+for ( i = 0; i < len; i++ ) {
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+}
+
+for ( i_TYPED = 0_TYPED; i_TYPED < len_TYPED; i_TYPED++ ) {
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+} b
+
+`for ( i = 0; i < len; i++ ) {
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+}^
+
+a for ( i = 0; i < len; i++ ) {
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+}
+
+
     /*  -------------fprintf---------------                     */
     /* fprintf(`$SParg^`stream^,`$SPop^`:_printfElts:^`$SParg^) */
 
@@ -896,6 +896,55 @@ name()
 }
 
 
+    /*  -------------ifee---------------                              */
+    /* `:_if:^` `else_if...{{^`$BRel^`Include:elif^` `else_if...^`}}^ */
+
+
+
+if ( condition ) {
+    
+}
+else if ( condition ) {
+    /* cursor */
+}
+else if ( condition ) {
+    /* cursor */
+}
+else if ( condition ) {
+    /* cursor */
+}
+
+if ( condition_TYPED ) {
+    _TYPED
+} else_if_TYPED b
+
+`if ( condition ) {
+    
+}
+else if ( condition ) {
+    /* cursor */
+}
+else if ( condition ) {
+    /* cursor */
+}
+else if ( condition ) {
+    /* cursor */
+}^
+
+a if ( condition ) {
+    
+}
+else if ( condition ) {
+    /* cursor */
+}
+else if ( condition ) {
+    /* cursor */
+}
+else if ( condition ) {
+    /* cursor */
+}
+
+
     /*  -------------if--------------- */
     /* `Include:_if^                   */
 
@@ -948,55 +997,6 @@ a if ( 0 == var ) {
 }
 
 
-    /*  -------------ifee---------------                              */
-    /* `:_if:^` `else_if...{{^`$BRel^`Include:elif^` `else_if...^`}}^ */
-
-
-
-if ( condition ) {
-    
-}
-else if ( condition ) {
-    /* cursor */
-}
-else if ( condition ) {
-    /* cursor */
-}
-else if ( condition ) {
-    /* cursor */
-}
-
-if ( condition_TYPED ) {
-    _TYPED
-} else_if_TYPED b
-
-`if ( condition ) {
-    
-}
-else if ( condition ) {
-    /* cursor */
-}
-else if ( condition ) {
-    /* cursor */
-}
-else if ( condition ) {
-    /* cursor */
-}^
-
-a if ( condition ) {
-    
-}
-else if ( condition ) {
-    /* cursor */
-}
-else if ( condition ) {
-    /* cursor */
-}
-else if ( condition ) {
-    /* cursor */
-}
-
-
     /*  -------------ifn--------------- */
     /* `Include:_if^                    */
 
diff --git a/ftplugin/ocaml/test.page b/ftplugin/ocaml/test.page
index 85dab94f..0a8f7f0d 100644
--- a/ftplugin/ocaml/test.page
+++ b/ftplugin/ocaml/test.page
@@ -144,35 +144,6 @@ end^
 
 a begin
     
-end
-
-
-    (*  -------------class--------------- *)
-    (* class `_^^ `name^ =                *)
-    (* object (self)                      *)
-    (*     `cursor^                       *)
-    (* end                                *)
-
-
-
-class  name =
-object (self)
-    
-end
-
-class __TYPED name_TYPED =
-object (self)
-    
-end b
-
-`class  name =
-object (self)
-    
-end^
-
-a class  name =
-object (self)
-    
 end
 
 
@@ -274,6 +245,35 @@ object
 end
 
 
+    (*  -------------class--------------- *)
+    (* class `_^^ `name^ =                *)
+    (* object (self)                      *)
+    (*     `cursor^                       *)
+    (* end                                *)
+
+
+
+class  name =
+object (self)
+    
+end
+
+class __TYPED name_TYPED =
+object (self)
+    
+end b
+
+`class  name =
+object (self)
+    
+end^
+
+a class  name =
+object (self)
+    
+end
+
+
     (*  -------------comment--------------- *)
     (* `$CL^ `what^^ `$CR^`^                *)
 
@@ -616,50 +616,50 @@ fun args ->
                                                    | what -> with
 
 
-    (*  -------------module--------------- *)
-    (* module `name^ `^ = struct           *)
-    (*     `cursor^                        *)
-    (* end                                 *)
+    (*  -------------moduletype--------------- *)
+    (* module type `name^ `^ = sig             *)
+    (*     `cursor^                            *)
+    (* end                                     *)
 
 
 
-                                                   module Name  = struct
+                                                   module type name  = sig
                                                        
                                                    end
 
-                                                   module Name_TYPED _TYPED = struct
+                                                   module type name_TYPED _TYPED = sig
                                                        
                                                    end b
 
-                                                   `module Name  = struct
+                                                   `module type name  = sig
                                                        
                                                    end^
 
-                                                   a module Name  = struct
+                                                   a module type name  = sig
                                                        
                                                    end
 
 
-    (*  -------------moduletype--------------- *)
-    (* module type `name^ `^ = sig             *)
-    (*     `cursor^                            *)
-    (* end                                     *)
+    (*  -------------module--------------- *)
+    (* module `name^ `^ = struct           *)
+    (*     `cursor^                        *)
+    (* end                                 *)
 
 
 
-module type name  = sig
+module Name  = struct
     
 end
 
-module type name_TYPED _TYPED = sig
+module Name_TYPED _TYPED = struct
     
 end b
 
-`module type name  = sig
+`module Name  = struct
     
 end^
 
-a module type name  = sig
+a module Name  = struct
     
 end
 
@@ -719,74 +719,74 @@ with  exc -> rez
            a t -> t2 -> t2 -> t2
 
 
-    (*  -------------typerecord--------------- *)
-    (* type `typename^` `typeParams?^ =        *)
-    (*     { `recordField^ : `fType^` `...^    *)
-    (*     ; `recordField^ : `fType^` `...^    *)
-    (*     }                                   *)
+    (*  -------------typerecordcom---------------            *)
+    (* _CMT_* `type_descr^ _cmt_                             *)
+    (* type `typename^ `_^^=                                 *)
+    (*     { `recordField^ : `fType^ _CMT_* `desc^ _cmt_` `...^ *)
+    (*     ; `otherfield^ : `othertype^ _CMT_* `desc^ _cmt_` `...^ *)
+    (*     }                                                 *)
 
 
 
+                                         (** type_descr *)
                                          type typename =
-                                             { recordField : fType
-                                             ; recordField : fType
-                                             ; recordField : fType
+                                             { recordField : fType (** desc *)
+                                             ; otherfield : othertype (** desc *)
+                                             ; otherfield : othertype (** desc *)
+                                             ; otherfield : othertype (** desc *)
                                              }
 
-                                             type typename_TYPED typeParams_TYPED =
-                                                 { recordField_TYPED : fType_TYPED _TYPED
+                                             (** type_descr_TYPED *)
+                                             type typename_TYPED __TYPED=
+                                                 { recordField_TYPED : fType_TYPED (** desc_TYPED *) _TYPED
                                                  } b
 
-                                                 `type typename =
-                                                     { recordField : fType
-                                                     ; recordField : fType
-                                                     ; recordField : fType
+                                                 `(** type_descr *)
+                                                 type typename =
+                                                     { recordField : fType (** desc *)
+                                                     ; otherfield : othertype (** desc *)
+                                                     ; otherfield : othertype (** desc *)
+                                                     ; otherfield : othertype (** desc *)
                                                      }^
 
-                                                     a type typename =
-                                                         { recordField : fType
-                                                         ; recordField : fType
-                                                         ; recordField : fType
+                                                     a (** type_descr *)
+                                                     type typename =
+                                                         { recordField : fType (** desc *)
+                                                         ; otherfield : othertype (** desc *)
+                                                         ; otherfield : othertype (** desc *)
+                                                         ; otherfield : othertype (** desc *)
                                                          }
 
 
-    (*  -------------typerecordcom---------------            *)
-    (* _CMT_* `type_descr^ _cmt_                             *)
-    (* type `typename^ `_^^=                                 *)
-    (*     { `recordField^ : `fType^ _CMT_* `desc^ _cmt_` `...^ *)
-    (*     ; `otherfield^ : `othertype^ _CMT_* `desc^ _cmt_` `...^ *)
-    (*     }                                                 *)
+    (*  -------------typerecord--------------- *)
+    (* type `typename^` `typeParams?^ =        *)
+    (*     { `recordField^ : `fType^` `...^    *)
+    (*     ; `recordField^ : `fType^` `...^    *)
+    (*     }                                   *)
 
 
 
-                                             (** type_descr *)
-                                             type typename =
-                                                 { recordField : fType (** desc *)
-                                                 ; otherfield : othertype (** desc *)
-                                                 ; otherfield : othertype (** desc *)
-                                                 ; otherfield : othertype (** desc *)
-                                                 }
+                                                     type typename =
+                                                         { recordField : fType
+                                                         ; recordField : fType
+                                                         ; recordField : fType
+                                                         }
 
-                                                 (** type_descr_TYPED *)
-                                                 type typename_TYPED __TYPED=
-                                                     { recordField_TYPED : fType_TYPED (** desc_TYPED *) _TYPED
-                                                     } b
+                                                         type typename_TYPED typeParams_TYPED =
+                                                             { recordField_TYPED : fType_TYPED _TYPED
+                                                             } b
 
-                                                     `(** type_descr *)
-                                                     type typename =
-                                                         { recordField : fType (** desc *)
-                                                         ; otherfield : othertype (** desc *)
-                                                         ; otherfield : othertype (** desc *)
-                                                         ; otherfield : othertype (** desc *)
-                                                         }^
+                                                             `type typename =
+                                                                 { recordField : fType
+                                                                 ; recordField : fType
+                                                                 ; recordField : fType
+                                                                 }^
 
-                                                         a (** type_descr *)
-                                                         type typename =
-                                                             { recordField : fType (** desc *)
-                                                             ; otherfield : othertype (** desc *)
-                                                             ; otherfield : othertype (** desc *)
-                                                             ; otherfield : othertype (** desc *)
-                                                             }
+                                                                 a type typename =
+                                                                     { recordField : fType
+                                                                     ; recordField : fType
+                                                                     ; recordField : fType
+                                                                     }
 
 
     (*  -------------typesum--------------- *)
diff --git a/ftplugin/perl/test.page b/ftplugin/perl/test.page
index c318ded1..7b9c6be0 100644
--- a/ftplugin/perl/test.page
+++ b/ftplugin/perl/test.page
@@ -710,60 +710,60 @@ if ( $@ ) {
     }
 
 
-    #  -------------while---------------                   
-    # while`$SPcmd^(`$SParg^`condition^`$SParg^)`$BRloop^{ 
-    #     `cursor^                                         
-    # }                                                    
+    #  -------------while0---------------                   
+    # do`$BRloop^{                                          
+    #     `cursor^                                          
+    # }`$BRloop^while`$SPcmd^(`$SParg^`condition^`$SParg^); 
 
 
 
-while ( condition ) {
+do {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
-}
+} while ( 0 );
 
-while ( condition_TYPED ) {
+do {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
-} b
+} while ( 0 ); b
 
-`while ( condition ) {
+`do {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
-}^
+} while ( 0 );^
 
-a while ( condition ) {
+a do {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
-}
+} while ( 0 );
 
 
-    #  -------------while0---------------                   
-    # do`$BRloop^{                                          
-    #     `cursor^                                          
-    # }`$BRloop^while`$SPcmd^(`$SParg^`condition^`$SParg^); 
+    #  -------------while---------------                   
+    # while`$SPcmd^(`$SParg^`condition^`$SParg^)`$BRloop^{ 
+    #     `cursor^                                         
+    # }                                                    
 
 
 
-do {
+while ( condition ) {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
-} while ( 0 );
+}
 
-do {
+while ( condition_TYPED ) {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
-} while ( 0 ); b
+} b
 
-`do {
+`while ( condition ) {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
-} while ( 0 );^
+}^
 
-a do {
+a while ( condition ) {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
-} while ( 0 );
+}
 
 
     #  -------------while1---------------                  
diff --git a/ftplugin/php/php.ftdetect.vim b/ftplugin/php/php.ftdetect.vim
index e28fc66c..5a437cd7 100644
--- a/ftplugin/php/php.ftdetect.vim
+++ b/ftplugin/php/php.ftdetect.vim
@@ -41,7 +41,7 @@ let s:topFT = 'html'
 fun! XPT_phpFiletypeDetect() "{{{
     let pos = [ line( "." ), col( "." ) ]
 
-    let synName = g:xptutil.XPTgetCurrentOrPreviousSynName()
+    let synName = xpt#util#NearestSynName()
 
     if synName == ''
         " top level ft is html
diff --git a/ftplugin/php/php.xpt.vim b/ftplugin/php/php.xpt.vim
index 83b7dc63..a417ad6c 100644
--- a/ftplugin/php/php.xpt.vim
+++ b/ftplugin/php/php.xpt.vim
@@ -46,10 +46,6 @@ else
     XPTvar $PHP_TAG
 endif
 
-" ========================= Function and Variables =============================
-
-" ================================= Snippets ===================================
-
 XPT html " <?$PHP_TAG ... ?>
 ?>`html^<?`$PHP_TAG^
 
@@ -81,5 +77,5 @@ interface `interfaceName^`$BRfun^{
     `cursor^
 }
 
-
-" ================================= Wrapper ===================================
+XPT $ " make dollar a keyword
+$
diff --git a/ftplugin/php/test.page b/ftplugin/php/test.page
index 7f2867d8..e6707147 100644
--- a/ftplugin/php/test.page
+++ b/ftplugin/php/test.page
@@ -662,79 +662,79 @@ else if ( condition ) {
     }
 
 
-    /*  -------------ifn--------------- */
-    /* `Include:_if^                    */
+    /*  -------------ifn0--------------- */
+    /* `Include:_if^                     */
 
 
 
-if ( null == var ) {
+if ( 0 != var ) {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }
 
-if ( null == var_TYPED ) {
+if ( 0 != var_TYPED ) {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 } b
 
-`if ( null == var ) {
+`if ( 0 != var ) {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }^
 
-a if ( null == var ) {
+a if ( 0 != var ) {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }
 
 
-    /*  -------------ifn0--------------- */
+    /*  -------------ifnn--------------- */
     /* `Include:_if^                     */
 
 
 
-if ( 0 != var ) {
+if ( null != var ) {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }
 
-if ( 0 != var_TYPED ) {
+if ( null != var_TYPED ) {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 } b
 
-`if ( 0 != var ) {
+`if ( null != var ) {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }^
 
-a if ( 0 != var ) {
+a if ( null != var ) {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }
 
 
-    /*  -------------ifnn--------------- */
-    /* `Include:_if^                     */
+    /*  -------------ifn--------------- */
+    /* `Include:_if^                    */
 
 
 
-if ( null != var ) {
+if ( null == var ) {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }
 
-if ( null != var_TYPED ) {
+if ( null == var_TYPED ) {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 } b
 
-`if ( null != var ) {
+`if ( null == var ) {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }^
 
-a if ( null != var ) {
+a if ( null == var ) {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }
diff --git a/ftplugin/ps1/test.page b/ftplugin/ps1/test.page
index d6e99fd3..2f52e716 100644
--- a/ftplugin/ps1/test.page
+++ b/ftplugin/ps1/test.page
@@ -303,35 +303,6 @@ for ($var_TYPED = init_TYPED; $var_TYPED -ge val_TYPED; $var_TYPED--)
 a for ($var = init; $var -ge val; $var--)
 {
     
-}
-
-
-    /*  -------------fun--------------- */
-    /* function `funName^( `params^ )   */
-    /* {                                */
-    /*    `cursor^                      */
-    /* }                                */
-
-
-
-function funName( params )
-{
-   
-}
-
-function funName_TYPED( params_TYPED )
-{
-   
-} b
-
-`function funName( params )
-{
-   
-}^
-
-a function funName( params )
-{
-   
 }
 
 
@@ -410,6 +381,35 @@ a function funName( params )
 }
 
 
+    /*  -------------fun--------------- */
+    /* function `funName^( `params^ )   */
+    /* {                                */
+    /*    `cursor^                      */
+    /* }                                */
+
+
+
+function funName( params )
+{
+   
+}
+
+function funName_TYPED( params_TYPED )
+{
+   
+} b
+
+`function funName( params )
+{
+   
+}^
+
+a function funName( params )
+{
+   
+}
+
+
     /*  -------------if--------------- */
     /* if ( `cond^ )                   */
     /* {                               */
diff --git a/ftplugin/python/test.page b/ftplugin/python/test.page
index 8223492e..dc04336c 100644
--- a/ftplugin/python/test.page
+++ b/ftplugin/python/test.page
@@ -332,20 +332,6 @@ a except Exception, e:
     
 
 
-    #  -------------File--------------- 
-    # `file()^                          
-
-
-
-test.page
-
-test.page b
-
-`test.page^
-
-a test.page
-
-
     #  -------------filehead--------------- 
     # `$PYTHON_DOC_MARK^                    
     # File    : `file()^                    
@@ -395,41 +381,36 @@ Description :
 '''
 
 
-    #  -------------finally--------------- 
-    # finally:                             
-    #     `cursor^                         
+    #  -------------File--------------- 
+    # `file()^                          
 
 
 
-finally:
-    
+test.page
 
-    finally:
-         b
+test.page b
 
-`finally:
-    ^
+`test.page^
 
-a finally:
-    
+a test.page
 
 
-    #  -------------for---------------           
-    # for `var^ in `seq^`seq^python_seq_cmpl()^: 
-    #     `cursor^                               
+    #  -------------finally--------------- 
+    # finally:                             
+    #     `cursor^                         
 
 
 
-for var in seq:
+finally:
     
 
-    for var_TYPED in seq_TYPED:
+    finally:
          b
 
-`for var in seq:
+`finally:
     ^
 
-a for var in seq:
+a finally:
     
 
 
@@ -452,18 +433,23 @@ a for i in range( end ):
     
 
 
-    #  -------------from---------------       
-    # from `module^ import `item^` as `name?^ 
+    #  -------------for---------------           
+    # for `var^ in `seq^`seq^python_seq_cmpl()^: 
+    #     `cursor^                               
 
 
 
-from module import item
+for var in seq:
+    
 
-from module_TYPED import item_TYPED as name_TYPED b
+    for var_TYPED in seq_TYPED:
+         b
 
-`from module import item^
+`for var in seq:
+    ^
 
-a from module import item
+a for var in seq:
+    
 
 
     #  -------------fromfuture--------------- 
@@ -480,6 +466,20 @@ from __future__ import name b
 a from __future__ import name
 
 
+    #  -------------from---------------       
+    # from `module^ import `item^` as `name?^ 
+
+
+
+from module import item
+
+from module_TYPED import item_TYPED as name_TYPED b
+
+`from module import item^
+
+a from module import item
+
+
     #  -------------genExp--------------- 
     # (`$SParg^`:_generator:^`$SParg^)    
 
@@ -643,20 +643,6 @@ range( 0_TYPED, end_TYPED ) b
 a range( end )
 
 
-    #  -------------s--------------- 
-    # self.                          
-
-
-
-self.
-
-self. b
-
-`self.^
-
-a self.
-
-
     #  -------------sb--------------- 
     # _CMT_!`$PYTHON_EXC^             
     # _CMT_ coding: `encoding^        
@@ -735,6 +721,20 @@ super( clz_TYPED, self ).method_TYPED( arg_TYPED, arg_TYPED, arg_TYPED ) b
 a super( Me, self ).what()
 
 
+    #  -------------s--------------- 
+    # self.                          
+
+
+
+self.
+
+self. b
+
+`self.^
+
+a self.
+
+
     #  -------------try--------------- 
     # try:                             
     #     `job^                        
diff --git a/ftplugin/r/test.page b/ftplugin/r/test.page
index 366427cb..4b6a23ca 100644
--- a/ftplugin/r/test.page
+++ b/ftplugin/r/test.page
@@ -324,32 +324,6 @@ a funName <- function( args )
 a #! /usr/bin/env Rscript
 
 
-    /*  -------------if--------------- */
-    /* `Include:_if^                   */
-
-
-
-if ( condition ) {
-    WRAPPED_TEXT
-    WRAPPED_TEXT_line2
-}
-
-if ( condition_TYPED ) {
-    WRAPPED_TEXT
-    WRAPPED_TEXT_line2
-} b
-
-`if ( condition ) {
-    WRAPPED_TEXT
-    WRAPPED_TEXT_line2
-}^
-
-a if ( condition ) {
-    WRAPPED_TEXT
-    WRAPPED_TEXT_line2
-}
-
-
     /*  -------------if0--------------- */
     /* `Include:_if^                    */
 
@@ -425,79 +399,105 @@ else if ( condition ) {
 }
 
 
-    /*  -------------ifn--------------- */
-    /* `Include:_if^                    */
+    /*  -------------ifn0--------------- */
+    /* `Include:_if^                     */
 
 
 
-if ( NULL == var ) {
+if ( 0 != var ) {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }
 
-if ( NULL == var_TYPED ) {
+if ( 0 != var_TYPED ) {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 } b
 
-`if ( NULL == var ) {
+`if ( 0 != var ) {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }^
 
-a if ( NULL == var ) {
+a if ( 0 != var ) {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }
 
 
-    /*  -------------ifn0--------------- */
+    /*  -------------ifnn--------------- */
     /* `Include:_if^                     */
 
 
 
-if ( 0 != var ) {
+if ( NULL != var ) {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }
 
-if ( 0 != var_TYPED ) {
+if ( NULL != var_TYPED ) {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 } b
 
-`if ( 0 != var ) {
+`if ( NULL != var ) {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }^
 
-a if ( 0 != var ) {
+a if ( NULL != var ) {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }
 
 
-    /*  -------------ifnn--------------- */
-    /* `Include:_if^                     */
+    /*  -------------ifn--------------- */
+    /* `Include:_if^                    */
 
 
 
-if ( NULL != var ) {
+if ( NULL == var ) {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }
 
-if ( NULL != var_TYPED ) {
+if ( NULL == var_TYPED ) {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 } b
 
-`if ( NULL != var ) {
+`if ( NULL == var ) {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }^
 
-a if ( NULL != var ) {
+a if ( NULL == var ) {
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+}
+
+
+    /*  -------------if--------------- */
+    /* `Include:_if^                   */
+
+
+
+if ( condition ) {
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+}
+
+if ( condition_TYPED ) {
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+} b
+
+`if ( condition ) {
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+}^
+
+a if ( condition ) {
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 }
diff --git a/ftplugin/ruby/test.page b/ftplugin/ruby/test.page
index 20a8dd8c..fcbc0d71 100644
--- a/ftplugin/ruby/test.page
+++ b/ftplugin/ruby/test.page
@@ -330,13 +330,13 @@ WRAPPED_TEXT_line2`
         
     } b
 
-        `BEGIN {
-            
-        }^
+    `BEGIN {
+        
+    }^
 
-        a BEGIN {
-            
-        }
+    a BEGIN {
+        
+    }
 
 
     #   -------------begin--------------- 
@@ -370,40 +370,40 @@ WRAPPED_TEXT_line2`
         
     end
 
-        begin
-            expr_TYPED
-        rescue_TYPED
-        else_TYPED
-        ensure_TYPED
-        end b
-
-        `begin
-            expr
-        rescue Exception => e
-            # block
-        rescue Exception => e
-            # block
-        rescue Exception => e
-            # block
-        else
-            # block
-        ensure
-            
-        end^
-
-        a begin
-            expr
-        rescue Exception => e
-            # block
-        rescue Exception => e
-            # block
-        rescue Exception => e
-            # block
-        else
-            # block
-        ensure
-            
-        end
+    begin
+        expr_TYPED
+    rescue_TYPED
+    else_TYPED
+    ensure_TYPED
+    end b
+
+    `begin
+        expr
+    rescue Exception => e
+        # block
+    rescue Exception => e
+        # block
+    rescue Exception => e
+        # block
+    else
+        # block
+    ensure
+        
+    end^
+
+    a begin
+        expr
+    rescue Exception => e
+        # block
+    rescue Exception => e
+        # block
+    rescue Exception => e
+        # block
+    else
+        # block
+    ensure
+        
+    end
 
 
     #   -------------begin_--------------- 
@@ -438,43 +438,43 @@ ensure
     
 end
 
-        begin
-            WRAPPED_TEXT
-            WRAPPED_TEXT_line2
-        rescue_TYPED
-        else_TYPED
-        ensure_TYPED
-        end b
-
-        `begin
-            WRAPPED_TEXT
-            WRAPPED_TEXT_line2
-        rescue Exception => e
-            # block
-        rescue Exception => e
-            # block
-        rescue Exception => e
-            # block
-        else
-            # block
-        ensure
-            
-        end^
-
-        a begin
-            WRAPPED_TEXT
-            WRAPPED_TEXT_line2
-        rescue Exception => e
-            # block
-        rescue Exception => e
-            # block
-        rescue Exception => e
-            # block
-        else
-            # block
-        ensure
-            
-        end
+    begin
+        WRAPPED_TEXT
+        WRAPPED_TEXT_line2
+    rescue_TYPED
+    else_TYPED
+    ensure_TYPED
+    end b
+
+    `begin
+        WRAPPED_TEXT
+        WRAPPED_TEXT_line2
+    rescue Exception => e
+        # block
+    rescue Exception => e
+        # block
+    rescue Exception => e
+        # block
+    else
+        # block
+    ensure
+        
+    end^
+
+    a begin
+        WRAPPED_TEXT
+        WRAPPED_TEXT_line2
+    rescue Exception => e
+        # block
+    rescue Exception => e
+        # block
+    rescue Exception => e
+        # block
+    else
+        # block
+    ensure
+        
+    end
 
 
     #   -------------bm--------------- 
@@ -587,30 +587,6 @@ end
     a classify { |element|  }
 
 
-    #   -------------cl--------------- 
-    #  class `ClassName^               
-    #      `cursor^                    
-    #  end                             
-
-
-
-    class ClassName
-        
-    end
-
-    class ClassNameTYPED
-        
-    end b
-
-    `class ClassName
-        
-    end^
-
-    a class ClassName
-        
-    end
-
-
     #   -------------class_--------------- 
     #  class `_^                           
     #      `wrapped^                       
@@ -623,20 +599,20 @@ class
     WRAPPED_TEXT_line2
 end
 
-    class TYPED
-        WRAPPED_TEXT
-        WRAPPED_TEXT_line2
-    end b
+class TYPED
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+end b
 
-    `class 
-        WRAPPED_TEXT
-        WRAPPED_TEXT_line2
-    end^
+`class 
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+end^
 
-    a class 
-        WRAPPED_TEXT
-        WRAPPED_TEXT_line2
-    end
+a class 
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+end
 
 
     #   -------------cld---------------                 
@@ -658,29 +634,53 @@ end
         end
     end
 
-    class ClassNameTYPED < DelegateClass(ParentClassTYPED)
-        def initialize(arg_TYPED, narg_TYPED, narg_TYPED)
-            super(delegateobject_TYPED)
+class ClassNameTYPED < DelegateClass(ParentClassTYPED)
+    def initialize(arg_TYPED, narg_TYPED, narg_TYPED)
+        super(delegateobject_TYPED)
+
+        
+    end
+end b
+
+`class ClassName < DelegateClass(ParentClass)
+    def initialize
+        super(delegate object)
+
+        
+    end
+end^
+
+a class ClassName < DelegateClass(ParentClass)
+    def initialize
+        super(delegate object)
+
+        
+    end
+end
+
+
+    #   -------------cl--------------- 
+    #  class `ClassName^               
+    #      `cursor^                    
+    #  end                             
+
+
+
+    class ClassName
+        
+    end
+
+class ClassNameTYPED
     
-            
-        end
-    end b
+end b
 
-    `class ClassName < DelegateClass(ParentClass)
-        def initialize
-            super(delegate object)
+`class ClassName
     
-            
-        end
-    end^
+end^
 
-    a class ClassName < DelegateClass(ParentClass)
-        def initialize
-            super(delegate object)
+a class ClassName
     
-            
-        end
-    end
+end
 
 
     #   -------------cli--------------- 
@@ -704,56 +704,32 @@ end
         end
     end
 
-    class ClassNameTYPED
-        def initialize(arg_TYPED, narg_TYPED, narg_TYPED)
-            init_TYPED
-        end
-        def_TYPED
-    end b
-
-    `class ClassName
-        def initialize
-            
-        end
-    
-        def method
-            
-        end
-    end^
-
-    a class ClassName
-        def initialize
-            
-        end
-    
-        def method
-            
-        end
+class ClassNameTYPED
+    def initialize(arg_TYPED, narg_TYPED, narg_TYPED)
+        init_TYPED
     end
+    def_TYPED
+end b
 
-
-    #   -------------cls--------------- 
-    #  class << `self^                  
-    #      `cursor^                     
-    #  end                              
-
-
-
-    class << self
+`class ClassName
+    def initialize
         
     end
 
-    class << self_TYPED
+    def method
         
-    end b
+    end
+end^
 
-    `class << self
+a class ClassName
+    def initialize
         
-    end^
+    end
 
-    a class << self
+    def method
         
     end
+end
 
 
     #   -------------clstr---------------            
@@ -776,6 +752,30 @@ end
     end
 
 
+    #   -------------cls--------------- 
+    #  class << `self^                  
+    #      `cursor^                     
+    #  end                              
+
+
+
+    class << self
+        
+    end
+
+    class << self_TYPED
+        
+    end b
+
+    `class << self
+        
+    end^
+
+    a class << self
+        
+    end
+
+
     #   -------------col--------------- 
     #  collect { |`obj^| `cursor^ }     
 
@@ -838,30 +838,6 @@ end
     a Marshal.load(Marshal.dump(obj))
 
 
-    #   -------------def--------------- 
-    #  def `method^`(`arg*`)^           
-    #      `cursor^                     
-    #  end                              
-
-
-
-    def method
-        
-    end
-
-    def method_TYPED(arg_TYPED, narg_TYPED, narg_TYPED)
-        
-    end b
-
-    `def method
-        
-    end^
-
-    a def method
-        
-    end
-
-
     #   -------------def_--------------- 
     #  def `method_name^`(`arg*`)^       
     #      `wrapped^                     
@@ -890,32 +866,32 @@ end
     end
 
 
-    #   -------------defd---------------                  
-    #  def_delegator :`del obj^, :`del meth^, :`new name^ 
+    #   -------------defds---------------        
+    #  def_delegators :`del obj^, :`del methods^ 
 
 
 
-    def_delegator :del obj, :del meth, :new name
+    def_delegators :del obj, :del methods
 
-    def_delegator :delobj_TYPED, :delmeth_TYPED, :new name b
+    def_delegators :delobj_TYPED, :del methods b
 
-    `def_delegator :del obj, :del meth, :new name^
+    `def_delegators :del obj, :del methods^
 
-    a def_delegator :del obj, :del meth, :new name
+    a def_delegators :del obj, :del methods
 
 
-    #   -------------defds---------------        
-    #  def_delegators :`del obj^, :`del methods^ 
+    #   -------------defd---------------                  
+    #  def_delegator :`del obj^, :`del meth^, :`new name^ 
 
 
 
-    def_delegators :del obj, :del methods
+    def_delegator :del obj, :del meth, :new name
 
-    def_delegators :delobj_TYPED, :del methods b
+    def_delegator :delobj_TYPED, :delmeth_TYPED, :new name b
 
-    `def_delegators :del obj, :del methods^
+    `def_delegator :del obj, :del meth, :new name^
 
-    a def_delegators :del obj, :del methods
+    a def_delegator :del obj, :del meth, :new name
 
 
     #   -------------defi--------------- 
@@ -942,6 +918,30 @@ end
     end
 
 
+    #   -------------def--------------- 
+    #  def `method^`(`arg*`)^           
+    #      `cursor^                     
+    #  end                              
+
+
+
+    def method
+        
+    end
+
+    def method_TYPED(arg_TYPED, narg_TYPED, narg_TYPED)
+        
+    end b
+
+    `def method
+        
+    end^
+
+    a def method
+        
+    end
+
+
     #   -------------defmm---------------      
     #  def method_missing(meth, *args, &block) 
     #      `cursor^                            
@@ -1070,6 +1070,20 @@ end
     a Dir.glob(dir) { |file|  }
 
 
+    #   -------------dow---------------      
+    #  downto(`lbound^) { |`arg^| `cursor^ } 
+
+
+
+    downto(0) { |i|  }
+
+    downto(lbound_TYPED) { |arg_TYPED|  } b
+
+    `downto(0) { |i|  }^
+
+    a downto(0) { |i|  }
+
+
     #   -------------do--------------- 
     #  do` |`arg*`|^                   
     #      `cursor^                    
@@ -1094,20 +1108,6 @@ end
     end
 
 
-    #   -------------dow---------------      
-    #  downto(`lbound^) { |`arg^| `cursor^ } 
-
-
-
-    downto(0) { |i|  }
-
-    downto(lbound_TYPED) { |arg_TYPED|  } b
-
-    `downto(0) { |i|  }^
-
-    a downto(0) { |i|  }
-
-
     #   -------------each---------------  
     #  each`_`what^ { |`vars^| `cursor^ } 
 
@@ -1222,32 +1222,32 @@ end
     a fetch(name) { |key|  }
 
 
-    #   -------------file---------------                
-    #  File.foreach('`filename^') { |`line^| `cursor^ } 
+    #   -------------File--------------- 
+    #  `file()^                          
 
 
 
-    File.foreach('filename') { |line|  }
+    test.page
 
-    File.foreach('filename_TYPED') { |line_TYPED|  } b
+    test.page b
 
-    `File.foreach('filename') { |line|  }^
+    `test.page^
 
-    a File.foreach('filename') { |line|  }
+    a test.page
 
 
-    #   -------------File--------------- 
-    #  `file()^                          
+    #   -------------file---------------                
+    #  File.foreach('`filename^') { |`line^| `cursor^ } 
 
 
 
-    test.page
+    File.foreach('filename') { |line|  }
 
-    test.page b
+    File.foreach('filename_TYPED') { |line_TYPED|  } b
 
-    `test.page^
+    `File.foreach('filename') { |line|  }^
 
-    a test.page
+    a File.foreach('filename') { |line|  }
 
 
     #   -------------fin--------------- 
@@ -1376,60 +1376,60 @@ end
     a Hash.new { |hash,key| hash[key] =  }
 
 
-    #   -------------if--------------- 
-    #  if `boolean exp^                
-    #      `cursor^                    
-    #  end                             
+    #   -------------ife--------------- 
+    #  if `boolean exp^                 
+    #      `block^                      
+    #  else                             
+    #      `cursor^                     
+    #  end                              
 
 
 
     if boolean exp
+        # block
+    else
         
     end
 
     if booleanexp_TYPED
+        block_TYPED
+    else
         
     end b
 
     `if boolean exp
+        # block
+    else
         
     end^
 
     a if boolean exp
+        # block
+    else
         
     end
 
 
-    #   -------------ife--------------- 
-    #  if `boolean exp^                 
-    #      `block^                      
-    #  else                             
-    #      `cursor^                     
-    #  end                              
+    #   -------------if--------------- 
+    #  if `boolean exp^                
+    #      `cursor^                    
+    #  end                             
 
 
 
     if boolean exp
-        # block
-    else
         
     end
 
     if booleanexp_TYPED
-        block_TYPED
-    else
         
     end b
 
     `if boolean exp
-        # block
-    else
         
     end^
 
     a if boolean exp
-        # block
-    else
         
     end
 
@@ -1701,20 +1701,20 @@ module
     WRAPPED_TEXT_line2
 end
 
-    module TYPED
-        WRAPPED_TEXT
-        WRAPPED_TEXT_line2
-    end b
+module TYPED
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+end b
 
-    `module 
-        WRAPPED_TEXT
-        WRAPPED_TEXT_line2
-    end^
+`module 
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+end^
 
-    a module 
-        WRAPPED_TEXT
-        WRAPPED_TEXT_line2
-    end
+a module 
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+end
 
 
     #   -------------nam--------------- 
@@ -1839,20 +1839,6 @@ end
     a result.report("name: ") { TESTS.times {  } }
 
 
-    #   -------------req--------------- 
-    #  require '`lib^'                  
-
-
-
-    require 'lib'
-
-    require 'lib_TYPED' b
-
-    `require 'lib'^
-
-    a require 'lib'
-
-
     #   -------------reqs---------------    
     #  %w[`lib*^].map { |lib| require lib } 
 
@@ -1871,6 +1857,20 @@ end
      
 
 
+    #   -------------req--------------- 
+    #  require '`lib^'                  
+
+
+
+    require 'lib'
+
+    require 'lib_TYPED' b
+
+    `require 'lib'^
+
+    a require 'lib'
+
+
     #   -------------reve---------------     
     #  reverse_each { |`element^| `cursor^ } 
 
diff --git a/ftplugin/scheme/test.page b/ftplugin/scheme/test.page
index 12790b8c..a7cff6c3 100644
--- a/ftplugin/scheme/test.page
+++ b/ftplugin/scheme/test.page
@@ -370,35 +370,6 @@ WRAPPED_TEXT_line2`
             ())
 
 
-    /*  -------------let---------------    */
-    /* (let [(`newVar^ `value^` `...^)     */
-    /* `      (`newVarn^ `valuen^` `...^)] */
-    /*      (`cursor^))                    */
-
-
-
-    (let [(newVar value)
-          (newVarn valuen)
-          (newVarn valuen)
-          (newVarn valuen)]
-         ())
-
-    (let [(newVar_TYPED value_TYPED _TYPED)]
-         ()) b
-
-    `(let [(newVar value)
-          (newVarn valuen)
-          (newVarn valuen)
-          (newVarn valuen)]
-         ())^
-
-    a (let [(newVar value)
-          (newVarn valuen)
-          (newVarn valuen)
-          (newVarn valuen)]
-         ())
-
-
     /*  -------------letrec---------------    */
     /* (letrec [(`newVar^ `value^` `...^)     */
     /* `         (`newVarn^ `valuen^` `...^)] */
@@ -428,6 +399,35 @@ WRAPPED_TEXT_line2`
          ())
 
 
+    /*  -------------let---------------    */
+    /* (let [(`newVar^ `value^` `...^)     */
+    /* `      (`newVarn^ `valuen^` `...^)] */
+    /*      (`cursor^))                    */
+
+
+
+    (let [(newVar value)
+          (newVarn valuen)
+          (newVarn valuen)
+          (newVarn valuen)]
+         ())
+
+    (let [(newVar_TYPED value_TYPED _TYPED)]
+         ()) b
+
+    `(let [(newVar value)
+          (newVarn valuen)
+          (newVarn valuen)
+          (newVarn valuen)]
+         ())^
+
+    a (let [(newVar value)
+          (newVarn valuen)
+          (newVarn valuen)
+          (newVarn valuen)]
+         ())
+
+
     /*  -------------unless--------------- */
     /* (unless (`cond^)                    */
     /*    (`todo0^)` `...^                 */
diff --git a/ftplugin/sh/test.page b/ftplugin/sh/test.page
index 7278e895..3388b214 100644
--- a/ftplugin/sh/test.page
+++ b/ftplugin/sh/test.page
@@ -184,24 +184,6 @@ a case $var in
 esac
 
 
-    #  -------------comment--------------- 
-    # `$CS `cursor^                        
-
-
-
-# WRAPPED_TEXT
-# WRAPPED_TEXT_line2
-
-# WRAPPED_TEXT
-# WRAPPED_TEXT_line2 b
-
-`# WRAPPED_TEXT
- # WRAPPED_TEXT_line2^
-
- a # WRAPPED_TEXT
-   # WRAPPED_TEXT_line2
-
-
     #  -------------commentBlock--------------- 
     # `$CS `cursor^                             
 
@@ -253,6 +235,24 @@ a #
 
 
 
+# WRAPPED_TEXT
+# WRAPPED_TEXT_line2
+
+# WRAPPED_TEXT
+# WRAPPED_TEXT_line2 b
+
+`# WRAPPED_TEXT
+ # WRAPPED_TEXT_line2^
+
+ a # WRAPPED_TEXT
+   # WRAPPED_TEXT_line2
+
+
+    #  -------------comment--------------- 
+    # `$CS `cursor^                        
+
+
+
 # WRAPPED_TEXT
 # WRAPPED_TEXT_line2
 
@@ -512,69 +512,69 @@ WRAPPED_TEXT_line2
 END
 
 
-    #  -------------if--------------- 
-    # if ~:_cond:^;~$BRif^then        
-    #     ~cursor^                    
-    # fi                              
+    #  -------------ife--------------- 
+    # if ~:_cond:^;~$BRif^then         
+    #     ~job^                        
+    # else                             
+    #     ~cursor^                     
+    # fi                               
 
 
 
 if condition; then
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
+else
+    
 fi
 
 if condition_TYPED; then
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
+else
+    
 fi b
 
 `if condition; then
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
+else
+    
 fi^
 
 a if condition; then
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
+else
+    
 fi
 
 
-    #  -------------ife--------------- 
-    # if ~:_cond:^;~$BRif^then         
-    #     ~job^                        
-    # else                             
-    #     ~cursor^                     
-    # fi                               
+    #  -------------if--------------- 
+    # if ~:_cond:^;~$BRif^then        
+    #     ~cursor^                    
+    # fi                              
 
 
 
 if condition; then
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
-else
-    
 fi
 
 if condition_TYPED; then
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
-else
-    
 fi b
 
 `if condition; then
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
-else
-    
 fi^
 
 a if condition; then
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
-else
-    
 fi
 
 
diff --git a/ftplugin/tcl/test.page b/ftplugin/tcl/test.page
index d2497249..709a744e 100644
--- a/ftplugin/tcl/test.page
+++ b/ftplugin/tcl/test.page
@@ -123,50 +123,50 @@ drdr.xp b
 a drdr.xp
 
 
-    #  -------------else--------------- 
-    # else {                            
-    #      ~cursor^                     
-    # }                                 
+    #  -------------elseif--------------- 
+    # elseif {~a^} {                      
+    #      ~cursor^                       
+    # }                                   
 
 
 
-else {
+elseif {a} {
      
 }
 
-else {
+elseif {a_TYPED} {
      
 } b
 
-`else {
+`elseif {a} {
      
 }^
 
-a else {
+a elseif {a} {
      
 }
 
 
-    #  -------------elseif--------------- 
-    # elseif {~a^} {                      
-    #      ~cursor^                       
-    # }                                   
+    #  -------------else--------------- 
+    # else {                            
+    #      ~cursor^                     
+    # }                                 
 
 
 
-elseif {a} {
+else {
      
 }
 
-elseif {a_TYPED} {
+else {
      
 } b
 
-`elseif {a} {
+`else {
      
 }^
 
-a elseif {a} {
+a else {
      
 }
 
diff --git a/ftplugin/tex/test.page b/ftplugin/tex/test.page
index 82bb2369..f478c935 100644
--- a/ftplugin/tex/test.page
+++ b/ftplugin/tex/test.page
@@ -308,6 +308,20 @@ WRAPPED_TEXT_line2{}
     \end{columns}
 
 
+    %  -------------documentclass--------------- 
+    % \documentclass[`size~11~pt]{`kind~}        
+
+
+
+    \documentclass[11pt]{article}
+
+    \documentclass[size_TYPEDpt]{article} b
+
+    `\documentclass[11pt]{article}^
+
+    a \documentclass[11pt]{article}
+
+
     %  -------------doc--------------- 
     % \begin{document}                 
     %     `cursor~                     
@@ -332,20 +346,6 @@ WRAPPED_TEXT_line2{}
     \end{document}
 
 
-    %  -------------documentclass--------------- 
-    % \documentclass[`size~11~pt]{`kind~}        
-
-
-
-    \documentclass[11pt]{article}
-
-    \documentclass[size_TYPEDpt]{article} b
-
-    `\documentclass[11pt]{article}^
-
-    a \documentclass[11pt]{article}
-
-
     %  -------------Email--------------- 
     % `$email^                           
 
diff --git a/ftplugin/tex/tex.xpt.vim b/ftplugin/tex/tex.xpt.vim
index e828dde8..424824f8 100644
--- a/ftplugin/tex/tex.xpt.vim
+++ b/ftplugin/tex/tex.xpt.vim
@@ -99,18 +99,25 @@ XPT lim " lim_....
 
 XPT itemize " begin{itemize} ... end{itemize}
 \begin{itemize}
-\item `what~~`...~
-\item `what~~`...~
+    \item `what~~`...~
+    \item `what~~`...~
 \end{itemize}
 ..XPT
 
 XPT enumerate " begin{enumerate} ... end{enumerate}
 \begin{enumerate}
-\item `what~~`...~
-\item `what~~`...~
+    \item `what~~`...~
+    \item `what~~`...~
 \end{enumerate}
 ..XPT
 
+XPT description " begin{description} ... end{description}
+\begin{description}
+    \item[`what~] `content~~`...~
+    \item[`what~] `content~~`...~
+\end{description}
+..XPT
+
 XPT sqrt " sqrt[..]{..}
 \sqrt`n...{{~[`nth~]`}}~{`cursor~}
 ..XPT
diff --git a/ftplugin/vim/autoload.vim.xpt.vim b/ftplugin/vim/autoload.vim.xpt.vim
new file mode 100644
index 00000000..da00a437
--- /dev/null
+++ b/ftplugin/vim/autoload.vim.xpt.vim
@@ -0,0 +1,30 @@
+if expand( "%:p:h" ) . '/' !~# '\V\[\\/]autoload\[\\/]'
+    finish
+endif
+
+XPTemplate priority=lang-
+
+let s:f = g:XPTfuncs()
+
+fun! s:f.vim_autoload_pre()
+    let path = expand( "%:p" )
+    let path = substitute( path, '\V\\', '/', 'g' )
+    let path = matchstr( path, '\V/autoload/\zs\.\+\ze.vim\$' )
+    let path = substitute( path, '\V/', '#', 'g' )
+    return path
+endfunction
+
+
+
+XPTinclude
+      \ _common/common
+      \ vim/vim
+
+" TODO fix it
+" XSET name|repl=vim_autoload_pre()#`name
+XPT fun alias=_fun " fun! vim_autoload_pre()#**
+XSET name=Build( '`' . vim_autoload_pre() . '#`n^' )
+
+
+XPT ## " vim_autoload_pre\()#
+`vim_autoload_pre()^#
diff --git a/ftplugin/vim/test.page b/ftplugin/vim/test.page
index 792ed5b6..f6add8ea 100644
--- a/ftplugin/vim/test.page
+++ b/ftplugin/vim/test.page
@@ -160,24 +160,6 @@ catch /.*/
                  
 
 
-    "  -------------comment--------------- 
-    " `$CS `cursor^                        
-
-
-
-" WRAPPED_TEXT
-" WRAPPED_TEXT_line2
-
-" WRAPPED_TEXT
-" WRAPPED_TEXT_line2 b
-
-`" WRAPPED_TEXT
- " WRAPPED_TEXT_line2^
-
- a " WRAPPED_TEXT
-   " WRAPPED_TEXT_line2
-
-
     "  -------------commentBlock--------------- 
     " `$CS `cursor^                             
 
@@ -224,6 +206,24 @@ a "
 "
 
 
+    "  -------------comment--------------- 
+    " `$CS `cursor^                        
+
+
+
+" WRAPPED_TEXT
+" WRAPPED_TEXT_line2
+
+" WRAPPED_TEXT
+" WRAPPED_TEXT_line2 b
+
+`" WRAPPED_TEXT
+ " WRAPPED_TEXT_line2^
+
+ a " WRAPPED_TEXT
+   " WRAPPED_TEXT_line2
+
+
     "  -------------commentLine--------------- 
     " `$CS `cursor^                            
 
@@ -751,34 +751,6 @@ endtry
     a call s:log.Warn(  )
 
 
-    "  -------------while--------------- 
-    " while `cond^                       
-    "     `cursor^                       
-    " endwhile                           
-
-
-
-while cond
-    WRAPPED_TEXT
-    WRAPPED_TEXT_line2
-endwhile
-
-while cond_TYPED
-    WRAPPED_TEXT
-    WRAPPED_TEXT_line2
-endwhile b
-
-`while cond
-    WRAPPED_TEXT
-    WRAPPED_TEXT_line2
-endwhile^
-
-a while cond
-    WRAPPED_TEXT
-    WRAPPED_TEXT_line2
-endwhile
-
-
     "  -------------while1--------------- 
     " while `cond^                        
     "     `cursor^                        
@@ -840,6 +812,34 @@ while i < len | let i += 1
 endwhile
 
 
+    "  -------------while--------------- 
+    " while `cond^                       
+    "     `cursor^                       
+    " endwhile                           
+
+
+
+while cond
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+endwhile
+
+while cond_TYPED
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+endwhile b
+
+`while cond
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+endwhile^
+
+a while cond
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+endwhile
+
+
     "  -------------{_--------------- 
     " {`w^}                           
 
diff --git a/ftplugin/vim/vim.xpt.vim b/ftplugin/vim/vim.xpt.vim
index 0db68112..ffba3817 100644
--- a/ftplugin/vim/vim.xpt.vim
+++ b/ftplugin/vim/vim.xpt.vim
@@ -42,6 +42,9 @@ call XPTdefineSnippet('vimformat', {}, [ '" vim:tw=78:ts=8:sw=4:sts=4:et:norl:fd
 
 
 
+XPT lncol " [ line\( "." ), col\( "." ) ]
+[ line( '.' ), col( '.' ) ]
+
 XPT printf	" printf\(..)
 XSET elts|pre=Echo('')
 XSET elts=c_printf_elts( R( 'pattern' ), "," )
@@ -76,11 +79,13 @@ if !exists(`$SParg^"`g^:`varname^"`$SParg^)
     let `g^:`varname^`$SPop^=`$SPop^`val^
 endif
 
-XPT fun wrap " fun! ..(..) .. endfunction
+XPT _fun hidden wrap " fun! ..(..) .. endfunction
 fun! `name^`$SPfun^(`:_args:^) "{{{
     `cursor^
 endfunction "}}}
 
+XPT fun alias=_fun
+
 XPT member wrap " tips
 fun! `name^`$SPfun^(`:_args:^) dict "{{{
     `cursor^
@@ -141,12 +146,30 @@ XPT filehead " description of file
 " }}}
 ..XPT
 
+XPT savecpo " save &cpo
+let s:oldcpo = &cpo
+set cpo-=< cpo+=B
+`cursor^
+let &cpo = s:oldcpo
+
 " The first placeholder wrapping 'com' keyword that causes ctags halt
 XPT sid "  generate s:sid variable
 exe 'map <Plug>xsid <SID>|let s:sid=matchstr(maparg("<Plug>xsid"), "\\d\\+_")|unmap <Plug>xsid'
 
 ..XPT
 
+XPT bench " while 1000.. doit..
+let i = 0
+let `t^_0 = reltime()
+
+while i < `100000^
+    let i += 1
+    `cursor^
+endwhile
+
+let `t^_1 = reltime( `t^_0 )
+echom reltimestr( reltime( `t^_0 ) )
+
 XPT call wraponly=param " ..\( .. )
 `vim_call()`name^(`$SParg^`param^`$SParg^)
 
@@ -154,4 +177,3 @@ XPT _call hidden wrap=param? " $_xSnipName( .. )
 `$_xSnipName^(`$SParg`param?`$SParg^)
 
 XPT string alias=_call
-
diff --git a/ftplugin/xhtml/test.page b/ftplugin/xhtml/test.page
index 5ed41daf..cfe12917 100644
--- a/ftplugin/xhtml/test.page
+++ b/ftplugin/xhtml/test.page
@@ -109,6 +109,20 @@ a `WRAPPED_TEXT
 WRAPPED_TEXT_line2`
 
 
+    <!--  -------------Author--------------- -->
+    <!-- `$author^                           -->
+
+
+
+    drdr.xp
+
+    drdr.xp b
+
+    `drdr.xp^
+
+    a drdr.xp
+
+
     <!--  -------------a--------------- -->
     <!-- <a href="`href^">`cursor^</a>  -->
 
@@ -127,20 +141,6 @@ a <a href="href">WRAPPED_TEXT
 WRAPPED_TEXT_line2</a>
 
 
-    <!--  -------------Author--------------- -->
-    <!-- `$author^                           -->
-
-
-
-    drdr.xp
-
-    drdr.xp b
-
-    `drdr.xp^
-
-    a drdr.xp
-
-
     <!--  -------------body--------------- -->
     <!-- <body>                            -->
     <!--     `cursor^                      -->
@@ -636,6 +636,48 @@ a <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.
 </html>
 
 
+    <!--  -------------ibutton---------------                                   -->
+    <!-- <input type="`Echo($_xSnipName[1:])^" name="`name^" value="`value^" /> -->
+
+
+
+    <input type="button" name="name" value="value" />
+
+    <input type="button" name="name_TYPED" value="value_TYPED" /> b
+
+    `<input type="button" name="name" value="value" />^
+
+    a <input type="button" name="name" value="value" />
+
+
+    <!--  -------------icheckbox---------------                                 -->
+    <!-- <input type="`Echo($_xSnipName[1:])^" name="`name^" value="`value^" /> -->
+
+
+
+    <input type="checkbox" name="name" value="value" />
+
+    <input type="checkbox" name="name_TYPED" value="value_TYPED" /> b
+
+    `<input type="checkbox" name="name" value="value" />^
+
+    a <input type="checkbox" name="name" value="value" />
+
+
+    <!--  -------------ifile---------------                                     -->
+    <!-- <input type="`Echo($_xSnipName[1:])^" name="`name^" value="`value^" /> -->
+
+
+
+    <input type="file" name="name" value="value" />
+
+    <input type="file" name="name_TYPED" value="value_TYPED" /> b
+
+    `<input type="file" name="name" value="value" />^
+
+    a <input type="file" name="name" value="value" />
+
+
     <!--  -------------iframe---------------                                           -->
     <!-- <`$_xSnipName^` `att?^>`content^^`content^html_cont_helper()^</`$_xSnipName^> -->
 
@@ -658,6 +700,34 @@ WRAPPED_TEXT_line2
 </iframe>
 
 
+    <!--  -------------ihidden---------------                                   -->
+    <!-- <input type="`Echo($_xSnipName[1:])^" name="`name^" value="`value^" /> -->
+
+
+
+    <input type="hidden" name="name" value="value" />
+
+    <input type="hidden" name="name_TYPED" value="value_TYPED" /> b
+
+    `<input type="hidden" name="name" value="value" />^
+
+    a <input type="hidden" name="name" value="value" />
+
+
+    <!--  -------------iimage---------------                                    -->
+    <!-- <input type="`Echo($_xSnipName[1:])^" name="`name^" value="`value^" /> -->
+
+
+
+    <input type="image" name="name" value="value" />
+
+    <input type="image" name="name_TYPED" value="value_TYPED" /> b
+
+    `<input type="image" name="name" value="value" />^
+
+    a <input type="image" name="name" value="value" />
+
+
     <!--  -------------img--------------- -->
     <!-- <`$_xSnipName^` `att?^/>         -->
 
@@ -686,6 +756,76 @@ WRAPPED_TEXT_line2
     a <input type="text" name="name" value="value"/>
 
 
+    <!--  -------------ipassword---------------                                 -->
+    <!-- <input type="`Echo($_xSnipName[1:])^" name="`name^" value="`value^" /> -->
+
+
+
+    <input type="password" name="name" value="value" />
+
+    <input type="password" name="name_TYPED" value="value_TYPED" /> b
+
+    `<input type="password" name="name" value="value" />^
+
+    a <input type="password" name="name" value="value" />
+
+
+    <!--  -------------iradio---------------                                    -->
+    <!-- <input type="`Echo($_xSnipName[1:])^" name="`name^" value="`value^" /> -->
+
+
+
+    <input type="radio" name="name" value="value" />
+
+    <input type="radio" name="name_TYPED" value="value_TYPED" /> b
+
+    `<input type="radio" name="name" value="value" />^
+
+    a <input type="radio" name="name" value="value" />
+
+
+    <!--  -------------ireset---------------                                    -->
+    <!-- <input type="`Echo($_xSnipName[1:])^" name="`name^" value="`value^" /> -->
+
+
+
+    <input type="reset" name="name" value="value" />
+
+    <input type="reset" name="name_TYPED" value="value_TYPED" /> b
+
+    `<input type="reset" name="name" value="value" />^
+
+    a <input type="reset" name="name" value="value" />
+
+
+    <!--  -------------isubmit---------------                                   -->
+    <!-- <input type="`Echo($_xSnipName[1:])^" name="`name^" value="`value^" /> -->
+
+
+
+    <input type="submit" name="name" value="value" />
+
+    <input type="submit" name="name_TYPED" value="value_TYPED" /> b
+
+    `<input type="submit" name="name" value="value" />^
+
+    a <input type="submit" name="name" value="value" />
+
+
+    <!--  -------------itext---------------                                     -->
+    <!-- <input type="`Echo($_xSnipName[1:])^" name="`name^" value="`value^" /> -->
+
+
+
+    <input type="text" name="name" value="value" />
+
+    <input type="text" name="name_TYPED" value="value_TYPED" /> b
+
+    `<input type="text" name="name" value="value" />^
+
+    a <input type="text" name="name" value="value" />
+
+
     <!--  -------------label---------------                                            -->
     <!-- <`$_xSnipName^` `att?^>`content^^`content^html_cont_helper()^</`$_xSnipName^> -->
 
@@ -708,6 +848,20 @@ WRAPPED_TEXT_line2
 </label>
 
 
+    <!--  -------------link---------------                               -->
+    <!-- <link rel="`stylesheet^" type="`type^text/css^" href="`url^" /> -->
+
+
+
+    <link rel="stylesheet" type="text/css" href="url" />
+
+    <link rel="stylesheet_TYPED" type="type_TYPED" href="url_TYPED" /> b
+
+    `<link rel="stylesheet" type="text/css" href="url" />^
+
+    a <link rel="stylesheet" type="text/css" href="url" />
+
+
     <!--  -------------li---------------                                       -->
     <!-- <`$_xSnipName^>`content^^`content^html_cont_helper()^</`$_xSnipName^> -->
 
@@ -730,20 +884,6 @@ WRAPPED_TEXT_line2
 </li>
 
 
-    <!--  -------------link---------------                               -->
-    <!-- <link rel="`stylesheet^" type="`type^text/css^" href="`url^" /> -->
-
-
-
-    <link rel="stylesheet" type="text/css" href="url" />
-
-    <link rel="stylesheet_TYPED" type="type_TYPED" href="url_TYPED" /> b
-
-    `<link rel="stylesheet" type="text/css" href="url" />^
-
-    a <link rel="stylesheet" type="text/css" href="url" />
-
-
     <!--  -------------meta---------------                    -->
     <!-- <meta name="`meta_name^" content="`meta_content^" /> -->
 
diff --git a/ftplugin/xml/test.page b/ftplugin/xml/test.page
index 6d4eb64d..d5a712f0 100644
--- a/ftplugin/xml/test.page
+++ b/ftplugin/xml/test.page
@@ -141,24 +141,6 @@ a <![CDATA[WRAPPED_TEXT
 WRAPPED_TEXT_line2]]>
 
 
-    <!--  -------------comment--------------- -->
-    <!-- `$CL^ `what^^ `$CR^`^                -->
-
-
-
-<!-- WRAPPED_TEXT
-WRAPPED_TEXT_line2 -->
-
-<!-- WRAPPED_TEXT
-WRAPPED_TEXT_line2 --> b
-
-`<!-- WRAPPED_TEXT
-WRAPPED_TEXT_line2 -->^
-
-a <!-- WRAPPED_TEXT
-WRAPPED_TEXT_line2 -->
-
-
     <!--  -------------commentBlock--------------- -->
     <!-- `$_xCommentLeftWithoutMid^`$CM `cursor^   -->
     <!-- `$_xCommentMidIndent$CR^                  -->
@@ -182,6 +164,24 @@ a <!-- WRAPPED_TEXT
     -->
 
 
+    <!--  -------------comment--------------- -->
+    <!-- `$CL^ `what^^ `$CR^`^                -->
+
+
+
+<!-- WRAPPED_TEXT
+WRAPPED_TEXT_line2 -->
+
+<!-- WRAPPED_TEXT
+WRAPPED_TEXT_line2 --> b
+
+`<!-- WRAPPED_TEXT
+WRAPPED_TEXT_line2 -->^
+
+a <!-- WRAPPED_TEXT
+WRAPPED_TEXT_line2 -->
+
+
     <!--  -------------commentDoc--------------- -->
     <!-- `$CL^`$CM^                              -->
     <!-- `$_xCommentMidIndent$CM `cursor^        -->
diff --git a/ftplugin/xpt/test.page b/ftplugin/xpt/test.page
index 4f2d96ed..3ca771ff 100644
--- a/ftplugin/xpt/test.page
+++ b/ftplugin/xpt/test.page
@@ -174,24 +174,6 @@ catch /exception_TYPED/
              
 
 
-    /*  -------------comment--------------- */
-    /* `$CS `cursor^                        */
-
-
-
-" WRAPPED_TEXT
-" WRAPPED_TEXT_line2
-
-" WRAPPED_TEXT
-" WRAPPED_TEXT_line2 b
-
-`" WRAPPED_TEXT
- " WRAPPED_TEXT_line2^
-
- a " WRAPPED_TEXT
-   " WRAPPED_TEXT_line2
-
-
     /*  -------------commentBlock--------------- */
     /* `$CS `cursor^                             */
 
@@ -243,6 +225,24 @@ a "
 
 
 
+" WRAPPED_TEXT
+" WRAPPED_TEXT_line2
+
+" WRAPPED_TEXT
+" WRAPPED_TEXT_line2 b
+
+`" WRAPPED_TEXT
+ " WRAPPED_TEXT_line2^
+
+ a " WRAPPED_TEXT
+   " WRAPPED_TEXT_line2
+
+
+    /*  -------------comment--------------- */
+    /* `$CS `cursor^                        */
+
+
+
 " WRAPPED_TEXT
 " WRAPPED_TEXT_line2
 
@@ -303,20 +303,6 @@ a "
              a drdr.xp@gmail.com
 
 
-    /*  -------------File--------------- */
-    /* `file()^                          */
-
-
-
-             test.page
-
-             test.page b
-
-             `test.page^
-
-             a test.page
-
-
     /*  -------------filehead---------------                                           */
     /* " File Description {{{                                                          */
     /* " ============================================================================= */
@@ -371,6 +357,20 @@ a "
              " }}}
 
 
+    /*  -------------File--------------- */
+    /* `file()^                          */
+
+
+
+             test.page
+
+             test.page b
+
+             `test.page^
+
+             a test.page
+
+
     /*  -------------finally--------------- */
     /* finally                              */
     /*     `cursor^                         */
@@ -488,6 +488,20 @@ a if cond
 endif
 
 
+    /*  -------------include--------------- */
+    /* \`Include:`name^\^                   */
+
+
+
+`Include:name^
+
+`Include:name_TYPED^ b
+
+``Include:name^^
+
+a `Include:name^
+
+
     /*  -------------inc--------------- */
     /* \`:`name^:\^                     */
 
@@ -526,20 +540,6 @@ XPTinclude
                         \ dot/dot
 
 
-    /*  -------------include--------------- */
-    /* \`Include:`name^\^                   */
-
-
-
-                        `Include:name^
-
-                        `Include:name_TYPED^ b
-
-                        ``Include:name^^
-
-                        a `Include:name^
-
-
     /*  -------------member---------------      */
     /* fun! `name^`$SPfun^(`:_args:^) dict "{{{ */
     /*     `cursor^                             */
@@ -866,58 +866,6 @@ catch /.*/
 endtry
 
 
-    /*  -------------var--------------- */
-    /* XPTvar $`name^ `cursor^          */
-
-
-
-XPTvar $name 
-
-XPTvar $name_TYPED  b
-
-`XPTvar $name ^
-
-a XPTvar $name 
-
-
-    /*  -------------varComment1--------------- */
-    /* XPTvar $CS    `cursor^                   */
-
-
-
-XPTvar $CS    
-
-XPTvar $CS     b
-
-`XPTvar $CS    ^
-
-a XPTvar $CS    
-
-
-    /*  -------------varComment2--------------- */
-    /* XPTvar $CL    `left sign^                */
-    /* XPTvar $CM    `cursor^                   */
-    /* XPTvar $CR    `right sign^               */
-
-
-
-XPTvar $CL    left sign
-XPTvar $CM    
-XPTvar $CR    right sign
-
-XPTvar $CL    leftsign_TYPED
-XPTvar $CM    
-XPTvar $CR    rightsign_TYPED b
-
-`XPTvar $CL    left sign
-XPTvar $CM    
-XPTvar $CR    right sign^
-
-a XPTvar $CL    left sign
-XPTvar $CM    
-XPTvar $CR    right sign
-
-
     /*  -------------varconf---------------        */
     /* if !exists(`$SParg^"`g^:`varname^"`$SParg^) */
     /*     let `g^:`varname^`$SPop^=`$SPop^`val^   */
@@ -971,6 +919,58 @@ XPTvar $NULL          NULL
 XPTvar $UNDEFINED     NULL
 
 
+    /*  -------------var--------------- */
+    /* XPTvar $`name^ `cursor^          */
+
+
+
+XPTvar $name 
+
+XPTvar $name_TYPED  b
+
+`XPTvar $name ^
+
+a XPTvar $name 
+
+
+    /*  -------------varComment1--------------- */
+    /* XPTvar $CS    `cursor^                   */
+
+
+
+XPTvar $CS    
+
+XPTvar $CS     b
+
+`XPTvar $CS    ^
+
+a XPTvar $CS    
+
+
+    /*  -------------varComment2--------------- */
+    /* XPTvar $CL    `left sign^                */
+    /* XPTvar $CM    `cursor^                   */
+    /* XPTvar $CR    `right sign^               */
+
+
+
+XPTvar $CL    left sign
+XPTvar $CM    
+XPTvar $CR    right sign
+
+XPTvar $CL    leftsign_TYPED
+XPTvar $CM    
+XPTvar $CR    rightsign_TYPED b
+
+`XPTvar $CL    left sign
+XPTvar $CM    
+XPTvar $CR    right sign^
+
+a XPTvar $CL    left sign
+XPTvar $CM    
+XPTvar $CR    right sign
+
+
     /*  -------------varFormat--------------- */
     /* " if () ** {                           */
     /* " else ** {                            */
@@ -1260,90 +1260,90 @@ let g_TYPED:i_TYPED = ver_TYPED
  a " vim:tw=78:ts=8:sw=4:sts=4:et:norl:fdm=marker:fmr={{{,}}}
 
 
-    /*  -------------while--------------- */
-    /* while `cond^                       */
-    /*     `cursor^                       */
-    /* endwhile                           */
+    /*  -------------whilei---------------                                                                              */
+    /* let [`$SParg^`i^,`$SPop^`len^`$SParg^] = [`$SParg^`0^`$SPop^-`$SPop^1,`$SPop^`len_expr^`$SPop^-`$SPop^1`$SParg^] */
+    /* while `i^`$SPop^<`$SPop^`len^ | let `i^`$SPop^+=`$SPop^1                                                         */
+    /*     `cursor^                                                                                                     */
+    /* endwhile                                                                                                         */
 
 
 
-while cond
+let [ i, len ] = [ 0 - 1, len_expr - 1 ]
+while i < len | let i += 1
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 endwhile
 
-while cond_TYPED
+let [ i_TYPED, len_TYPED ] = [ 0_TYPED - 1, len_expr_TYPED - 1 ]
+while i_TYPED < len_TYPED | let i_TYPED += 1
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 endwhile b
 
-`while cond
+`let [ i, len ] = [ 0 - 1, len_expr - 1 ]
+while i < len | let i += 1
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 endwhile^
 
-a while cond
+a let [ i, len ] = [ 0 - 1, len_expr - 1 ]
+while i < len | let i += 1
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 endwhile
 
 
-    /*  -------------while1--------------- */
-    /* while `cond^                        */
-    /*     `cursor^                        */
-    /* endwhile                            */
+    /*  -------------while--------------- */
+    /* while `cond^                       */
+    /*     `cursor^                       */
+    /* endwhile                           */
 
 
 
-while 1
+while cond
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 endwhile
 
-while 1
+while cond_TYPED
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 endwhile b
 
-`while 1
+`while cond
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 endwhile^
 
-a while 1
+a while cond
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 endwhile
 
 
-    /*  -------------whilei---------------                                                                              */
-    /* let [`$SParg^`i^,`$SPop^`len^`$SParg^] = [`$SParg^`0^`$SPop^-`$SPop^1,`$SPop^`len_expr^`$SPop^-`$SPop^1`$SParg^] */
-    /* while `i^`$SPop^<`$SPop^`len^ | let `i^`$SPop^+=`$SPop^1                                                         */
-    /*     `cursor^                                                                                                     */
-    /* endwhile                                                                                                         */
+    /*  -------------while1--------------- */
+    /* while `cond^                        */
+    /*     `cursor^                        */
+    /* endwhile                            */
 
 
 
-let [ i, len ] = [ 0 - 1, len_expr - 1 ]
-while i < len | let i += 1
+while 1
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 endwhile
 
-let [ i_TYPED, len_TYPED ] = [ 0_TYPED - 1, len_expr_TYPED - 1 ]
-while i_TYPED < len_TYPED | let i_TYPED += 1
+while 1
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 endwhile b
 
-`let [ i, len ] = [ 0 - 1, len_expr - 1 ]
-while i < len | let i += 1
+`while 1
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 endwhile^
 
-a let [ i, len ] = [ 0 - 1, len_expr - 1 ]
-while i < len | let i += 1
+a while 1
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
 endwhile
diff --git a/ftplugin/xslt/test.page b/ftplugin/xslt/test.page
index 5c8e358b..c67d11dd 100644
--- a/ftplugin/xslt/test.page
+++ b/ftplugin/xslt/test.page
@@ -109,24 +109,6 @@ a `WRAPPED_TEXT
 WRAPPED_TEXT_line2`
 
 
-    <!--  -------------a--------------- -->
-    <!-- <a href="`href^">`cursor^</a>  -->
-
-
-
-<a href="href">WRAPPED_TEXT
-WRAPPED_TEXT_line2</a>
-
-<a href="href_TYPED">WRAPPED_TEXT
-WRAPPED_TEXT_line2</a> b
-
-`<a href="href">WRAPPED_TEXT
-WRAPPED_TEXT_line2</a>^
-
-a <a href="href">WRAPPED_TEXT
-WRAPPED_TEXT_line2</a>
-
-
     <!--  -------------apply---------------      -->
     <!-- <xsl:apply-templates select="`what^" /> -->
 
@@ -155,6 +137,24 @@ WRAPPED_TEXT_line2</a>
     a drdr.xp
 
 
+    <!--  -------------a--------------- -->
+    <!-- <a href="`href^">`cursor^</a>  -->
+
+
+
+<a href="href">WRAPPED_TEXT
+WRAPPED_TEXT_line2</a>
+
+<a href="href_TYPED">WRAPPED_TEXT
+WRAPPED_TEXT_line2</a> b
+
+`<a href="href">WRAPPED_TEXT
+WRAPPED_TEXT_line2</a>^
+
+a <a href="href">WRAPPED_TEXT
+WRAPPED_TEXT_line2</a>
+
+
     <!--  -------------body--------------- -->
     <!-- <body>                            -->
     <!--     `cursor^                      -->
@@ -288,24 +288,6 @@ a <xsl:choose>
 </xsl:choose>
 
 
-    <!--  -------------comment--------------- -->
-    <!-- `$CL^ `what^^ `$CR^`^                -->
-
-
-
-<!-- WRAPPED_TEXT
-WRAPPED_TEXT_line2 -->
-
-<!-- WRAPPED_TEXT
-WRAPPED_TEXT_line2 --> b
-
-`<!-- WRAPPED_TEXT
-WRAPPED_TEXT_line2 -->^
-
-a <!-- WRAPPED_TEXT
-WRAPPED_TEXT_line2 -->
-
-
     <!--  -------------commentBlock--------------- -->
     <!-- `$_xCommentLeftWithoutMid^`$CM `cursor^   -->
     <!-- `$_xCommentMidIndent$CR^                  -->
@@ -375,6 +357,24 @@ a <!--
    <!-- WRAPPED_TEXT_line2 -->
 
 
+    <!--  -------------comment--------------- -->
+    <!-- `$CL^ `what^^ `$CR^`^                -->
+
+
+
+<!-- WRAPPED_TEXT
+WRAPPED_TEXT_line2 -->
+
+<!-- WRAPPED_TEXT
+WRAPPED_TEXT_line2 --> b
+
+`<!-- WRAPPED_TEXT
+WRAPPED_TEXT_line2 -->^
+
+a <!-- WRAPPED_TEXT
+WRAPPED_TEXT_line2 -->
+
+
     <!--  -------------contenttype---------------                                             -->
     <!-- <meta http-equiv="Content-Type" content="text/html; charset=`encoding^html_enc()^"/> -->
 
@@ -751,6 +751,34 @@ a <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.
 </html>
 
 
+    <!--  -------------ibutton---------------                                   -->
+    <!-- <input type="`Echo($_xSnipName[1:])^" name="`name^" value="`value^" /> -->
+
+
+
+    <input type="button" name="name" value="value" />
+
+    <input type="button" name="name_TYPED" value="value_TYPED" /> b
+
+    `<input type="button" name="name" value="value" />^
+
+    a <input type="button" name="name" value="value" />
+
+
+    <!--  -------------icheckbox---------------                                 -->
+    <!-- <input type="`Echo($_xSnipName[1:])^" name="`name^" value="`value^" /> -->
+
+
+
+    <input type="checkbox" name="name" value="value" />
+
+    <input type="checkbox" name="name_TYPED" value="value_TYPED" /> b
+
+    `<input type="checkbox" name="name" value="value" />^
+
+    a <input type="checkbox" name="name" value="value" />
+
+
     <!--  -------------if--------------- -->
     <!-- <xsl:if test="`test^">          -->
     <!--     `cursor^                    -->
@@ -775,6 +803,20 @@ a <xsl:if test="test">
 </xsl:if>
 
 
+    <!--  -------------ifile---------------                                     -->
+    <!-- <input type="`Echo($_xSnipName[1:])^" name="`name^" value="`value^" /> -->
+
+
+
+    <input type="file" name="name" value="value" />
+
+    <input type="file" name="name_TYPED" value="value_TYPED" /> b
+
+    `<input type="file" name="name" value="value" />^
+
+    a <input type="file" name="name" value="value" />
+
+
     <!--  -------------iframe---------------                                           -->
     <!-- <`$_xSnipName^` `att?^>`content^^`content^html_cont_helper()^</`$_xSnipName^> -->
 
@@ -797,6 +839,34 @@ WRAPPED_TEXT_line2
 </iframe>
 
 
+    <!--  -------------ihidden---------------                                   -->
+    <!-- <input type="`Echo($_xSnipName[1:])^" name="`name^" value="`value^" /> -->
+
+
+
+    <input type="hidden" name="name" value="value" />
+
+    <input type="hidden" name="name_TYPED" value="value_TYPED" /> b
+
+    `<input type="hidden" name="name" value="value" />^
+
+    a <input type="hidden" name="name" value="value" />
+
+
+    <!--  -------------iimage---------------                                    -->
+    <!-- <input type="`Echo($_xSnipName[1:])^" name="`name^" value="`value^" /> -->
+
+
+
+    <input type="image" name="name" value="value" />
+
+    <input type="image" name="name_TYPED" value="value_TYPED" /> b
+
+    `<input type="image" name="name" value="value" />^
+
+    a <input type="image" name="name" value="value" />
+
+
     <!--  -------------img--------------- -->
     <!-- <`$_xSnipName^` `att?^/>         -->
 
@@ -853,6 +923,76 @@ a <img src="where" alt="alt"/>
 a <input type="text" name="name" value="value"/>
 
 
+    <!--  -------------ipassword---------------                                 -->
+    <!-- <input type="`Echo($_xSnipName[1:])^" name="`name^" value="`value^" /> -->
+
+
+
+    <input type="password" name="name" value="value" />
+
+    <input type="password" name="name_TYPED" value="value_TYPED" /> b
+
+    `<input type="password" name="name" value="value" />^
+
+    a <input type="password" name="name" value="value" />
+
+
+    <!--  -------------iradio---------------                                    -->
+    <!-- <input type="`Echo($_xSnipName[1:])^" name="`name^" value="`value^" /> -->
+
+
+
+    <input type="radio" name="name" value="value" />
+
+    <input type="radio" name="name_TYPED" value="value_TYPED" /> b
+
+    `<input type="radio" name="name" value="value" />^
+
+    a <input type="radio" name="name" value="value" />
+
+
+    <!--  -------------ireset---------------                                    -->
+    <!-- <input type="`Echo($_xSnipName[1:])^" name="`name^" value="`value^" /> -->
+
+
+
+    <input type="reset" name="name" value="value" />
+
+    <input type="reset" name="name_TYPED" value="value_TYPED" /> b
+
+    `<input type="reset" name="name" value="value" />^
+
+    a <input type="reset" name="name" value="value" />
+
+
+    <!--  -------------isubmit---------------                                   -->
+    <!-- <input type="`Echo($_xSnipName[1:])^" name="`name^" value="`value^" /> -->
+
+
+
+    <input type="submit" name="name" value="value" />
+
+    <input type="submit" name="name_TYPED" value="value_TYPED" /> b
+
+    `<input type="submit" name="name" value="value" />^
+
+    a <input type="submit" name="name" value="value" />
+
+
+    <!--  -------------itext---------------                                     -->
+    <!-- <input type="`Echo($_xSnipName[1:])^" name="`name^" value="`value^" /> -->
+
+
+
+    <input type="text" name="name" value="value" />
+
+    <input type="text" name="name_TYPED" value="value_TYPED" /> b
+
+    `<input type="text" name="name" value="value" />^
+
+    a <input type="text" name="name" value="value" />
+
+
     <!--  -------------label---------------                                            -->
     <!-- <`$_xSnipName^` `att?^>`content^^`content^html_cont_helper()^</`$_xSnipName^> -->
 
@@ -875,6 +1015,20 @@ WRAPPED_TEXT_line2
 </label>
 
 
+    <!--  -------------link---------------                               -->
+    <!-- <link rel="`stylesheet^" type="`type^text/css^" href="`url^" /> -->
+
+
+
+    <link rel="stylesheet" type="text/css" href="url" />
+
+    <link rel="stylesheet_TYPED" type="type_TYPED" href="url_TYPED" /> b
+
+    `<link rel="stylesheet" type="text/css" href="url" />^
+
+    a <link rel="stylesheet" type="text/css" href="url" />
+
+
     <!--  -------------li---------------                                       -->
     <!-- <`$_xSnipName^>`content^^`content^html_cont_helper()^</`$_xSnipName^> -->
 
@@ -897,20 +1051,6 @@ WRAPPED_TEXT_line2
 </li>
 
 
-    <!--  -------------link---------------                               -->
-    <!-- <link rel="`stylesheet^" type="`type^text/css^" href="`url^" /> -->
-
-
-
-    <link rel="stylesheet" type="text/css" href="url" />
-
-    <link rel="stylesheet_TYPED" type="type_TYPED" href="url_TYPED" /> b
-
-    `<link rel="stylesheet" type="text/css" href="url" />^
-
-    a <link rel="stylesheet" type="text/css" href="url" />
-
-
     <!--  -------------meta---------------                    -->
     <!-- <meta name="`meta_name^" content="`meta_content^" /> -->
 
@@ -1005,6 +1145,20 @@ WRAPPED_TEXT_line2
     a <xsl:param name="name" select="expr" />
 
 
+    <!--  -------------scriptsrc---------------                                    -->
+    <!-- <script language="javascript" type="text/javascript" src="`js^"></script> -->
+
+
+
+    <script language="javascript" type="text/javascript" src="js"></script>
+
+    <script language="javascript" type="text/javascript" src="js_TYPED"></script> b
+
+    `<script language="javascript" type="text/javascript" src="js"></script>^
+
+    a <script language="javascript" type="text/javascript" src="js"></script>
+
+
     <!--  -------------script---------------                   -->
     <!-- <script language="javascript" type="text/javascript"> -->
     <!--     `cursor^                                          -->
@@ -1029,20 +1183,6 @@ a <script language="javascript" type="text/javascript">
 </script>
 
 
-    <!--  -------------scriptsrc---------------                                    -->
-    <!-- <script language="javascript" type="text/javascript" src="`js^"></script> -->
-
-
-
-    <script language="javascript" type="text/javascript" src="js"></script>
-
-    <script language="javascript" type="text/javascript" src="js_TYPED"></script> b
-
-    `<script language="javascript" type="text/javascript" src="js"></script>^
-
-    a <script language="javascript" type="text/javascript" src="js"></script>
-
-
     <!--  -------------select---------------                                           -->
     <!-- <`$_xSnipName^` `att?^>`content^^`content^html_cont_helper()^</`$_xSnipName^> -->
 
diff --git a/ftplugin/yacc/test.page b/ftplugin/yacc/test.page
index 0f528195..e135d588 100644
--- a/ftplugin/yacc/test.page
+++ b/ftplugin/yacc/test.page
@@ -103,32 +103,32 @@ WRAPPED_TEXT_line2
 #endif /* symbol */
 
 
-    /*  -------------#inc--------------- */
-    /* #include <`^.h>                   */
+    /*  -------------#include_user--------------- */
+    /* #include "`me^.h"                          */
 
 
 
-#include <.h>
+#include "test.h"
 
-#include <_TYPED.h> b
+#include "me_TYPED.h" b
 
-`#include <.h>^
+`#include "test.h"^
 
-a #include <.h>
+a #include "test.h"
 
 
-    /*  -------------#include_user--------------- */
-    /* #include "`me^.h"                          */
+    /*  -------------#inc--------------- */
+    /* #include <`^.h>                   */
 
 
 
-#include "test.h"
+#include <.h>
 
-#include "me_TYPED.h" b
+#include <_TYPED.h> b
 
-`#include "test.h"^
+`#include <.h>^
 
-a #include "test.h"
+a #include <.h>
 
 
     /*  -------------#ind--------------- */
@@ -309,24 +309,6 @@ a case constant :
     break;
 
 
-    /*  -------------comment--------------- */
-    /* `$CL^ `what^^ `$CR^`^                */
-
-
-
-/* WRAPPED_TEXT
-WRAPPED_TEXT_line2 */
-
-/* WRAPPED_TEXT
-WRAPPED_TEXT_line2 */ b
-
-`/* WRAPPED_TEXT
-WRAPPED_TEXT_line2 */^
-
-a /* WRAPPED_TEXT
-WRAPPED_TEXT_line2 */
-
-
     /*  -------------commentBlock--------------- */
     /* `$_xCommentLeftWithoutMid^`$CM `cursor^   */
     /* `$_xCommentMidIndent$CR^                  */
@@ -396,6 +378,24 @@ a /* WRAPPED_TEXT */
   /* WRAPPED_TEXT_line2 */
 
 
+    /*  -------------comment--------------- */
+    /* `$CL^ `what^^ `$CR^`^                */
+
+
+
+/* WRAPPED_TEXT
+WRAPPED_TEXT_line2 */
+
+/* WRAPPED_TEXT
+WRAPPED_TEXT_line2 */ b
+
+`/* WRAPPED_TEXT
+WRAPPED_TEXT_line2 */^
+
+a /* WRAPPED_TEXT
+WRAPPED_TEXT_line2 */
+
+
     /*  -------------default--------------- */
     /* default:                             */
     /*     `cursor^                         */
@@ -676,34 +676,6 @@ a /**-------------------------/// sum \\\---------------------------
 
 
 
-    /*  -------------for---------------                                                                                  */
-    /* for`$SPcmd^(`$SParg^`$FOR_SCOPE^`$VAR_PRE`i^`$SPop^=`$SPop^`0^; `i^`$SPop^<`$SPop^`len^; `i^++`$SParg^)`$BRloop^{ */
-    /*     `cursor^                                                                                                      */
-    /* }                                                                                                                 */
-
-
-
-for ( i = 0; i < len; i++ ) {
-    WRAPPED_TEXT
-    WRAPPED_TEXT_line2
-}
-
-for ( i_TYPED = 0_TYPED; i_TYPED < len_TYPED; i_TYPED++ ) {
-    WRAPPED_TEXT
-    WRAPPED_TEXT_line2
-} b
-
-`for ( i = 0; i < len; i++ ) {
-    WRAPPED_TEXT
-    WRAPPED_TEXT_line2
-}^
-
-a for ( i = 0; i < len; i++ ) {
-    WRAPPED_TEXT
-    WRAPPED_TEXT_line2
-}
-
-
     /*  -------------forever--------------- */
     /* for`$SPcmd^(;;) `cursor^             */
 
@@ -774,6 +746,34 @@ a for ( i = 0; i >= end; i-- ) {
 }
 
 
+    /*  -------------for---------------                                                                                  */
+    /* for`$SPcmd^(`$SParg^`$FOR_SCOPE^`$VAR_PRE`i^`$SPop^=`$SPop^`0^; `i^`$SPop^<`$SPop^`len^; `i^++`$SParg^)`$BRloop^{ */
+    /*     `cursor^                                                                                                      */
+    /* }                                                                                                                 */
+
+
+
+for ( i = 0; i < len; i++ ) {
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+}
+
+for ( i_TYPED = 0_TYPED; i_TYPED < len_TYPED; i_TYPED++ ) {
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+} b
+
+`for ( i = 0; i < len; i++ ) {
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+}^
+
+a for ( i = 0; i < len; i++ ) {
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+}
+
+
     /*  -------------fprintf---------------                     */
     /* fprintf(`$SParg^`stream^,`$SPop^`:_printfElts:^`$SParg^) */
 
@@ -1266,34 +1266,6 @@ a switch ( var ) {
 a %token 
 
 
-    /*  -------------while---------------                   */
-    /* while`$SPcmd^(`$SParg^`condition^`$SParg^)`$BRloop^{ */
-    /*     `cursor^                                         */
-    /* }                                                    */
-
-
-
-while ( condition ) {
-    WRAPPED_TEXT
-    WRAPPED_TEXT_line2
-}
-
-while ( condition_TYPED ) {
-    WRAPPED_TEXT
-    WRAPPED_TEXT_line2
-} b
-
-`while ( condition ) {
-    WRAPPED_TEXT
-    WRAPPED_TEXT_line2
-}^
-
-a while ( condition ) {
-    WRAPPED_TEXT
-    WRAPPED_TEXT_line2
-}
-
-
     /*  -------------while0---------------                   */
     /* do`$BRloop^{                                          */
     /*     `cursor^                                          */
@@ -1378,6 +1350,34 @@ a while ( NULL != x ) {
 }
 
 
+    /*  -------------while---------------                   */
+    /* while`$SPcmd^(`$SParg^`condition^`$SParg^)`$BRloop^{ */
+    /*     `cursor^                                         */
+    /* }                                                    */
+
+
+
+while ( condition ) {
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+}
+
+while ( condition_TYPED ) {
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+} b
+
+`while ( condition ) {
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+}^
+
+a while ( condition ) {
+    WRAPPED_TEXT
+    WRAPPED_TEXT_line2
+}
+
+
     /*  -------------yacc--------------- */
     /* %{                                */
     /* _CMT_ includes _cmt_              */
diff --git a/ftplugin/zsh/test.page b/ftplugin/zsh/test.page
index 4592878e..b7cb2f05 100644
--- a/ftplugin/zsh/test.page
+++ b/ftplugin/zsh/test.page
@@ -184,24 +184,6 @@ a case $var in
 esac
 
 
-    #   -------------comment--------------- 
-    #  `$CS `cursor^                        
-
-
-
-# WRAPPED_TEXT
-# WRAPPED_TEXT_line2
-
-# WRAPPED_TEXT
-# WRAPPED_TEXT_line2 b
-
-`# WRAPPED_TEXT
- # WRAPPED_TEXT_line2^
-
- a # WRAPPED_TEXT
-   # WRAPPED_TEXT_line2
-
-
     #   -------------commentBlock--------------- 
     #  `$CS `cursor^                             
 
@@ -253,6 +235,24 @@ a #
 
 
 
+# WRAPPED_TEXT
+# WRAPPED_TEXT_line2
+
+# WRAPPED_TEXT
+# WRAPPED_TEXT_line2 b
+
+`# WRAPPED_TEXT
+ # WRAPPED_TEXT_line2^
+
+ a # WRAPPED_TEXT
+   # WRAPPED_TEXT_line2
+
+
+    #   -------------comment--------------- 
+    #  `$CS `cursor^                        
+
+
+
 # WRAPPED_TEXT
 # WRAPPED_TEXT_line2
 
@@ -512,69 +512,69 @@ WRAPPED_TEXT_line2
 END
 
 
-    #   -------------if--------------- 
-    #  if ~:_cond:^;~$BRif^then        
-    #      ~cursor^                    
-    #  fi                              
+    #   -------------ife--------------- 
+    #  if ~:_cond:^;~$BRif^then         
+    #      ~job^                        
+    #  else                             
+    #      ~cursor^                     
+    #  fi                               
 
 
 
 if condition; then
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
+else
+    
 fi
 
 if condition_TYPED; then
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
+else
+    
 fi b
 
 `if condition; then
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
+else
+    
 fi^
 
 a if condition; then
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
+else
+    
 fi
 
 
-    #   -------------ife--------------- 
-    #  if ~:_cond:^;~$BRif^then         
-    #      ~job^                        
-    #  else                             
-    #      ~cursor^                     
-    #  fi                               
+    #   -------------if--------------- 
+    #  if ~:_cond:^;~$BRif^then        
+    #      ~cursor^                    
+    #  fi                              
 
 
 
 if condition; then
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
-else
-    
 fi
 
 if condition_TYPED; then
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
-else
-    
 fi b
 
 `if condition; then
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
-else
-    
 fi^
 
 a if condition; then
     WRAPPED_TEXT
     WRAPPED_TEXT_line2
-else
-    
 fi
 
 
diff --git a/plugin/FilterValue.class.vim b/plugin/FilterValue.class.vim
deleted file mode 100644
index e69de29b..00000000
diff --git a/plugin/MapSaver.class.vim b/plugin/MapSaver.class.vim
deleted file mode 100644
index e69de29b..00000000
diff --git a/plugin/SettingSwitch.class.vim b/plugin/SettingSwitch.class.vim
deleted file mode 100644
index e69de29b..00000000
diff --git a/plugin/SnippetScope.class.vim b/plugin/SnippetScope.class.vim
deleted file mode 100644
index e69de29b..00000000
diff --git a/plugin/classes/FiletypeScope.vim b/plugin/classes/FiletypeScope.vim
index 8a3b96ff..5f7bfbed 100644
--- a/plugin/classes/FiletypeScope.vim
+++ b/plugin/classes/FiletypeScope.vim
@@ -30,7 +30,7 @@ fun! s:SetSnippetLoaded( filename ) dict "{{{
     let self.loadedSnipFiles[ a:filename ] = 1
 
     let fn = substitute(a:filename, '\\', '/', 'g')
-    let shortname = matchstr(fn, '\Vftplugin\/\zs\w\+\/\.\*\ze.xpt.vim')
+    let shortname = matchstr(fn, '\Vftplugin\/\zs\[^/]\+\/\.\*\ze.xpt.vim')
     let self.loadedSnipFiles[shortname] = 1
 endfunction "}}}
 
diff --git a/plugin/classes/FilterValue.vim b/plugin/classes/FilterValue.vim
deleted file mode 100644
index 608ffa60..00000000
--- a/plugin/classes/FilterValue.vim
+++ /dev/null
@@ -1,75 +0,0 @@
-if exists( "g:__FILTERVALUE_VIM__" ) && g:__FILTERVALUE_VIM__ >= XPT#ver
-    finish
-endif
-let g:__FILTERVALUE_VIM__ = XPT#ver
-
-
-
-let s:oldcpo = &cpo
-set cpo-=< cpo+=B
-
-let g:EmptyFilter = {}
-
-let s:proto = {}
-
-fun! s:New( nIndent, text, ... ) dict "{{{
-    let self.nIndent = a:nIndent
-    let self.text    = a:text
-
-    " force to use this
-    let self.force   = a:0 == 1 && a:1
-    let self.marks   = 'innerMarks'
-
-    let self.rc      = 1 " right status. 0 means nothing should be updated.
-    let self.toBuild = 0
-endfunction "}}}
-
-fun! s:AdjustIndent( startPos ) dict "{{{
-
-    if self.text !~ '\n'
-        let self.nIndent = 0
-        return
-    endif
-
-
-    let nIndent = XPT#getIndentNr( a:startPos[0], a:startPos[1] )
-    let [ nIndent, self.nIndent ] = [ max( [ 0, nIndent + self.nIndent ] ), 0 ]
-
-    if nIndent == 0
-        return
-    endif
-
-
-    let indentSpaces = repeat( ' ', nIndent )
-
-    let self.text = substitute( self.text, '\n', "\n" . indentSpaces, 'g' )
-
-endfunction "}}}
-
-fun! s:AdjustTextAction( context ) dict "{{{
-
-    if !has_key( self.action, 'text' )
-        return
-    endif
-
-
-    let self.text = self.action.text
-    unlet self.action.text
-
-    if has_key( self.action, 'resetIndent' )
-
-        let self.nIndent = self.action.nIndent
-
-        unlet self.action.nIndent
-        unlet self.action.resetIndent
-
-    endif
-
-    call self.AdjustIndent( a:context.startPos )
-
-endfunction "}}}
-
-exe XPT#let_sid
-let g:FilterValue = XPT#class( s:sid, s:proto )
-
-let &cpo = s:oldcpo
diff --git a/plugin/classes/MapSaver.vim b/plugin/classes/MapSaver.vim
deleted file mode 100644
index dcc48832..00000000
--- a/plugin/classes/MapSaver.vim
+++ /dev/null
@@ -1,271 +0,0 @@
-if exists( "g:__MAPSAVER_VIM__" ) && g:__MAPSAVER_VIM__ >= XPT#ver
-    finish
-endif
-let g:__MAPSAVER_VIM__ = XPT#ver
-
-
-let s:oldcpo = &cpo
-set cpo-=< cpo+=B
-
-
-
-runtime plugin/debug.vim
-
-
-let s:log = CreateLogger( 'warn' )
-let s:log = CreateLogger( 'debug' )
-
-
-
-snoremap <Plug>selectToInsert d<BS>
-
-" Critical implementation!!
-" Not sure whether it works well on any platform
-"
-" TODO Maybe use <script> mapping is better
-fun! s:_GetAlighWidth() "{{{
-    nmap <buffer> 1 2
-    let line = XPT#getCmdOutput("silent nmap <buffer> 1")
-    nunmap <buffer> 1
-
-    let line = split(line, "\n")[0]
-
-    return len(matchstr(line, '^n.*\ze2$'))
-endfunction "}}}
-
-let s:alignWidth = s:_GetAlighWidth()
-
-delfunction s:_GetAlighWidth
-
-
-let s:stack = []
-
-
-
-fun! s:_GetMapLine(key, mode, isbuffer) "{{{
-    let mcmd = "silent ".a:mode."map ".(a:isbuffer ? "<buffer> " : "").a:key
-
-    " get fixed mapping
-    let str = XPT#getCmdOutput(mcmd)
-
-    let lines = split(str, "\n")
-
-
-    " Find out the line representing the expect mapping. Because mappings with
-    " the same prefix may all returned.
-    "
-    " *  norepeat
-    " &@ script or buffer local
-    "
-    " The :map command format: if a mapped key length is less than s:alignWidth,
-    " the right hand part is aligned. Or 1 space separates the left part and the
-    " right part
-    let localmark = a:isbuffer ? '@' : ' '
-    let ptn = '\V\c' . a:mode . '  ' . escape(a:key, '\') . '\s\{-}' . '\zs\[* ]' 
-          \. localmark . '\%>' . s:alignWidth . 'c\S\.\{-}\$'
-
-
-    for line in lines
-        if line =~? ptn
-            return matchstr(line, ptn)
-        endif
-    endfor
-
-    return ""
-
-endfunction "}}}
-
-fun! MapSaver_GetMapInfo( key, mode, isbuffer ) "{{{
-    let line = s:_GetMapLine(a:key, a:mode, a:isbuffer)
-    if line == ''
-        " unmap info
-        return { 'mode'  : a:mode,
-              \  'key'   : a:key,
-              \  'nore'  : '',
-              \  'isbuf' : a:isbuffer ? ' <buffer> ' : ' ',
-              \  'cont'  : ''}
-    endif
-
-    let item = line[0:1] " the first 2 characters
-
-    let info =  {'mode' : a:mode,
-          \'key'   : a:key,
-          \'nore'  : item =~ '*' ? 'nore' : '',
-          \'isbuf' : a:isbuffer ? ' <buffer> ' : ' ',
-          \'cont'  : line[2:]}
-
-    call s:log.Debug( "map info=" . string( info ) )
-    return info
-
-endfunction "}}}
-
-fun! s:_MapPop( info ) "{{{
-
-    call s:log.Debug("map a:info:".string(a:info))
-
-    Assert !empty( a:info )
-
-    let cmd = MapSaverGetMapCommand( a:info )
-
-    try
-        exe cmd
-    catch /.*/
-    endtry
-endfunction "}}}
-
-" fun! s:EscapeMap( s ) "{{{
-    " return substitute( a:s, '\V<', '\<lt>', 'g' )
-" endfunction "}}}
-
-fun! MapSaverGetMapCommand( info ) "{{{
-    " NOTE: guess it, no way to figure out whether a key is mapped with <expr> or not
-    let exprMap = ''
-    if a:info.mode == 'i' && a:info.cont =~ '\V\w(\.\*)' && a:info.cont !~? '\V<c-r>'
-          \ || a:info.mode != 'i' && a:info.cont =~ '\V\w(\.\*)' 
-          \ || a:info.mode == 'i' && a:info.cont =~ '\V\.\*?\.\*:\.\*'
-        let exprMap = '<expr> '
-    endif
-
-
-    if a:info.cont == ''
-        let cmd = "silent! " . a:info.mode . 'unmap <silent> ' . a:info.isbuf . a:info.key 
-    else
-        let cmd = "silent! " . a:info.mode . a:info.nore . 'map <silent> '. exprMap . a:info.isbuf . a:info.key . ' ' . a:info.cont
-    endif
-
-    return cmd
-    
-endfunction "}}}
-
-
-
-fun! s:String( stack ) "{{{
-    let rst = ''    
-    for ms in a:stack
-        let rst .= " **** " . string( ms.keys )
-    endfor
-
-    return rst
-endfunction "}}}
-
-
-fun! s:New( isLocal ) dict "{{{
-    let self.isLocal = !!a:isLocal
-    let self.keys = []
-    let self.saved = []
-endfunction "}}}
-
-fun! s:Add( mode, key ) dict "{{{
-    if self.saved != []
-        throw "keys are already saved and can not be added"
-    endif
-    let self.keys += [ [ a:mode, a:key ] ]
-endfunction "}}}
-
-fun! s:AddList( ... ) dict "{{{
-    if a:0 > 0 && type( a:1 ) == type( [] )
-        let list = a:1
-    else
-        let list = a:000
-    endif
-    for item in list
-        let [ mode, key ] = split( item, '^\w\zs_' )
-        call self.Add( mode, key )
-    endfor
-
-endfunction "}}}
-
-fun! s:UnmapAll() dict "{{{
-    if self.saved == []
-        throw "keys are not saved, can not unmap all"
-    endif
-
-    let localStr = self.isLocal ? '<buffer> ' : ''
-
-    for [ mode, key ] in self.keys
-        exe 'silent! ' . mode . 'unmap ' . localStr . key
-    endfor
-
-endfunction "}}}
-
-fun! s:Save() dict "{{{
-
-    if self.saved != []
-        " throw "keys are already saved and can not be save again"
-        return
-    endif
-
-
-    for [ mode, key ] in self.keys
-        call insert( self.saved, MapSaver_GetMapInfo( key, mode, self.isLocal ) )
-    endfor
-
-    let stack = self.GetStack()
-    call add( stack, self )
-
-    call s:log.Debug( "Saved stack:" . s:String( stack ) )
-
-endfunction "}}}
-
-fun! s:Literalize( ... ) dict "{{{
-    if self.saved == []
-        throw "keys are not saved yet, can not literalize"
-    endif
-
-    let option = a:0 == 1 ? a:1 : {}
-
-    let insertAsSelect = get(option, 'insertAsSelect', 0)
-
-    let localStr = self.isLocal ? '<buffer> ' : ''
-    for [ mode, key ] in self.keys
-        if mode == 's' && insertAsSelect
-            " exe 'silent! ' . mode . 'noremap ' . localStr . key . ' d<BS><C-o>:call feedkeys(' . string(key) . ', "mt")<CR>'
-
-            " NOTE: do not use nore-map to enable original insert-mode key mapping
-            exe 'silent! ' . mode . 'map ' . localStr . key . ' <Plug>selectToInsert' . key
-        else
-            exe 'silent! ' . mode . 'noremap ' . localStr . key . ' ' . key
-        endif
-    endfor
-
-endfunction "}}}
-
-fun! s:Restore() dict "{{{
-    if self.saved == []
-        return
-    endif
-
-
-    let stack = self.GetStack()
-    if empty( stack ) || stack[ -1 ] != self
-        throw "MapSaver: Incorrect Restore of MapSaver:" . s:String( stack )
-              \ . ' but ' . string( self.keys )
-    endif
-
-    for info in self.saved
-        call s:_MapPop( info )
-    endfor
-
-    let self.saved = []
-
-    call remove( stack, -1 )
-
-    call s:log.Debug( "Restored stack:" . s:String( stack ) )
-
-endfunction "}}}
-
-fun! s:GetStack() dict "{{{
-    if self.isLocal
-        if !exists( 'b:__map_saver_stack__' )
-            let b:__map_saver_stack__ = []
-        endif
-        return b:__map_saver_stack__
-    else
-        return s:stack
-    endif
-endfunction "}}}
-
-exe XPT#let_sid
-let g:MapSaver = XPT#class( s:sid, {} )
-
-let &cpo = s:oldcpo
diff --git a/plugin/classes/RenderContext.vim b/plugin/classes/RenderContext.vim
deleted file mode 100644
index 568a5059..00000000
--- a/plugin/classes/RenderContext.vim
+++ /dev/null
@@ -1,92 +0,0 @@
-if exists( "g:__RENDERCONTEXT_VIM__" ) && g:__RENDERCONTEXT_VIM__ >= XPT#ver
-    finish
-endif
-let g:__RENDERCONTEXT_VIM__ = XPT#ver
-
-
-
-let s:oldcpo = &cpo
-set cpo-=< cpo+=B
-
-" runtime plugin/debug.vim
-
-" let s:log = CreateLogger( 'warn' )
-" let s:log = CreateLogger( 'debug' )
-
-
-let s:proto = {}
-
-let g:xptRenderPhase = {
-      \ 'uninit'    : 'uninit'   ,
-      \ 'popup'     : 'popup'    ,
-      \ 'inited'    : 'inited'   ,
-      \ 'rendering' : 'rendering',
-      \ 'rendered'  : 'rendered' ,
-      \ 'iteminit'  : 'iteminit' ,
-      \ 'fillin'    : 'fillin'   ,
-      \ 'post'      : 'post'     ,
-      \ 'finished'  : 'finished' ,
-      \ }
-
-let p = g:xptRenderPhase
-let s:phaseGraph = {
-      \ p.uninit    : [ p.popup, p.inited ],
-      \ p.popup     : [ p.inited ],
-      \ p.inited    : [ p.rendering ],
-      \ p.rendering : [ p.rendered ],
-      \ p.rendered  : [ p.iteminit ],
-      \ p.iteminit  : [ p.iteminit, p.fillin, p.post ],
-      \ p.fillin    : [ p.post, p.finished ],
-      \ p.post      : [ p.finished, p.iteminit ],
-      \ p.finished  : [ p.uninit ],
-      \ }
-unlet p
-
-
-fun! s:New( x ) dict "{{{
-
-    let pre = "X" . len( a:x.stack ) . '_'
-
-    call extend( self, {
-          \   'ftScope'            : {},
-          \   'level'              : len( a:x.stack ),
-          \   'snipObject'         : {},
-          \   'evalCtx'            : {},
-          \   'phase'              : g:xptRenderPhase.uninit,
-          \   'action'             : '',
-          \   'wrap'               : {},
-          \   'markNamePre'        : pre,
-          \   'item'               : {},
-          \   'leadingPlaceHolder' : {},
-          \   'activeLeaderMarks'  : 'innerMarks',
-          \   'history'            : [],
-          \   'namedStep'          : {},
-          \   'processing'         : 0,
-          \   'marks'              : {
-          \      'tmpl'            : {
-          \         'start' : pre . '`tmpl`s',
-          \         'end'   : pre . '`tmpl`e' } },
-          \   'itemDict'           : {},
-          \   'itemList'           : [],
-          \   'lastContent'        : '',
-          \   'snipSetting'        : {},
-          \   'tmpmappings'        : {},
-          \ }, 'force' )
-
-endfunction "}}}
-
-fun! s:SwitchPhase( nextPhase ) dict "{{{
-    if -1 == match( s:phaseGraph[ self.phase ], '\V\<' . a:nextPhase . '\>' )
-        throw 'XPT:RenderContext:switching from [' . self.phase . '] to [' . a:nextPhase . '] is not allowed'
-    endif
-
-    let self.phase = a:nextPhase
-
-endfunction "}}}
-
-
-
-exe XPT#let_sid
-let g:RenderContext = XPT#class( s:sid, s:proto )
-
-let &cpo = s:oldcpo
diff --git a/plugin/classes/SnippetScope.vim b/plugin/classes/SnippetScope.vim
deleted file mode 100644
index bace4c78..00000000
--- a/plugin/classes/SnippetScope.vim
+++ /dev/null
@@ -1 +0,0 @@
-" in dev
diff --git a/plugin/mapstack.vim b/plugin/mapstack.vim
deleted file mode 100644
index 8b137891..00000000
--- a/plugin/mapstack.vim
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/plugin/xpclass.vim b/plugin/xpclass.vim
deleted file mode 100644
index e69de29b..00000000
diff --git a/plugin/xpop.test.vim b/plugin/xpop.test.vim
deleted file mode 100644
index 748b8cb8..00000000
--- a/plugin/xpop.test.vim
+++ /dev/null
@@ -1 +0,0 @@
-" just for over-writing old junk staff
diff --git a/plugin/xpopup.vim b/plugin/xpopup.vim
index c1bc660d..8e7bd82d 100644
--- a/plugin/xpopup.vim
+++ b/plugin/xpopup.vim
@@ -26,7 +26,6 @@ set cpo-=< cpo+=B
 
 runtime plugin/debug.vim
 runtime plugin/classes/SettingSwitch.vim
-runtime plugin/classes/MapSaver.vim
 
 
 exe XPT#let_sid
@@ -391,7 +390,10 @@ fun! s:sessionPrototype.addList( list ) "{{{
     if type( list[0] ) == type( '' )
         call map( list, '{"word" : v:val, "icase" : 1 }' )
     else
-        call map( list, '{"word" : v:val["word"], "menu" : get( v:val, "menu", "" ), "icase" : 1 }' )
+        call map( list, '{"word" : v:val["word"],'
+              \ . '"info": get(v:val, "info", ""),'
+              \ . '"menu": get(v:val, "menu", ""),'
+              \ . '"icase": 1 }' )
     endif
 
     let self.list += list
@@ -405,6 +407,11 @@ fun! s:sessionPrototype.createPrefixIndex(list) "{{{
 endfunction "}}}
 
 fun! s:sessionPrototype.updatePrefixIndex(list) "{{{
+
+    if g:xptemplate_pum_quick_back == 0
+        return
+    endif
+
     for item in a:list
         let key = ( type(item) == type({}) ) ?item.word : item
 
@@ -429,8 +436,8 @@ fun! s:_InitBuffer() "{{{
         return
     endif
 
-    let b:_xpp_map_saver = g:MapSaver.New( 1 )
-    call b:_xpp_map_saver.AddList( 
+    let b:_xpp_map_saver = xpt#msvr#New(1)
+    call xpt#msvr#AddList( b:_xpp_map_saver,
           \ 'i_<UP>', 
           \ 'i_<DOWN>', 
           \
@@ -449,10 +456,17 @@ fun! s:_InitBuffer() "{{{
     "       non-keywords char make pum disappear.
 
     let b:_xpp_setting_switch = g:SettingSwitch.New()
+
+    let co = {"menu":1, "menuone":1, "longest":1}
+    for k in split(&completeopt, ',')
+        let co[k] = 1
+    endfor
+    let new_completeopt = join( keys(co), ',' )
+
     call b:_xpp_setting_switch.AddList( 
           \ [ '&l:cinkeys', '' ], 
           \ [ '&l:indentkeys', '' ], 
-          \ [ '&completeopt', 'menu,longest,menuone' ], 
+          \ [ '&completeopt', new_completeopt ],
           \)
           " \ [ '&iskeyword', '33-127,128-255' ], 
     " TODO  '&l:ignorecase', '1'???
@@ -824,13 +838,17 @@ fun! XPPshorten() "{{{
     let actions = "\<C-y>"
     let actions = ""
 
+    if g:xptemplate_pum_quick_back == 1
 
-    let prefixMap = ( sess.ignoreCase ) ? sess.prefixIndex.lower : sess.prefixIndex.ori
-    call s:log.Log("prefix map:".string(prefixMap))
+        let prefixMap = ( sess.ignoreCase ) ? sess.prefixIndex.lower : sess.prefixIndex.ori
+        call s:log.Log("prefix map:".string(prefixMap))
 
+        let shorterKey = s:FindShorter(prefixMap, ( sess.ignoreCase ? substitute(current, '.', '\l&', 'g') : current ))
+        call s:log.Log("shorterKey=".shorterKey)
 
-    let shorterKey = s:FindShorter(prefixMap, ( sess.ignoreCase ? substitute(current, '.', '\l&', 'g') : current ))
-    call s:log.Log("shorterKey=".shorterKey)
+    else
+         let shorterKey = current[ 0 : -2 ]
+    endif
 
 
     let action = actions . repeat( "\<bs>", len(current) - len(shorterKey) ) . "\<C-r>=XPPrepopup(0, 'noenlarge')\<cr>"
@@ -959,7 +977,7 @@ fun! s:ApplyMapAndSetting() "{{{
 
     call s:log.Debug( 'ApplyMapAndSetting' )
 
-    call b:_xpp_map_saver.Save()
+    call xpt#msvr#Save( b:_xpp_map_saver )
 
 
     let sess = b:__xpp_current_session
@@ -1019,7 +1037,7 @@ fun! s:ClearMapAndSetting() "{{{
         " let 
 
 
-    call b:_xpp_map_saver.Restore()
+    call xpt#msvr#Restore( b:_xpp_map_saver )
     call b:_xpp_setting_switch.Restore()
     if exists( ':AcpUnlock' )
         try
diff --git a/plugin/xpreplace.vim b/plugin/xpreplace.vim
index 7dd4aa86..c013d411 100644
--- a/plugin/xpreplace.vim
+++ b/plugin/xpreplace.vim
@@ -98,15 +98,6 @@ fun! XPreplaceByMarkInternal( startMark, endMark, replacement ) "{{{
     return pos
 endfunction "}}}
 
-" let s:ii = 0
-
-
-fun! s:ConvertSpaceToTab( text ) "{{{
-    return XPT#convertSpaceToTab( a:text )
-endfunction "}}}
-
-
-
 " For internal use only, the caller is reponsible to set settings correctly.
 fun! XPreplaceInternal(start, end, replacement, ...) "{{{
     " Cursor stays just after replacement
@@ -138,12 +129,8 @@ fun! XPreplaceInternal(start, end, replacement, ...) "{{{
     " reserved register 0
     " Assert @" == 'XPreplaceInited'
 
-
-    let replacement = s:ConvertSpaceToTab( a:replacement )
-    " let repLines = XPT#SpaceToTabExceptFirstLine( split( a:replacement, '\n', 1 ) )
-    let repLines = XPT#SpaceToTab( split( a:replacement, '\n', 1 ) )
-
-
+    let replacement = a:replacement
+    let repLines = split( a:replacement, '\n', 1 )
 
     if option.doJobs
         " TODO not good
diff --git a/plugin/xptemplate.conf.vim b/plugin/xptemplate.conf.vim
index 0e59d987..ce18b382 100644
--- a/plugin/xptemplate.conf.vim
+++ b/plugin/xptemplate.conf.vim
@@ -16,55 +16,64 @@ let s:ep           = '\%(' . '\%(\[^\\]\|\^\)' . '\%(\\\\\)\*' . '\)' . '\@<='
 
 
 
+let s:def = function( "XPT#setIfNotExist" )
 
 
-" call XPT#setIfNotExist('g:xptemplate_show_stack'	, 1 )
-" call XPT#setIfNotExist('g:xptemplate_abbr_mode'	, 0 )
-" call XPT#setIfNotExist('g:xptemplate_crash'	, '<C-g>' )
-" call XPT#setIfNotExist('g:xptemplate_nav_clear_next'	, '<cr>' )
-" call XPT#setIfNotExist('g:xptemplate_map'	, '' )
+" call s:def('g:xptemplate_show_stack'	, 1 )
+" call s:def('g:xptemplate_abbr_mode'	, 0 )
+" call s:def('g:xptemplate_crash'	, '<C-g>' )
+" call s:def('g:xptemplate_nav_clear_next'	, '<cr>' )
+" call s:def('g:xptemplate_map'	, '' )
 
-call XPT#setIfNotExist('g:xptemplate_key'	, '<C-\>' )
-call XPT#setIfNotExist('g:xptemplate_key_force_pum'	, '<C-r>' . g:xptemplate_key )
-call XPT#setIfNotExist('g:xptemplate_key_pum_only'	, '<C-r><C-r>' . g:xptemplate_key )
+call s:def('g:xptemplate_key'	, '<C-\>' )
+call s:def('g:xptemplate_key_force_pum'	, '<C-r>' . g:xptemplate_key )
+call s:def('g:xptemplate_key_pum_only'	, '<C-r><C-r>' . g:xptemplate_key )
+call s:def('g:xptemplate_key_visual'	, g:xptemplate_key )
 
 
-call XPT#setIfNotExist('g:xptemplate_nav_next'	, '<Tab>' )
-call XPT#setIfNotExist('g:xptemplate_nav_prev'	, '<S-Tab>' )
-call XPT#setIfNotExist('g:xptemplate_nav_cancel'	, '<cr>' )
-call XPT#setIfNotExist('g:xptemplate_goback'	, '<C-g>' )
-call XPT#setIfNotExist('g:xptemplate_to_right'	, '<C-l>' )
+call s:def('g:xptemplate_nav_next'	, '<Tab>' )
+call s:def('g:xptemplate_nav_prev'	, '<S-Tab>' )
+call s:def('g:xptemplate_nav_cancel'	, '<cr>' )
+call s:def('g:xptemplate_goback'	, '<C-g>' )
+call s:def('g:xptemplate_to_right'	, '<C-l>' )
 
 " TODO doc it
-call XPT#setIfNotExist('g:xptemplate_key_2'	, g:xptemplate_key )
-call XPT#setIfNotExist('g:xptemplate_nav_next_2'	, g:xptemplate_nav_next )
-call XPT#setIfNotExist('g:xptemplate_fallback'	, '<Plug>XPTrawKey' )
+call s:def('g:xptemplate_key_2'	, g:xptemplate_key )
+call s:def('g:xptemplate_nav_next_2'	, g:xptemplate_nav_next )
+call s:def('g:xptemplate_fallback'	, '<Plug>XPTrawKey' )
+call s:def('g:xptemplate_key_visual_2'	, g:xptemplate_key_visual )
 
 
 " doc it
-call XPT#setIfNotExist('g:xptemplate_fallback_condition'	, '\V\c<Tab>' )
+call s:def('g:xptemplate_fallback_condition'	, '\V\c<Tab>' )
 " doc it
-call XPT#setIfNotExist('g:xptemplate_move_even_with_pum'	, g:xptemplate_nav_next !=? '<Tab>' )
-call XPT#setIfNotExist('g:xptemplate_always_show_pum'	, 0 )
-call XPT#setIfNotExist('g:xptemplate_minimal_prefix'	, 1 )
-call XPT#setIfNotExist('g:xptemplate_pum_tab_nav'	, 0 )
-call XPT#setIfNotExist('g:xptemplate_strict'	, 2 )
-call XPT#setIfNotExist('g:xptemplate_highlight'	, 'next' )
-call XPT#setIfNotExist('g:xptemplate_highlight_nested'	, 0 )
-call XPT#setIfNotExist('g:xptemplate_brace_complete'	, 0 )
-call XPT#setIfNotExist('g:xptemplate_strip_left'	, 1 )
-call XPT#setIfNotExist('g:xptemplate_fix'	, 1 )
-call XPT#setIfNotExist('g:xptemplate_ph_pum_accept_empty'	, 1 )
-
-
-call XPT#setIfNotExist('g:xptemplate_vars'	, '' )
-call XPT#setIfNotExist('g:xptemplate_bundle'	, '' )
-call XPT#setIfNotExist('g:xptemplate_snippet_folders'	, [] )
+call s:def('g:xptemplate_move_even_with_pum'	, g:xptemplate_nav_next !=? '<Tab>' )
+call s:def('g:xptemplate_close_pum'	, 0 )
+call s:def('g:xptemplate_break_undo'	, 0 )
+call s:def('g:xptemplate_always_show_pum'	, 0 )
+call s:def('g:xptemplate_minimal_prefix'	, 1 )
+call s:def('g:xptemplate_pum_tab_nav'	, 0 )
+call s:def('g:xptemplate_pum_quick_back'	, 1 )
+call s:def('g:xptemplate_strict'	, 2 )
+call s:def('g:xptemplate_highlight'	, 'next' )
+call s:def('g:xptemplate_highlight_nested'	, 0 )
+call s:def('g:xptemplate_brace_complete'	, 0 )
+call s:def('g:xptemplate_strip_left'	, 1 )
+call s:def('g:xptemplate_fix'	, 1 )
+call s:def('g:xptemplate_ph_pum_accept_empty'	, 1 )
+call s:def('g:xptemplate_cwd_snippet'	, 0 )
+call s:def('g:xptemplate_hook_before_cr'	, '' )
+call s:def('g:xptemplate_debug_log'	, '' )
+
+
+call s:def('g:xptemplate_vars'	, '' )
+call s:def('g:xptemplate_bundle'	, '' )
+call s:def('g:xptemplate_snippet_folders'	, [] )
 
 
 
 " for test script
-call XPT#setIfNotExist('g:xpt_post_action', '')
+call s:def('g:xpt_post_action', '')
 
 
 if type( g:xptemplate_minimal_prefix ) == type( '' )
@@ -84,7 +93,7 @@ if type( g:xptemplate_minimal_prefix ) == type( '' )
     endif
 endif
 
-call XPT#setIfNotExist( 'g:xptemplate_minimal_prefix_nested', g:xptemplate_minimal_prefix )
+call s:def( 'g:xptemplate_minimal_prefix_nested', g:xptemplate_minimal_prefix )
 
 
 
@@ -146,6 +155,15 @@ let g:XPTmappings = {
       \                     : "<C-c>`>i<C-r>=XPTemplateStart(0,{'k':'%s'})<cr>",
       \ }
 
+if g:xptemplate_break_undo
+    let g:XPTmappings.trigger = "<C-g>u" . g:XPTmappings.trigger
+endif
+
+if g:xptemplate_close_pum
+    for k in split('popup,force_pum,trigger', ',')
+        let g:XPTmappings[k] = "<C-v><C-v><BS>" . g:XPTmappings[k]
+    endfor
+end
 
 if g:xptemplate_fallback =~ '\V\^nore:'
     let g:xptemplate_fallback = g:xptemplate_fallback[ 5: ]
@@ -164,17 +182,20 @@ endfunction "}}}
 
 
 exe "inoremap <silent>" g:xptemplate_key           printf( g:XPTmappings.trigger      , s:EscapeMap( g:xptemplate_key )          )
-exe "xnoremap <silent>" g:xptemplate_key           g:XPTmappings.wrapTrigger
+exe "xnoremap <silent>" g:xptemplate_key_visual    g:XPTmappings.wrapTrigger
 exe "snoremap <silent>" g:xptemplate_key           printf( g:XPTmappings.selTrigger   , s:EscapeMap( g:xptemplate_key )          )
 exe "inoremap <silent>" g:xptemplate_key_pum_only  printf( g:XPTmappings.popup        , s:EscapeMap( g:xptemplate_key_pum_only ) )
 exe "inoremap <silent>" g:xptemplate_key_force_pum printf( g:XPTmappings.force_pum    , s:EscapeMap( g:xptemplate_key_force_pum ))
 
 if g:xptemplate_key_2 != g:xptemplate_key
     exe "inoremap <silent>" g:xptemplate_key_2           g:XPTmappings.trigger
-    exe "xnoremap <silent>" g:xptemplate_key_2           g:XPTmappings.wrapTrigger
     exe "snoremap <silent>" g:xptemplate_key_2           g:XPTmappings.selTrigger
 endif
 
+if g:xptemplate_key_visual_2 != g:xptemplate_key_visual
+    exe "xnoremap <silent>" g:xptemplate_key_visual_2           g:XPTmappings.wrapTrigger
+endif
+
 
 " let &cpo = s:oldcpo
 
@@ -207,7 +228,8 @@ endif
 
 let g:xptBundle = {}
 for ftAndBundle in s:bundle
-    let [ ft, bundle ] = split( ftAndBundle, '_' )
+    let [ ft; bundle_list ] = split( ftAndBundle, '_' )
+    let bundle = join( bundle_list, '_' )
     if !has_key( g:xptBundle, ft )
         let g:xptBundle[ ft ] = {}
     endif
diff --git a/plugin/xptemplate.parser.vim b/plugin/xptemplate.parser.vim
index 2f68e8e7..dfdf3c3e 100644
--- a/plugin/xptemplate.parser.vim
+++ b/plugin/xptemplate.parser.vim
@@ -25,11 +25,9 @@ set cpo-=< cpo+=B
 runtime plugin/debug.vim
 
 runtime plugin/classes/FiletypeScope.vim
-runtime plugin/classes/FilterValue.vim
-runtime plugin/xptemplate.util.vim
 runtime plugin/xptemplate.vim
 
-
+exec XPT#importConst
 
 let s:log = CreateLogger( 'warn' )
 " let s:log = CreateLogger( 'debug' )
@@ -48,9 +46,6 @@ com! -nargs=+ XPTinclude    call XPTinclude(<f-args>)
 com! -nargs=+ XPTembed      call XPTembed(<f-args>)
 " com! -nargs=* XSET          call XPTbufferScopeSet( <q-args> )
 
-
-let s:nonEscaped = '\%(' . '\%(\[^\\]\|\^\)' . '\%(\\\\\)\*' . '\)' . '\@<='
-
 fun! s:AssignSnipFT( filename ) "{{{
     let x = b:xptemplateData
 
@@ -310,8 +305,6 @@ fun! DoParseSnippet( p ) "{{{
 
     let [i, len] = [0, len(lines)]
 
-    call s:ConvertIndent( lines )
-
     " parse lines
     " start end and blank start
     let [s, e, blk] = [-1, -1, 10000]
@@ -386,7 +379,7 @@ fun! s:XPTemplateParseSnippet(lines) "{{{
         let value = pair[ len(name) : ]
 
         " flag setting need no value present
-        let value = value[0:0] == '=' ? g:xptutil.UnescapeChar(value[1:], ' ') : 1
+        let value = value[0:0] == '=' ? xpt#util#UnescapeChar(value[1:], ' ') : 1
 
         let setting[name] = value
     endfor
@@ -410,7 +403,7 @@ fun! s:XPTemplateParseSnippet(lines) "{{{
             call s:log.Log("got value, start=".start)
 
 
-            let [ keyname, keytype ] = s:GetKeyType( key )
+            let [ keyname, keytype ] = xpt#parser#GetKeyType( key )
 
             call s:log.Log("parse XSET:" . keyname . "|" . keytype . '=' . val)
 
@@ -491,22 +484,6 @@ fun! s:GetSnipCommentHint(str) "{{{
     endif
 endfunction "}}}
 
-
-
-" TODO convert indent in runtime
-fun! s:ConvertIndent( snipLines ) "{{{
-
-
-    let tabspaces = repeat( ' ', &l:tabstop )
-    let indentRep = repeat( '\1', &l:shiftwidth )
-
-
-    let cmdExpand = 'substitute(v:val, ''^\( *\)\1\1\1'', ''' . indentRep . ''', "g" )'
-
-    call map( a:snipLines, cmdExpand )
-
-endfunction "}}}
-
 fun! s:getXSETkeyAndValue(lines, start) "{{{
     let start = a:start
 
@@ -541,7 +518,7 @@ endfunction "}}}
 " XXX
 " fun! s:XPTbufferScopeSet( str )
     " let [ key, value, start ] = s:getXSETkeyAndValue( [ 'XSET ' . a:str ], 0 )
-    " let [ keyname, keytype ] = s:GetKeyType( key )
+    " let [ keyname, keytype ] = xpt#parser#GetKeyType( key )
 " 
 " endfunction
 
@@ -602,27 +579,13 @@ fun! s:ParseMultiLineValues(lines, start) "{{{
     return [ start, val ]
 endfunction "}}}
 
-fun! s:GetKeyType(rawKey) "{{{
-
-    let keytype = matchstr(a:rawKey, '\V'.s:nonEscaped.'|\zs\.\{-}\$')
-    if keytype == ""
-        let keytype = matchstr(a:rawKey, '\V'.s:nonEscaped.'.\zs\.\{-}\$')
-    endif
-
-    let keyname = keytype == "" ? a:rawKey :  a:rawKey[ 0 : - len(keytype) - 2 ]
-    let keyname = substitute(keyname, '\V\\\(\[.|\\]\)', '\1', 'g')
-
-    return [ keyname, keytype ]
-
-endfunction "}}}
-
 fun! s:HandleXSETcommand(setting, command, keyname, keytype, value) "{{{
 
     if a:keyname ==# 'ComeFirst'
-        let a:setting.comeFirst = s:SplitWith( a:value, ' ' )
+        let a:setting.comeFirst = xpt#util#SplitWith( a:value, ' ' )
 
     elseif a:keyname ==# 'ComeLast'
-        let a:setting.comeLast = s:SplitWith( a:value, ' ' )
+        let a:setting.comeLast = xpt#util#SplitWith( a:value, ' ' )
 
     elseif a:keyname ==# 'postQuoter'
         let a:setting.postQuoter = a:value
@@ -634,28 +597,28 @@ fun! s:HandleXSETcommand(setting, command, keyname, keytype, value) "{{{
 
     elseif a:keytype == "" || a:keytype ==# 'def'
         " first line is indent : empty indent
-        let a:setting.defaultValues[a:keyname] = g:FilterValue.New( 0, a:value )
+        let a:setting.defaultValues[a:keyname] = xpt#flt#New( 0, a:value )
 
     elseif a:keytype ==# 'map'
 
         let a:setting.mappings[ a:keyname ] = get(
               \ a:setting.mappings,
               \ a:keyname,
-              \ { 'saver' : g:MapSaver.New( 1 ), 'keys' : {} } )
+              \ { 'saver' : xpt#msvr#New(1), 'keys' : {} } )
 
         let key = matchstr( a:value, '\V\^\S\+\ze\s' )
         let mapping = matchstr( a:value, '\V\s\+\zs\.\*' )
 
-        call a:setting.mappings[ a:keyname ].saver.Add( 'i', key )
+        call xpt#msvr#Add( a:setting.mappings[ a:keyname ].saver, 'i', key )
 
-        let a:setting.mappings[ a:keyname ].keys[ key ] = g:FilterValue.New( 0, mapping )
+        let a:setting.mappings[ a:keyname ].keys[ key ] = xpt#flt#New( 0, mapping )
 
 
     elseif a:keytype ==# 'pre'
-        let a:setting.preValues[a:keyname] = g:FilterValue.New( 0, a:value )
+        let a:setting.preValues[a:keyname] = xpt#flt#New( 0, a:value )
 
     elseif a:keytype ==# 'ontype'
-        let a:setting.ontypeFilters[a:keyname] = g:FilterValue.New( 0, a:value )
+        let a:setting.ontypeFilters[a:keyname] = xpt#flt#New( 0, a:value )
 
     elseif a:keytype ==# 'post'
         if a:keyname =~ '\V...'
@@ -663,11 +626,11 @@ fun! s:HandleXSETcommand(setting, command, keyname, keytype, value) "{{{
             "
             " first line is indent : empty indent
             let a:setting.postFilters[a:keyname] = 
-                  \ g:FilterValue.New( 0, 'BuildIfNoChange(' . string(a:value) . ')' )
+                  \ xpt#flt#New( 0, 'BuildIfNoChange(' . string(a:value) . ')' )
 
         else
             " first line is indent : empty indent
-            let a:setting.postFilters[a:keyname] = g:FilterValue.New( 0, a:value )
+            let a:setting.postFilters[a:keyname] = xpt#flt#New( 0, a:value )
 
         endif
 
@@ -679,12 +642,6 @@ fun! s:HandleXSETcommand(setting, command, keyname, keytype, value) "{{{
 endfunction "}}}
 
 
-fun! s:SplitWith( str, char ) "{{{
-  let s = split( a:str, '\V' . s:nonEscaped . a:char, 1 )
-  return s
-endfunction "}}}
-
-
 let &cpo = s:oldcpo
 
 
diff --git a/plugin/xptemplate.util.vim b/plugin/xptemplate.util.vim
deleted file mode 100644
index 3d987bc6..00000000
--- a/plugin/xptemplate.util.vim
+++ /dev/null
@@ -1,109 +0,0 @@
-if exists( "g:__XPTEMPLATE_UTIL_VIM__" ) && g:__XPTEMPLATE_UTIL_VIM__ >= XPT#ver
-    finish
-endif
-let g:__XPTEMPLATE_UTIL_VIM__ = XPT#ver
-
-
-let s:oldcpo = &cpo
-set cpo-=< cpo+=B
-
-runtime plugin/debug.vim
-
-
-let s:log = CreateLogger( 'warn' )
-" let s:log = CreateLogger( 'debug' )
-
-
-
-
-
-let s:unescapeHead          = '\v(\\*)\1\\?\V'
-
-fun! g:XPclassPrototype( sid, ...) "{{{
-    let p = {}
-    for name in a:000
-        let p[ name ] = function( '<SNR>' . a:sid . name )
-    endfor
-
-    return p
-endfunction "}}}
-
-fun! s:UnescapeChar( str, chars ) "{{{
-    " unescape only chars started with several '\' 
-
-    " remove all '\'.
-    let chars = substitute( a:chars, '\\', '', 'g' )
-
-    
-    let pattern = s:unescapeHead . '\(\[' . escape( chars, '\]-^' ) . ']\)'
-    " call s:log.Log( 'to unescape pattern='.pattern )
-    let unescaped = substitute( a:str, pattern, '\1\2', 'g' )
-    " call s:log.Log( 'unescaped ='.unescaped )
-    return unescaped
-endfunction "}}}
-
-fun! s:DeepExtend( to, from ) "{{{
-    for key in keys( a:from )
-
-        if type( a:from[ key ] ) == 4
-            " dict 
-            if has_key( a:to, key )
-                call g:xptutil.DeepExtend( a:to[ key ], a:from[ key ] )
-            else
-                let a:to[ key ] = a:from[key]
-            endif
-
-        elseif type( a:from[key] ) == 3
-            " list 
-
-            if has_key( a:to, key )
-                call extend( a:to[ key ], a:from[key] )
-            else
-                let a:to[ key ] = a:from[key]
-            endif
-        else
-            let a:to[ key ] = a:from[key]
-        endif
-
-    endfor
-endfunction "}}}
-
-fun! s:XPTgetCurrentOrPreviousSynName() "{{{
-    let pos = [ line( "." ), col( "." ) ]
-    let synName = synIDattr(synID(pos[0], pos[1], 1), "name")
-
-    if synName == ''
-        let prevPos = searchpos( '\S', 'bWn' )
-        if prevPos == [0, 0]
-            return synName
-        endif
-
-        let synName = synIDattr(synID(prevPos[0], prevPos[1], 1), "name")
-        if synName == ''
-            " an empty syntax char
-            return &filetype
-        endif
-    endif
-
-    return synName
-
-endfunction "}}}
-
-fun! s:RemoveDuplicate( list ) "{{{
-    let dict = {}
-    let newList = []
-    for e in a:list
-        if !has_key( dict, e )
-            call add( newList, e )
-        endif
-        let dict[ e ] = 1
-    endfor
-
-    return newList
-endfunction "}}}
-
-exe XPT#let_sid
-let g:xptutil = XPT#class( s:sid, {} )
-
-let &cpo = s:oldcpo
-
diff --git a/plugin/xptemplate.vim b/plugin/xptemplate.vim
index 2b7e8360..76918476 100644
--- a/plugin/xptemplate.vim
+++ b/plugin/xptemplate.vim
@@ -29,7 +29,7 @@
 " TODO lazy load of scripts
 " TODO add: be able to load textmate snippet or snipmate snippet.
 " TODO add: <BS> at ph start to shift backward.
-" TODO add: php snippet <% for .. %> in html 
+" TODO add: php snippet <% for .. %> in html
 " TODO improve: 3 quotes in python
 " TODO fix: register handling when snippet expand
 " TODO goto next or trigger?
@@ -112,20 +112,17 @@ exe XPT#let_sid
 
 
 runtime plugin/xptemplate.conf.vim
-runtime plugin/debug.vim
-runtime plugin/xptemplate.util.vim
 runtime plugin/xpreplace.vim
 runtime plugin/xpmark.vim
 runtime plugin/xpopup.vim
-runtime plugin/classes/MapSaver.vim
 runtime plugin/classes/SettingSwitch.vim
-runtime plugin/classes/FiletypeScope.vim
-runtime plugin/classes/FilterValue.vim
-runtime plugin/classes/RenderContext.vim
 
+exec XPT#importConst
 
-let s:log = CreateLogger( 'warn' )
-let s:log = CreateLogger( 'debug' )
+let s:log = xpt#debug#Logger( 'warn' )
+let s:log = xpt#debug#Logger( 'debug' )
+
+let s:renderPhase = xpt#rctx#phase
 
 call XPRaddPreJob( 'XPMupdateCursorStat' )
 call XPRaddPostJob( 'XPMupdateSpecificChangedRange' )
@@ -170,7 +167,7 @@ let s:nonEscaped =
 let g:XPTemplateSettingPrototype  = {
       \    'hidden'           : 0,
       \    'variables'        : {},
-      \    'preValues'        : { 'cursor' : g:FilterValue.New( 0, '$CURSOR_PH' ) },
+      \    'preValues'        : { 'cursor' : xpt#flt#New( 0, '$CURSOR_PH' ) },
       \    'defaultValues'    : {},
       \    'mappings'         : {},
       \    'ontypeFilters'    : {},
@@ -186,29 +183,9 @@ fun! g:XPTapplyTemplateSettingDefaultValue( setting ) "{{{
     let s.preValues.cursor  = get( s.preValues, 'cursor',       '$CURSOR_PH' )
 endfunction "}}}
 
-
-fun! s:SetDefaultFilters( ph ) "{{{
-    let setting = b:xptemplateData.renderContext.snipSetting
-
-    " post filters
-    if !has_key( setting.postFilters, a:ph.name )
-        let pfs = setting.postFilters
-
-        if a:ph.name =~ '\V\w\+?'	| let pfs[ a:ph.name ] = g:FilterValue.New( 0, "EchoIfNoChange( '' )" )
-        endif
-    endif
-endfunction "}}}
-
-
-let s:priorities = {'all' : 64, 'spec' : 48, 'like' : 32, 'lang' : 16, 'sub' : 8, 'personal' : 0}
-
 let g:XPT_RC = {
       \   'ok' : {},
       \   'canceled' : {},
-      \   'POST' : {
-      \       'unchanged'     : {},
-      \       'keepIndent'    : {},
-      \   }
       \}
 
 let s:buildingSeqNr = 0
@@ -284,15 +261,18 @@ fun! XPTemplateKeyword(val) "{{{
     let x.keywordList = split( substitute( join( x.keywordList, '' ), '\v(.)\1+', '\1', 'g' ), '\v\s*' )
 
 
-    let x.keyword = '\w\|\[' . escape( join( x.keywordList, '' ), needEscape ) . ']'
+    let x.keyword = '\[0-9A-Za-z_' . escape( join( x.keywordList, '' ), needEscape ) . ']'
 
 endfunction "}}}
 
 fun! XPTemplatePriority(...) "{{{
     let x = b:xptemplateData
-    let p = a:0 == 0 ? 'lang' : a:1
+    let p = get( a:000, 0, '' )
+    if p == ''
+        let p = 'lang'
+    endif
 
-    let x.snipFileScope.priority = s:ParsePriorityString(p)
+    let x.snipFileScope.priority = xpt#priority#Parse(p)
 endfunction "}}}
 
 fun! XPTemplateMark(sl, sr) "{{{
@@ -319,28 +299,33 @@ fun! XPTemplateAlias( name, toWhich, setting ) "{{{
 
     let xptObj = b:xptemplateData
     let xt = xptObj.filetypes[ g:GetSnipFileFT() ].allTemplates
+    let toSnip = get( xt, a:toWhich )
+
+    if toSnip is 0
+        return
+    endif
+
+    let setting = deepcopy(toSnip.setting)
+    call xpt#util#DeepExtend( setting, a:setting )
+
+    let prio = xptObj.snipFileScope.priority
+
+    let existed = get( xt, a:name, { 'priority': xpt#priority#Get( 'lowest' ) } )
+    if existed.priority < prio
+        return
+    endif
 
     if has_key( xt, a:toWhich )
-        let toSnip = xt[ a:toWhich ]
         let xt[a:name] = {
                         \ 'name'        : a:name,
                         \ 'parsed'      : 0,
                         \ 'ftScope'     : toSnip.ftScope,
-                        \ 'snipText'        : toSnip.snipText,
-                        \ 'priority'    : toSnip.priority,
-                        \ 'setting'     : deepcopy(toSnip.setting),
+                        \ 'snipText'    : toSnip.snipText,
+                        \ 'priority'    : prio,
+                        \ 'setting'     : setting,
                         \ 'ptn'         : deepcopy(toSnip.ptn),
                         \}
-        
-
-        if has_key( toSnip.setting, 'rawHint' )
-              \ && !has_key( a:setting, 'rawHint' )
-
-            let a:setting.rawHint = toSnip.setting.rawHint
-
-        endif
-
-        call g:xptutil.DeepExtend( xt[ a:name ].setting, a:setting )
+        call s:UpdateNamePrefixDict( toSnip.ftScope, a:name )
 
         call s:ParseTemplateSetting( xt[ a:name ] )
 
@@ -437,10 +422,7 @@ fun! XPTdefineSnippet( name, setting, snip ) "{{{
     call extend( templateSetting, a:setting, 'force' )
     call g:XPTapplyTemplateSettingDefaultValue( templateSetting )
 
-
-    let prio =  has_key(templateSetting, 'priority')
-                \ ? s:ParsePriorityString(templateSetting.priority)
-                \ : x.snipFileScope.priority
+    let prio = x.snipFileScope.priority
 
 
     " Existed template has the same priority is overrided.
@@ -518,7 +500,7 @@ fun! s:InitTemplateObject( xptObj, tmplObj ) "{{{
 
     if !has_key( a:tmplObj.setting.defaultValues, 'cursor' )
                 " \ || a:tmplObj.setting.defaultValues.cursor !~ 'Finish'
-        let a:tmplObj.setting.defaultValues.cursor = g:FilterValue.New( 0, 'Finish()' )
+        let a:tmplObj.setting.defaultValues.cursor = xpt#flt#New( 0, 'Finish("")' )
     endif
 
     call s:log.Debug( 'a:tmplObj.setting.defaultValues.cursor=' . string( a:tmplObj.setting.defaultValues.cursor ) )
@@ -596,6 +578,7 @@ fun! s:DoInclude( tmplDict, tmplObject, pattern, keepCursor ) "{{{
             let ph = matchstr( matching, a:pattern.ph )
 
             let incTmplObject = a:tmplDict[ incName ]
+            call s:ParseSnippet( incTmplObject, incTmplObject.ftScope )
             call s:MergeSetting( a:tmplObject.setting, incTmplObject.setting )
 
             let incSnip = s:ReplacePHInSubSnip( a:tmplObject, incTmplObject, params )
@@ -646,17 +629,17 @@ fun! s:ReplacePHInSubSnip( snipObject, subSnipObject, params ) "{{{
 
             if piece =~# '\V' . k
                 let parts = split( piece, '\V' . xp.lft, 1 )
-                
+
                 " len of parts : 2 3 4
                 " index of name: 1 2 2
-                
+
                 let iName = len( parts ) == 4 ? 2 : len( parts ) - 1
 
 
                 if parts[ iName ] ==# k
                     let parts[ iName ] = v
                 endif
-                
+
                 let incSnipPieces[ i ] = join( parts, xp.l )
             endif
 
@@ -673,7 +656,7 @@ fun! s:ParseInclusionStatement( snipObject, st ) "{{{
 
     let xp = a:snipObject.ptn
 
-    
+
     let ptn = '\V\^\[^(]\{-}('
     let st = a:st
 
@@ -685,7 +668,7 @@ fun! s:ParseInclusionStatement( snipObject, st ) "{{{
         call s:log.Debug( 'name=' . string( name ) )
         call s:log.Debug( 'paramStr' . string( paramStr ) )
 
-        let paramStr = g:xptutil.UnescapeChar( paramStr, xp.l . xp.r )
+        let paramStr = xpt#util#UnescapeChar( paramStr, xp.l . xp.r )
         let params = {}
         try
             let params = eval( paramStr )
@@ -716,11 +699,11 @@ fun! s:MergeSetting( toSettings, fromSettings ) "{{{
     for key in keys( a:fromSettings.mappings )
         if !has_key( a:toSettings.mappings, key )
             let a:toSettings.mappings[ key ] =
-                  \ { 'saver' : g:MapSaver.New( 1 ), 'keys' : {} }
+                  \ { 'saver' : xpt#msvr#New(1), 'keys' : {} }
         endif
         for keystroke in keys( a:fromSettings.mappings[ key ].keys )
             let a:toSettings.mappings[ key ].keys[ keystroke ] = a:fromSettings.mappings[ key ].keys[ keystroke ]
-            call a:toSettings.mappings[ key ].saver.Add( 'i', keystroke )
+            call xpt#msvr#Add( a:toSettings.mappings[ key ].saver, 'i', keystroke )
         endfor
     endfor
 
@@ -750,9 +733,10 @@ fun! s:ParseTemplateSetting( tmpl ) "{{{
     " Note: empty means nothing, "" means something that can override others
     if has_key(setting, 'rawHint')
 
-        let setting.hint = s:Eval( setting.rawHint,
-              \ x.filetypes[ x.snipFileScope.filetype ].funcs, 
-              \ { 'variables' : setting.variables } )
+        let setting.hint = xpt#eval#Eval( setting.rawHint,
+              \ [ x.filetypes[ x.snipFileScope.filetype ].funcs,
+              \   setting.variables,
+              \ ] )
 
     endif
 
@@ -788,8 +772,8 @@ endfunction "}}}
 fun! s:InitItemOrderList( setting ) "{{{
     " TODO move me to template creation phase
 
-    let a:setting.comeFirst = g:xptutil.RemoveDuplicate( a:setting.comeFirst )
-    let a:setting.comeLast  = g:xptutil.RemoveDuplicate( a:setting.comeLast )
+    let a:setting.comeFirst = xpt#util#RemoveDuplicate( a:setting.comeFirst )
+    let a:setting.comeLast  = xpt#util#RemoveDuplicate( a:setting.comeLast )
 
 endfunction "}}}
 
@@ -832,9 +816,9 @@ fun! XPTemplatePreWrap( wrap ) "{{{
     " TODO is that ok?
     let x.wrap = substitute( x.wrap, '\V\n\$', '', '' )
 
-
-    let x.wrap = XPT#LeadingTabToSpace( x.wrap )
-
+    " xpt use tab internally to represent an indent
+    let x.wrap = xpt#indent#ToSpace( x.wrap )
+    let x.wrap = xpt#indent#SpaceToTab( x.wrap )
 
     if ( g:xptemplate_strip_left || x.wrap =~ '\n' )
           \ && visualmode() ==# 'V'
@@ -938,7 +922,7 @@ fun! XPTabbr( name ) "{{{
             return printf( "\<C-r>=XPTtgr(%s, {'k':''})\<CR>", string( a:name ) )
         endif
     endif
-    
+
 endfunction "}}}
 
 fun! XPTtgr( snippetName, ... ) "{{{
@@ -1054,27 +1038,48 @@ fun! XPTemplateStart(pos_unused_any_more, ...) " {{{
 
     if pumvisible()
 
+        call s:log.Debug( "has pum" )
+
         if XPPhasSession()
+
+            call s:log.Debug( "has session" )
+
             return XPPend() . "\<C-r>=XPTemplateStart(0," . string( opt ) . ")\<CR>"
         else
 
+            call s:log.Debug( "has no session" )
+
             if x.fallbacks == []
                 " no more tries can be done
 
+                call s:log.Debug( "has no fallbacks" )
+
                 if keypressed =~ g:xptemplate_fallback_condition
+
+                    call s:log.Debug( "it is fallback condition" )
+
                     let x.fallbacks = [ [ "\<Plug>XPTfallback", 'feed' ] ] + x.fallbacks
                     return XPT#fallback( x.fallbacks )
                 else
+
+                    call s:log.Debug( "nothing to do" )
+
                     " nothing to do, normal procedure.
                 endif
 
             else
+
+                call s:log.Debug( "has fallbacks" )
+
                 if g:xptemplate_fallback =~? '\V<Plug>XPTrawKey\|<NOP>'
                       \ || g:xptemplate_fallback ==? keypressed
 
                     return XPT#fallback( x.fallbacks )
 
                 else
+
+                    call s:log.Debug( "set up fall back" )
+
                     let x.fallbacks = [ [ "\<Plug>XPTfallback", 'feed' ] ] + x.fallbacks
                     return XPT#fallback( x.fallbacks )
                 endif
@@ -1084,6 +1089,8 @@ fun! XPTemplateStart(pos_unused_any_more, ...) " {{{
 
     else
 
+        call s:log.Debug( "no pum" )
+
         if XPPhasSession()
             call XPPend()
         endif
@@ -1144,8 +1151,17 @@ fun! XPTemplateStart(pos_unused_any_more, ...) " {{{
         let ftScope = s:GetContextFTObj()
         let pre = ftScope.namePrefix
         let n = split( lineToCursor, '\s', 1 )[ -1 ]
+
+        " TODO use filetype.keyword
+        " TODO in php $se should not trigger snippet 'se'
+
+        " <non-keyword><keyword> is not breakable: $var in php
+        " <keyword><non-keyword> is breakable: func( in c
+
+        " search for valid snippet name or single non-keyword name
+        let snpt_name_ptn = '\V\^' . x.keyword . '\w\*\|\^\W'
         while n != '' && !has_key( pre, n )
-            let n = substitute( n, '\V\^\w\+\|\^\W', '', '' )
+            let n = substitute( n, snpt_name_ptn, '', '' )
         endwhile
         let matched = n
 
@@ -1182,102 +1198,22 @@ fun! XPTemplateStart(pos_unused_any_more, ...) " {{{
     return action
 endfunction " }}}
 
-" TODO simplify with split
-let s:priPtn = 'all\|spec\|like\|lang\|sub\|personal\|\d\+'
-fun! s:ParsePriorityString(s) "{{{
-    let x = b:xptemplateData
-
-    let pstr = a:s
-
-    if pstr == ""
-        return x.snipFileScope.priority
-    endif
-
-    let newPrio = s:ParsePriority( a:s )
-    return newPrio
-
-
-
-    " let prio = 0
-
-    " let p = matchlist(pstr, '\V\^\(' . s:priPtn . '\)' . '\%(' . '\(\[+-]\)' . '\(\d\+\)\?\)\?\$')
-
-    " let base   = 0
-    " let r      = 1
-    " let offset = 0
-
-    " if p[1] != ""
-    "     if has_key(s:priorities, p[1])
-    "         let base = s:priorities[p[1]]
-    "     elseif p[1] =~ '^\d\+$'
-    "         let base = 0 + p[1]
-    "     else
-    "         let base = 0
-    "     endif
-    " else
-    "     let base = 0
-    " endif
-
-    " let r = p[2] == '+'
-    "       \ ? 1
-    "       \ : ( p[2] == '-' ? -1 : 0 )
-
-    " if p[3] != ""
-    "     let offset = 0 + p[3]
-    " else
-    "     let offset = 1
-    " endif
-
-    " let prio = base + offset * r
-
-
-    " call s:log.Log("parse priority : str=".a:s." value=".prio)
-
-    " return prio
-endfunction "}}}
-
-fun! s:ParsePriority( pstr ) "{{{
-    let pstr = a:pstr
-    if pstr =~ '\V\[+-]\$'
-        let pstr .= '1'
-    endif
-    
-    let reg = '\V\(\w\+\|\[+-]\)\zs'
-    let prioParts = split( pstr, reg )
-
-    let prioParts[ 0 ] = get( s:priorities, prioParts[ 0 ], prioParts[ 0 ] - 0 )
-    return eval( join( prioParts, '' ) )
-endfunction "}}}
-
 fun! s:NewRenderContext( ftScope, tmplName ) "{{{
 
     let x = b:xptemplateData
 
     if x.renderContext.processing
-        call s:PushRenderContext()
+        call xpt#buf#Pushrctx()
     endif
 
-    let renderContext = g:RenderContext.New( x )
+    let renderContext = xpt#rctx#New( x )
     let x.renderContext = renderContext
 
     let renderContext.phase = 'inited'
     let renderContext.snipObject  = s:GetContextFTObj().allTemplates[ a:tmplName ]
     let renderContext.ftScope = a:ftScope
 
-
-
-    if !renderContext.snipObject.parsed
-
-        call s:ParseInclusion( renderContext.ftScope.allTemplates, renderContext.snipObject )
-
-        let renderContext.snipObject.snipText = s:ParseSpaces( renderContext.snipObject )
-        let renderContext.snipObject.snipText = s:ParseQuotedPostFilter( renderContext.snipObject )
-        let renderContext.snipObject.snipText = s:ParseRepetition( renderContext.snipObject )
-
-        let renderContext.snipObject.parsed = 1
-
-    endif
-
+    call s:ParseSnippet( renderContext.snipObject, renderContext.ftScope )
 
     let renderContext.snipSetting = copy( renderContext.snipObject.setting )
 
@@ -1291,6 +1227,21 @@ fun! s:NewRenderContext( ftScope, tmplName ) "{{{
     return renderContext
 endfunction "}}}
 
+fun! s:ParseSnippet( snippet, ftScope ) "{{{
+
+    if !a:snippet.parsed
+
+        let a:snippet.snipText = xpt#indent#IndentToTabStr( a:snippet.snipText )
+
+        call s:ParseInclusion( a:ftScope.allTemplates, a:snippet )
+
+        let a:snippet.snipText = s:ParseQuotedPostFilter( a:snippet )
+        let a:snippet.snipText = s:ParseRepetition( a:snippet )
+
+        let a:snippet.parsed = 1
+    endif
+endfunction "}}}
+
 fun! s:DoStart( sess ) " {{{
     " @param sess       xpopup call back argument
 
@@ -1345,7 +1296,7 @@ fun! s:RenderSnippet() "{{{
     call s:log.Debug("post action =".action)
     call s:log.Debug("mode:".mode())
 
-    call s:log.Debug( "tmpl:", s:TextBetween( XPMposStartEnd( ctx.marks.tmpl ) ) )
+    call s:log.Debug( "tmpl:", xpt#util#TextBetween( XPMposStartEnd( ctx.marks.tmpl ) ) )
 
     call s:CallPlugin( 'start', 'after' )
 
@@ -1359,10 +1310,7 @@ fun! s:SaveNavKey() "{{{
 
     let navKey = g:xptemplate_nav_next
 
-    let mapInfo = MapSaver_GetMapInfo( navKey, 'i', 1 )
-    if mapInfo.cont == ''
-        let mapInfo = MapSaver_GetMapInfo( navKey, 'i', 0 )
-    endif
+    let mapInfo = xpt#msvr#MapInfo( navKey, 'i' )
 
     if mapInfo.cont == ''
         let x.canNavFallback = 0
@@ -1371,7 +1319,7 @@ fun! s:SaveNavKey() "{{{
         let x.canNavFallback = 1
         let mapInfo.key = '<Plug>XPTnavFallback'
 
-        exe MapSaverGetMapCommand( mapInfo )
+        exe xpt#msvr#MapCommand( mapInfo )
 
     endif
 
@@ -1411,7 +1359,7 @@ fun! s:FinishRendering(...) "{{{
 
     else
 
-        call s:PopRenderContext()
+        call xpt#buf#Poprctx()
         call s:CallPlugin( 'finishSnippet', 'after' )
         let renderContext = x.renderContext
     endif
@@ -1520,96 +1468,13 @@ fun! s:IfSnippetShow( snipObj, synNames ) "{{{
 
 endfunction "}}}
 
+fun! s:AddIndent( text, nIndent ) "{{{
 
-
-fun! s:AddIndent( text, startPos ) "{{{
-
-    let nIndent = XPT#getIndentNr( a:startPos[0], a:startPos[1] )
-
-    let baseIndent = repeat( " ", nIndent )
-
+    let baseIndent = repeat( " ", a:nIndent )
     return substitute(a:text, '\n', '&' . baseIndent, 'g')
 
 endfunction "}}}
 
-fun! s:ParseSpaces( snipObject ) "{{{
-    " variables are pre-evaled. so that variable can not be
-    " recursivelyrecursively evaled
-    let xp = a:snipObject.ptn
-    let text = a:snipObject.snipText
-
-    let ptn = xp.lft
-
-    let start = 0
-    let end = -1
-
-    let lastMark = xp.r
-
-    let renderContext = b:xptemplateData.renderContext
-
-    let renderContext.ftScope.funcs.renderContext = renderContext
-
-    while 1
-        let start = match( text, '\V' . xp.lft, start )
-        if start < 0
-            break
-        endif
-
-        let end = match( text, '\V' . xp.lft . '\|' . xp.rt, start + 1 )
-
-        if end < 0
-            break
-        endif
-
-        let raw = text[ start + 1 : end - 1 ]
-
-        let expr = s:CachedCompileExpr( raw, renderContext.ftScope.funcs )
-
-        if substitute( expr, 'GetVar', '', 'g' ) =~ '\V\<xfunc.\w\+('
-            let start = end
-            let lastMark = text[ end - 1 ]
-            continue
-        endif
-
-        let str = s:Eval( raw, renderContext.ftScope.funcs, { 'variables' : a:snipObject.setting.variables } )
-        if raw == str
-            let start = end
-            let lastMark = text[ end ]
-            continue
-        endif
-        if str =~ '\V\n'
-            let start = end + 1
-            let lastMark = text[ end ]
-            continue
-        endif
-
-        let currentMark = text[ end ]
-
-
-
-        if lastMark == xp.l
-            let text = text[ : start ] . str . text[ end : ]
-            let start += 1 + len( str ) + 1
-        else
-            if text[ end ] == xp.l
-                let text = text[ : start ] . str . text[ end : ]
-                let start += 1 + len( str )
-            else
-                let before = start == 0 ? '' : text[ : start - 1 ]
-                let text = before . str . text[ end + 1 : ]
-                let start += len( str )
-            endif
-        endif
-
-
-        let lastMark = currentMark
-
-    endwhile
-
-    return text
-
-endfunction "}}}
-
 fun! s:ParseRepetition( snipObject ) "{{{
     let tmplObj = a:snipObject
     let xp = a:snipObject.ptn
@@ -1661,7 +1526,7 @@ fun! s:ParseRepetition( snipObject ) "{{{
         let symbol = matchstr(rest, rp)
         let name = substitute( symbol, '\V' . xp.lft . '\|' . xp.rt, '', 'g' )
 
-        let tmplObj.setting.postFilters[ name ] = g:FilterValue.New( -indentNr, repeatPart )
+        let tmplObj.setting.postFilters[ name ] = xpt#flt#New( -indentNr, repeatPart )
 
 
 
@@ -1779,7 +1644,7 @@ fun! s:ParseQuotedPostFilter( tmplObj ) "{{{
             let plainPostFilter = 'BuildIfNoChange(' . string( plainPostFilter ) . ')'
         endif
 
-        let postFilters[ name ] = g:FilterValue.New( -firstLineIndentNr, plainPostFilter )
+        let postFilters[ name ] = xpt#flt#New( -firstLineIndentNr, plainPostFilter )
 
         call s:log.Debug( 'name=' . name )
         call s:log.Debug( 'quoted post filter=' . string( postFilters[ name ] ) )
@@ -1804,14 +1669,50 @@ fun! s:BuildSnippet(nameStartPosition, nameEndPosition) " {{{
     let ctx = b:xptemplateData.renderContext
     let xp = ctx.snipObject.ptn
 
+
+
+    let curline = getline( a:nameStartPosition[ 0 ] )
+
+    let nIndent = -1
+    if len( matchstr( curline, '\V\^\s\*' ) ) == a:nameStartPosition[ 1 ] - 1
+        " snippet name starts as the first non-space char
+
+        if has_key( ctx.oriIndentkeys, ctx.snipObject.name )
+              \ || has_key( ctx.leadingCharToReindent, ctx.snipObject.name )
+
+            " TODO
+            "       For correct indentexpr, we have to place snippet name first on
+            "       screen and then clear it.
+            "
+            "       This is a dirty fix. Better way is to place the snippet name out
+            "       of this function.
+
+            if a:nameStartPosition == a:nameEndPosition
+                call XPreplace( a:nameStartPosition, a:nameEndPosition,
+                      \ ctx.snipObject.name, { 'doJobs' : 0 } )
+            endif
+
+            let nIndent = XPT#getPreferedIndentNr( a:nameStartPosition[ 0 ] )
+
+            if a:nameStartPosition == a:nameEndPosition
+                call XPreplace( a:nameStartPosition, [ a:nameEndPosition[ 0 ],
+                      \     a:nameEndPosition[ 1 ] + len( ctx.snipObject.name ) ],
+                      \ '', { 'doJobs' : 0 } )
+            endif
+
+        endif
+
+    endif
+
+
     let ctx.phase = 'rendering'
 
 
     if ctx.snipSetting.iswrap && x.wrap isnot ''
         let setting = ctx.snipSetting
 
-        let setting.preValues[ setting.wrap ] = g:FilterValue.New( 0, 'GetWrappedText()' )
-        let setting.defaultValues[ setting.wrap ] = g:FilterValue.New( 0, "Next()", 1 )
+        let setting.preValues[ setting.wrap ] = xpt#flt#New( 0, 'GetWrappedText()' )
+        let setting.defaultValues[ setting.wrap ] = xpt#flt#New( 0, "Next()", 1 )
 
         call insert( setting.comeFirst, setting.wrap, 0 )
     endif
@@ -1822,10 +1723,29 @@ fun! s:BuildSnippet(nameStartPosition, nameEndPosition) " {{{
 
     let snippetText = ctx.snipObject.snipText
 
-    if snippetText =~ '\n'
-        let snippetText = s:AddIndent( snippetText, a:nameStartPosition )
+
+
+    let currentNIndent = XPT#getIndentNr( a:nameStartPosition[ 0 ], a:nameStartPosition[ 1 ] )
+    let nIndentToAdd = currentNIndent
+    if nIndent >= 0
+
+        if nIndent > currentNIndent
+
+            let snippetText = repeat( ' ', nIndent - currentNIndent ) . snippetText
+            let nIndentToAdd = nIndent
+
+        elseif nIndent < currentNIndent
+
+            let snippetText = repeat( ' ', nIndent ) . snippetText
+            let nIndentToAdd = nIndent
+            let a:nameStartPosition[ 1 ] = 1
+
+        endif
+
     endif
 
+    let snippetText = xpt#indent#ToActualIndentStr(snippetText, nIndentToAdd)
+
     " Note: simple implementation of wrapping, the better way is by default value
     " TODO use default value!
 
@@ -1958,6 +1878,18 @@ fun! s:GetValueInfo( end ) "{{{
     return [r0, r1, r2]
 endfunction "}}}
 
+fun! s:TextWithoutIndent(posRange) "{{{
+
+    let [ s, e ] = a:posRange
+
+    let text = xpt#util#TextBetween([s, e])
+    let text = xpt#indent#ToSpace(text)
+    let nIndent = xpt#indent#IndentBefore(s)
+    let text = xpt#indent#RemoveIndentStr(text, nIndent)
+
+    return text
+endfunction "}}}
+
 " XSET name|def=
 " XSET name|post=
 "
@@ -1966,24 +1898,20 @@ endfunction "}}}
 
 fun! s:CreatePlaceHolder( ctx, nameInfo, valueInfo ) "{{{
 
-    " 1) Place holder with edge is the editable place holder. Or the key place holder
-    "
-    " 2) If none of place holders of one item has edge. The first place
-    " holder is the key place holder.
-    "
-    " 3) if more than one place holders set with edge, the first
-    " one is the key place holder.
-
     let xp = a:ctx.snipObject.ptn
-
+    let toescape = xp.l . xp.r
 
     " 1 is length of left mark
-    let leftEdge  = s:TextBetween( a:nameInfo[ 0 : 1 ] )
-    let name      = s:TextBetween( a:nameInfo[ 1 : 2 ] )
-    let rightEdge = s:TextBetween( a:nameInfo[ 2 : 3 ] )
+    let leftEdge  = s:TextWithoutIndent( a:nameInfo[ 0 : 1 ] )
+    let name      = s:TextWithoutIndent( a:nameInfo[ 1 : 2 ] )
+    let rightEdge = s:TextWithoutIndent( a:nameInfo[ 2 : 3 ] )
 
     let [ leftEdge, name, rightEdge ] = [ leftEdge[1 : ], name[1 : ], rightEdge[1 : ] ]
 
+    let leftEdge = xpt#util#UnescapeChar(leftEdge, toescape)
+    let name = xpt#util#UnescapeChar(name, toescape)
+    let rightEdge = xpt#util#UnescapeChar(rightEdge, toescape)
+
     let fullname  = leftEdge . name . rightEdge
 
     call s:log.Log( "item is :" . string( [ leftEdge, name, rightEdge ] ) )
@@ -2001,7 +1929,7 @@ fun! s:CreatePlaceHolder( ctx, nameInfo, valueInfo ) "{{{
     " in name but not edge.
     if name =~ '\V' . xp.item_var . '\|' . xp.item_func
         " that is only a instant place holder
-        return { 'value' : fullname, 
+        return { 'value' : fullname,
               \     'leftEdge'  : leftEdge,
               \     'name'  : name,
               \     'rightEdge' : rightEdge,
@@ -2032,9 +1960,9 @@ fun! s:CreatePlaceHolder( ctx, nameInfo, valueInfo ) "{{{
         let isPostFilter = a:valueInfo[1][0] == a:valueInfo[2][0]
                     \&& a:valueInfo[1][1] + 1 == a:valueInfo[2][1]
 
-        let val = s:TextBetween( a:valueInfo[ 0 : 1 ] )
+        let val = xpt#util#TextBetween( a:valueInfo[ 0 : 1 ] )
         let val = val[1:]
-        let val = g:xptutil.UnescapeChar( val, xp.l . xp.r )
+        let val = xpt#util#UnescapeChar( val, xp.l . xp.r )
 
         " NOTE: problem indent() returns indent without no mark consideration
         let nIndent = indent( a:valueInfo[0][0] )
@@ -2046,12 +1974,12 @@ fun! s:CreatePlaceHolder( ctx, nameInfo, valueInfo ) "{{{
             if name =~ s:expandablePattern
 
                 " it is converted to string, thus escaped chars are safe now
-                let val = g:xptutil.UnescapeChar( val, '{$( ' )
+                let val = xpt#util#UnescapeChar( val, '{$( ' )
                 let val = 'BuildIfNoChange(' . string( val ) . ')'
             endif
-            let placeHolder.postFilter = g:FilterValue.New( -nIndent, val )
+            let placeHolder.postFilter = xpt#flt#New( -nIndent, val )
         else
-            let placeHolder.ontimeFilter = g:FilterValue.New( -nIndent, val )
+            let placeHolder.ontimeFilter = xpt#flt#New( -nIndent, val )
         endif
 
         call s:log.Debug("placeHolder post filter:key=val : " . name . "=" . val)
@@ -2177,9 +2105,17 @@ fun! s:AddItemToRenderContext( ctx, item ) "{{{
         let ctx.itemDict[ item.name ] = item
     endif
 
+    if exist
+        return
+    endif
+
     " TODO to be precise phase, do not use false condition
     if ctx.phase != 'rendering'
-        call add( ctx.firstList, item )
+
+        if ! s:AddToOrderList( ctx.firstList, item )
+            call add( ctx.firstList, item )
+        endif
+
         call filter( ctx.itemList, 'v:val isnot item' )
 
         call s:log.Log( 'item insert to the head of itemList:' . string( item ) )
@@ -2188,9 +2124,6 @@ fun! s:AddItemToRenderContext( ctx, item ) "{{{
     endif
 
     " rendering phase
-    if exist
-        return
-    endif
 
     if item.name == ''
 
@@ -2222,7 +2155,7 @@ fun! s:AddToOrderList( list, item ) "{{{
     else
         return 0
     endif
-    
+
 endfunction "}}}
 
 fun! s:BuildPlaceHolders( markRange ) "{{{
@@ -2277,8 +2210,6 @@ fun! s:BuildPlaceHolders( markRange ) "{{{
         let end = XPMpos( a:markRange.end )
         let nEnd = end[0] * 10000 + end[1]
 
-
-
         if markPos == [0, 0] || markPos[0] * 10000 + markPos[1] >= nEnd
             break
         endif
@@ -2286,10 +2217,9 @@ fun! s:BuildPlaceHolders( markRange ) "{{{
         call s:log.Log( "building now" )
         call s:log.Log(" : end=".string(end))
 
-
-
         let nn = [ line( "." ), col( "." ) ]
-
+        " let text = xpt#util#TextBetween([nn, end])
+        " let elts = xpt#snip#TextToPlaceholders(text, xp)
 
         let nameInfo = s:GetNameInfo(end)
         if nameInfo[0] == [0, 0]
@@ -2297,21 +2227,17 @@ fun! s:BuildPlaceHolders( markRange ) "{{{
             break
         endif
 
-
         " locate at end of place holder
         call cursor(nameInfo[3])
 
-
         let valueInfo = s:GetValueInfo(end)
         if valueInfo[0] == [0, 0]
             " there is no right mark matching the left mark
             break
         endif
 
-
         call s:log.Log("got nameinfo, valueinfo:".string([nameInfo, valueInfo]))
 
-
         let placeHolder = s:CreatePlaceHolder(renderContext, nameInfo, valueInfo)
         let rc = 1
 
@@ -2353,9 +2279,10 @@ fun! s:BuildPlaceHolders( markRange ) "{{{
             " Cursor left just after replacement, and it is where next search
             " start
 
-            call s:ApplyInstantValue( placeHolder, nameInfo, valueInfo )
-            " TODO continue building?
-            " move cursor to start?
+            let to_build = s:ApplyInstantValue( placeHolder, nameInfo, valueInfo )
+            if to_build
+                call cursor( nameInfo[ 0 ] )
+            endif
 
         else
             " build item and marks, as a fill in place holder
@@ -2377,8 +2304,7 @@ fun! s:BuildPlaceHolders( markRange ) "{{{
             call s:ApplyPreValues( placeHolder )
 
             " TODO set it when item created.
-            call s:SetDefaultFilters( placeHolder )
-
+            call xpt#rctx#AddDefaultPHFilters(renderContext, placeHolder)
 
             call cursor( XPMpos( placeHolder.mark.end ) )
 
@@ -2475,38 +2401,46 @@ endfunction "}}}
 
 fun! s:EvaluateEdge( xp, item, ph ) "{{{
     call s:log.Debug( 'EvaluateEdge' )
-    let x = b:xptemplateData
     if !a:ph.isKey
         return
     endif
 
-    if a:ph.leftEdge =~ '\V' . a:xp.item_var . '\|' . a:xp.item_func
-        let ledge = s:Eval( a:ph.leftEdge, x.renderContext.ftScope.funcs )
-        " call XPRstartSession()
-        try
-            call XPreplaceByMarkInternal( a:ph.mark.start, a:ph.editMark.start, ledge )
-        finally
-            " call XPRendSession()
-        endtry
-        let a:ph.leftEdge = ledge
-        let a:ph.fullname   = a:ph.leftEdge . a:item.name . a:ph.rightEdge
-        let a:item.fullname = a:ph.fullname
-    endif
+    let eval_ptn = '\V' . a:xp.item_var . '\|' . a:xp.item_func
 
+    if a:ph.leftEdge =~ eval_ptn
+        let a:ph.leftEdge = s:EvalAsFilter(a:ph.leftEdge,
+              \                            XPMpos(a:ph.mark.start))
+        call XPreplaceByMarkInternal( a:ph.mark.start, a:ph.editMark.start,
+              \                       a:ph.leftEdge )
+    endif
 
-    if a:ph.rightEdge =~ '\V' . a:xp.item_var . '\|' . a:xp.item_func
-        let redge = s:Eval( a:ph.rightEdge, x.renderContext.ftScope.funcs )
-        " call XPRstartSession()
-        try
-            call XPreplaceByMarkInternal( a:ph.editMark.end, a:ph.mark.end, redge )
-        finally
-            " call XPRendSession()
-        endtry
-        let a:ph.rightEdge = redge
-        let a:ph.fullname   = a:ph.leftEdge . a:item.name . a:ph.rightEdge
-        let a:item.fullname = a:ph.fullname
+    if a:ph.rightEdge =~ eval_ptn
+        let a:ph.rightEdge = s:EvalAsFilter(a:ph.rightEdge,
+              \                             XPMpos(a:ph.editMark.end))
+        call XPreplaceByMarkInternal( a:ph.editMark.end, a:ph.mark.end,
+              \                       a:ph.rightEdge )
     endif
 
+    let a:ph.fullname   = a:ph.leftEdge . a:item.name . a:ph.rightEdge
+    let a:item.fullname = a:ph.fullname
+
+endfunction "}}}
+
+fun! s:EvalAsFilter( raw, start_pos ) "{{{
+    let x = b:xptemplateData
+    let rctx = x.renderContext
+
+    let flt = xpt#flt#New(0, a:raw)
+    let flt_rst = s:EvalFilter(flt, [
+          \     rctx.ftScope.funcs,
+          \     rctx.snipSetting.variables,
+          \ ])
+    return s:IndentFilterText(flt_rst, a:start_pos)
+endfunction "}}}
+
+fun! s:IndentFilterText( flt_rst, start ) "{{{
+    let indent = s:IndentAt(a:start, a:flt_rst)
+    return xpt#indent#ParseStr(a:flt_rst.text, indent)
 endfunction "}}}
 
 fun! s:ApplyBuildTimeInclusion( placeHolder, nameInfo, valueInfo ) "{{{
@@ -2527,26 +2461,14 @@ fun! s:ApplyBuildTimeInclusion( placeHolder, nameInfo, valueInfo ) "{{{
         return
     endif
 
-
-
     let incTmplObject = tmplDict[ incName ]
 
-    if !incTmplObject.parsed
-
-        call s:ParseInclusion( renderContext.ftScope.allTemplates, incTmplObject )
-
-        let incTmplObject.snipText = s:ParseSpaces( incTmplObject )
-        let incTmplObject.snipText = s:ParseQuotedPostFilter( incTmplObject )
-        let incTmplObject.snipText = s:ParseRepetition( incTmplObject )
-
-        let incTmplObject.parsed = 1
-
-    endif
+    call s:ParseSnippet( incTmplObject, renderContext.ftScope )
 
     call s:MergeSetting( renderContext.snipSetting, incTmplObject.setting )
 
     let incSnip = s:ReplacePHInSubSnip( renderContext.snipObject, incTmplObject, params )
-    let incSnip = s:AddIndent( incSnip, nameInfo[0] )
+    let incSnip = s:AddIndent( incSnip, nameInfo[0][1]-1 )
 
     let valueInfo[-1][1] += 1
     call XPreplaceInternal( nameInfo[0], valueInfo[-1], incSnip )
@@ -2556,51 +2478,62 @@ endfunction "}}}
 fun! s:ApplyInstantValue( placeHolder, nameInfo, valueInfo ) "{{{
     " TODO eval edge and name separately?
 
-    let x = b:xptemplateData
+    let rctx = b:xptemplateData.renderContext
 
-    let placeHolder = a:placeHolder
+    let ph = a:placeHolder
     let nameInfo    = a:nameInfo
     let valueInfo   = a:valueInfo
+    let start = a:nameInfo[0]
 
     call s:log.Debug( 'instant placeHolder' )
 
-
+    let combined_flt_rst = {}
     let text = ''
-    if placeHolder.leftEdge != ''
-
-        let filter = g:FilterValue.New( 0, placeHolder.leftEdge )
-        let filter = s:EvalFilter( filter, x.renderContext.ftScope.funcs, { 'startPos' : a:nameInfo[0] } )
-        let text .= get( filter, 'text', '' )
-
-    endif
-
-    if placeHolder.name != ''
+    let to_build = 0
+    for k in [ 'leftEdge', 'name', 'rightEdge' ]
+        if ph[k] != ''
+            let flt = xpt#flt#New( 0, ph[k] )
+            let flt_rst = s:EvalFilter( flt, [
+                  \     rctx.ftScope.funcs,
+                  \     rctx.snipSetting.variables,
+                  \ ] )
+
+            if flt_rst.rc == 0
+                continue
+            endif
 
-        let filter = g:FilterValue.New( 0, placeHolder.name )
-        let filter = s:EvalFilter( filter, x.renderContext.ftScope.funcs, { 'startPos' : a:nameInfo[0] } )
-        let text .= get( filter, 'text', '' )
+            let text .= get( flt_rst, 'text', '' )
+            if get(flt_rst, 'nIndent', 0) != 0
+                let combined_flt_rst.nIndent = flt_rst.nIndent
+            endif
+            if flt_rst.action == 'build'
+                let to_build = 1
+            endif
+        endif
+    endfor
 
-    endif
+    call s:log.Log( "instant value filter value:" . string( flt_rst ) )
 
-    if placeHolder.rightEdge != ''
+    let valueInfo[-1][1] += 1
 
-        let filter = g:FilterValue.New( 0, placeHolder.rightEdge )
-        let filter = s:EvalFilter( filter, x.renderContext.ftScope.funcs, { 'startPos' : a:nameInfo[0] } )
-        let text .= get( filter, 'text', '' )
+    let combined_flt_rst.text = text
+    let text = s:IndentFilterText(combined_flt_rst, start)
 
-    endif
+    call XPreplaceInternal( nameInfo[0], valueInfo[-1], text, { 'doJobs' : 1 } )
 
+    return to_build
 
-    call s:log.Log( "instant value filter value:" . string( filter ) )
+endfunction "}}}
 
-    " if !has_key( filter, 'text' )
-    "     let filter.text = ''
-    " endif
+fun! s:IndentAt( start, flt_rst ) "{{{
+    " instant filter does not support well yet
+    let filter_indent_offset = get(a:flt_rst, 'nIndent', 0)
 
-    let valueInfo[-1][1] += 1
-    call XPreplaceInternal( nameInfo[0], valueInfo[-1], text, { 'doJobs' : 1 } )
-    " call XPreplace( nameInfo[0], valueInfo[-1], filter.text )
+    let indent = xpt#indent#IndentBefore( a:start )
+    let indent += filter_indent_offset
+    let indent = max([0, indent])
 
+    return indent
 endfunction "}}}
 
 " TODO simplify : if PH has preValue, replace it at once, without replacing with the name
@@ -2624,33 +2557,39 @@ fun! s:ApplyPreValues( placeHolder ) "{{{
 
     endif
 
-
     if preValue is g:EmptyFilter
         return
     endif
 
+    let flt_rst = s:EvalFilter( preValue, [
+          \     renderContext.ftScope.funcs,
+          \     renderContext.snipSetting.variables,
+          \ ] )
 
-    let preValue = copy( preValue )
 
-
-    call s:EvalFilter( preValue, renderContext.ftScope.funcs, { 'startPos' : XPMpos( a:placeHolder.innerMarks.start ) } )
-
-
-    if preValue.rc isnot 0 && has_key( preValue, 'text' )
-        call s:SetPreValue( a:placeHolder, preValue )
+    " TODO isnot 0? or is 0?
+    if flt_rst.rc isnot 0 && has_key( flt_rst, 'text' )
+        call s:SetPreValue( a:placeHolder, flt_rst )
     endif
 
 endfunction "}}}
 
-fun! s:SetPreValue( placeHolder, filter ) "{{{
+fun! s:SetPreValue( placeHolder, flt_rst ) "{{{
 
-    let marks = a:placeHolder.innerMarks
+    if ! has_key( a:flt_rst, 'text' )
+        call s:log.Debug( "flt_rst has no text while SetPreValue" )
+        return
+    end
 
+    let marks = a:placeHolder.innerMarks
+    let [ start, _end ] = XPMposStartEnd( marks )
+    let indent = s:IndentAt(start, a:flt_rst)
+    let text = xpt#indent#ToActualIndentStr(a:flt_rst.text, indent)
 
-    call s:log.Log( 'preValue=' . a:filter.text )
+    call s:log.Log( 'preValue=' . text )
     " call XPRstartSession()
     try
-        call XPreplaceByMarkInternal( marks.start, marks.end, a:filter.text )
+        call XPreplaceByMarkInternal( marks.start, marks.end, text )
     catch /.*/
     finally
         " call XPRendSession()
@@ -2658,7 +2597,7 @@ fun! s:SetPreValue( placeHolder, filter ) "{{{
 endfunction "}}}
 
 fun! s:BuildItemForPlaceHolder( placeHolder ) "{{{
-    
+
     " anonymous item with name set to '' will never been added to a:renderContext.itemDict
 
     let renderContext = b:xptemplateData.renderContext
@@ -2815,7 +2754,7 @@ fun! XPTforceForward( action ) "{{{
     call s:log.Debug( "postaction=" . string( postaction ) )
 
     return postaction
-    
+
 endfunction "}}}
 
 " TODO this function should reset item and leadingPlaceHolder to null
@@ -2907,7 +2846,6 @@ fun! s:ApplyPostFilter() "{{{
 
     let renderContext.activeLeaderMarks = 'mark'
 
-
     let posts  = renderContext.snipSetting.postFilters
     let name   = renderContext.item.name
     let leader = renderContext.leadingPlaceHolder
@@ -2915,77 +2853,63 @@ fun! s:ApplyPostFilter() "{{{
 
     let renderContext.phase = 'post'
 
-    let typed = s:TextBetween( XPMposStartEnd( marks ) )
+    let typed = xpt#util#TextBetween( XPMposStartEnd( marks ) )
 
     " NOTE: some post filter need the typed value
     if renderContext.item.name != ''
         let renderContext.namedStep[renderContext.item.name] = typed
     endif
 
-    call s:log.Log("before post filtering, tmpl:\n" . s:TextBetween( XPMposStartEnd( renderContext.marks.tmpl ) ) )
-
-
-
+    call s:log.Log("before post filtering, tmpl:\n" . xpt#util#TextBetween( XPMposStartEnd( renderContext.marks.tmpl ) ) )
 
     let groupPostFilter  = get( posts, name, g:EmptyFilter )
     let leaderPostFilter = get( leader, 'postFilter', g:EmptyFilter )
 
-
     let filter = groupPostFilter is g:EmptyFilter
           \ ? leaderPostFilter
           \ : groupPostFilter
 
-
-
     call s:log.Log("name:".name)
     call s:log.Log("typed:".typed)
     call s:log.Log('group post filter :' . string(groupPostFilter))
     call s:log.Log('leader post filter :' . string(leaderPostFilter))
 
-
-
-
     let hadBuilt = 0
     " TODO per-place-holder filter
     " check by 'groupPostFilter' is ok
     if filter isnot g:EmptyFilter
-        let filter = copy( filter )
-
-        call s:EvalPostFilter( filter, typed, leader )
-
-        call s:log.Log( 'text=' . filter.text )
-
 
-
-        let oriFilter = copy( filter )
+        let flt_rst = s:EvalPostFilter( filter, typed, leader )
+        let ori_flt_rst = copy( flt_rst )
+        call s:log.Log( 'text=' . get(flt_rst, 'text') )
 
         let [ start, end ] = XPMposStartEnd( marks )
 
         " TODO do not replace if no change made
         call XPMsetLikelyBetween( marks.start, marks.end )
-        if filter.rc != 0 && filter.text !=# typed
-            call s:log.Debug( 'before replace, marks=' . XPMallMark() )
-
-            call s:RemoveEditMark( leader )
+        if flt_rst.rc != 0
+            if has_key( flt_rst, 'text' )
+                if flt_rst.text !=# typed
+                    call s:log.Debug( 'before replace, marks=' . XPMallMark() )
 
-            call b:xptemplateData.settingWrap.Switch()
+                    call s:RemoveEditMark( leader )
+                    call b:xptemplateData.settingWrap.Switch()
 
-            call XPreplace( start, end, filter.text )
-            call s:log.Debug( 'after replace, marks=' . XPMallMark() )
+                    let text = s:IndentFilterText(flt_rst, start)
+                    call XPreplace( start, end, text )
+                    call s:log.Debug( 'after replace, marks=' . XPMallMark() )
+                endif
+            endif
         endif
 
-
-
-        if filter.toBuild
+        if flt_rst.rc != 0 && flt_rst.action == 'build'
             " TODO extract to function
 
-            call cursor( start )
-
             let renderContext.firstList = []
             let buildrc = s:BuildPlaceHolders( marks )
 
             if 0 > buildrc
-                return [ s:Crash(), filter.toBuild ]
+                return [ s:Crash(), 1 ]
             endif
 
             " bad name , 'alreadyBuilt' ?
@@ -2994,10 +2918,7 @@ fun! s:ApplyPostFilter() "{{{
             " change back the phase
             let renderContext.phase = 'post'
 
-            let filter.toBuild = 0
         endif
-
-
     endif
 
     " after indent segment, there is something
@@ -3006,15 +2927,13 @@ fun! s:ApplyPostFilter() "{{{
         return [ typed, hadBuilt ]
 
     else
-        call s:UpdateFollowingPlaceHoldersWith( typed, { 'post' : oriFilter } )
+        call s:UpdateFollowingPlaceHoldersWith( typed, { 'post' : ori_flt_rst } )
         if hadBuilt
             return [ typed, hadBuilt ]
         else
-            return [ filter.text, hadBuilt ]
+            return [ get(flt_rst, 'text', typed), hadBuilt ]
         endif
     endif
-
-
 endfunction "}}}
 
 fun! s:RemoveEditMark( ph ) "{{{
@@ -3031,52 +2950,14 @@ fun! s:EvalPostFilter( filter, typed, leader ) "{{{
     let pos = XPMpos( a:leader.mark.start )
     let pos[ 1 ] = 1
     let startMark = XPMmarkAfter( pos )
-    call s:EvalFilter( a:filter, renderContext.ftScope.funcs, {
-          \ 'typed' : a:typed, 'startPos' : startMark.pos } )
-
+    let flt_rst = s:EvalFilter( a:filter, [
+          \     renderContext.ftScope.funcs,
+          \     renderContext.snipSetting.variables,
+          \     { '$UserInput' : a:typed } ] )
 
     call s:log.Log("post_value:\n", string(a:filter))
 
-    let a:filter.toBuild = 0
-    if a:filter.rc == 0
-        return
-    endif
-
-    if has_key( a:filter, 'action' )
-        let act = a:filter.action
-
-        if act.name == 'build'
-            let a:filter.toBuild = 1
-
-        elseif act.name == 'keepIndent'
-            let a:filter.nIndent = 0
-
-            " TODO
-        " elseif act.name == 'expandTmpl'
-            " let leader = renderContext.leadingPlaceHolder
-            " let marks = leader.marks
-            " let [ start, end ] = XPMposList( marks.start, marks.end )
-
-            " call XPreplace( start, end, '')
-            " return XPTemplateStart(0, {'startPos' : start, 'tmplName' : post.tmplName})
-
-            " let res = [ post. ]
-        else
-            " unknown action
-            " let a:filter.text = get( post, 'text', '' )
-        endif
-
-    elseif has_key( a:filter, 'text' )
-        " Even if it is not an action, post filter is needed to build by
-        " default
-        let a:filter.toBuild = 1
-
-    else
-        " let a:filter.text = post
-        " let a:filter.nIndent = 0
-
-    endif
-
+    return flt_rst
 endfunction "}}}
 
 
@@ -3184,7 +3065,7 @@ fun! s:DoGotoNextItem() "{{{
     if postaction == ''
 
         if oldRenderContext == renderContext || oldRenderContext.level < renderContext.level
-            call cursor( XPMpos( renderContext.leadingPlaceHolder.innerMarks.end ) ) 
+            call cursor( XPMpos( renderContext.leadingPlaceHolder.innerMarks.end ) )
         endif
 
         return ''
@@ -3232,45 +3113,47 @@ fun! s:ExtractOneItem() "{{{
 
 endfunction "}}}
 
-fun! s:HandleDefaultValueAction( ctx, filter ) "{{{
+fun! s:HandleDefaultValueAction( rctx, flt_rst ) "{{{
     " @return   string  typing
     "           -1      if this action can not be handled
 
     let x = b:xptemplateData
-    let ctx = a:ctx
-    let leader = ctx.leadingPlaceHolder
-
-    let act = a:filter.action
-
+    let rctx = a:rctx
+    let leader = rctx.leadingPlaceHolder
 
-    call s:log.Log( "type is " . type( act ). ' {} type is ' . type( {} ) )
+    call s:log.Log( "type is " . type( a:flt_rst ). ' {} type is ' . type( {} ) )
 
-    if act.name ==# 'expandTmpl'
-        " let ctx.item.behavior.gotoNextAtOnce = 1
+    if a:flt_rst.action ==# 'expandTmpl'
+        " let rctx.item.behavior.gotoNextAtOnce = 1
 
 
         " do NOT need to update position
-        " TODO innerMarks ? 
+        " TODO innerMarks ?
         let marks = leader.mark
         call XPreplace(XPMpos( marks.start ), XPMpos( marks.end ), '')
         call XPMsetLikelyBetween( marks.start, marks.end )
-        return XPTemplateStart(0, {'startPos' : getpos(".")[1:2], 'tmplName' : act.tmplName})
+        return XPTemplateStart(0, {'startPos' : getpos(".")[1:2], 'tmplName' : a:flt_rst.tmplName})
 
-    elseif act.name ==# 'finishTemplate'
+    elseif a:flt_rst.action ==# 'pum'
+        return s:DefaultValuePumHandler( rctx, a:flt_rst )
 
-        return s:ActionFinish( ctx, a:filter )
+    elseif a:flt_rst.action ==# 'finishTemplate'
 
-    elseif act.name ==# 'embed'
-        " embed a piece of snippet
+        return s:ActionFinish( rctx, a:flt_rst )
 
-        return s:EmbedSnippetInLeadingPlaceHolder( ctx, a:filter.text )
+    elseif a:flt_rst.action ==# 'build'
+
+        " building destory current item
+        " TODO what if flt_rst has no text?
+        let [ built ] =  s:EmbedSnippetInLeadingPlaceHolder( rctx, get(a:flt_rst, 'text', ''), a:flt_rst )
+        return s:GotoNextItem()
 
-    elseif act.name ==# 'next'
+    elseif a:flt_rst.action ==# 'next'
 
         let postaction = ''
         " Note: update following?
-        if has_key( a:filter, 'text' )
-            let postaction = s:FillinLeadingPlaceHolderAndSelect( ctx, a:filter.text )
+        if has_key( a:flt_rst, 'text' )
+            let postaction = s:FillinLeadingPlaceHolderAndSelect( rctx, a:flt_rst )
         endif
         if x.renderContext.processing
             return s:ShiftForward( '' )
@@ -3278,11 +3161,11 @@ fun! s:HandleDefaultValueAction( ctx, filter ) "{{{
             return postaction
         endif
 
-    elseif act.name ==# 'remove'
+    elseif a:flt_rst.action ==# 'remove'
 
         let postaction = ''
-        if has_key( a:filter, 'text' )
-            let postaction = s:FillinLeadingPlaceHolderAndSelect( ctx, a:filter.text )
+        if has_key( a:flt_rst, 'text' )
+            let postaction = s:FillinLeadingPlaceHolderAndSelect( rctx, a:flt_rst )
         endif
         if x.renderContext.processing
             return s:ShiftForward( 'clear' )
@@ -3290,6 +3173,8 @@ fun! s:HandleDefaultValueAction( ctx, filter ) "{{{
             return postaction
         endif
 
+    elseif a:flt_rst.action ==# 'text'
+        return s:FillinLeadingPlaceHolderAndSelect( rctx, a:flt_rst )
     else
         " other action
 
@@ -3299,23 +3184,26 @@ fun! s:HandleDefaultValueAction( ctx, filter ) "{{{
 
 endfunction "}}}
 
-fun! s:ActionFinish( renderContext, filter ) "{{{
-    let marks = a:renderContext.leadingPlaceHolder[ a:filter.marks ]
+fun! s:ActionFinish( renderContext, flt_rst ) "{{{
+    let marks = a:renderContext.leadingPlaceHolder[ a:flt_rst.marks ]
     let [ start, end ] = XPMposStartEnd( marks )
 
     call s:log.Debug( "start, end=" . string( [ start, end ] ) )
     call s:log.Debug( "start line=" . string( getline( start[0] ) ) )
 
     if start[ 0 ] != 0 && end[ 0 ] != 0
+        call s:log.Debug( "flt_rst.rc= ".string( a:flt_rst.rc ) )
+        call s:log.Debug( "flt_rst= ".string( a:flt_rst ) )
         " marks are not deleted during user edit
-        if a:filter.rc isnot 0
-        
-            let text = get( a:filter, 'text', '' )
-        
+        if a:flt_rst.rc isnot 0
+
             " do NOT need to update position
-        
-            call s:log.Debug( "text=" . string( text ) . len( text ) )
-            call XPreplace( start, end, text )
+
+            if has_key( a:flt_rst, 'text' )
+                let text = s:IndentFilterText( a:flt_rst, start )
+                call s:log.Debug( "text=" . string( text ) . len( text ) )
+                call XPreplace( start, end, text )
+            endif
         endif
     endif
 
@@ -3324,13 +3212,13 @@ fun! s:ActionFinish( renderContext, filter ) "{{{
     endif
 
 
-    " TODO bad 
+    " TODO bad
     call cursor( XPMpos( a:renderContext.leadingPlaceHolder.mark.end ) )
 
     let xptObj = b:xptemplateData
 
     " TODO controled by behavior is better?
-    " NOTE: XXX TODO!!! 
+    " NOTE: XXX TODO!!!
     if empty( xptObj.stack )
           \ || 1
         return s:FinishRendering()
@@ -3339,67 +3227,74 @@ fun! s:ActionFinish( renderContext, filter ) "{{{
         " need to select something or doing something else?
         return ''
     endif
-    
+
 endfunction "}}}
 
-fun! s:EmbedSnippetInLeadingPlaceHolder( ctx, snippet ) "{{{
+fun! s:EmbedSnippetInLeadingPlaceHolder( ctx, snippet, flt_rst ) "{{{
     " TODO remove needless marks
     let ph = a:ctx.leadingPlaceHolder
 
     let marks = ph.innerMarks
     let range = [ XPMpos( marks.start ), XPMpos( marks.end ) ]
     if range[0] == [0, 0] || range[1] == [0, 0]
-        return s:Crash( 'leading place holder''s mark lost:' . string( marks ) )
+        call s:Crash( 'leading place holder''s mark lost:' . string( marks ) )
+        return [ s:NOTBUILT ]
     endif
 
     call b:xptemplateData.settingWrap.Switch()
 
-    call XPreplace( range[0], range[1] , a:snippet )
+    let text = s:IndentFilterText(a:flt_rst, range[0])
+    call XPreplace( range[0], range[1], text )
 
-    if 0 > s:BuildPlaceHolders( marks )
-        return s:Crash('building place holder failed')
-    endif
-
-    call s:RemoveCurrentMarks()
-
-    return s:GotoNextItem()
+    if a:flt_rst.action == 'build'
+        let build_rc = s:BuildPlaceHolders( marks )
+        call s:log.Log( "build_rc=" . string( build_rc ) )
+        if build_rc < 0
+            call s:Crash('building place holder failed')
+            return [ s:NOTBUILT ]
+        else
+            if build_rc == s:BUILT
+                call s:RemoveCurrentMarks()
+            end
+            return [ build_rc ]
+        endif
+    end
+    return [ s:NOTBUILT ]
 endfunction "}}}
 
 
 
 " TODO bad implementation. If further build or shifforward needed, return back a
 " flag to inform caller to do this.  Do not do it silently itself
-fun! s:FillinLeadingPlaceHolderAndSelect( ctx, str ) "{{{
+fun! s:FillinLeadingPlaceHolderAndSelect( rctx, flt_rst ) "{{{
     " TODO remove needless marks
 
-    let [ ctx, str ] = [ a:ctx, a:str ]
-    let [ item, ph ] = [ ctx.item, ctx.leadingPlaceHolder ]
-
-    let marks = ph.innerMarks
-    let [ start, end ] = [ XPMpos( marks.start ), XPMpos( marks.end ) ]
+    if has_key( a:flt_rst, 'text' )
 
+        let ph = a:rctx.leadingPlaceHolder
+        let marks = ph.innerMarks
+        let [ start, _end ] = [ XPMpos( marks.start ), XPMpos( marks.end ) ]
 
-    if start == [0, 0] || end == [0, 0]
-        return s:Crash()
-    endif
-
-
-    call b:xptemplateData.settingWrap.Switch()
-    " set str to key place holder or the first normal place holder
-    call XPreplace( start, end, str )
-
-
-    let xp = ctx.snipObject.ptn
-
-    if str =~ '\V' . xp.lft . '\.\*' . xp.rt
-        if 0 > s:BuildPlaceHolders( marks )
+        if start == [0, 0] || _end == [0, 0]
             return s:Crash()
         endif
 
-        call s:log.Log( 'rebuild default values' )
-        return s:GotoNextItem()
+        let str = s:IndentFilterText(a:flt_rst, start)
+
+        call b:xptemplateData.settingWrap.Switch()
+        call XPreplace( start, _end, str )
     endif
 
+    " TODO action should not be 'build' if it goes in to this function
+    " if flt_rst.action == 'build'
+    "     if 0 > s:BuildPlaceHolders( marks )
+    "         return s:Crash()
+    "     endif
+
+    "     call s:log.Log( 'rebuild default values' )
+    "     return s:GotoNextItem()
+    " endif
+
 
     call s:XPTupdate()
 
@@ -3422,64 +3317,50 @@ fun! s:ApplyDefaultValueToPH( renderContext, filter ) "{{{
 
     call s:log.Debug( 'filter=' . string( a:filter ) )
 
-    call s:EvalFilter( a:filter, renderContext.ftScope.funcs, { 'startPos' : start } )
+    let ph = renderContext.leadingPlaceHolder
+    let typed = xpt#util#TextBetween( XPMposStartEnd( ph.innerMarks ) )
+    let flt_rst = s:EvalFilter( a:filter, [
+          \     renderContext.ftScope.funcs,
+          \     renderContext.snipSetting.variables,
+          \     { '$UserInput': typed } ] )
 
 
-    if a:filter.rc is 0
+    if flt_rst.rc is 0
         let action = s:SelectCurrent()
 
         call XPMupdateStat()
         return action
     endif
 
-
-    if has_key( a:filter, 'action' )
-
-        if a:filter.action.name == 'pum'
-            " popup
-            return s:DefaultValuePumHandler( renderContext, a:filter )
-
-        elseif a:filter.action.name == 'complete'
-            " complete pum
-            let postaction = s:DefaultValueShowPum( renderContext, a:filter )
-            return postaction
-
-        else
-
-            let rc = s:HandleDefaultValueAction( renderContext, a:filter )
-            return ( rc is -1 )
-                  \ ? s:FillinLeadingPlaceHolderAndSelect( renderContext, '' )
-                  \ : rc
-        endif
-
-    elseif has_key( a:filter, 'text' )
-        " string
-        return s:FillinLeadingPlaceHolderAndSelect( renderContext, a:filter.text )
-
+    let rc = s:HandleDefaultValueAction( renderContext, flt_rst )
+    if rc is -1
+        return s:FillinLeadingPlaceHolderAndSelect( renderContext, flt_rst )
     else
-        return s:FillinLeadingPlaceHolderAndSelect( renderContext, '' )
-
+        return rc
     endif
+
 endfunction "}}}
 
-fun! s:DefaultValuePumHandler( renderContext, filter ) "{{{
+fun! s:DefaultValuePumHandler( renderContext, flt_rst ) "{{{
 
-    let pumlen = len( a:filter.action.pum )
+    let pumlen = len( a:flt_rst.pum )
 
     if pumlen == 0
-        return s:FillinLeadingPlaceHolderAndSelect( a:renderContext, '' )
+        let a:flt_rst.text = ''
+        return s:FillinLeadingPlaceHolderAndSelect( a:renderContext, a:flt_rst )
 
     elseif pumlen == 1
-        return s:FillinLeadingPlaceHolderAndSelect( a:renderContext, a:filter.action.pum[0] )
+        let a:flt_rst.text = a:flt_rst.pum[0]
+        return s:FillinLeadingPlaceHolderAndSelect( a:renderContext, a:flt_rst )
 
     else
-        return s:DefaultValueShowPum( a:renderContext, a:filter )
+        return s:DefaultValueShowPum( a:renderContext, a:flt_rst )
 
     endif
 
 endfunction "}}}
 
-fun! s:DefaultValueShowPum( renderContext, filter ) "{{{
+fun! s:DefaultValueShowPum( renderContext, flt_rst ) "{{{
 
     let leader = a:renderContext.leadingPlaceHolder
     let [ start, end ] = XPMposStartEnd( leader.innerMarks )
@@ -3491,8 +3372,8 @@ fun! s:DefaultValueShowPum( renderContext, filter ) "{{{
 
     " to pop up, but do not enlarge matching, thus empty string is selected at first
     " if only word listed,  do callback at once.
-    let pumsess = XPPopupNew( s:ItemPumCB, {}, a:filter.action.pum )
-    call pumsess.SetAcceptEmpty( get( a:filter.action, 'acceptEmpty',  g:xptemplate_ph_pum_accept_empty ) )
+    let pumsess = XPPopupNew( s:ItemPumCB, {}, a:flt_rst.pum )
+    call pumsess.SetAcceptEmpty( get( a:flt_rst, 'acceptEmpty',  g:xptemplate_ph_pum_accept_empty ) )
     call pumsess.SetOption( {
           \ 'tabNav'      : g:xptemplate_pum_tab_nav } )
 
@@ -3507,9 +3388,9 @@ fun! s:InitItem() " {{{
     let currentItem = renderContext.item
     let leaderMark = renderContext.leadingPlaceHolder.innerMarks
 
-    let currentItem.initValue = s:TextBetween( XPMposStartEnd( leaderMark ) )
+    let currentItem.initValue = xpt#util#TextBetween( XPMposStartEnd( leaderMark ) )
 
-    call renderContext.SwitchPhase( g:xptRenderPhase.iteminit )
+    call xpt#rctx#SwitchPhase( renderContext, s:renderPhase.iteminit )
 
 
     let postaction = s:ApplyDefaultValue()
@@ -3520,14 +3401,14 @@ fun! s:InitItem() " {{{
 
     " NOTE: InitItem() may change current item to next one
     if renderContext.processing && currentItem == renderContext.item
-        let renderContext.item.initValue = s:TextBetween( XPMposStartEnd( leaderMark ) )
+        let renderContext.item.initValue = xpt#util#TextBetween( XPMposStartEnd( leaderMark ) )
     endif
 
-    if renderContext.phase == g:xptRenderPhase.iteminit
+    if renderContext.phase == s:renderPhase.iteminit
         " not finished by default value
         call s:InitItemMapping()
         call s:InitItemTempMapping()
-        call renderContext.SwitchPhase( g:xptRenderPhase.fillin )
+        call xpt#rctx#SwitchPhase( renderContext, s:renderPhase.fillin )
     endif
 
     return postaction
@@ -3540,35 +3421,35 @@ fun! s:ApplyDefaultValue() "{{{
     let renderContext = b:xptemplateData.renderContext
     let leader = renderContext.leadingPlaceHolder
     let defs = renderContext.snipSetting.defaultValues
-    
+
     if has_key( defs, leader.name )
           \ && defs[ leader.name ].force
-    
+
         let defValue = defs[ leader.name ]
-    
+
     else
-    
+
         let defValue =
               \ get( leader, 'ontimeFilter',
               \     get( defs, leader.name,
               \         g:EmptyFilter ) )
-    
+
     endif
-    
-    
+
+
     if defValue is g:EmptyFilter
         " TODO needed to fill in?
         let str = renderContext.item.name
-    
+
         " to update the edge to following place holder
         call s:XPTupdate()
-    
+
         let postaction = s:SelectCurrent()
 
         call XPMupdateStat()
-    
+
     else
-        let postaction = s:ApplyDefaultValueToPH( renderContext, copy( defValue ) )
+        let postaction = s:ApplyDefaultValueToPH( renderContext, defValue )
     endif
 
     return postaction
@@ -3596,21 +3477,29 @@ fun! XPTmappingEval( str ) "{{{
 
     let x = b:xptemplateData
 
-    let typed = s:TextBetween(
+    let typed = xpt#util#TextBetween(
           \ XPMposStartEnd(
           \     x.renderContext.leadingPlaceHolder.mark ) )
 
 
-    let filter = g:FilterValue.New( 0, a:str )
-    let filter = s:EvalFilter( filter, x.renderContext.ftScope.funcs,
-          \ { 'typed' : typed, 'startPos' : [ line( "." ), col( "." ) ] } )
+    let filter = xpt#flt#New( 0, a:str )
+    let flt_rst = s:EvalFilter( filter, [
+          \     x.renderContext.ftScope.funcs,
+          \     x.renderContext.snipSetting.variables,
+          \ { '$UserInput' : typed } ] )
 
-    if has_key( filter, 'action' )
-        let postAction = s:HandleAction( x.renderContext, filter )
+    if has_key( flt_rst, 'action' )
 
-    elseif has_key( filter, 'text' )
-        let postAction = filter.text
+        let act = flt_rst.action
+        if act == 'text'
+            let postAction = get(flt_rst, 'text', typed)
+        else
+            let postAction = s:HandleAction( x.renderContext, flt_rst )
+        endif
 
+    else
+        " TODO should not go to here
+        postAction = typed
     endif
 
     call s:log.Log( 'postAction=' . postAction )
@@ -3627,7 +3516,7 @@ fun! s:InitItemMapping() "{{{
 
     if has_key( mappings, item.name )
 
-        call mappings[ item.name ].saver.Save()
+        call xpt#msvr#Save( mappings[ item.name ].saver )
 
         for [ key, mapping ] in items( mappings[ item.name ].keys )
             " TODO not good
@@ -3648,10 +3537,10 @@ fun! s:InitItemTempMapping() "{{{
 
 
     for keys in mappings.keys
-        call mappings.saver.Add( 'i', keys[0] )
+        call xpt#msvr#Add( mappings.saver, 'i', keys[0] )
     endfor
 
-    call mappings.saver.Save()
+    call xpt#msvr#Save( mappings.saver )
 
     for keys in mappings.keys
         exe 'inoremap <silent> <buffer>' keys[0] '<C-r>=XPTmappingEval(' string( keys[1] ) ')<CR>'
@@ -3665,13 +3554,13 @@ fun! XPTmapKey( left, right ) "{{{
     let renderContext = b:xptemplateData.renderContext
     let mappings = renderContext.tmpmappings
 
-    if renderContext.phase != g:xptRenderPhase.iteminit
+    if renderContext.phase != s:renderPhase.iteminit
         call s:log.Warn( "Not in [iteminit] phase, mapping ingored" )
         return
     endif
 
     if !has_key( mappings, 'saver' )
-        let mappings.saver = g:MapSaver.New( 1 )
+        let mappings.saver = xpt#msvr#New(1)
         let mappings.keys = []
     endif
 
@@ -3685,7 +3574,7 @@ fun! s:ClearItemMapping( rctx ) "{{{
 
     let mappings = renderContext.tmpmappings
     if has_key( mappings, 'saver' )
-        call mappings.saver.Restore()
+        call xpt#msvr#Restore( mappings.saver )
     endif
 
 
@@ -3693,7 +3582,7 @@ fun! s:ClearItemMapping( rctx ) "{{{
     let item = renderContext.item
 
     if has_key( mappings, item.name )
-        call mappings[ item.name ].saver.Restore()
+        call xpt#msvr#Restore( mappings[ item.name ].saver )
     endif
 
 endfunction "}}}
@@ -3748,302 +3637,93 @@ fun! s:SelectCurrent() "{{{
 
 endfunction "}}}
 
-fun! s:CreateStringMask( str ) "{{{
-
-    if a:str == ''
-        return ''
-    endif
-
-    if has_key( b:_xpeval.strMaskCache, a:str )
-        return b:_xpeval.strMaskCache[ a:str ]
-    endif
+fun! s:EvalFilter( filter, closures ) "{{{
 
-    " non-escaped prefix
+    " TODO EvalFilter might be called from non-rendering phase, is there a snipObject?
+    let rctx = b:xptemplateData.renderContext
+    let snipptn = rctx.snipObject.ptn
 
-    " non-escaped quotation
-    let dqe = '\V\('. s:nonEscaped . '"\)'
-    let sqe = '\V\('. s:nonEscaped . "'\\)"
-
-    let dptn = dqe.'\_.\{-}\1'
-
-    " let sptn = sqe.'\_.\{-}\1'
-    " Note: only ' is escaped by doubling it: ''
-    " let sptn = sqe.'\_.\{-}\%(\^\|\[^'']\)\(''''\)\*'''
-    let sptn = sqe.'\%(\_[^'']\)\{-}'''
-
-    " create mask hiding all string literal with space
-    let mask = substitute(a:str, '[ *]', '+', 'g')
-    while 1 "{{{
-        let d = match(mask, dptn)
-        let s = match(mask, sptn)
-
-        if d == -1 && s == -1
-            break
-        endif
-
-        if d > -1 && (d < s || s == -1)
-            let sub = matchstr(mask, dptn)
-            let sub = repeat(' ', len(sub))
-            let mask = substitute(mask, dptn, sub, '')
-        elseif s > -1
-            let sub = matchstr(mask, sptn)
-            let sub = repeat(' ', len(sub))
-            let mask = substitute(mask, sptn, sub, '')
-        endif
-
-    endwhile "}}}
-
-    let b:_xpeval.strMaskCache[ a:str ] = mask
-
-    return mask
-
-endfunction "}}}
-
-fun! s:EvalFilter( filter, container, context ) "{{{
-
-    let a:filter.rc = 1
-
-    let rst = s:Eval( a:filter.text, a:container, a:context )
+    let r = { 'rc': 1, 'filter': a:filter }
 
+    let rst = xpt#eval#Eval( a:filter.text, a:closures )
+    call s:log.Debug( "rst after xpt#eval#Eval=" . string( rst ) )
 
     if type( rst ) == type( 0 )
-        let a:filter.rc = 0
-        return a:filter
+        let r.rc = 0
+        return r
     endif
 
     if type( rst ) == type( '' )
-        let a:filter.text = rst
-        call a:filter.AdjustIndent( a:context.startPos )
-
-        return a:filter
-    endif
-
-
-    unlet a:filter.text
 
-    if type( rst ) == type( [] )
-        let a:filter.action = { 'name' : 'pum', 'pum' : rst }
-
-    else
-        if has_key( rst, 'action' )
-            let rst.name = rst.action
-            unlet rst.action
+        " plain text is interpreted as plain text or snippet segment, depends
+        " on if there is mark in it.
+        "
+        " To explicitly use plain text or snippet segment, use Echo() and
+        " Build() respectively.
+        if rst =~ snipptn.lft
+            let r.action = 'build'
+        else
+            let r.action = 'text'
         endif
-
-        let a:filter.action = rst
-        let a:filter.marks = get( rst, 'marks', a:filter.marks )
-
-
-        call a:filter.AdjustTextAction( a:context )
-
+        let r.text = rst
+        return r
     endif
 
-    return a:filter
-
-endfunction "}}}
-
-
-
-fun! s:Eval(str, container, ...) "{{{
-    " @param a:1    key         desc
-    "               'typed'     what user typed
+    if type( rst ) == type( [] )
+        let r.action = 'pum'
+        let r.pum = rst
+        return r
 
-    " TODO if expression compiled in loading phase, Variable not found can
-    "       not be found any more in runtime phase.
-    if a:str == ''
-        return ''
     endif
 
-    let renderContext = b:xptemplateData.renderContext
-
-
-    " TODO simplify me
-    let a:container.renderContext = renderContext
-
-    let opt = a:0 == 1 ? a:1 : {}
-    let typed = get( opt, 'typed', '' )
-    let variables = get( opt, 'variables', {} )
-
-    let renderContext.evalCtx = { 'userInput' : renderContext.processing ? typed : '',
-          \                       'variables' : variables, }
-
-
-    let expr = s:CachedCompileExpr( a:str, a:container )
-
-    try
-        let xfunc = a:container
-        return eval(expr)
-    catch /.*/
-        call s:log.Warn(expr . "\n" . v:exception)
-        return ''
-    endtry
-
-endfunction "}}}
-
+    " rst is dictionary
+    if has_key( rst, 'action' )
+        call extend( r, rst, 'error' )
 
-fun! s:CachedCompileExpr( s, xfunc ) "{{{
-
-    let expr = get( b:_xpeval.evalCache, a:s, 0 )
-
-    if expr is 0
-        let expr = s:CompileExpr( a:s, a:xfunc )
-        if a:s != ''
-            let b:_xpeval.evalCache[ a:s ] = expr
+        " backward compatible
+        if r.action ==# 'embed'
+            let r.action = 'build'
         endif
-    endif
-
-    return expr
-
-endfunction "}}}
-
-
-fun! s:CompileExpr(s, xfunc) "{{{
-
-    " non-escaped prefix
-
-
-    " TODO bug:() can not be evaluated
-    " TODO how to add '$' ?
-    " TODO \$ inside func or ( ) can not be parsed correctly
-    let fptn = '\V' . '\w\+(\[^($]\{-})' . '\|' . s:nonEscaped . '{\w\+(\[^($]\{-})}'
-    let vptn = '\V' . s:nonEscaped . '$\w\+' . '\|' . s:nonEscaped . '{$\w\+}'
-    let sptn = '\V' . s:nonEscaped . '(\[^($]\{-})'
-
-    let patternVarOrFunc = fptn . '\|' . vptn . '\|' . sptn
+    else
+        let text = get( r, 'text', '' )
 
-    " simple test
-    if a:s !~  '\V\w(\|$\w'
-        return string(g:xptutil.UnescapeChar(a:s, '{$( '))
+        " effective action is determined by if there is item pattern in text
+        if text =~ snipptn.lft
+            let r.action = 'build'
+        else
+            let r.action = 'text'
+        endif
     endif
 
-    let stringMask = s:CreateStringMask( a:s )
-
-    if stringMask !~ patternVarOrFunc
-        return string(g:xptutil.UnescapeChar(a:s, '{$( '))
+    if ! has_key( r, 'marks' )
+        let r.marks = a:filter.marks
     endif
 
-    call s:log.Debug( 'string =' . a:s, 'strmask=' . stringMask )
+    call s:LoadFilterActionSnippet( r )
 
-
-
-
-
-    let str = a:s
-    let evalMask = repeat('-', len(stringMask))
-
-
-    while 1
-
-        let matchedIndex = match(stringMask, patternVarOrFunc)
-        if matchedIndex == -1
-            break
-        endif
-
-
-        let matchedLen = len(matchstr(stringMask, patternVarOrFunc))
-        let matched = str[matchedIndex : matchedIndex + matchedLen - 1]
-
-
-        if matched =~ '^{.*}$'
-            let matched = matched[1:-2]
-        endif
-
-
-        if matched[0:0] == '(' && matched[-1:-1] == ')'
-            " ignore it
-            let contextedMatchedLen = len(matched)
-            let spaces = repeat(' ', contextedMatchedLen)
-            let stringMask = (matchedIndex == 0 ? "" : stringMask[:matchedIndex-1])
-                        \ . spaces
-                        \ . stringMask[matchedIndex + matchedLen :]
-
-            continue
-
-        elseif matched[-1:] == ')' && has_key(a:xfunc, matchstr(matched, '^\w\+'))
-            let matched = "xfunc." . matched
-
-        elseif matched[0:0] == '$'
-            let matched = 'xfunc.GetVar(' . string( matched ) . ')'
-
-        endif
-
-
-        let contextedMatchedLen = len(matched)
-
-        let spaces = repeat(' ', contextedMatchedLen)
-
-        let evalMask = (matchedIndex == 0 ? "" : evalMask[:matchedIndex-1])
-                    \ . '+' . spaces[1:]
-                    \ . evalMask[matchedIndex + matchedLen :]
-
-        let stringMask = (matchedIndex == 0 ? "" : stringMask[:matchedIndex-1])
-                    \ . spaces
-                    \ . stringMask[matchedIndex + matchedLen :]
-
-        let str  = (matchedIndex == 0 ? "" :  str[:matchedIndex-1])
-                    \ . matched
-                    \ . str[matchedIndex + matchedLen :]
-
-    endwhile
-
-
-    let idx = 0
-    let expr = "''"
-    while 1
-        let matches = matchlist( evalMask, '\V\(-\*\)\(+ \*\)\?', idx )
-        if '' == matches[0]
-            break
-        endif
-
-        if '' != matches[1]
-            let part = str[ idx : idx + len(matches[1]) - 1 ]
-            let part = g:xptutil.UnescapeChar(part, '{$( ')
-            let expr .= '.' . string(part)
-        endif
-
-        if '' != matches[2]
-            let expr .= '.' . str[ idx + len(matches[1]) : idx + len(matches[0]) - 1 ]
-        endif
-
-        let idx += len(matches[0])
-    endwhile
-
-    let expr = matchstr(expr, "\\V\\^''.\\zs\\.\\*")
-    call s:log.Log('expression to evaluate=' . string(expr))
-
-    return expr
+    return r
 
 endfunction "}}}
 
-fun! s:TextBetween( posList ) "{{{
-
-    let [ s, e ] = a:posList
-
-    if s[0] > e[0]
-        return ""
-    endif
+fun! s:LoadFilterActionSnippet( flt_rst ) "{{{
 
-    if s[0] == e[0]
-        if s[1] == e[1]
-            return ""
-        else
-            call s:log.Log( "content between " . string( [s, e] ) . ' is :' . getline(s[0])[ s[1] - 1 : e[1] - 2] )
-            return getline(s[0])[ s[1] - 1 : e[1] - 2 ]
-        endif
-    endif
-
-
-    let r = [ getline(s[0])[s[1] - 1:] ] + getline(s[0]+1, e[0]-1)
+    let renderContext = b:xptemplateData.renderContext
 
-    if e[1] > 1
-        let r += [ getline(e[0])[:e[1] - 2] ]
-    else
-        let r += ['']
-    endif
+    if has_key( a:flt_rst, 'snippet' )
 
-    call s:log.Log( "content between " . string( [s, e] ) . ' is :'.join( r, "\n" ) )
-    return join(r, "\n")
+        let allsnip = renderContext.ftScope.allTemplates
+        let snipname = a:flt_rst.snippet
 
+        if has_key( allsnip, snipname )
+            let snip = allsnip[ snipname ]
+            call s:ParseSnippet( snip, renderContext.ftScope )
+            call s:MergeSetting( renderContext.snipSetting,
+                  \ snip.setting )
+            let a:flt_rst.text = snip.snipText
+        else
+            call XPT#warn( 'snippet "' . snipname . '" not found' )
+        end
+    end
 endfunction "}}}
 
 fun! s:Goback() "{{{
@@ -4055,32 +3735,24 @@ fun! s:Goback() "{{{
 endfunction "}}}
 
 fun! s:XPTinitMapping() "{{{
-    let disabledKeys = [
-        \ 's_[%',
-        \ 's_]%',
-        \]
 
     " Note: <bs> works the same with <C-h>, but only masking <bs> in buffer
     " level does mask <c-h>. So that <bs> still works with old mapping
-    let literalKeys = [
-        \ 's_%',
-        \ 's_''',
-        \ 's_"',
-        \ 's_(',
-        \ 's_)',
-        \ 's_{',
-        \ 's_}',
-        \ 's_[',
-        \ 's_]',
-        \
-        \ 's_g',
-        \ 's_m',
-        \ 's_a',
-        \]
-
-
-    let b:mapSaver = g:MapSaver.New(1)
-    call b:mapSaver.AddList(
+    let literal_chars = ''
+          \ . 'abcdefghijklmnopqrstuvwxyz'
+          \ . 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+          \ . '1234567890'
+          \ . '!@#$%^&*()'
+          \ . '`~-_=+[{]}\;:"'',<.>/?'
+    let literalKeys = split( literal_chars, '\V\s\*' )
+    let literalKeys = map( literalKeys, '"s_".v:val' )
+          \ + [
+          \     's_<SPACE>',
+          \     's_\|',
+          \   ]
+
+    let b:mapSaver = xpt#msvr#New(1)
+    call xpt#msvr#AddList( b:mapSaver,
           \ 'i_' . g:xptemplate_nav_next,
           \ 's_' . g:xptemplate_nav_next,
           \
@@ -4100,19 +3772,15 @@ fun! s:XPTinitMapping() "{{{
           \)
 
     if g:xptemplate_nav_next_2 != g:xptemplate_nav_next
-        call b:mapSaver.AddList(
+        call xpt#msvr#AddList( b:mapSaver,
               \ 'i_' . g:xptemplate_nav_next_2,
               \ 's_' . g:xptemplate_nav_next_2,
               \ )
-        
-    endif
-
-    let b:mapLiteral = g:MapSaver.New( 1 )
-    call b:mapLiteral.AddList( literalKeys )
 
+    endif
 
-    let b:mapMask = g:MapSaver.New( 0 )
-    call b:mapMask.AddList( disabledKeys )
+    let b:mapLiteral = xpt#msvr#New(1)
+    call xpt#msvr#AddList( b:mapLiteral, literalKeys )
 
 
     " 'indentkeys' causes problem that it changes indent or converts tabs/spaces
@@ -4152,6 +3820,7 @@ endfunction "}}}
 fun! s:ApplyMap() " {{{
 
     let x = b:xptemplateData
+    let renderContext = x.renderContext
 
     " if exists( ':AcpLock' )
     "     AcpLock
@@ -4161,13 +3830,11 @@ fun! s:ApplyMap() " {{{
     call b:xptemplateData.settingSwitch.Switch()
 
 
-    call b:mapSaver.Save()
-    call b:mapLiteral.Save()
-    call b:mapMask.Save()
+    call xpt#msvr#Save( b:mapSaver )
+    call xpt#msvr#Save( b:mapLiteral )
 
-    call b:mapSaver.UnmapAll()
-    call b:mapLiteral.Literalize( { 'insertAsSelect' : 1 } )
-    call b:mapMask.UnmapAll()
+    call xpt#msvr#UnmapAll( b:mapSaver )
+    call xpt#msvr#Literalize( b:mapLiteral, { 'insertAsSelect' : 1 } )
 
 
 
@@ -4182,7 +3849,7 @@ fun! s:ApplyMap() " {{{
     exe 'nnoremap <silent> <buffer>' g:xptemplate_goback     'i<C-r>=<SID>Goback()<CR>'
     exe 'inoremap <silent> <buffer>' g:xptemplate_goback     ' <C-v><C-v><BS><C-r>=<SID>Goback()<CR>'
 
-    inoremap <silent> <buffer> <CR> <C-r>=<SID>XPTCR()<CR>
+    exe 'imap <silent> <buffer> <CR>' g:xptemplate_hook_before_cr . '<Plug>XPT_map_CR'
     snoremap <silent> <buffer> <Del> <Del>i
     snoremap <silent> <buffer> <BS> d<BS>
 
@@ -4210,9 +3877,8 @@ fun! s:ClearMap() " {{{
 
     call b:xptemplateData.settingSwitch.Restore()
 
-    call b:mapMask.Restore()
-    call b:mapLiteral.Restore()
-    call b:mapSaver.Restore()
+    call xpt#msvr#Restore( b:mapLiteral )
+    call xpt#msvr#Restore( b:mapSaver )
 
     " if exists( ':AcpUnlock' )
     "     try
@@ -4235,7 +3901,7 @@ endfunction "}}}
 let s:snipScopePrototype = {
       \ 'filename'  : '',
       \ 'ptn'       : {'l':'`', 'r':'^'},
-      \ 'priority'  : s:priorities.lang,
+      \ 'priority'  : xpt#priority#Get( 'default' ),
       \ 'filetype'  : '',
       \ 'inheritFT' : 0,
       \}
@@ -4273,46 +3939,12 @@ endfunction
 
 fun! XPTemplateInit() "{{{
 
-    if exists( 'b:xptemplateData' )
-        return
-    endif
-
-    let b:xptemplateData = {
-          \     'filetypes'         : {},
-          \     'wrapStartPos'      : 0,
-          \     'wrap'              : '',
-          \     'savedReg'          : '',
-          \     'snippetToParse'    : [],
-          \     'abbrPrefix'        : {},
-          \     'fallbacks'         : [],
-          \ }
-
-    let b:xptemplateData.posStack = []
-    let b:xptemplateData.stack = []
-
-    " which letter can be used in template name
-    let b:xptemplateData.keyword = '\w'
-    let b:xptemplateData.keywordList = []
-
-    let b:xptemplateData.snipFileScope = {}
-    let b:xptemplateData.snipFileScopeStack = []
-
-
-    let b:xptemplateData.renderContext = g:RenderContext.New( b:xptemplateData )
+    let x = xpt#buf#New()
 
     " TODO is this the right place to do that?
     call XPMsetBufSortFunction( function( 'XPTmarkCompare' ) )
 
     call s:XPTinitMapping()
-
-    let b:_xpeval = { 'strMaskCache' : {}, 'evalCache' : {} }
-
-    let b:_xptSnipCache = {
-          \ 'conditions' : [],
-          \ 'pumCache' : {
-          \ }
-          \ }
-
 endfunction "}}}
 
 fun! s:RedefinePattern() "{{{
@@ -4343,18 +3975,6 @@ fun! s:RedefinePattern() "{{{
 
 endfunction "}}}
 
-fun! s:PushRenderContext() "{{{
-    let x = b:xptemplateData
-
-    call add( x.stack, b:xptemplateData.renderContext )
-    let x.renderContext = g:RenderContext.New( x )
-endfunction "}}}
-fun! s:PopRenderContext() "{{{
-    let x = b:xptemplateData
-    let x.renderContext = x.stack[-1]
-    call remove(x.stack, -1)
-endfunction "}}}
-
 fun! s:SynNameStack(l, c) "{{{
     if exists( '*synstack' )
         let ids = synstack(a:l, a:c)
@@ -4384,7 +4004,7 @@ fun! s:UpdateFollowingPlaceHoldersWith( contentTyped, option ) "{{{
 
     let useGroupPost = renderContext.phase == 'post' && has_key( a:option, 'post' )
     if useGroupPost
-        let groupFilter = a:option.post
+        let group_flt_rst = a:option.post
     endif
 
     call XPRstartSession()
@@ -4405,33 +4025,31 @@ fun! s:UpdateFollowingPlaceHoldersWith( contentTyped, option ) "{{{
             let [ phln, phcol ] = phStartPos
 
             if flt isnot g:EmptyFilter
-                let flt = copy( flt )
 
-                call s:EvalFilter( flt, renderContext.ftScope.funcs,
-                      \ { 'typed'    : a:contentTyped,
-                      \   'startPos' : phStartPos } )
+                let flt_rst = s:EvalFilter( flt, [
+                      \     renderContext.ftScope.funcs,
+                      \     renderContext.snipSetting.variables,
+                      \     { '$UserInput' : a:contentTyped } ] )
 
 
                 " TODO ontime flt action support?
 
             elseif useGroupPost
-                let flt = copy( groupFilter )
-                call flt.AdjustIndent( phStartPos )
-
+                let flt_rst = copy( group_flt_rst )
             else
-                let flt = g:FilterValue.New( -XPT#getIndentNr( phln, phcol ), a:contentTyped )
-                call flt.AdjustIndent( phStartPos )
-
+                let flt_rst = { 'nIndent': -XPT#getIndentNr( phln, phcol ),
+                      \         'text': a:contentTyped }
             endif
+            let flttext = s:IndentFilterText(flt_rst, phStartPos)
 
 
             " TODO replace only when filter applied or filter.text has line break
-            let text = s:TextBetween( XPMposStartEnd( ph.mark ) )
-            if text !=# flt.text
-                call XPreplaceByMarkInternal( ph.mark.start, ph.mark.end, flt.text )
+            let text = xpt#util#TextBetween( XPMposStartEnd( ph.mark ) )
+            if text !=# flttext
+                call XPreplaceByMarkInternal( ph.mark.start, ph.mark.end, flttext )
             endif
 
-            call s:log.Debug( 'after update 1 place holder:', s:TextBetween( XPMposStartEnd( renderContext.marks.tmpl ) ) )
+            call s:log.Debug( 'after update 1 place holder:', xpt#util#TextBetween( XPMposStartEnd( renderContext.marks.tmpl ) ) )
         endfor
     catch /.*/
         call XPT#error( v:exception )
@@ -4459,7 +4077,7 @@ fun! s:Crash(...) "{{{
     call s:ClearMap()
 
     let x.stack = []
-    let x.renderContext = g:RenderContext.New( x )
+    let x.renderContext = xpt#rctx#New( x )
     call XPMflushWithHistory()
 
     call XPT#warn( msg )
@@ -4510,7 +4128,7 @@ fun! s:XPTupdateTyping() "{{{
     let flt = get( ontypeFilters, leader.name, g:EmptyFilter )
 
     if flt isnot g:EmptyFilter
-        call s:HandleOntypeFilter( copy( flt ) )
+        call s:HandleOntypeFilter( flt )
     endif
 
     return rc
@@ -4523,22 +4141,25 @@ fun! s:HandleOntypeFilter( filter ) "{{{
     let renderContext = b:xptemplateData.renderContext
     let leader = renderContext.leadingPlaceHolder
     let [ start, end ] = XPMposStartEnd( leader.mark )
-    let contentTyped = s:TextBetween( [ start, end ] )
+    let contentTyped = xpt#util#TextBetween( [ start, end ] )
 
-    call s:EvalFilter( a:filter, renderContext.ftScope.funcs, { 'typed' : contentTyped, 'startPos' : start } )
+    let flt_rst = s:EvalFilter( a:filter, [
+          \     renderContext.ftScope.funcs,
+          \     renderContext.snipSetting.variables,
+          \     { '$UserInput' : contentTyped } ] )
 
 
-    if 0 is a:filter.rc
+    if 0 is flt_rst.rc
         return
 
-    elseif has_key( a:filter, 'action' )
-        call s:HandleOntypeAction( renderContext, a:filter )
+    elseif has_key( flt_rst, 'action' )
+        call s:HandleOntypeAction( renderContext, flt_rst )
 
-    elseif has_key( a:filter, 'text' )
+    elseif has_key( flt_rst, 'text' )
 
-        if a:filter.text != contentTyped
+        if flt_rst.text != contentTyped
             let [ start, end ] = XPMposStartEnd( leader.mark )
-            call XPreplace( start, end, a:filter.text )
+            call XPreplace( start, end, flt_rst.text )
             call s:XPTupdate()
         endif
 
@@ -4546,9 +4167,9 @@ fun! s:HandleOntypeFilter( filter ) "{{{
 
 endfunction "}}}
 
-fun! s:HandleOntypeAction( renderContext, filter ) "{{{
+fun! s:HandleOntypeAction( renderContext, flt_rst ) "{{{
 
-    let postaction = s:HandleAction( a:renderContext, a:filter )
+    let postaction = s:HandleAction( a:renderContext, a:flt_rst )
 
     if '' != postaction
         call feedkeys( postaction, 'n' )
@@ -4556,7 +4177,7 @@ fun! s:HandleOntypeAction( renderContext, filter ) "{{{
 
 endfunction "}}}
 
-fun! s:HandleAction( renderContext, filter ) "{{{
+fun! s:HandleAction( renderContext, flt_rst ) "{{{
     " NOTE: handle only leader's action
 
     if a:renderContext.phase == 'post'
@@ -4567,28 +4188,28 @@ fun! s:HandleAction( renderContext, filter ) "{{{
 
 
     let postaction = ''
-    if a:filter.action.name == 'next'
+    if a:flt_rst.action == 'next'
 
-        if has_key( a:filter, 'text' )
+        if has_key( a:flt_rst, 'text' )
 
             " TODO replace by mark
             let [ start, end ] = XPMposList( marks.start, marks.end )
-            call XPreplace( start, end, a:filter.text )
+            call XPreplace( start, end, a:flt_rst.text )
 
         endif
 
         let postaction = s:ShiftForward( '' )
 
-    elseif a:filter.action.name == 'finishTemplate'
-        let postaction = s:ActionFinish( a:renderContext, a:filter )
+    elseif a:flt_rst.action == 'finishTemplate'
+        let postaction = s:ActionFinish( a:renderContext, a:flt_rst )
 
-    elseif a:filter.action.name == ''
+    elseif a:flt_rst.action == ''
         " TODO other actions
-        
+
     endif
 
     return postaction
-    
+
 endfunction "}}}
 
 fun! s:IsUpdateCondition( renderContext ) "{{{
@@ -4713,7 +4334,7 @@ fun! s:DoUpdate( renderContext, changeType ) "{{{
 
     let renderContext = a:renderContext
 
-    let contentTyped = s:TextBetween( XPMposStartEnd( renderContext.leadingPlaceHolder.mark ) )
+    let contentTyped = xpt#util#TextBetween( XPMposStartEnd( renderContext.leadingPlaceHolder.mark ) )
 
     if contentTyped ==# renderContext.lastContent
         call s:log.Log( "nothing different typed" )
@@ -4731,7 +4352,7 @@ fun! s:DoUpdate( renderContext, changeType ) "{{{
 
     call s:log.Log( "-----------------------")
     call s:log.Log( 'current line=' . string( getline( "." ) ) )
-    call s:log.Log( "tmpl:", s:TextBetween( XPMposStartEnd( renderContext.marks.tmpl ) ) )
+    call s:log.Log( "tmpl:", xpt#util#TextBetween( XPMposStartEnd( renderContext.marks.tmpl ) ) )
     call s:log.Log( "lastContent=".renderContext.lastContent )
     call s:log.Log( "contentTyped=".contentTyped )
 
@@ -4776,6 +4397,7 @@ fun! s:DoBreakUndo() "{{{
 endfunction "}}}
 
 inoremap <silent> <Plug>XPTdoBreakUndo <C-r>=<SID>DoBreakUndo()<CR>
+inoremap <silent> <Plug>XPT_map_CR <C-r>=<SID>XPTCR()<CR>
 
 fun! s:BreakUndo() "{{{
     if mode() != 'i' || pumvisible()
@@ -4809,7 +4431,7 @@ fun! s:GotoRelativePosToMark( rPos, mark ) "{{{
 endfunction "}}}
 
 fun! s:XPTcheck() "{{{
-    
+
     if !exists( 'b:xptemplateData' )
         call XPTemplateInit()
     endif
@@ -4888,6 +4510,11 @@ augroup XPT "{{{
         au CursorMovedI * call <SID>BreakUndo()
     endif
 
+    if g:xptemplate_cwd_snippet == 1
+        au BufEnter  * silent! call xpt#cwd#snpt#load()
+        au BufUnload * silent! call xpt#cwd#snpt#clearFlag()
+    endif
+
 augroup END "}}}
 
 fun! g:XPTaddPlugin(event, when, func) "{{{
@@ -4938,40 +4565,7 @@ fun! s:CallPlugin(ev, when) "{{{
 
 endfunction "}}}
 
-
 com! XPTreload call XPTreload()
 com! XPTcrash call <SID>Crash()
 
-
-" " acp hack to detect if acp is showing
-" let scriptnames = XPT#getCmdOutput( 'silent scriptnames' )
-" let scrs = split( scriptnames, "\n" )
-" for s in scrs
-"     if s =~ '\V/autoload/acp.vim\$'
-"         let acpline = s
-"         break
-"     endif
-" endfor
-
-" let acpsid = matchstr( acpline, '\V\s\*\zs\d\+' )
-
-" let SS = function( '<SNR>' . acpsid . '_setTempOption' )
-
-
-" fun! XPTwhat(x)
-"     let s:acp_tempOptionSet = a:x
-"     let a:x[ 0 ] = {}
-"     return ''
-" endfunction
-
-
-" try
-"     call SS( 0, 'readonly.XPTwhat(s:tempOptionSet)', &readonly )
-" catch /.*/
-" endtry
-
-" echom string( s:acp_tempOptionSet )
-
 let &cpo = s:oldcpo
-
-
diff --git a/readme-img/400x/browse-and-basic.gif b/readme-img/400x/browse-and-basic.gif
new file mode 100644
index 00000000..c57e5302
Binary files /dev/null and b/readme-img/400x/browse-and-basic.gif differ
diff --git a/readme-img/400x/c-ifee.gif b/readme-img/400x/c-ifee.gif
new file mode 100644
index 00000000..175ed166
Binary files /dev/null and b/readme-img/400x/c-ifee.gif differ
diff --git a/readme-img/400x/c-loop-and-wrapper.gif b/readme-img/400x/c-loop-and-wrapper.gif
new file mode 100644
index 00000000..ed0214af
Binary files /dev/null and b/readme-img/400x/c-loop-and-wrapper.gif differ
diff --git a/readme-img/400x/c-macro.gif b/readme-img/400x/c-macro.gif
new file mode 100644
index 00000000..3364b976
Binary files /dev/null and b/readme-img/400x/c-macro.gif differ
diff --git a/readme-img/400x/c-outline.gif b/readme-img/400x/c-outline.gif
new file mode 100644
index 00000000..3f611c95
Binary files /dev/null and b/readme-img/400x/c-outline.gif differ
diff --git a/readme-img/400x/py-class-def.gif b/readme-img/400x/py-class-def.gif
new file mode 100644
index 00000000..a52d8218
Binary files /dev/null and b/readme-img/400x/py-class-def.gif differ
diff --git a/readme-img/400x/py-for-inline-cmpl.gif b/readme-img/400x/py-for-inline-cmpl.gif
new file mode 100644
index 00000000..6576c030
Binary files /dev/null and b/readme-img/400x/py-for-inline-cmpl.gif differ
diff --git a/readme-img/400x/py-optional-ph.gif b/readme-img/400x/py-optional-ph.gif
new file mode 100644
index 00000000..b26e11d3
Binary files /dev/null and b/readme-img/400x/py-optional-ph.gif differ
diff --git a/readme-img/400x/py-quick-add.gif b/readme-img/400x/py-quick-add.gif
new file mode 100644
index 00000000..2aacad70
Binary files /dev/null and b/readme-img/400x/py-quick-add.gif differ
diff --git a/readme-img/400x/py-try.gif b/readme-img/400x/py-try.gif
new file mode 100644
index 00000000..60697471
Binary files /dev/null and b/readme-img/400x/py-try.gif differ
diff --git a/readme-img/600x/browse-and-basic.gif b/readme-img/600x/browse-and-basic.gif
new file mode 100644
index 00000000..3c6acffd
Binary files /dev/null and b/readme-img/600x/browse-and-basic.gif differ
diff --git a/readme-img/600x/c-ifee.gif b/readme-img/600x/c-ifee.gif
new file mode 100644
index 00000000..1319685d
Binary files /dev/null and b/readme-img/600x/c-ifee.gif differ
diff --git a/readme-img/600x/c-loop-and-wrapper.gif b/readme-img/600x/c-loop-and-wrapper.gif
new file mode 100644
index 00000000..585ba535
Binary files /dev/null and b/readme-img/600x/c-loop-and-wrapper.gif differ
diff --git a/readme-img/600x/c-macro.gif b/readme-img/600x/c-macro.gif
new file mode 100644
index 00000000..8f459489
Binary files /dev/null and b/readme-img/600x/c-macro.gif differ
diff --git a/readme-img/600x/c-outline.gif b/readme-img/600x/c-outline.gif
new file mode 100644
index 00000000..36659382
Binary files /dev/null and b/readme-img/600x/c-outline.gif differ
diff --git a/readme-img/600x/py-class-def.gif b/readme-img/600x/py-class-def.gif
new file mode 100644
index 00000000..9df3fded
Binary files /dev/null and b/readme-img/600x/py-class-def.gif differ
diff --git a/readme-img/600x/py-for-inline-cmpl.gif b/readme-img/600x/py-for-inline-cmpl.gif
new file mode 100644
index 00000000..eb18fbbd
Binary files /dev/null and b/readme-img/600x/py-for-inline-cmpl.gif differ
diff --git a/readme-img/600x/py-optional-ph.gif b/readme-img/600x/py-optional-ph.gif
new file mode 100644
index 00000000..f0418b03
Binary files /dev/null and b/readme-img/600x/py-optional-ph.gif differ
diff --git a/readme-img/600x/py-quick-add.gif b/readme-img/600x/py-quick-add.gif
new file mode 100644
index 00000000..65c2d2b2
Binary files /dev/null and b/readme-img/600x/py-quick-add.gif differ
diff --git a/readme-img/600x/py-try.gif b/readme-img/600x/py-try.gif
new file mode 100644
index 00000000..d1f57940
Binary files /dev/null and b/readme-img/600x/py-try.gif differ
diff --git a/readme-img/c-pum-starts-with-f.png b/readme-img/c-pum-starts-with-f.png
new file mode 100644
index 00000000..082ecafb
Binary files /dev/null and b/readme-img/c-pum-starts-with-f.png differ
diff --git a/readme-img/samples/b-box.gif b/readme-img/samples/b-box.gif
new file mode 100644
index 00000000..49a54613
Binary files /dev/null and b/readme-img/samples/b-box.gif differ
diff --git a/readme-img/samples/b-catrom.gif b/readme-img/samples/b-catrom.gif
new file mode 100644
index 00000000..5c32fe76
Binary files /dev/null and b/readme-img/samples/b-catrom.gif differ
diff --git a/readme-img/samples/b-lanczos2.gif b/readme-img/samples/b-lanczos2.gif
new file mode 100644
index 00000000..8c14a99d
Binary files /dev/null and b/readme-img/samples/b-lanczos2.gif differ
diff --git a/readme-img/samples/b-lanczos3.gif b/readme-img/samples/b-lanczos3.gif
new file mode 100644
index 00000000..3c6acffd
Binary files /dev/null and b/readme-img/samples/b-lanczos3.gif differ
diff --git a/readme-img/samples/b-mitchell.gif b/readme-img/samples/b-mitchell.gif
new file mode 100644
index 00000000..4c3f1e95
Binary files /dev/null and b/readme-img/samples/b-mitchell.gif differ
diff --git a/readme-img/samples/b-mix.gif b/readme-img/samples/b-mix.gif
new file mode 100644
index 00000000..b73c0b77
Binary files /dev/null and b/readme-img/samples/b-mix.gif differ
diff --git a/readme-img/samples/b-sample.gif b/readme-img/samples/b-sample.gif
new file mode 100644
index 00000000..49a54613
Binary files /dev/null and b/readme-img/samples/b-sample.gif differ
diff --git a/readme-img/samples/x.md b/readme-img/samples/x.md
new file mode 100644
index 00000000..133c55b3
--- /dev/null
+++ b/readme-img/samples/x.md
@@ -0,0 +1,14 @@
+## b-box.gif
+![](b-box.gif)
+## b-catrom.gif
+![](b-catrom.gif)
+## b-lanczos2.gif
+![](b-lanczos2.gif)
+## b-lanczos3.gif
+![](b-lanczos3.gif)
+## b-mitchell.gif
+![](b-mitchell.gif)
+## b-mix.gif
+![](b-mix.gif)
+## b-sample.gif
+![](b-sample.gif)
diff --git a/syntax/xpt.vim b/syntax/xpt.vim
index 4337aee6..9df2bf3c 100644
--- a/syntax/xpt.vim
+++ b/syntax/xpt.vim
@@ -118,7 +118,7 @@ syntax match XPTmeta_name /\w\+\ze=\?/ containedin=XPTmeta nextgroup=XPTmeta_val
 syntax keyword XPTmeta_name_key hint alias synonym hidden wrap wraponly abbr syn contained containedin=XPTmeta_name
 syntax match XPTmeta_value /=\zs\(\\\s\|\S\)*/ containedin=XPTmeta
 
-syntax region XPTsnippetBody  start=/^/ end=/\ze\%(^$\n\)*\%$\|\ze\%(^$\n\)*XPT\s\|^\.\.XPT\|^\ze\(".*\n\|\s*\n\)*\(XPT\s\|\%$\)/ contained containedin=XPTsnippetTitle contains=XPTxset excludenl fold
+syntax region XPTsnippetBody  start=/^/ end=/\ze\%(^$\n\)*\%$\|\ze\%(^$\n\)*XPT\s\|^\.\.XPT\|\ze\(^".*\n\|^\s*\n\)*\(^XPT\s\|\%$\|^".*\%$\|^\s*\%$\)/ contained containedin=XPTsnippetTitle contains=XPTxset excludenl fold
 
 syntax match XPThintMark /\V \zs**\ze / contained containedin=vimLineComment
 syntax match vimLineComment /^".*$/ containedin=XPTregion contains=@vimCommentGroup,vimCommentString,vimCommentTitle
diff --git a/syntax/xptlog.vim b/syntax/xptlog.vim
new file mode 100644
index 00000000..c1b16d69
--- /dev/null
+++ b/syntax/xptlog.vim
@@ -0,0 +1,9 @@
+syn match xptlogStack /^\w\+:::.*/ contains=xptlogFunctionName,xptlogLevel
+syn match xptlogLevel /^\w\+\ze:::/ contained
+syn match xptlogFunctionName /[^:.]\+\ze\%(\.\.\|$\)/ contained contains=xptlogFunctionSID
+syn match xptlogFunctionSID /<SNR>\d\+_/
+
+hi def link xptlogStack             Statement
+hi def link xptlogLevel             Label
+hi def link xptlogFunctionName      Function
+hi def link xptlogFunctionSID       Title
diff --git a/test/cases/.gitignore b/test/cases/.gitignore
new file mode 100644
index 00000000..0d7ac5f2
--- /dev/null
+++ b/test/cases/.gitignore
@@ -0,0 +1 @@
+rst
diff --git a/test/cases/00-context/context b/test/cases/00-context/context
new file mode 100644
index 00000000..c530f325
--- /dev/null
+++ b/test/cases/00-context/context
@@ -0,0 +1,3 @@
+123
+xy
+456
diff --git a/test/cases/00-context/tests/1-context b/test/cases/00-context/tests/1-context
new file mode 100644
index 00000000..ecb00c15
--- /dev/null
+++ b/test/cases/00-context/tests/1-context
@@ -0,0 +1,4 @@
+expected:
+123
+xy
+456
diff --git a/test/cases/00-edit/tests/1-edit b/test/cases/00-edit/tests/1-edit
new file mode 100644
index 00000000..83f0de9f
--- /dev/null
+++ b/test/cases/00-edit/tests/1-edit
@@ -0,0 +1,6 @@
+keys:
+123
456
+
+expected:
+123
+456
diff --git a/test/cases/00-vimrc/tests/1-vimrc-loaded b/test/cases/00-vimrc/tests/1-vimrc-loaded
new file mode 100644
index 00000000..108a2e5d
--- /dev/null
+++ b/test/cases/00-vimrc/tests/1-vimrc-loaded
@@ -0,0 +1,5 @@
+keys:
+i
+
+expected:
+j
diff --git a/test/cases/00-vimrc/vimrc b/test/cases/00-vimrc/vimrc
new file mode 100644
index 00000000..7be40a13
--- /dev/null
+++ b/test/cases/00-vimrc/vimrc
@@ -0,0 +1,2 @@
+so ./test/core_vimrc
+inoremap i j
diff --git a/test/cases/01-g-xptemplate_vars/tests/1-author b/test/cases/01-g-xptemplate_vars/tests/1-author
new file mode 100644
index 00000000..2f7fd28f
--- /dev/null
+++ b/test/cases/01-g-xptemplate_vars/tests/1-author
@@ -0,0 +1,5 @@
+keys:
+Author
+
+expected:
+drdr.xp
diff --git a/test/cases/01-g-xptemplate_vars/vimrc b/test/cases/01-g-xptemplate_vars/vimrc
new file mode 100644
index 00000000..f965c888
--- /dev/null
+++ b/test/cases/01-g-xptemplate_vars/vimrc
@@ -0,0 +1,2 @@
+so ./test/core_vimrc
+let g:xptemplate_vars = 'author=drdr.xp'
diff --git a/test/cases/02-override-author/ftplugin/foo/foo.xpt.vim b/test/cases/02-override-author/ftplugin/foo/foo.xpt.vim
new file mode 100644
index 00000000..2411ad8b
--- /dev/null
+++ b/test/cases/02-override-author/ftplugin/foo/foo.xpt.vim
@@ -0,0 +1,9 @@
+XPTemplate priority=lang
+
+let s:f = g:XPTfuncs()
+
+XPTinclude
+      \ _common/common
+
+XPT Author
+other
diff --git a/test/cases/02-override-author/tests/1-auther b/test/cases/02-override-author/tests/1-auther
new file mode 100644
index 00000000..013b5437
--- /dev/null
+++ b/test/cases/02-override-author/tests/1-auther
@@ -0,0 +1,5 @@
+keys:
+Author
+
+expected:
+other
diff --git a/test/cases/10-snip-name-matching/ftplugin/foo/foo.xpt.vim b/test/cases/10-snip-name-matching/ftplugin/foo/foo.xpt.vim
new file mode 100644
index 00000000..3c157fac
--- /dev/null
+++ b/test/cases/10-snip-name-matching/ftplugin/foo/foo.xpt.vim
@@ -0,0 +1,24 @@
+XPTemplate priority=lang
+
+let s:f = g:XPTfuncs()
+
+XPTinclude
+      \ _common/common
+
+XPT (
+(abc
+
+XPT se
+--se
+
+XPT $
+$
+
+XPT a
+-a
+XPT *
+-*
+XPT a*
+-a*
+XPT *a
+-*a
diff --git a/test/cases/10-snip-name-matching/tests/1-matching b/test/cases/10-snip-name-matching/tests/1-matching
new file mode 100644
index 00000000..39e06851
--- /dev/null
+++ b/test/cases/10-snip-name-matching/tests/1-matching
@@ -0,0 +1,40 @@
+keys:
+
func(
+
(func
+
$se
+
se
+
+
a
+
*
+
a*
+
*a
+
+
xa
+
xa*
+
x*a
+
x*a*
+
+
*a*
+
**a
+
**a*
+
+expected:
+emptyline
+func(abc
+(func
+$se
+--se
+emptyline
+-a
+-*
+-a*
+-*a
+emptyline
+xa
+xa-*
+x-*a
+x*a-*
+emptyline
+*a-*
+*-*a
+**a-*
diff --git a/test/cases/11-opt-close_pum-0/context b/test/cases/11-opt-close_pum-0/context
new file mode 100644
index 00000000..96031935
--- /dev/null
+++ b/test/cases/11-opt-close_pum-0/context
@@ -0,0 +1,3 @@
+foo
+fop
+fo
diff --git a/test/cases/11-opt-close_pum-0/ftplugin/foo/foo.xpt.vim b/test/cases/11-opt-close_pum-0/ftplugin/foo/foo.xpt.vim
new file mode 100644
index 00000000..4214c0ed
--- /dev/null
+++ b/test/cases/11-opt-close_pum-0/ftplugin/foo/foo.xpt.vim
@@ -0,0 +1,12 @@
+XPTemplate priority=lang
+
+let s:f = g:XPTfuncs()
+
+XPTinclude
+      \ _common/common
+
+XPT for
+forloop
+
+XPT fot
+fotoooo
diff --git a/test/cases/11-opt-close_pum-0/tests/1-close_pum b/test/cases/11-opt-close_pum-0/tests/1-close_pum
new file mode 100644
index 00000000..4f7c4840
--- /dev/null
+++ b/test/cases/11-opt-close_pum-0/tests/1-close_pum
@@ -0,0 +1,7 @@
+keys:
+
+
+expected:
+foo
+fop
+fo
diff --git a/test/cases/11-opt-close_pum-0/vimrc b/test/cases/11-opt-close_pum-0/vimrc
new file mode 100644
index 00000000..8b3abd53
--- /dev/null
+++ b/test/cases/11-opt-close_pum-0/vimrc
@@ -0,0 +1,2 @@
+so ./test/core_vimrc
+let g:xptemplate_close_pum = 0
diff --git a/test/cases/11-opt-close_pum-1/context b/test/cases/11-opt-close_pum-1/context
new file mode 100644
index 00000000..96031935
--- /dev/null
+++ b/test/cases/11-opt-close_pum-1/context
@@ -0,0 +1,3 @@
+foo
+fop
+fo
diff --git a/test/cases/11-opt-close_pum-1/ftplugin/foo/foo.xpt.vim b/test/cases/11-opt-close_pum-1/ftplugin/foo/foo.xpt.vim
new file mode 100644
index 00000000..1eb1fd1e
--- /dev/null
+++ b/test/cases/11-opt-close_pum-1/ftplugin/foo/foo.xpt.vim
@@ -0,0 +1,9 @@
+XPTemplate priority=lang
+
+let s:f = g:XPTfuncs()
+
+XPTinclude
+      \ _common/common
+
+XPT for
+forloop
diff --git a/test/cases/11-opt-close_pum-1/tests/1-close_pum-1 b/test/cases/11-opt-close_pum-1/tests/1-close_pum-1
new file mode 100644
index 00000000..ab8c32a0
--- /dev/null
+++ b/test/cases/11-opt-close_pum-1/tests/1-close_pum-1
@@ -0,0 +1,7 @@
+keys:
+
+
+expected:
+foo
+fop
+forloop
diff --git a/test/cases/11-opt-close_pum-1/vimrc b/test/cases/11-opt-close_pum-1/vimrc
new file mode 100644
index 00000000..49b4638e
--- /dev/null
+++ b/test/cases/11-opt-close_pum-1/vimrc
@@ -0,0 +1,2 @@
+so ./test/core_vimrc
+let g:xptemplate_close_pum = 1
diff --git a/test/cases/15-snip-cont/ftplugin/foo/foo.xpt.vim b/test/cases/15-snip-cont/ftplugin/foo/foo.xpt.vim
new file mode 100644
index 00000000..bd943d45
--- /dev/null
+++ b/test/cases/15-snip-cont/ftplugin/foo/foo.xpt.vim
@@ -0,0 +1,49 @@
+XPTemplate priority=lang
+
+let s:f = g:XPTfuncs()
+
+XPTinclude
+      \ _common/common
+
+
+XPT basic
+basic
+" comment
+
+" comment
+XPT in-mid-of-comment
+in-mid-of-comment
+" comment
+
+XPT comment-in-body
+" comment
+ " comment
+ " comment "
+comment-in-body
+" comment
+
+XPT comment-only
+" comment
+
+XPT comment-at-last
+" comment
+..XPT
+
+XPT xpt-tail
+\..XPT
+
+XPT xset-in-mid
+XSET x=x-def
+-`x^=
+
+XPT xset-at-end
+-`x^=
+XSET x=x-def
+
+XPT xset-2
+XSET y=y-def
+-`x^-`y^=
+XSET x=x-def
+
+XPT empty
+XPT empty2
diff --git a/test/cases/15-snip-cont/tests/0-basic b/test/cases/15-snip-cont/tests/0-basic
new file mode 100644
index 00000000..f7c350bf
--- /dev/null
+++ b/test/cases/15-snip-cont/tests/0-basic
@@ -0,0 +1,5 @@
+keys:
+basic
+
+expected:
+basic
diff --git a/test/cases/15-snip-cont/tests/1-comment b/test/cases/15-snip-cont/tests/1-comment
new file mode 100644
index 00000000..9e4d550e
--- /dev/null
+++ b/test/cases/15-snip-cont/tests/1-comment
@@ -0,0 +1,5 @@
+keys:
+in-mid-of-comment
+
+expected:
+in-mid-of-comment
diff --git a/test/cases/15-snip-cont/tests/2-comment-in-body b/test/cases/15-snip-cont/tests/2-comment-in-body
new file mode 100644
index 00000000..2b95241b
--- /dev/null
+++ b/test/cases/15-snip-cont/tests/2-comment-in-body
@@ -0,0 +1,9 @@
+keys:
+comment-in-body
+
+
+expected:
+" comment
+ " comment
+ " comment "
+comment-in-body
diff --git a/test/cases/15-snip-cont/tests/3-comment-only b/test/cases/15-snip-cont/tests/3-comment-only
new file mode 100644
index 00000000..00a0e05a
--- /dev/null
+++ b/test/cases/15-snip-cont/tests/3-comment-only
@@ -0,0 +1,5 @@
+keys:
+comment-only
+
+
+expected:
diff --git a/test/cases/15-snip-cont/tests/4-comment-at-last b/test/cases/15-snip-cont/tests/4-comment-at-last
new file mode 100644
index 00000000..e7b8c436
--- /dev/null
+++ b/test/cases/15-snip-cont/tests/4-comment-at-last
@@ -0,0 +1,5 @@
+keys:
+comment-at-last
+
+expected:
+" comment
diff --git a/test/cases/15-snip-cont/tests/5-empty b/test/cases/15-snip-cont/tests/5-empty
new file mode 100644
index 00000000..43915e95
--- /dev/null
+++ b/test/cases/15-snip-cont/tests/5-empty
@@ -0,0 +1,5 @@
+keys:
+empty
+empty2
+
+expected:
diff --git a/test/cases/15-snip-cont/tests/6-xpt-tail b/test/cases/15-snip-cont/tests/6-xpt-tail
new file mode 100644
index 00000000..b8804b84
--- /dev/null
+++ b/test/cases/15-snip-cont/tests/6-xpt-tail
@@ -0,0 +1,5 @@
+keys:
+xpt-tail
+
+expected:
+\..XPT
diff --git a/test/cases/15-snip-cont/tests/7-xset-in-mid b/test/cases/15-snip-cont/tests/7-xset-in-mid
new file mode 100644
index 00000000..f25582c7
--- /dev/null
+++ b/test/cases/15-snip-cont/tests/7-xset-in-mid
@@ -0,0 +1,5 @@
+keys:
+xset-in-mid
+
+expected:
+-x-def=
diff --git a/test/cases/15-snip-cont/tests/8-xset-at-end b/test/cases/15-snip-cont/tests/8-xset-at-end
new file mode 100644
index 00000000..ffc2ee81
--- /dev/null
+++ b/test/cases/15-snip-cont/tests/8-xset-at-end
@@ -0,0 +1,5 @@
+keys:
+xset-at-end
+
+expected:
+-x-def=
diff --git a/test/cases/15-snip-cont/tests/9-xset-2 b/test/cases/15-snip-cont/tests/9-xset-2
new file mode 100644
index 00000000..ae642b99
--- /dev/null
+++ b/test/cases/15-snip-cont/tests/9-xset-2
@@ -0,0 +1,5 @@
+keys:
+xset-2
+
+expected:
+-x-def-y-def=
diff --git a/test/cases/16-nav/ftplugin/foo/foo.xpt.vim b/test/cases/16-nav/ftplugin/foo/foo.xpt.vim
new file mode 100644
index 00000000..35830291
--- /dev/null
+++ b/test/cases/16-nav/ftplugin/foo/foo.xpt.vim
@@ -0,0 +1,10 @@
+XPTemplate priority=lang
+let s:f = g:XPTfuncs()
+XPTinclude
+      \ _common/common
+
+XPT phs
+`1^
+`2^
+`3^
+`4^-
diff --git a/test/cases/16-nav/tests/1-forthback b/test/cases/16-nav/tests/1-forthback
new file mode 100644
index 00000000..d9a98d55
--- /dev/null
+++ b/test/cases/16-nav/tests/1-forthback
@@ -0,0 +1,14 @@
+keys:
+phs
+forth,forth,forth,back	
+	
+	
+
+on_3
+
+
+expected:
+forth,forth,forth,back
+2
+on_3
+4-
diff --git a/test/cases/16-nav/tests/2-reedit b/test/cases/16-nav/tests/2-reedit
new file mode 100644
index 00000000..27fabd9d
--- /dev/null
+++ b/test/cases/16-nav/tests/2-reedit
@@ -0,0 +1,21 @@
+keys:
+phs
+forth,forth,forth,back	
+	
+	
+
+on_3
+
+on_2
+
+again_on_1	
+	
+	
+on_4	
+at_end
+
+expected:
+again_on_1
+on_2
+on_3
+on_4-at_end
diff --git a/test/cases/18-instant-value/ftplugin/foo/foo.xpt.vim b/test/cases/18-instant-value/ftplugin/foo/foo.xpt.vim
new file mode 100644
index 00000000..bd6d5575
--- /dev/null
+++ b/test/cases/18-instant-value/ftplugin/foo/foo.xpt.vim
@@ -0,0 +1,32 @@
+XPTemplate priority=lang
+let s:f = g:XPTfuncs()
+XPTinclude
+      \ _common/common
+
+fun! s:f.l()
+    return '(left)'
+endfunction
+
+fun! s:f.r()
+    return '(right)'
+endfunction
+
+fun! s:f.t()
+    return 'T'
+endfunction
+
+
+XPT one-ph
+-`t()^=
+
+XPT edge-only-is-not-instant
+-`l()`x`r()^=
+
+XPT with-edge-3func
+-`l()`t()`r()^=
+
+XPT not-confused
+-`x`t()x`r()^=
+
+XPT action
+-`(text)`Echo("ok")^=
diff --git a/test/cases/18-instant-value/tests/1-one-ph b/test/cases/18-instant-value/tests/1-one-ph
new file mode 100644
index 00000000..c2c8c4eb
--- /dev/null
+++ b/test/cases/18-instant-value/tests/1-one-ph
@@ -0,0 +1,5 @@
+keys:
+one-ph
+
+expected:
+-T=
diff --git a/test/cases/18-instant-value/tests/2-edge-only b/test/cases/18-instant-value/tests/2-edge-only
new file mode 100644
index 00000000..45da0f11
--- /dev/null
+++ b/test/cases/18-instant-value/tests/2-edge-only
@@ -0,0 +1,11 @@
+keys:
+edge-only-is-not-instant
+on_x	
+at_end
+
+edge-only-is-not-instant
+
+
+expected:
+-(left)on_x(right)=at_end
+-(left)x(right)=
diff --git a/test/cases/18-instant-value/tests/3-with-edge b/test/cases/18-instant-value/tests/3-with-edge
new file mode 100644
index 00000000..cb435fb6
--- /dev/null
+++ b/test/cases/18-instant-value/tests/3-with-edge
@@ -0,0 +1,6 @@
+keys:
+with-edge-3func
+at_end
+
+expected:
+-(left)T(right)=at_end
diff --git a/test/cases/18-instant-value/tests/4-separated b/test/cases/18-instant-value/tests/4-separated
new file mode 100644
index 00000000..c380cfb3
--- /dev/null
+++ b/test/cases/18-instant-value/tests/4-separated
@@ -0,0 +1,6 @@
+keys:
+not-confused
+at_end
+
+expected:
+-xTx(right)=at_end
diff --git a/test/cases/18-instant-value/tests/5-action b/test/cases/18-instant-value/tests/5-action
new file mode 100644
index 00000000..4a0d2947
--- /dev/null
+++ b/test/cases/18-instant-value/tests/5-action
@@ -0,0 +1,6 @@
+keys:
+action
+at_end
+
+expected:
+-(text)ok=at_end
diff --git a/test/cases/19-xset/ftplugin/foo/foo.xpt.vim b/test/cases/19-xset/ftplugin/foo/foo.xpt.vim
new file mode 100644
index 00000000..71ed67a7
--- /dev/null
+++ b/test/cases/19-xset/ftplugin/foo/foo.xpt.vim
@@ -0,0 +1,32 @@
+XPTemplate priority=lang
+
+let s:f = g:XPTfuncs()
+
+XPTinclude
+      \ _common/common
+
+XPT pre-basic
+XSET x|pre=a
+XSET y|pre=b
+-`x^-`y^=
+
+XPT pre-and-def
+XSET x|pre=x-pre
+XSET y|pre=y-pre
+XSET y=y-def
+-`x^-`y^=
+
+XPT def
+XSET x=x-def
+-`x^=
+
+XPT def-as-pre
+XSET x|def=x-def
+XSET y|def=y-def
+XSET y|pre=y-pre
+-`x^-`y^=
+
+XPT pre-use-def
+XSET y|def=y-def
+-`x^-`y^=
+
diff --git a/test/cases/19-xset/tests/1-def-selected b/test/cases/19-xset/tests/1-def-selected
new file mode 100644
index 00000000..ae7fff2b
--- /dev/null
+++ b/test/cases/19-xset/tests/1-def-selected
@@ -0,0 +1,12 @@
+keys:
+def
+	
+at_end
+
+def
+at_x	
+at_end
+
+expected:
+-x-def=at_end
+-at_x=at_end
diff --git a/test/cases/19-xset/tests/1-pre-and-def b/test/cases/19-xset/tests/1-pre-and-def
new file mode 100644
index 00000000..0cf4d5cd
--- /dev/null
+++ b/test/cases/19-xset/tests/1-pre-and-def
@@ -0,0 +1,7 @@
+keys:
+pre-and-def
+on_x	
+
+
+expected:
+-on_x-y-def=
diff --git a/test/cases/19-xset/tests/1-pre-basic b/test/cases/19-xset/tests/1-pre-basic
new file mode 100644
index 00000000..40407491
--- /dev/null
+++ b/test/cases/19-xset/tests/1-pre-basic
@@ -0,0 +1,6 @@
+keys:
+pre-basic
+
+expected:
+-a-b=
+
diff --git a/test/cases/19-xset/tests/2-def-as-pre b/test/cases/19-xset/tests/2-def-as-pre
new file mode 100644
index 00000000..f79d14b2
--- /dev/null
+++ b/test/cases/19-xset/tests/2-def-as-pre
@@ -0,0 +1,5 @@
+keys:
+def-as-pre
+
+expected:
+-x-def-y-pre=
diff --git a/test/cases/19-xset/tests/3-def-replace-pre b/test/cases/19-xset/tests/3-def-replace-pre
new file mode 100644
index 00000000..11c7061c
--- /dev/null
+++ b/test/cases/19-xset/tests/3-def-replace-pre
@@ -0,0 +1,8 @@
+keys:
+def-as-pre
+	
+	
+at_end
+
+expected:
+-x-def-y-def=at_end
diff --git a/test/cases/19-xset/tests/4-pre-use-def b/test/cases/19-xset/tests/4-pre-use-def
new file mode 100644
index 00000000..4f602d8b
--- /dev/null
+++ b/test/cases/19-xset/tests/4-pre-use-def
@@ -0,0 +1,5 @@
+keys:
+pre-use-def
+
+expected:
+-x-y-def=
diff --git a/test/cases/20-snip-indent/ftplugin/foo/foo.xpt.vim b/test/cases/20-snip-indent/ftplugin/foo/foo.xpt.vim
new file mode 100644
index 00000000..77ac8589
--- /dev/null
+++ b/test/cases/20-snip-indent/ftplugin/foo/foo.xpt.vim
@@ -0,0 +1,99 @@
+XPTemplate priority=lang
+
+let s:f = g:XPTfuncs()
+
+XPTinclude
+      \ _common/common
+
+XPT snip-indent
+line1
+    1-indent
+     1-indent-and-1-space
+          2-indent-and-2-space
+
+XPT 5-spaces
+line1
+     line2
+
+XPT 1-tab-1-space
+line1
+	 line2
+
+XPT xsetm
+XSETm ph
+ph-line-1
+    ph-line-2
+XSETm END
+line1
+    `ph^
+
+XPT xset
+XSET ph=ph-line-1\n    ph-line-2
+line1
+    `ph^
+
+XPT xset-2tab-indent
+XSET ph=ph-line-1\n		ph-line-2
+line1
+    `ph^
+
+XPT xset-action-echo
+XSET ph=Echo("ph-line-1\n    ph-line-2")
+line1
+    `ph^
+
+XPT xset-action-build
+XSET ph=Build("ph-line-1\n    ph-line-2")
+line1
+    `ph^
+
+XPT xset-post
+XSET ph|post=line-1\n    line-2
+line1
+    `ph^
+        `ph^
+
+XPT xsetm-post
+XSETm ph|post
+line-1
+    line-2
+XSETm END
+line1
+    `ph^
+        `ph^
+
+XPT xsetm-post-build
+XSETm ph|post
+`ph1^
+    `ph2^
+XSETm END
+line1
+    `ph^
+
+XPT xset-post-build
+XSET ph|post=`ph1^\n    `ph2^
+line1
+    `ph^
+
+XPT xset-reset-indent-backward-4
+XSET ph=ResetIndent(-4,"ph-line-1\n    ph-line-2")
+line1-`ph^
+
+XPT instant-1-indent
+line1`Echo("\n    ")^line2
+
+XPT instant-reset-indent-backward-4
+line1-`ResetIndent(-4,"ph-line-1\nph-line-2")^
+
+XPT instant-reset-indent-backward-4-edge
+line1-`edge-`ResetIndent(-4,"ph-line-1\nph-line-2")`-edge^
+
+XPT indent-in-edge-instant
+    -`
+    `Echo("line-1\n     line-2")`
+    (right)^=
+
+XPT tab-in-edge-instant
+    -`
+	`Echo("line-1\n	line-2")`
+    (right)^=
diff --git a/test/cases/20-snip-indent/tests/0-2tab-indent-action-with-rawtab b/test/cases/20-snip-indent/tests/0-2tab-indent-action-with-rawtab
new file mode 100644
index 00000000..e886f4f1
--- /dev/null
+++ b/test/cases/20-snip-indent/tests/0-2tab-indent-action-with-rawtab
@@ -0,0 +1,14 @@
+vim: tabstop=2 shiftwidth=4
+
+setting:
+noexpandtab
+shiftwidth=4
+tabstop=2
+
+keys:
+xset-2tab-indent
+
+expected:
+line1
+		ph-line-1
+						ph-line-2
diff --git a/test/cases/20-snip-indent/tests/0-snip-indent-noexpand b/test/cases/20-snip-indent/tests/0-snip-indent-noexpand
new file mode 100644
index 00000000..560ebf30
--- /dev/null
+++ b/test/cases/20-snip-indent/tests/0-snip-indent-noexpand
@@ -0,0 +1,13 @@
+setting:
+noexpandtab
+shiftwidth=4
+tabstop=8
+
+keys:
+snip-indent
+
+expected:
+line1
+    1-indent
+     1-indent-and-1-space
+	  2-indent-and-2-space
diff --git a/test/cases/20-snip-indent/tests/1-snip-indent-expand b/test/cases/20-snip-indent/tests/1-snip-indent-expand
new file mode 100644
index 00000000..ea2f9389
--- /dev/null
+++ b/test/cases/20-snip-indent/tests/1-snip-indent-expand
@@ -0,0 +1,20 @@
+setting:
+expandtab
+shiftwidth=4
+tabstop=8
+
+keys:
+snip-indent
+
+	snip-indent
+
+
+expected:
+line1
+    1-indent
+     1-indent-and-1-space
+          2-indent-and-2-space
+        line1
+            1-indent
+             1-indent-and-1-space
+                  2-indent-and-2-space
diff --git a/test/cases/20-snip-indent/tests/2-space-indent-local b/test/cases/20-snip-indent/tests/2-space-indent-local
new file mode 100644
index 00000000..faf54adf
--- /dev/null
+++ b/test/cases/20-snip-indent/tests/2-space-indent-local
@@ -0,0 +1,15 @@
+setting:
+expandtab
+shiftwidth=8
+
+localsetting:
+shiftwidth=2
+
+keys:
+snip-indent
+
+expected:
+line1
+  1-indent
+   1-indent-and-1-space
+      2-indent-and-2-space
diff --git a/test/cases/20-snip-indent/tests/3-literal-tab-expandtab b/test/cases/20-snip-indent/tests/3-literal-tab-expandtab
new file mode 100644
index 00000000..8c2309da
--- /dev/null
+++ b/test/cases/20-snip-indent/tests/3-literal-tab-expandtab
@@ -0,0 +1,10 @@
+setting:
+expandtab
+shiftwidth=8
+
+keys:
+1-tab-1-space
+
+expected:
+line1
+         line2
diff --git a/test/cases/20-snip-indent/tests/3-literal-tab-noexpandtab b/test/cases/20-snip-indent/tests/3-literal-tab-noexpandtab
new file mode 100644
index 00000000..30b63ac1
--- /dev/null
+++ b/test/cases/20-snip-indent/tests/3-literal-tab-noexpandtab
@@ -0,0 +1,10 @@
+setting:
+noexpandtab
+shiftwidth=8
+
+keys:
+1-tab-1-space
+
+expected:
+line1
+	 line2
diff --git a/test/cases/20-snip-indent/tests/4-live-shiftwidth b/test/cases/20-snip-indent/tests/4-live-shiftwidth
new file mode 100644
index 00000000..42db7d78
--- /dev/null
+++ b/test/cases/20-snip-indent/tests/4-live-shiftwidth
@@ -0,0 +1,19 @@
+setting:
+expandtab
+shiftwidth=8
+
+localsetting:
+shiftwidth=2
+
+keys:
+5-spaces
+
+:setlocal shiftwidth=4
+5-spaces
+
+
+expected:
+line1
+   line2
+line1
+     line2
diff --git a/test/cases/20-snip-indent/tests/5-instant-value b/test/cases/20-snip-indent/tests/5-instant-value
new file mode 100644
index 00000000..38b84d3d
--- /dev/null
+++ b/test/cases/20-snip-indent/tests/5-instant-value
@@ -0,0 +1,30 @@
+vim: ts=4
+
+setting:
+noexpandtab
+sw=8
+ts=4
+
+
+keys:
+instant-1-indent
+
+    instant-1-indent
+
+        instant-reset-indent-backward-4
+
+instant-reset-indent-backward-4
+
+        instant-reset-indent-backward-4-edge
+
+expected:
+line1
+		line2
+    line1
+			line2
+        line1-ph-line-1
+	ph-line-2
+line1-ph-line-1
+ph-line-2
+        line1-edge-ph-line-1
+	ph-line-2-edge
diff --git a/test/cases/20-snip-indent/tests/6-indent-in-edge b/test/cases/20-snip-indent/tests/6-indent-in-edge
new file mode 100644
index 00000000..469c5ae0
--- /dev/null
+++ b/test/cases/20-snip-indent/tests/6-indent-in-edge
@@ -0,0 +1,9 @@
+keys:
+indent-in-edge-instant
+at_end
+
+expected:
+	-
+	line-1
+		 line-2
+	(right)=at_end
diff --git a/test/cases/20-snip-indent/tests/6-indent-in-edge-expandtab b/test/cases/20-snip-indent/tests/6-indent-in-edge-expandtab
new file mode 100644
index 00000000..e99eb922
--- /dev/null
+++ b/test/cases/20-snip-indent/tests/6-indent-in-edge-expandtab
@@ -0,0 +1,15 @@
+vim: ts=4
+
+setting:
+expandtab
+shiftwidth=2
+
+keys:
+indent-in-edge-instant
+at_end
+
+expected:
+  -
+  line-1
+     line-2
+  (right)=at_end
diff --git a/test/cases/20-snip-indent/tests/7-tab-in-edge b/test/cases/20-snip-indent/tests/7-tab-in-edge
new file mode 100644
index 00000000..1966d44a
--- /dev/null
+++ b/test/cases/20-snip-indent/tests/7-tab-in-edge
@@ -0,0 +1,15 @@
+vim: ts=4
+
+setting:
+expandtab
+shiftwidth=2
+
+keys:
+tab-in-edge-instant
+at_end
+
+expected:
+  -
+  line-1
+    line-2
+  (right)=at_end
diff --git a/test/cases/20-snip-indent/tests/9-xset-default-value-expand b/test/cases/20-snip-indent/tests/9-xset-default-value-expand
new file mode 100644
index 00000000..336ee183
--- /dev/null
+++ b/test/cases/20-snip-indent/tests/9-xset-default-value-expand
@@ -0,0 +1,38 @@
+setting:
+expandtab
+shiftwidth=8
+
+localsetting:
+shiftwidth=2
+
+keys:
+xset
+
+A
+
+:setlocal shiftwidth=4
+xset
+
+A
+
+xset-action-echo
+
+A
+
+    xset-action-build
+
+A
+
+expected:
+line1
+  ph-line-1
+    ph-line-2
+line1
+    ph-line-1
+        ph-line-2
+line1
+    ph-line-1
+        ph-line-2
+    line1
+        ph-line-1
+            ph-line-2
diff --git a/test/cases/20-snip-indent/tests/9-xset-post-noexpandtab b/test/cases/20-snip-indent/tests/9-xset-post-noexpandtab
new file mode 100644
index 00000000..ad4b392f
--- /dev/null
+++ b/test/cases/20-snip-indent/tests/9-xset-post-noexpandtab
@@ -0,0 +1,28 @@
+vim: ts=4 noexpandtab sw=2
+
+setting:
+noexpandtab
+shiftwidth=8
+ts=4
+
+localsetting:
+shiftwidth=2
+
+keys:
+xset-post
+should_not_be_seen	
+
+xset-post-build
+should_not_be_seen	
+on_ph1	
+on_ph2
+
+expected:
+line1
+  line-1
+	line-2
+	line-1
+	  line-2
+line1
+  on_ph1
+	on_ph2
diff --git a/test/cases/20-snip-indent/tests/9-xsetm-indent-convert b/test/cases/20-snip-indent/tests/9-xsetm-indent-convert
new file mode 100644
index 00000000..d45b14fd
--- /dev/null
+++ b/test/cases/20-snip-indent/tests/9-xsetm-indent-convert
@@ -0,0 +1,24 @@
+setting:
+expandtab
+shiftwidth=8
+
+localsetting:
+shiftwidth=2
+
+keys:
+xsetm
+
+A
+
+:setlocal shiftwidth=4
+xsetm
+
+A
+
+expected:
+line1
+  ph-line-1
+    ph-line-2
+line1
+    ph-line-1
+        ph-line-2
diff --git a/test/cases/20-snip-indent/tests/9-xsetm-post-noexpandtab b/test/cases/20-snip-indent/tests/9-xsetm-post-noexpandtab
new file mode 100644
index 00000000..7efcb157
--- /dev/null
+++ b/test/cases/20-snip-indent/tests/9-xsetm-post-noexpandtab
@@ -0,0 +1,28 @@
+vim: ts=4 noexpandtab sw=2
+
+setting:
+noexpandtab
+shiftwidth=8
+ts=4
+
+localsetting:
+shiftwidth=2
+
+keys:
+xsetm-post
+should_not_be_seen	
+
+xsetm-post-build
+should_not_be_seen	
+on_ph1	
+on_ph2
+
+expected:
+line1
+  line-1
+	line-2
+	line-1
+	  line-2
+line1
+  on_ph1
+	on_ph2
diff --git a/plugin/FiletypeScope.class.vim b/test/cases/20-snip-indent/tests/todo-test-indentkeys
similarity index 100%
rename from plugin/FiletypeScope.class.vim
rename to test/cases/20-snip-indent/tests/todo-test-indentkeys
diff --git a/test/cases/21-xset-ComeFirst/ftplugin/foo/foo.xpt.vim b/test/cases/21-xset-ComeFirst/ftplugin/foo/foo.xpt.vim
new file mode 100644
index 00000000..eabc585c
--- /dev/null
+++ b/test/cases/21-xset-ComeFirst/ftplugin/foo/foo.xpt.vim
@@ -0,0 +1,27 @@
+XPTemplate priority=lang
+
+let s:f = g:XPTfuncs()
+
+XPTinclude
+      \ _common/common
+
+XPT come
+XSET ComeFirst=y x
+XSET ComeLast=v u
+-`x^-`y^-`u^-`v^=
+
+XPT container
+XSET ComeFirst=y x
+XSET ComeLast=v u
+XSET inc|post=BuildSnippet("sub")
+-`x^-`inc^-`y^-`u^-`v^=
+
+XPT def-container
+XSET ComeFirst=y x
+XSET ComeLast=v u
+XSET inc=BuildSnippet("sub")
+-`x^-`inc^-`y^-`u^-`v^=
+
+XPT sub
+XSET ComeFirst=b a
+(-`a^-`b^=)
diff --git a/test/cases/21-xset-ComeFirst/tests/1-come b/test/cases/21-xset-ComeFirst/tests/1-come
new file mode 100644
index 00000000..de701234
--- /dev/null
+++ b/test/cases/21-xset-ComeFirst/tests/1-come
@@ -0,0 +1,10 @@
+keys:
+come
+first	
+second	
+third	
+forth	
+at_end
+
+expected:
+-second-first-forth-third=at_end
diff --git a/test/cases/21-xset-ComeFirst/tests/2-buildsnippet b/test/cases/21-xset-ComeFirst/tests/2-buildsnippet
new file mode 100644
index 00000000..20895bb0
--- /dev/null
+++ b/test/cases/21-xset-ComeFirst/tests/2-buildsnippet
@@ -0,0 +1,13 @@
+keys:
+container
+first	
+second	
+not_seen	
+on_b	
+on_a	
+third	
+forth	
+at_end
+
+expected:
+-second-(-on_a-on_b=)-first-forth-third=at_end
diff --git a/test/cases/21-xset-ComeFirst/tests/3-def-buildsnippet b/test/cases/21-xset-ComeFirst/tests/3-def-buildsnippet
new file mode 100644
index 00000000..452c5da5
--- /dev/null
+++ b/test/cases/21-xset-ComeFirst/tests/3-def-buildsnippet
@@ -0,0 +1,12 @@
+keys:
+def-container
+first	
+second	
+on_b	
+on_a	
+third	
+forth	
+at_end
+
+expected:
+-second-(-on_a-on_b=)-first-forth-third=at_end
diff --git a/test/cases/21-xset-map/ftplugin/foo/foo.xpt.vim b/test/cases/21-xset-map/ftplugin/foo/foo.xpt.vim
new file mode 100644
index 00000000..17600388
--- /dev/null
+++ b/test/cases/21-xset-map/ftplugin/foo/foo.xpt.vim
@@ -0,0 +1,15 @@
+XPTemplate priority=lang
+
+let s:f = g:XPTfuncs()
+
+XPTinclude
+      \ _common/common
+
+XPT maps
+XSET x|map=[ .br.
+XSET y|map=( Echo('y_build')
+XSET z|map=- Next()
+-`x^-`y^-`z^-`w^=
+
+XPT foo
+-`x^=
diff --git a/test/cases/21-xset-map/script-mapping.vim b/test/cases/21-xset-map/script-mapping.vim
new file mode 100644
index 00000000..c94b365b
--- /dev/null
+++ b/test/cases/21-xset-map/script-mapping.vim
@@ -0,0 +1,5 @@
+so ./test/core_vimrc
+
+inoremap <SID>(s) (S)
+inoremap qqq QQQ
+inoremap <buffer><script><CR> <SID>(s)qqq<CR>
diff --git a/test/cases/21-xset-map/tests/1-basic-map b/test/cases/21-xset-map/tests/1-basic-map
new file mode 100644
index 00000000..78052067
--- /dev/null
+++ b/test/cases/21-xset-map/tests/1-basic-map
@@ -0,0 +1,10 @@
+keys:
+maps
+on_x[on_x2	
+(	
+on_z-
+on_w	
+at_end
+
+expected:
+-on_x.br.on_x2-y_build-on_z-on_w=at_end
diff --git a/test/cases/21-xset-map/tests/1-restore-xset-map b/test/cases/21-xset-map/tests/1-restore-xset-map
new file mode 100644
index 00000000..b77da3d5
--- /dev/null
+++ b/test/cases/21-xset-map/tests/1-restore-xset-map
@@ -0,0 +1,16 @@
+map:
+inoremap <buffer>[ (br)
+
+keys:
+maps
+on_x[	
+	
+	
+	
+at_end
+[
+
+expected:
+-on_x.br.-y-z-w=at_end
+(br)
+
diff --git a/test/cases/21-xset-map/tests/2-buffer-map-restore b/test/cases/21-xset-map/tests/2-buffer-map-restore
new file mode 100644
index 00000000..5ef0bfae
--- /dev/null
+++ b/test/cases/21-xset-map/tests/2-buffer-map-restore
@@ -0,0 +1,17 @@
+map:
+inoremap <buffer><CR> (mapped)<CR>
+
+keys:
+foo
+on_x_1
+
+on_x_2	
+at_end
+
+last_line
+
+
+expected:
+-on_x_1
+on_x_2=at_end(mapped)
+last_line
diff --git a/test/cases/21-xset-map/tests/3-global-map-no-override b/test/cases/21-xset-map/tests/3-global-map-no-override
new file mode 100644
index 00000000..5838c9e7
--- /dev/null
+++ b/test/cases/21-xset-map/tests/3-global-map-no-override
@@ -0,0 +1,17 @@
+map:
+inoremap <CR> (mapped)<CR>
+
+keys:
+foo
+on_x_1
+
+on_x_2	
+at_end
+
+last_line
+
+
+expected:
+-on_x_1
+on_x_2=at_end(mapped)
+last_line
diff --git a/test/cases/21-xset-map/tests/4-script-local-map-restore b/test/cases/21-xset-map/tests/4-script-local-map-restore
new file mode 100644
index 00000000..90c3a7a7
--- /dev/null
+++ b/test/cases/21-xset-map/tests/4-script-local-map-restore
@@ -0,0 +1,17 @@
+
+keys:
+:so ./test/cases/21-xset-map/script-mapping.vim
+foo
+on_x_1
+
+on_x_2	
+at_end
+
+last_line
+
+
+expected:
+-on_x_1
+on_x_2=at_end(S)qqq
+last_line
+
diff --git a/test/cases/21-xset-pre/ftplugin/foo/foo.xpt.vim b/test/cases/21-xset-pre/ftplugin/foo/foo.xpt.vim
new file mode 100644
index 00000000..d841b37e
--- /dev/null
+++ b/test/cases/21-xset-pre/ftplugin/foo/foo.xpt.vim
@@ -0,0 +1,13 @@
+XPTemplate priority=lang
+let s:f = g:XPTfuncs()
+XPTinclude
+      \ _common/common
+
+XPT pre-indent
+XSET x|pre=BuildSnippet("sub")
+-`what^-`x^=
+
+XPT sub
+    l1-1-indent
+l2-0-indent
+        l3-2-indent(`ph_in_sub_snippet_is_not_built^)
diff --git a/test/cases/21-xset-pre/tests/1-not-built b/test/cases/21-xset-pre/tests/1-not-built
new file mode 100644
index 00000000..f1d7b906
--- /dev/null
+++ b/test/cases/21-xset-pre/tests/1-not-built
@@ -0,0 +1,11 @@
+setting:
+expandtab
+shiftwidth=4
+
+keys:
+    pre-indent
+
+expected:
+    -what-    l1-1-indent
+    l2-0-indent
+            l3-2-indent(`ph_in_sub_snippet_is_not_built^)=
diff --git a/test/cases/21-xset-pre/tests/2-indent b/test/cases/21-xset-pre/tests/2-indent
new file mode 100644
index 00000000..a4216614
--- /dev/null
+++ b/test/cases/21-xset-pre/tests/2-indent
@@ -0,0 +1,12 @@
+setting:
+noexpandtab
+shiftwidth=2
+tabstop=4
+
+keys:
+  pre-indent
+
+expected:
+  -what-  l1-1-indent
+  l2-0-indent
+	  l3-2-indent(`ph_in_sub_snippet_is_not_built^)=
diff --git a/test/cases/21-xset-pre/tests/3-selectable b/test/cases/21-xset-pre/tests/3-selectable
new file mode 100644
index 00000000..88d2efe5
--- /dev/null
+++ b/test/cases/21-xset-pre/tests/3-selectable
@@ -0,0 +1,13 @@
+setting:
+noexpandtab
+shiftwidth=2
+tabstop=4
+
+keys:
+  pre-indent
+on_what	
+on_x	
+at_end
+
+expected:
+  -on_what-on_x=at_end
diff --git a/test/cases/30-var/ftplugin/foo/foo.xpt.vim b/test/cases/30-var/ftplugin/foo/foo.xpt.vim
new file mode 100644
index 00000000..ecbfd770
--- /dev/null
+++ b/test/cases/30-var/ftplugin/foo/foo.xpt.vim
@@ -0,0 +1,37 @@
+XPTemplate priority=lang
+
+let s:f = g:XPTfuncs()
+
+XPTinclude
+      \ _common/common
+
+XPTvar $FOO var-foo
+XPTvar $BAR_QUOTE 'var-bar'
+
+" variable in simple place holder is evaluated instantly and is converted to
+" literal text.
+XPT var-x
+XSET $x=var-x
+-before-`$x^-after-
+
+" var in complete place holder is evaluated but place holder is not removed.
+XPT var-x-edge
+XSET $x=var-x-edge
+-before-`=left=`$x`=right=^-after-
+
+XPT var-x-alias alias=var-x
+XSET $x=alias
+
+XPT var-foo
+`$FOO^
+
+XPT var-bar-quote
+`$BAR_QUOTE^
+
+XPT var-as-linebreak
+XSET $lb=\n
+line1`$lb^line2
+
+XPT edge-break
+XSET $lb=\n
+line1`$lb`x^line2
diff --git a/test/cases/30-var/tests/edge-break b/test/cases/30-var/tests/edge-break
new file mode 100644
index 00000000..db51aa16
--- /dev/null
+++ b/test/cases/30-var/tests/edge-break
@@ -0,0 +1,8 @@
+keys:
+    edge-break
+on_ph	
+at_end
+
+expected:
+    line1
+    on_phline2at_end
diff --git a/test/cases/30-var/tests/leader-is-a-var b/test/cases/30-var/tests/leader-is-a-var
new file mode 100644
index 00000000..dd0130e1
--- /dev/null
+++ b/test/cases/30-var/tests/leader-is-a-var
@@ -0,0 +1,6 @@
+keys:
+var-x-edge
+at_end
+
+expected:
+-before-=left=var-x-edge=right=-after-at_end
diff --git a/test/cases/30-var/tests/ph-is-a-var b/test/cases/30-var/tests/ph-is-a-var
new file mode 100644
index 00000000..a51f18cb
--- /dev/null
+++ b/test/cases/30-var/tests/ph-is-a-var
@@ -0,0 +1,6 @@
+keys:
+var-x
+at_end
+
+expected:
+-before-var-x-after-at_end
diff --git a/test/cases/30-var/tests/snip-file-scope-var b/test/cases/30-var/tests/snip-file-scope-var
new file mode 100644
index 00000000..18f8124a
--- /dev/null
+++ b/test/cases/30-var/tests/snip-file-scope-var
@@ -0,0 +1,8 @@
+keys:
+var-foo
+
+var-bar-quote
+
+expected:
+var-foo
+var-bar
diff --git a/test/cases/30-var/tests/var-as-linebreak b/test/cases/30-var/tests/var-as-linebreak
new file mode 100644
index 00000000..15a6b7c4
--- /dev/null
+++ b/test/cases/30-var/tests/var-as-linebreak
@@ -0,0 +1,6 @@
+keys:
+    var-as-linebreak
+
+expected:
+    line1
+    line2
diff --git a/test/cases/30-var/tests/var-overriding-in-alias b/test/cases/30-var/tests/var-overriding-in-alias
new file mode 100644
index 00000000..625f82df
--- /dev/null
+++ b/test/cases/30-var/tests/var-overriding-in-alias
@@ -0,0 +1,5 @@
+keys:
+var-x-alias
+
+expected:
+-before-alias-after-
diff --git a/test/cases/31-cursor/ftplugin/foo/foo.xpt.vim b/test/cases/31-cursor/ftplugin/foo/foo.xpt.vim
new file mode 100644
index 00000000..82aa08bc
--- /dev/null
+++ b/test/cases/31-cursor/ftplugin/foo/foo.xpt.vim
@@ -0,0 +1,7 @@
+XPTemplate priority=lang
+
+XPTinclude
+      \ _common/common
+
+XPT cursor
+-`x^-`cursor^=
diff --git a/test/cases/31-cursor/tests/1-cursor-in-mid b/test/cases/31-cursor/tests/1-cursor-in-mid
new file mode 100644
index 00000000..99de140e
--- /dev/null
+++ b/test/cases/31-cursor/tests/1-cursor-in-mid
@@ -0,0 +1,7 @@
+keys:
+cursor
+on_x	
+
+
+expected:
+-on_x-=
diff --git a/test/cases/31-cursor/tests/2-type-on-cursor b/test/cases/31-cursor/tests/2-type-on-cursor
new file mode 100644
index 00000000..31b8786d
--- /dev/null
+++ b/test/cases/31-cursor/tests/2-type-on-cursor
@@ -0,0 +1,7 @@
+keys:
+cursor
+on_x	
+on_cursor
+
+expected:
+-on_x-on_cursor=
diff --git a/test/cases/40-snip-include/ftplugin/foo/foo.xpt.vim b/test/cases/40-snip-include/ftplugin/foo/foo.xpt.vim
new file mode 100644
index 00000000..fa29abe4
--- /dev/null
+++ b/test/cases/40-snip-include/ftplugin/foo/foo.xpt.vim
@@ -0,0 +1,39 @@
+XPTemplate priority=lang
+
+let s:f = g:XPTfuncs()
+
+XPTinclude
+      \ _common/common
+
+XPT _included
+-`x^=
+    `y^=
+    `cursor^=
+
+XPT including
+-`:_included:^=
+
+XPT inc-cursor
+-`Include:_included^=
+
+XPT inc-set-def
+XSET y=y-def
+-`:_included:^=
+
+
+XPT _inc-y
+XSET y=y-included
+-`y^=
+
+XPT inc-override-def
+XSET y=y-def
+-`:_inc-y:^=
+
+XPT inc-inherit-def
+-`:_inc-y:^=
+
+XPT _inc-x
+-`x^=
+
+XPT inc-param
+-`Include:_inc-x({"x":"x-2"})^=
diff --git a/test/cases/40-snip-include/setting.vim b/test/cases/40-snip-include/setting.vim
new file mode 100644
index 00000000..ab0fc460
--- /dev/null
+++ b/test/cases/40-snip-include/setting.vim
@@ -0,0 +1,3 @@
+set expandtab
+set tabstop=4
+set shiftwidth=4
diff --git a/test/cases/40-snip-include/tests/1-without-curosr b/test/cases/40-snip-include/tests/1-without-curosr
new file mode 100644
index 00000000..8b34ac61
--- /dev/null
+++ b/test/cases/40-snip-include/tests/1-without-curosr
@@ -0,0 +1,7 @@
+keys:
+including
+
+expected:
+--x=
+    y=
+    ==
diff --git a/test/cases/40-snip-include/tests/2-with-corsor b/test/cases/40-snip-include/tests/2-with-corsor
new file mode 100644
index 00000000..d5f3290b
--- /dev/null
+++ b/test/cases/40-snip-include/tests/2-with-corsor
@@ -0,0 +1,7 @@
+keys:
+inc-cursor
+
+expected:
+--x=
+    y=
+    CURSOR==
diff --git a/test/cases/40-snip-include/tests/3-set-def b/test/cases/40-snip-include/tests/3-set-def
new file mode 100644
index 00000000..f556e4ce
--- /dev/null
+++ b/test/cases/40-snip-include/tests/3-set-def
@@ -0,0 +1,8 @@
+keys:
+inc-set-def
+
+
+expected:
+--x=
+    y-def=
+    ==
diff --git a/test/cases/40-snip-include/tests/4-override-def b/test/cases/40-snip-include/tests/4-override-def
new file mode 100644
index 00000000..61fd61e9
--- /dev/null
+++ b/test/cases/40-snip-include/tests/4-override-def
@@ -0,0 +1,5 @@
+keys:
+inc-override-def
+
+expected:
+--y-def==
diff --git a/test/cases/40-snip-include/tests/5-inherit-def b/test/cases/40-snip-include/tests/5-inherit-def
new file mode 100644
index 00000000..21d7bd26
--- /dev/null
+++ b/test/cases/40-snip-include/tests/5-inherit-def
@@ -0,0 +1,6 @@
+keys:
+inc-inherit-def
+
+
+expected:
+--y-included==
diff --git a/test/cases/40-snip-include/tests/6-param b/test/cases/40-snip-include/tests/6-param
new file mode 100644
index 00000000..a5d60c6d
--- /dev/null
+++ b/test/cases/40-snip-include/tests/6-param
@@ -0,0 +1,12 @@
+keys:
+inc-param
+	
+at_end
+
+inc-param
+at_x	
+at_end
+
+expected:
+--x-2==at_end
+--at_x==at_end
diff --git a/test/cases/41-action/ftplugin/foo/foo.xpt.vim b/test/cases/41-action/ftplugin/foo/foo.xpt.vim
new file mode 100644
index 00000000..a44d99b8
--- /dev/null
+++ b/test/cases/41-action/ftplugin/foo/foo.xpt.vim
@@ -0,0 +1,29 @@
+XPTemplate priority=lang
+
+let s:f = g:XPTfuncs()
+
+XPTinclude
+      \ _common/common
+
+fun! s:f.no_text()
+    return { 'action': 'text' }
+endfunction
+
+fun! s:f.set_text(text)
+    return { 'action': 'text', 'text':a:text }
+endfunction
+
+XPT def
+XSET x|def=no_text()
+XSET y|def=no_text()
+-`x^-`y^=
+
+XPT def-set
+XSET x|def=set_text('x2')
+XSET y|def=set_text('y2')
+-`x^-`y^=
+
+XPT post
+XSET x|post=no_text()
+XSET y|post=no_text()
+-`x^-`y^=
diff --git a/test/cases/41-action/tests/1-def-nochange b/test/cases/41-action/tests/1-def-nochange
new file mode 100644
index 00000000..72cc3b2f
--- /dev/null
+++ b/test/cases/41-action/tests/1-def-nochange
@@ -0,0 +1,5 @@
+keys:
+def
+
+expected:
+-x-y=
diff --git a/test/cases/41-action/tests/2-def-apply-text b/test/cases/41-action/tests/2-def-apply-text
new file mode 100644
index 00000000..0e8eda98
--- /dev/null
+++ b/test/cases/41-action/tests/2-def-apply-text
@@ -0,0 +1,6 @@
+keys:
+def-set
+
+
+expected:
+-x2-y2=
diff --git a/test/cases/41-action/tests/3-post-nochange b/test/cases/41-action/tests/3-post-nochange
new file mode 100644
index 00000000..a802d083
--- /dev/null
+++ b/test/cases/41-action/tests/3-post-nochange
@@ -0,0 +1,8 @@
+keys:
+post
+on_x	
+on_y	
+at_end
+
+expected:
+-on_x-on_y=at_end
diff --git a/test/cases/42-wrap/ftplugin/foo/foo.xpt.vim b/test/cases/42-wrap/ftplugin/foo/foo.xpt.vim
new file mode 100644
index 00000000..dee3f0db
--- /dev/null
+++ b/test/cases/42-wrap/ftplugin/foo/foo.xpt.vim
@@ -0,0 +1,11 @@
+XPTemplate priority=lang
+let s:f = g:XPTfuncs()
+XPTinclude
+      \ _common/common
+
+XPT wrapper wrap
+left-`cursor^=right
+
+XPT indent-wrapper wrap
+left-
+    `cursor^=right
diff --git a/test/cases/42-wrap/tests/1-basic b/test/cases/42-wrap/tests/1-basic
new file mode 100644
index 00000000..d88f55e9
--- /dev/null
+++ b/test/cases/42-wrap/tests/1-basic
@@ -0,0 +1,15 @@
+setting:
+noexpandtab
+tabstop=4
+
+keys:
+line1
+    line2
+
+Vk
+
+wrapper	
+
+expected:
+left-line1
+	line2=right
diff --git a/test/cases/42-wrap/tests/2-expandtab-2 b/test/cases/42-wrap/tests/2-expandtab-2
new file mode 100644
index 00000000..bb5212bc
--- /dev/null
+++ b/test/cases/42-wrap/tests/2-expandtab-2
@@ -0,0 +1,18 @@
+setting:
+expandtab
+shiftwidth=2
+tabstop=8
+
+keys:
+line1
+  line2
+    line3
+
+Vkk
+
+wrapper	
+
+expected:
+left-line1
+  line2
+    line3=right
diff --git a/test/cases/42-wrap/tests/3-emptyline b/test/cases/42-wrap/tests/3-emptyline
new file mode 100644
index 00000000..925a2eaa
--- /dev/null
+++ b/test/cases/42-wrap/tests/3-emptyline
@@ -0,0 +1,24 @@
+setting:
+noexpandtab
+shiftwidth=2
+tabstop=4
+
+keys:
+line1
+  
+  one_indent_to_two_space
+    two_indent_to_one_tab
+      three_indent_to_one_tab_two_space
+        four_indent_to_two_tab
+
+Vkkkkk
+
+wrapper	
+
+expected:
+left-line1
+  
+  one_indent_to_two_space
+	two_indent_to_one_tab
+	  three_indent_to_one_tab_two_space
+		four_indent_to_two_tab=right
diff --git a/test/cases/42-wrap/tests/4-strip-firstline-indent b/test/cases/42-wrap/tests/4-strip-firstline-indent
new file mode 100644
index 00000000..c46107ef
--- /dev/null
+++ b/test/cases/42-wrap/tests/4-strip-firstline-indent
@@ -0,0 +1,18 @@
+setting:
+noexpandtab
+shiftwidth=2
+tabstop=4
+
+keys:
+  line1
+  
+  one_indent_to_two_space
+
+Vkk
+
+wrapper	
+
+expected:
+left-line1
+  
+  one_indent_to_two_space=right
diff --git a/test/cases/42-wrap/tests/5-indent b/test/cases/42-wrap/tests/5-indent
new file mode 100644
index 00000000..5678d45e
--- /dev/null
+++ b/test/cases/42-wrap/tests/5-indent
@@ -0,0 +1,27 @@
+setting:
+noexpandtab
+shiftwidth=2
+tabstop=4
+
+keys:
+line1
+
+  
+  one_indent_to_two_space
+    two_indent_to_one_tab
+      three_indent_to_one_tab_two_space
+        four_indent_to_two_tab
+
+Vkkkkkk
+
+indent-wrapper	
+
+expected:
+left-
+  line1
+emptyline
+	
+	one_indent_to_two_space
+	  two_indent_to_one_tab
+		three_indent_to_one_tab_two_space
+		  four_indent_to_two_tab=right
diff --git a/test/cases/50-pum-preview/ftplugin/foo/foo.xpt.vim b/test/cases/50-pum-preview/ftplugin/foo/foo.xpt.vim
new file mode 100644
index 00000000..269e49af
--- /dev/null
+++ b/test/cases/50-pum-preview/ftplugin/foo/foo.xpt.vim
@@ -0,0 +1,10 @@
+XPTemplate priority=lang
+
+let s:f = g:XPTfuncs()
+
+XPTinclude
+      \ _common/common
+
+XPT pum
+XSET fires=Choose([{"word": "before", "info": "kasjfaj"}, {"word": "after", "info": "muci"}])
+-`fires^
diff --git a/test/cases/50-pum-preview/tests/completeopt-all b/test/cases/50-pum-preview/tests/completeopt-all
new file mode 100644
index 00000000..b143298a
--- /dev/null
+++ b/test/cases/50-pum-preview/tests/completeopt-all
@@ -0,0 +1,9 @@
+setting:
+completeopt=preview,longest,menu,menuone
+
+keys:
+pum
+=winnr("#")."_is_2nd_window"
+
+expected:
+-1_is_2nd_window
diff --git a/test/cases/50-pum-preview/tests/completeopt-no-preview b/test/cases/50-pum-preview/tests/completeopt-no-preview
new file mode 100644
index 00000000..ceeb1ea1
--- /dev/null
+++ b/test/cases/50-pum-preview/tests/completeopt-no-preview
@@ -0,0 +1,9 @@
+setting:
+completeopt=longest,menu,menuone
+
+keys:
+pum
+=winnr("#")."_is_1st_window"
+
+expected:
+-0_is_1st_window
diff --git a/test/cases/50-pum-preview/tests/completeopt-preview b/test/cases/50-pum-preview/tests/completeopt-preview
new file mode 100644
index 00000000..ded01895
--- /dev/null
+++ b/test/cases/50-pum-preview/tests/completeopt-preview
@@ -0,0 +1,9 @@
+setting:
+completeopt=preview
+
+keys:
+pum
+=winnr("#")."_is_2nd_window"
+
+expected:
+-1_is_2nd_window
diff --git a/test/cases/55-func-returnval/ftplugin/foo/foo.xpt.vim b/test/cases/55-func-returnval/ftplugin/foo/foo.xpt.vim
new file mode 100644
index 00000000..fb3c00b2
--- /dev/null
+++ b/test/cases/55-func-returnval/ftplugin/foo/foo.xpt.vim
@@ -0,0 +1,19 @@
+XPTemplate priority=lang
+let s:f = g:XPTfuncs()
+XPTinclude
+      \ _common/common
+
+fun! s:f.Return(arg)
+    return a:arg
+endfunction
+
+
+XPT return0
+XSET a|pre=Return(0)
+XSET b|def=Return(0)
+XSET c|post=Return(0)
+-`(left)`Return(0)`(right)^
+-`(left)`a`(right)^
+-`(left)`b`(right)^
+-`(left)`c`(right)^
+=
diff --git a/test/cases/55-func-returnval/rc b/test/cases/55-func-returnval/rc
new file mode 100644
index 00000000..0e826f5f
--- /dev/null
+++ b/test/cases/55-func-returnval/rc
@@ -0,0 +1 @@
+all-passed
\ No newline at end of file
diff --git a/test/cases/55-func-returnval/tests/1-return-0 b/test/cases/55-func-returnval/tests/1-return-0
new file mode 100644
index 00000000..7e3a6ec8
--- /dev/null
+++ b/test/cases/55-func-returnval/tests/1-return-0
@@ -0,0 +1,13 @@
+keys:
+return0
+	
+	
+	
+at_end
+
+expected:
+-(left)(right)
+-(left)a(right)
+-(left)b(right)
+-(left)c(right)
+=at_end
diff --git a/test/cases/60-Trigger-def/ftplugin/foo/foo.xpt.vim b/test/cases/60-Trigger-def/ftplugin/foo/foo.xpt.vim
new file mode 100644
index 00000000..186108f7
--- /dev/null
+++ b/test/cases/60-Trigger-def/ftplugin/foo/foo.xpt.vim
@@ -0,0 +1,12 @@
+XPTemplate priority=lang
+let s:f = g:XPTfuncs()
+XPTinclude
+      \ _common/common
+
+XPT trigger
+XSET x|def=Trigger('sub')
+XSET x|def=Trigger('sub')
+-`x^-`sub_x^-`y^=
+
+XPT sub
+(`sub_x^-`sub_x^)
diff --git a/test/cases/60-Trigger-def/tests/1-no-input b/test/cases/60-Trigger-def/tests/1-no-input
new file mode 100644
index 00000000..430b302b
--- /dev/null
+++ b/test/cases/60-Trigger-def/tests/1-no-input
@@ -0,0 +1,5 @@
+keys:
+trigger
+
+expected:
+-(sub_x-sub_x)-sub_x-y=
diff --git a/test/cases/60-Trigger-def/tests/2-input-in-sub b/test/cases/60-Trigger-def/tests/2-input-in-sub
new file mode 100644
index 00000000..000559dc
--- /dev/null
+++ b/test/cases/60-Trigger-def/tests/2-input-in-sub
@@ -0,0 +1,6 @@
+keys:
+trigger
+on_sub_x	
+
+expected:
+-(on_sub_x-on_sub_x)-sub_x-y=
diff --git a/test/cases/60-Trigger-def/tests/3-input-sub-parent b/test/cases/60-Trigger-def/tests/3-input-sub-parent
new file mode 100644
index 00000000..6ea7b749
--- /dev/null
+++ b/test/cases/60-Trigger-def/tests/3-input-sub-parent
@@ -0,0 +1,11 @@
+keys:
+trigger
+on_sub_x	
+end_of_sub	
+on_sub_x_of_parent	
+on_y	
+at_end
+
+
+expected:
+-(on_sub_x-on_sub_x)end_of_sub-on_sub_x_of_parent-on_y=at_end
diff --git a/test/cases/60-ph-func-Build-def/ftplugin/foo/foo.xpt.vim b/test/cases/60-ph-func-Build-def/ftplugin/foo/foo.xpt.vim
new file mode 100644
index 00000000..d67abd3d
--- /dev/null
+++ b/test/cases/60-ph-func-Build-def/ftplugin/foo/foo.xpt.vim
@@ -0,0 +1,35 @@
+XPTemplate priority=lang
+
+let s:f = g:XPTfuncs()
+
+XPTinclude
+      \ _common/common
+
+XPT build
+XSET x=Build("text_built")
+-`x^=
+
+XPT build-ph
+XSET x=Build("-`ph_built^-")
+-`x^=
+
+XPT build-2ph
+XSET x=Build("-`ph1^-`ph2^-")
+-`x^=
+
+XPT build-phgroup
+XSET x=Build("-`ph1^-`ph1^-")
+-`x^=
+
+XPT build-ph-no-mixin
+XSET x=Build("-`ph1^-`ph1^-")
+-`x^-`ph1^-`ph1^=
+
+XPT embed
+XSET x=Embed("text_embed")
+-`x^=
+
+XPT embed-ph-no-mixin
+XSET x=Embed("-`ph1^-`ph1^-")
+-`x^-`ph1^-`ph1^=
+
diff --git a/test/cases/60-ph-func-Build-def/tests/build b/test/cases/60-ph-func-Build-def/tests/build
new file mode 100644
index 00000000..efc24e59
--- /dev/null
+++ b/test/cases/60-ph-func-Build-def/tests/build
@@ -0,0 +1,6 @@
+keys:
+build
+type_at_end
+
+expected:
+-text_built=type_at_end
diff --git a/test/cases/60-ph-func-Build-def/tests/build-2ph b/test/cases/60-ph-func-Build-def/tests/build-2ph
new file mode 100644
index 00000000..c0b2f8df
--- /dev/null
+++ b/test/cases/60-ph-func-Build-def/tests/build-2ph
@@ -0,0 +1,14 @@
+keys:
+build-2ph
+	
+	
+type_at_end
+
+build-2ph
+on_ph1	
+on_ph2	
+type_at_end
+
+expected:
+--ph1-ph2-=type_at_end
+--on_ph1-on_ph2-=type_at_end
diff --git a/test/cases/60-ph-func-Build-def/tests/build-ph b/test/cases/60-ph-func-Build-def/tests/build-ph
new file mode 100644
index 00000000..401eb072
--- /dev/null
+++ b/test/cases/60-ph-func-Build-def/tests/build-ph
@@ -0,0 +1,12 @@
+keys:
+build-ph
+	
+type_at_end
+
+build-ph
+type_on_ph_built	
+type_at_end
+
+expected:
+--ph_built-=type_at_end
+--type_on_ph_built-=type_at_end
diff --git a/test/cases/60-ph-func-Build-def/tests/build-ph-no-mixin b/test/cases/60-ph-func-Build-def/tests/build-ph-no-mixin
new file mode 100644
index 00000000..e5c3aeb3
--- /dev/null
+++ b/test/cases/60-ph-func-Build-def/tests/build-ph-no-mixin
@@ -0,0 +1,10 @@
+keys:
+build-ph-no-mixin
+
+=col(".")
+	
+on_group	
+at_end
+
+expected:
+--3-3--on_group-on_group=at_end
diff --git a/test/cases/60-ph-func-Build-def/tests/build-phgroup b/test/cases/60-ph-func-Build-def/tests/build-phgroup
new file mode 100644
index 00000000..6ec38c1f
--- /dev/null
+++ b/test/cases/60-ph-func-Build-def/tests/build-phgroup
@@ -0,0 +1,7 @@
+keys:
+build-phgroup
+on_group	
+type_at_end
+
+expected:
+--on_group-on_group-=type_at_end
diff --git a/test/cases/60-ph-func-Build-def/tests/embed-is-build b/test/cases/60-ph-func-Build-def/tests/embed-is-build
new file mode 100644
index 00000000..a5579406
--- /dev/null
+++ b/test/cases/60-ph-func-Build-def/tests/embed-is-build
@@ -0,0 +1,6 @@
+keys:
+embed
+at_end
+
+expected:
+-text_embed=at_end
diff --git a/test/cases/60-ph-func-Build-def/tests/embed-ph-no-mixin b/test/cases/60-ph-func-Build-def/tests/embed-ph-no-mixin
new file mode 100644
index 00000000..85982bfe
--- /dev/null
+++ b/test/cases/60-ph-func-Build-def/tests/embed-ph-no-mixin
@@ -0,0 +1,10 @@
+keys:
+embed-ph-no-mixin
+
+=col(".")
+	
+on_group	
+at_end
+
+expected:
+--3-3--on_group-on_group=at_end
diff --git a/test/cases/60-ph-func-Build-instant/ftplugin/foo/foo.xpt.vim b/test/cases/60-ph-func-Build-instant/ftplugin/foo/foo.xpt.vim
new file mode 100644
index 00000000..e960f7fe
--- /dev/null
+++ b/test/cases/60-ph-func-Build-instant/ftplugin/foo/foo.xpt.vim
@@ -0,0 +1,25 @@
+XPTemplate priority=lang
+
+let s:f = g:XPTfuncs()
+
+XPTinclude
+      \ _common/common
+
+" expression is not selectable
+XPT build-instant
+-`Build("x")^-
+
+" expression is not selectable
+XPT build-instant-edge
+-`left=`Build("x")`=right^-
+
+" expression is not selectable
+XPT build-instant-edge-expr
+-`Build("x")`Build("y")`Build("z")^-
+
+XPT build-ph
+-`Build('\`ph\^')^-
+
+XPT build-ph-group
+-`\`ph\^-`Build('\`ph\^-\`ph\^')^-
+
diff --git a/test/cases/60-ph-func-Build-instant/tests/0-instance b/test/cases/60-ph-func-Build-instant/tests/0-instance
new file mode 100644
index 00000000..6077ee5f
--- /dev/null
+++ b/test/cases/60-ph-func-Build-instant/tests/0-instance
@@ -0,0 +1,6 @@
+keys:
+build-instant
+at_end
+
+expected:
+-x-at_end
diff --git a/test/cases/60-ph-func-Build-instant/tests/1-with-edge b/test/cases/60-ph-func-Build-instant/tests/1-with-edge
new file mode 100644
index 00000000..d000eb32
--- /dev/null
+++ b/test/cases/60-ph-func-Build-instant/tests/1-with-edge
@@ -0,0 +1,6 @@
+keys:
+build-instant-edge
+at_end
+
+expected:
+-left=x=right-at_end
diff --git a/test/cases/60-ph-func-Build-instant/tests/2-build-edge b/test/cases/60-ph-func-Build-instant/tests/2-build-edge
new file mode 100644
index 00000000..02096e6c
--- /dev/null
+++ b/test/cases/60-ph-func-Build-instant/tests/2-build-edge
@@ -0,0 +1,6 @@
+keys:
+build-instant-edge-expr
+at_end
+
+expected:
+-xyz-at_end
diff --git a/test/cases/60-ph-func-Build-instant/tests/3-build-ph b/test/cases/60-ph-func-Build-instant/tests/3-build-ph
new file mode 100644
index 00000000..6e9457b2
--- /dev/null
+++ b/test/cases/60-ph-func-Build-instant/tests/3-build-ph
@@ -0,0 +1,17 @@
+keys:
+build-ph
+	
+at_end
+
+build-ph
+on_ph	
+at_end
+
+build-ph-group
+on_ph	
+at_end
+
+expected:
+-ph-at_end
+-on_ph-at_end
+-on_ph-on_ph-on_ph-at_end
diff --git a/test/cases/60-ph-func-Build-post/ftplugin/foo/foo.xpt.vim b/test/cases/60-ph-func-Build-post/ftplugin/foo/foo.xpt.vim
new file mode 100644
index 00000000..93c9b71b
--- /dev/null
+++ b/test/cases/60-ph-func-Build-post/ftplugin/foo/foo.xpt.vim
@@ -0,0 +1,32 @@
+XPTemplate priority=lang
+
+let s:f = g:XPTfuncs()
+
+XPTinclude
+      \ _common/common
+
+" TODO build edge with ph
+
+XPT build-post
+XSET x|post=Build("text_built")
+-`x^=
+
+XPT build-post-ph
+XSET x|post=Build("-`ph_built^-")
+-`x^=
+
+XPT build-post-2ph
+XSET x|post=Build("-`ph1^-`ph2^-")
+-`x^=
+
+XPT build-post-phgroup
+XSET x|post=Build("-`ph1^-`ph1^-")
+-`x^=
+
+XPT build-post-ph-no-mixin
+XSET x|post=Build("-`ph1^-`ph1^-")
+-`x^-`ph1^-`ph1^=
+
+XPT plain-text-with-ph
+XSET x|post=-`ph1^-
+-`x^=
diff --git a/test/cases/60-ph-func-Build-post/tests/0-plain-text b/test/cases/60-ph-func-Build-post/tests/0-plain-text
new file mode 100644
index 00000000..814a0943
--- /dev/null
+++ b/test/cases/60-ph-func-Build-post/tests/0-plain-text
@@ -0,0 +1,7 @@
+keys:
+build-post
+should_not_be_seen	
+typed
+
+expected:
+-text_built=typed
diff --git a/test/cases/60-ph-func-Build-post/tests/1-one-ph b/test/cases/60-ph-func-Build-post/tests/1-one-ph
new file mode 100644
index 00000000..805d218f
--- /dev/null
+++ b/test/cases/60-ph-func-Build-post/tests/1-one-ph
@@ -0,0 +1,14 @@
+keys:
+build-post-ph
+should_not_be_seen	
+type_on_ph_built	
+at_end
+
+build-post-ph
+should_not_be_seen	
+	
+at_end
+
+expected:
+--type_on_ph_built-=at_end
+--ph_built-=at_end
diff --git a/test/cases/60-ph-func-Build-post/tests/2-two-diff-ph b/test/cases/60-ph-func-Build-post/tests/2-two-diff-ph
new file mode 100644
index 00000000..df36d836
--- /dev/null
+++ b/test/cases/60-ph-func-Build-post/tests/2-two-diff-ph
@@ -0,0 +1,17 @@
+keys:
+build-post-2ph
+should_not_be_seen	
+	
+	
+at_end
+
+build-post-2ph
+should_not_be_seen	
+on_ph1	
+on_ph2	
+at_end
+
+
+expected:
+--ph1-ph2-=at_end
+--on_ph1-on_ph2-=at_end
diff --git a/test/cases/60-ph-func-Build-post/tests/3-two-same-ph b/test/cases/60-ph-func-Build-post/tests/3-two-same-ph
new file mode 100644
index 00000000..dae4a4ba
--- /dev/null
+++ b/test/cases/60-ph-func-Build-post/tests/3-two-same-ph
@@ -0,0 +1,8 @@
+keys:
+build-post-phgroup
+should_not_be_seen	
+type_on_group	
+type_at_end
+
+expected:
+--type_on_group-type_on_group-=type_at_end
diff --git a/test/cases/60-ph-func-Build-post/tests/4-no-mix b/test/cases/60-ph-func-Build-post/tests/4-no-mix
new file mode 100644
index 00000000..247a77c7
--- /dev/null
+++ b/test/cases/60-ph-func-Build-post/tests/4-no-mix
@@ -0,0 +1,11 @@
+keys:
+build-post-ph-no-mixin
+should_not_be_seen	
+
+=col(".")
+	
+type_on_group	
+at_end
+
+expected:
+--3-3--type_on_group-type_on_group=at_end
diff --git a/test/cases/60-ph-func-Build-post/tests/5-plain-text-should-be-built b/test/cases/60-ph-func-Build-post/tests/5-plain-text-should-be-built
new file mode 100644
index 00000000..280334bc
--- /dev/null
+++ b/test/cases/60-ph-func-Build-post/tests/5-plain-text-should-be-built
@@ -0,0 +1,8 @@
+keys:
+plain-text-with-ph
+should_not_be_seen	
+on_ph1	
+at_end
+
+expected:
+--on_ph1-=at_end
diff --git a/test/cases/60-ph-func-BuildIfNoChange/ftplugin/foo/foo.xpt.vim b/test/cases/60-ph-func-BuildIfNoChange/ftplugin/foo/foo.xpt.vim
new file mode 100644
index 00000000..ffe9edac
--- /dev/null
+++ b/test/cases/60-ph-func-BuildIfNoChange/ftplugin/foo/foo.xpt.vim
@@ -0,0 +1,20 @@
+XPTemplate priority=lang
+
+let s:f = g:XPTfuncs()
+
+XPTinclude
+      \ _common/common
+
+XPT basic
+XSET x|post=BuildIfNoChange( '`ph-built^' )
+-`x^=
+
+XPT with-def
+XSET x|def=x2
+XSET x|post=BuildIfNoChange( '`ph-built^' )
+-`x^=
+
+XPT with-edge
+XSET x|def=x2
+XSET x|post=BuildIfNoChange( '`ph-built^' )
+-`Echo( "left." )`x`Echo( ".right" )^=
diff --git a/test/cases/60-ph-func-BuildIfNoChange/tests/0-basic b/test/cases/60-ph-func-BuildIfNoChange/tests/0-basic
new file mode 100644
index 00000000..b9d2734d
--- /dev/null
+++ b/test/cases/60-ph-func-BuildIfNoChange/tests/0-basic
@@ -0,0 +1,13 @@
+keys:
+basic
+	
+	
+at_end
+
+basic
+x-changed	
+at_end
+
+expected:
+-ph-built=at_end
+-x-changed=at_end
diff --git a/test/cases/60-ph-func-BuildIfNoChange/tests/1-with-def b/test/cases/60-ph-func-BuildIfNoChange/tests/1-with-def
new file mode 100644
index 00000000..67c74c4f
--- /dev/null
+++ b/test/cases/60-ph-func-BuildIfNoChange/tests/1-with-def
@@ -0,0 +1,19 @@
+keys:
+with-def
+	
+	
+at_end
+
+with-def
+x	
+at_end
+
+with-def
+x2	
+	
+at_end
+
+expected:
+-ph-built=at_end
+-x=at_end
+-ph-built=at_end
diff --git a/test/cases/60-ph-func-BuildIfNoChange/tests/2-with-edge b/test/cases/60-ph-func-BuildIfNoChange/tests/2-with-edge
new file mode 100644
index 00000000..c00ddd78
--- /dev/null
+++ b/test/cases/60-ph-func-BuildIfNoChange/tests/2-with-edge
@@ -0,0 +1,13 @@
+keys:
+with-edge
+x	
+at_end
+
+with-edge
+x2	
+	
+at_end
+
+expected:
+-left.x.right=at_end
+-ph-built=at_end
diff --git a/test/cases/60-ph-func-BuildSnippet/ftplugin/foo/foo.xpt.vim b/test/cases/60-ph-func-BuildSnippet/ftplugin/foo/foo.xpt.vim
new file mode 100644
index 00000000..6fc3b401
--- /dev/null
+++ b/test/cases/60-ph-func-BuildSnippet/ftplugin/foo/foo.xpt.vim
@@ -0,0 +1,42 @@
+XPTemplate priority=lang
+
+let s:f = g:XPTfuncs()
+
+XPTinclude
+      \ _common/common
+
+XPT snip_a
+this-is-a:`a^
+
+XPT snip_b hidden
+this-is-b:`b^
+
+XPT snip_pum hidden
+XSET pum=Choose(["foo", "for"])
+this-is-pum:`pum^
+
+XPT test_post
+XSET x|post=BuildSnippet( V() )
+-`x^=
+
+XPT test_initval
+XSET x=BuildSnippet( 'snip_a' )
+-`x^=
+
+XPT test_post_with_setting
+XSET x|post=BuildSnippet( "snip_pum" )
+-`x^=
+
+XPT 3line
+    l1-1-indent
+l2-0-indent
+        l3-2-indent
+    (`inp^)
+
+XPT def-indent
+XSET x=BuildSnippet( "3line" )
+    -`x^=
+
+XPT post-indent
+XSET x|post=BuildSnippet( "3line" )
+    -`x^=
diff --git a/test/cases/60-ph-func-BuildSnippet/tests/1-in-post b/test/cases/60-ph-func-BuildSnippet/tests/1-in-post
new file mode 100644
index 00000000..bcd8c29e
--- /dev/null
+++ b/test/cases/60-ph-func-BuildSnippet/tests/1-in-post
@@ -0,0 +1,12 @@
+keys:
+test_post
+snip_a	
+x	
+
+test_post
+snip_b	
+x	
+
+expected:
+-this-is-a:x=
+-this-is-b:x=
diff --git a/test/cases/60-ph-func-BuildSnippet/tests/1-in-post-indent b/test/cases/60-ph-func-BuildSnippet/tests/1-in-post-indent
new file mode 100644
index 00000000..96f6715a
--- /dev/null
+++ b/test/cases/60-ph-func-BuildSnippet/tests/1-in-post-indent
@@ -0,0 +1,17 @@
+setting:
+noexpandtab
+tabstop=4
+shiftwidth=2
+
+keys:
+post-indent
+not_seen	
+on_inp	
+at_end
+
+expected:
+  -  l1-1-indent
+  l2-0-indent
+	  l3-2-indent
+	(on_inp)=at_end
+
diff --git a/test/cases/60-ph-func-BuildSnippet/tests/1-in-post-notfound b/test/cases/60-ph-func-BuildSnippet/tests/1-in-post-notfound
new file mode 100644
index 00000000..50f9286a
--- /dev/null
+++ b/test/cases/60-ph-func-BuildSnippet/tests/1-in-post-notfound
@@ -0,0 +1,6 @@
+keys:
+test_post
+snip_c	
+
+expected:
+-snip_c=
diff --git a/test/cases/60-ph-func-BuildSnippet/tests/1-in-post-pum b/test/cases/60-ph-func-BuildSnippet/tests/1-in-post-pum
new file mode 100644
index 00000000..b4112124
--- /dev/null
+++ b/test/cases/60-ph-func-BuildSnippet/tests/1-in-post-pum
@@ -0,0 +1,7 @@
+keys:
+test_post_with_setting
+	
+
+
+expected:
+-this-is-pum:foo=
diff --git a/test/cases/60-ph-func-BuildSnippet/tests/3-in-def b/test/cases/60-ph-func-BuildSnippet/tests/3-in-def
new file mode 100644
index 00000000..d63e8da7
--- /dev/null
+++ b/test/cases/60-ph-func-BuildSnippet/tests/3-in-def
@@ -0,0 +1,6 @@
+keys:
+test_initval
+	
+
+expected:
+-this-is-a:a=
diff --git a/test/cases/60-ph-func-BuildSnippet/tests/5-in-def-indent b/test/cases/60-ph-func-BuildSnippet/tests/5-in-def-indent
new file mode 100644
index 00000000..28054a27
--- /dev/null
+++ b/test/cases/60-ph-func-BuildSnippet/tests/5-in-def-indent
@@ -0,0 +1,14 @@
+setting:
+expandtab
+shiftwidth=4
+
+keys:
+def-indent
+on_inp	
+at_end
+
+expected:
+    -    l1-1-indent
+    l2-0-indent
+            l3-2-indent
+        (on_inp)=at_end
diff --git a/test/cases/60-ph-func-BuildSnippet/tests/5-in-def-indent-noexpandtab b/test/cases/60-ph-func-BuildSnippet/tests/5-in-def-indent-noexpandtab
new file mode 100644
index 00000000..9e4dcd08
--- /dev/null
+++ b/test/cases/60-ph-func-BuildSnippet/tests/5-in-def-indent-noexpandtab
@@ -0,0 +1,15 @@
+setting:
+noexpandtab
+tabstop=4
+shiftwidth=2
+
+keys:
+  def-indent
+on_inp	
+at_end
+
+expected:
+    -  l1-1-indent
+	l2-0-indent
+		l3-2-indent
+	  (on_inp)=at_end
diff --git a/test/cases/60-ph-func-Choose/ftplugin/foo/foo.xpt.vim b/test/cases/60-ph-func-Choose/ftplugin/foo/foo.xpt.vim
new file mode 100644
index 00000000..bf980ef9
--- /dev/null
+++ b/test/cases/60-ph-func-Choose/ftplugin/foo/foo.xpt.vim
@@ -0,0 +1,14 @@
+XPTemplate priority=lang
+
+let s:f = g:XPTfuncs()
+
+XPTinclude
+      \ _common/common
+
+XPT choose-1
+XSET pum=Choose(["foo"])
+choose-1:`pum^;
+
+XPT choose-2
+XSET pum=Choose(["foo", "for"])
+choose-2:`pum^;
diff --git a/test/cases/60-ph-func-Choose/tests/0-choose-1 b/test/cases/60-ph-func-Choose/tests/0-choose-1
new file mode 100644
index 00000000..66243111
--- /dev/null
+++ b/test/cases/60-ph-func-Choose/tests/0-choose-1
@@ -0,0 +1,11 @@
+keys:
+choose-1
+the_only_one_is_selected
+	
+
+choose-1
+	
+
+expected:
+choose-1:the_only_one_is_selected;
+choose-1:foo;
diff --git a/test/cases/60-ph-func-Choose/tests/1-choose-2 b/test/cases/60-ph-func-Choose/tests/1-choose-2
new file mode 100644
index 00000000..3ec6a9ea
--- /dev/null
+++ b/test/cases/60-ph-func-Choose/tests/1-choose-2
@@ -0,0 +1,17 @@
+keys:
+choose-2
+
+
+
+choose-2
+
+	
+
+choose-2
+
+
+
+expected:
+choose-2:foo;
+choose-2:foo;
+choose-2:for;
diff --git a/test/cases/60-ph-func-Echo-def/ftplugin/foo/foo.xpt.vim b/test/cases/60-ph-func-Echo-def/ftplugin/foo/foo.xpt.vim
new file mode 100644
index 00000000..770640be
--- /dev/null
+++ b/test/cases/60-ph-func-Echo-def/ftplugin/foo/foo.xpt.vim
@@ -0,0 +1,34 @@
+XPTemplate priority=lang
+
+let s:f = g:XPTfuncs()
+
+XPTvar $FOO foo
+
+XPTinclude
+      \ _common/common
+
+" TODO build edge with ph
+
+XPT basic
+XSET x=Echo("echo")
+-`x^=
+
+XPT func_and_var
+XSET x=Echo("$FOO-tr('aaa','a','b')")
+-`x^=
+
+XPT escape
+XSET x=Echo( "\"\'" . '\"' )
+-`x^=
+
+XPT slave
+XSET x=Echo("echo")
+-`x^=`x^=
+
+XPT ph-not-built
+XSET x=Echo( "`ph1^" )
+-`x^=
+
+XPT args
+XSET x=Echo( $FOO . tr('aaa','a','b') )
+-`x^=
diff --git a/test/cases/60-ph-func-Echo-def/tests/0-basic b/test/cases/60-ph-func-Echo-def/tests/0-basic
new file mode 100644
index 00000000..47876207
--- /dev/null
+++ b/test/cases/60-ph-func-Echo-def/tests/0-basic
@@ -0,0 +1,7 @@
+keys:
+basic
+	
+at_end
+
+expected:
+-echo=at_end
diff --git a/test/cases/60-ph-func-Echo-def/tests/1-func_and_var b/test/cases/60-ph-func-Echo-def/tests/1-func_and_var
new file mode 100644
index 00000000..90bcfd98
--- /dev/null
+++ b/test/cases/60-ph-func-Echo-def/tests/1-func_and_var
@@ -0,0 +1,7 @@
+keys:
+func_and_var
+	
+at_end
+
+expected:
+-$FOO-tr('aaa','a','b')=at_end
diff --git a/test/cases/60-ph-func-Echo-def/tests/2-escape b/test/cases/60-ph-func-Echo-def/tests/2-escape
new file mode 100644
index 00000000..5ea3a51c
--- /dev/null
+++ b/test/cases/60-ph-func-Echo-def/tests/2-escape
@@ -0,0 +1,8 @@
+keys:
+escape
+	
+at_end
+
+
+expected:
+-"'\"=at_end
diff --git a/test/cases/60-ph-func-Echo-def/tests/3-slave b/test/cases/60-ph-func-Echo-def/tests/3-slave
new file mode 100644
index 00000000..a0e8682d
--- /dev/null
+++ b/test/cases/60-ph-func-Echo-def/tests/3-slave
@@ -0,0 +1,7 @@
+keys:
+slave
+	
+at_end
+
+expected:
+-echo=echo=at_end
diff --git a/test/cases/60-ph-func-Echo-def/tests/4-ph-not-built b/test/cases/60-ph-func-Echo-def/tests/4-ph-not-built
new file mode 100644
index 00000000..d0bcfd35
--- /dev/null
+++ b/test/cases/60-ph-func-Echo-def/tests/4-ph-not-built
@@ -0,0 +1,7 @@
+keys:
+ph-not-built
+	
+at_end
+
+expected:
+-`ph1^=at_end
diff --git a/test/cases/60-ph-func-Echo-def/tests/5-args b/test/cases/60-ph-func-Echo-def/tests/5-args
new file mode 100644
index 00000000..fb540f99
--- /dev/null
+++ b/test/cases/60-ph-func-Echo-def/tests/5-args
@@ -0,0 +1,7 @@
+keys:
+args
+	
+at_end
+
+expected:
+-foobbb=at_end
diff --git a/test/cases/60-ph-func-Echo-instant/ftplugin/foo/foo.xpt.vim b/test/cases/60-ph-func-Echo-instant/ftplugin/foo/foo.xpt.vim
new file mode 100644
index 00000000..ce0a347c
--- /dev/null
+++ b/test/cases/60-ph-func-Echo-instant/ftplugin/foo/foo.xpt.vim
@@ -0,0 +1,22 @@
+XPTemplate priority=lang
+
+let s:f = g:XPTfuncs()
+
+XPTvar $FOO foo
+
+XPTinclude
+      \ _common/common
+
+" TODO build edge with ph
+
+XPT basic
+-`Echo( "echo" . $FOO )^=
+
+XPT edge
+-`Echo( "left" )`Echo( "x" )`Echo( "right" )^=
+
+XPT escape
+-`Echo( "\"\'" . '\"' )^=
+
+XPT ph-not-built
+-`Echo( "\`ph1\^" )^=
diff --git a/test/cases/60-ph-func-Echo-instant/tests/0-basic b/test/cases/60-ph-func-Echo-instant/tests/0-basic
new file mode 100644
index 00000000..ddd0b331
--- /dev/null
+++ b/test/cases/60-ph-func-Echo-instant/tests/0-basic
@@ -0,0 +1,6 @@
+keys:
+basic
+at_end
+
+expected:
+-echofoo=at_end
diff --git a/test/cases/60-ph-func-Echo-instant/tests/1-edge b/test/cases/60-ph-func-Echo-instant/tests/1-edge
new file mode 100644
index 00000000..731e7587
--- /dev/null
+++ b/test/cases/60-ph-func-Echo-instant/tests/1-edge
@@ -0,0 +1,6 @@
+keys:
+edge
+at_end
+
+expected:
+-leftxright=at_end
diff --git a/test/cases/60-ph-func-Echo-instant/tests/2-escape b/test/cases/60-ph-func-Echo-instant/tests/2-escape
new file mode 100644
index 00000000..86dd9d1a
--- /dev/null
+++ b/test/cases/60-ph-func-Echo-instant/tests/2-escape
@@ -0,0 +1,7 @@
+keys:
+escape
+at_end
+
+
+expected:
+-"'\"=at_end
diff --git a/test/cases/60-ph-func-Echo-instant/tests/3-ph-not-built b/test/cases/60-ph-func-Echo-instant/tests/3-ph-not-built
new file mode 100644
index 00000000..38aef7f3
--- /dev/null
+++ b/test/cases/60-ph-func-Echo-instant/tests/3-ph-not-built
@@ -0,0 +1,6 @@
+keys:
+ph-not-built
+at_end
+
+expected:
+-`ph1^=at_end
diff --git a/test/cases/60-ph-func-Echo-post/ftplugin/foo/foo.xpt.vim b/test/cases/60-ph-func-Echo-post/ftplugin/foo/foo.xpt.vim
new file mode 100644
index 00000000..d31a0b99
--- /dev/null
+++ b/test/cases/60-ph-func-Echo-post/ftplugin/foo/foo.xpt.vim
@@ -0,0 +1,34 @@
+XPTemplate priority=lang
+
+let s:f = g:XPTfuncs()
+
+XPTvar $FOO foo
+
+XPTinclude
+      \ _common/common
+
+" TODO build edge with ph
+
+XPT basic
+XSET x|post=Echo("echo")
+-`x^=
+
+XPT func_and_var
+XSET x|post=Echo("$FOO-tr('aaa','a','b')")
+-`x^=
+
+XPT escape
+XSET x|post=Echo( "\"\'" . '\"' )
+-`x^=
+
+XPT slave
+XSET x|post=Echo("echo")
+-`x^=`x^=
+
+XPT ph-not-built
+XSET x|post=Echo( "`ph1^" )
+-`x^=
+
+XPT args
+XSET x|post=Echo( $FOO . tr('aaa','a','b') )
+-`x^=
diff --git a/test/cases/60-ph-func-Echo-post/tests/0-basic b/test/cases/60-ph-func-Echo-post/tests/0-basic
new file mode 100644
index 00000000..bf093786
--- /dev/null
+++ b/test/cases/60-ph-func-Echo-post/tests/0-basic
@@ -0,0 +1,7 @@
+keys:
+basic
+should_not_be_seen	
+at_end
+
+expected:
+-echo=at_end
diff --git a/test/cases/60-ph-func-Echo-post/tests/1-func_and_var b/test/cases/60-ph-func-Echo-post/tests/1-func_and_var
new file mode 100644
index 00000000..73d1ee15
--- /dev/null
+++ b/test/cases/60-ph-func-Echo-post/tests/1-func_and_var
@@ -0,0 +1,7 @@
+keys:
+func_and_var
+should_not_be_seen	
+at_end
+
+expected:
+-$FOO-tr('aaa','a','b')=at_end
diff --git a/test/cases/60-ph-func-Echo-post/tests/2-escape b/test/cases/60-ph-func-Echo-post/tests/2-escape
new file mode 100644
index 00000000..cfeba96b
--- /dev/null
+++ b/test/cases/60-ph-func-Echo-post/tests/2-escape
@@ -0,0 +1,8 @@
+keys:
+escape
+should_not_be_seen	
+at_end
+
+
+expected:
+-"'\"=at_end
diff --git a/test/cases/60-ph-func-Echo-post/tests/3-slave b/test/cases/60-ph-func-Echo-post/tests/3-slave
new file mode 100644
index 00000000..4daf8e8e
--- /dev/null
+++ b/test/cases/60-ph-func-Echo-post/tests/3-slave
@@ -0,0 +1,7 @@
+keys:
+slave
+should_not_be_seen	
+at_end
+
+expected:
+-echo=echo=at_end
diff --git a/test/cases/60-ph-func-Echo-post/tests/4-ph-not-built b/test/cases/60-ph-func-Echo-post/tests/4-ph-not-built
new file mode 100644
index 00000000..92dc03a9
--- /dev/null
+++ b/test/cases/60-ph-func-Echo-post/tests/4-ph-not-built
@@ -0,0 +1,7 @@
+keys:
+ph-not-built
+should_not_be_seen	
+at_end
+
+expected:
+-`ph1^=at_end
diff --git a/test/cases/60-ph-func-Echo-post/tests/5-args b/test/cases/60-ph-func-Echo-post/tests/5-args
new file mode 100644
index 00000000..895a8c8c
--- /dev/null
+++ b/test/cases/60-ph-func-Echo-post/tests/5-args
@@ -0,0 +1,7 @@
+keys:
+args
+should_not_be_seen	
+at_end
+
+expected:
+-foobbb=at_end
diff --git a/test/core_vimrc b/test/core_vimrc
new file mode 100644
index 00000000..cfb82828
--- /dev/null
+++ b/test/core_vimrc
@@ -0,0 +1,9 @@
+set nocompatible
+filetype plugin  on
+
+let g:xptemplate_debug_log = './xpt-debug.log'
+set runtimepath+=.
+set noswapfile
+set list
+set listchars=tab:].,trail:\|,extends:<,precedes:>
+set number
diff --git a/test/makecase b/test/makecase
new file mode 100755
index 00000000..b809300f
--- /dev/null
+++ b/test/makecase
@@ -0,0 +1,33 @@
+#!/bin/bash
+
+name=$1
+
+base=test/cases/$name
+
+if [ -d $base ]; then
+    echo $base exists >&2
+    exit 1
+fi
+
+mkdir -p \
+    $base/ftplugin/foo/ \
+    $base/tests/
+
+cat > $base/ftplugin/foo/foo.xpt.vim<<-END
+XPTemplate priority=lang
+let s:f = g:XPTfuncs()
+XPTinclude
+      \ _common/common
+
+XPT foo
+foo-bar
+END
+
+cat >$base/tests/1-foo <<-END
+keys:
+foo
+
+expected:
+foo-bar
+END
+
diff --git a/test/run.py b/test/run.py
new file mode 100755
index 00000000..065577f5
--- /dev/null
+++ b/test/run.py
@@ -0,0 +1,392 @@
+#!/usr/bin/env python
+# coding: utf-8
+
+import os
+import sys
+import fcntl
+import pprint
+import subprocess
+import logging
+import logging.handlers
+import stat
+import time
+import fnmatch
+
+flags = {
+        'keep': True, # keep vim open for further check if test fails
+}
+mybase = os.path.dirname(os.path.realpath(__file__))
+
+class TestError( Exception ): pass
+
+class XPTLogHandler( logging.handlers.WatchedFileHandler ):
+
+    def _open( self ):
+        _stream = logging.handlers.WatchedFileHandler._open( self )
+        fd = _stream.fileno()
+
+        r = fcntl.fcntl( fd, fcntl.F_GETFD, 0 )
+        r = fcntl.fcntl( fd, fcntl.F_SETFD, r | fcntl.FD_CLOEXEC )
+        return _stream
+
+    def emit(self, record):
+
+        try:
+            st = os.stat(self.baseFilename)
+            changed = (st[stat.ST_DEV] != self.dev) or (st[stat.ST_INO] != self.ino)
+        except OSError, e:
+            st = None
+            changed = 1
+
+        if changed and self.stream is not None:
+            self.stream.flush()
+            self.stream.close()
+            self.stream = self._open()
+            if st is None:
+                st = os.stat(self.baseFilename)
+            self.dev, self.ino = st[stat.ST_DEV], st[stat.ST_INO]
+        logging.FileHandler.emit(self, record)
+
+def make_logger():
+    logname = 'xpt-test'
+    filename = logname + ".log"
+
+    logger = logging.getLogger( logname )
+    logger.setLevel( logging.DEBUG )
+
+    handler = XPTLogHandler( filename )
+
+    fmt = "[%(asctime)s,%(process)d-%(thread)d,%(filename)s,%(lineno)d,%(levelname)s] %(message)s"
+
+    _formatter = logging.Formatter( fmt )
+
+    handler.setFormatter(_formatter)
+
+    logger.handlers = []
+    logger.addHandler( handler )
+
+    stdhandler = logging.StreamHandler( sys.stdout )
+    stdhandler.setFormatter( logging.Formatter( "[%(asctime)s,%(filename)s,%(lineno)d] %(message)s" ) )
+    stdhandler.setLevel( logging.INFO )
+
+    logger.addHandler( stdhandler )
+
+    return logger
+
+logger = make_logger()
+
+key = {
+        "cr":  "\r",
+        "tab": "	",
+        "esc": "",
+        "c_v": "",
+        "c_l": "",
+        "c_c": "",
+        "c_o": "",
+}
+
+
+def main( pattern, subpattern='*' ):
+    logger.info("start ...")
+    tmux_setup()
+    try:
+        run_all( pattern, subpattern )
+    except TestError as e:
+        # with TestError, stop and see what happened
+        ex, ac = e[1], e[2]
+
+        logger.info( "failure:" )
+        for i in range( len(ex) ):
+            if i >= len(ac) or ex[i] != ac[i]:
+                logger.info( ( i+1, ex[i], ac[i] ) )
+
+        if flags[ 'keep' ]:
+            # wait for user to see what happened
+            logger.info( "Ctrl-c to quit" )
+            while True:
+                time.sleep( 10 )
+        else:
+            tmux_cleanup()
+            raise
+
+    except Exception as e:
+        # with other error, close it
+        tmux_cleanup()
+        raise
+    tmux_cleanup()
+
+def run_all( pattern, subpattern ):
+
+    base = os.path.join( mybase, "cases" )
+
+    cases = os.listdir( base )
+    cases.sort()
+
+    for c in cases:
+        if not os.path.isdir( os.path.join( base, c ) ):
+            continue
+
+        if fnmatch.fnmatch( c, pattern ):
+            run_case( c, subpattern )
+
+    logger.info("all test passed")
+
+def run_case( cname, subpattern ):
+
+    logger.info( "running " + cname + " ..." )
+
+    casebase = os.path.join( mybase, "cases", cname )
+    tests_dir = os.path.join(casebase, 'tests')
+    testnames = os.listdir(tests_dir)
+
+    for testname in testnames:
+        if not fnmatch.fnmatch( testname, subpattern ):
+            continue
+
+        logger.info("running {0} {1} ...".format(os.path.basename(casebase),
+                                                testname))
+
+        test = load_test(os.path.join(tests_dir, testname))
+        if test[None][:1] == ['TODO']:
+            logger.info("SKIP: " + testname)
+            continue
+
+        try_rm_rst(casebase)
+
+        vim_start(casebase)
+        vim_add_rtp( casebase )
+        vim_set_default_ft( casebase )
+        vim_so_fn( os.path.join( casebase, "setting.vim" ) )
+        vim_add_settings(test['setting'])
+        vim_add_local_settings(test['localsetting'])
+        vim_add_map(test['map'])
+        vim_load_content( os.path.join( casebase, "context" ) )
+        tmux_keys( "s" )
+
+        vim_key_sequence_strings(test['keys'])
+        vim_save_to( os.path.join( casebase, "rst" ) )
+
+        rst = fread( casebase, "rst" )
+        _check_rst( (casebase, testname), test['expected'], rst )
+        os.unlink( os.path.join( casebase, "rst" ) )
+
+        vim_close()
+
+    rcpath = os.path.join( casebase, 'rc' )
+    fwrite( rcpath, "all-passed" )
+
+
+def load_test(testfn):
+
+    # None for internal parameters
+    test = { None: [],
+             'setting': [],
+             'localsetting': [],
+             'map': [],
+             'keys': [],
+             'expected': [], }
+
+    cont = fread(testfn)
+    state = None
+    for line in cont.split('\n'):
+
+        if line == '':
+            state = None
+            continue
+
+        if state is None and line[:-1] in test:
+            state = line[:-1]
+            continue
+
+        if line == 'emptyline':
+            line = ''
+
+        test[state].append( line )
+        logger.info( '- ' + repr(state) + ': ' + repr(line) )
+
+    test['expected'] = '\n'.join(test['expected'])
+    return test
+
+def try_rm_rst(base):
+    try:
+        os.unlink( os.path.join( base, 'rst' ) )
+    except OSError as e:
+        pass
+
+def vim_start( base ):
+    vimrcfn = os.path.join( base, "vimrc" )
+    if not os.path.exists( vimrcfn ):
+        vimrcfn = os.path.join( mybase, "core_vimrc" )
+
+    vim_start_vimrc( vimrcfn )
+
+def vim_start_vimrc( vimrcfn ):
+    tmux_keys( "vim -u " + vimrcfn + key["cr"] )
+    delay()
+    logger.debug( "vim started with vimrc: " + repr(vimrcfn) )
+
+def vim_close():
+    tmux_keys( key["esc"], ":qa!", key["cr"] )
+    delay()
+    logger.debug( "vim closed" )
+
+def vim_load_content( fn ):
+
+    if not os.path.exists( fn ):
+        return
+
+    content = fread( fn )
+
+    tmux_keys( ":append", key['cr'] )
+    tmux_keys( content, key['cr'] )
+    tmux_keys( key['c_c'] )
+    tmux_keys( '/', key['c_v'], key['c_l'], key['cr'] )
+    delay()
+
+    logger.debug( "vim content loaded: " + repr( content ) )
+
+def vim_so_fn( fn ):
+    if not os.path.exists( fn ):
+        return
+
+    tmux_keys( ":so " + fn, key['cr'] )
+    delay()
+    logger.debug( "vim setting loaed: " + repr(fn) )
+
+def vim_add_rtp( path ):
+    if not os.path.exists( path ):
+        return
+
+    tmux_keys( ":set rtp+=", path, key['cr'] )
+    logger.debug( "additional rtp: " + repr( path ) )
+
+def vim_add_settings( settings ):
+    if len( settings ) == 0:
+        return
+    vim_cmd( [ "set" ] + settings )
+
+def vim_add_local_settings( settings ):
+    if len( settings ) == 0:
+        return
+    vim_cmd( [ "setlocal" ] + settings )
+
+def vim_add_map(maps):
+    for mp in maps:
+        vim_cmd([mp])
+
+def vim_cmd( elts ):
+    s = ":" + ' '.join( elts )
+    tmux_keys( s + key['cr'] )
+    logger.debug( s )
+
+def vim_set_default_ft( base ):
+    ft_foo_path = _path( base, 'ftplugin', 'foo', 'foo.xpt.vim' )
+    logger.debug( "ft_foo_path: " + ft_foo_path )
+    if os.path.isfile( ft_foo_path ):
+        vim_add_settings( [ 'filetype=foo' ] )
+        # changing setting may cause a lot ftplugin to load
+        delay()
+
+def vim_key_sequence_strings( lines ):
+
+    for line in lines:
+        if line == '':
+            continue
+        tmux_keys( line )
+        delay()
+
+    logger.debug( "end of key sequence" )
+
+def vim_save_to( fn ):
+
+    tmux_keys( key['esc']*2, ":w " + fn, key['cr'] )
+
+    while not os.path.exists( os.path.join( fn ) ):
+        time.sleep(0.1)
+
+    logger.debug( "rst saved to " + repr(fn))
+
+def _check_rst(ident, expected, rst):
+
+    if type(ident) == type(()):
+        casepath, testname = ident
+    else:
+        casepath, testname = ident, ""
+
+    rcpath = os.path.join( casepath, 'rc' )
+    if expected != rst:
+        fwrite( rcpath, "fail " + testname )
+        raise TestError( ident, expected.split("\n"), rst.split("\n") )
+    else:
+        fwrite( rcpath, "pass " + testname )
+
+def tmux_setup():
+    try:
+        _tmux( "kill-pane", "-t", ":0.1" )
+    except Exception as e:
+        pass
+    _tmux( "split-window", "-h", "bash --norc" )
+    _tmux( "select-pane", "-t", ":0.0" )
+
+def tmux_cleanup():
+    _tmux( "kill-pane", "-t", ":0.1" )
+
+def tmux_keys( *args ):
+    _tmux( "send-key", "-l", "-t", ":0.1", "".join(args) )
+
+def _tmux( *args ):
+    sh( 'tmux', *args )
+
+def fwrite( fn, cont ):
+    with open(fn, 'w') as f:
+        f.write( cont )
+
+def fread( *args ):
+    fn = os.path.join( *args )
+    with open(fn, 'r') as f:
+        content = f.read()
+
+    if content.endswith('\n'):
+        content = content[:-1]
+
+    return content
+
+def delay():
+    logger.debug( "delay 1 second" )
+    time.sleep( 1 )
+
+def sh( *args, **argkv ):
+
+    args = [str(x) for x in args]
+    logger.debug( "Shell Command: " + repr( args ) )
+
+    subproc = subprocess.Popen( args,
+                             close_fds = True,
+                             stdout = subprocess.PIPE,
+                             stderr = subprocess.PIPE, )
+
+
+    out, err = subproc.communicate()
+    subproc.wait()
+    rst = [ subproc.returncode, out, err ]
+
+    if subproc.returncode != 0:
+        raise Exception( rst )
+
+    return rst
+
+def _path( *args ):
+    return os.path.join( *args )
+
+
+if __name__ == "__main__":
+    args = sys.argv
+    if '-s' in args:
+        # silent mode, do not keep
+        flags[ 'keep' ] = False
+        args.remove( '-s' )
+
+    if len(args) > 1:
+        main(*args[1:])
+    else:
+        main("*")
diff --git a/test/t b/test/t
new file mode 100755
index 00000000..98a42d5b
--- /dev/null
+++ b/test/t
@@ -0,0 +1,124 @@
+#!/bin/bash
+
+if which python2.6; then
+    py=python2.6
+else
+    py=python2
+fi
+
+branch=$(git rev-parse --symbolic-full-name HEAD)
+hsh=$(git rev-parse HEAD)
+
+name="${branch} @ ${hsh}"
+
+tpath=/tmp/xpt-ci/$hsh
+casedir=$tpath/test/cases
+
+test_one_case()
+{
+    local casename=$1
+    local casepath=$casedir/$casename
+    local sessname=xpt-test-$casename
+
+    echo "testing" >$casepath/rc
+
+    echo ">   start test $sessname"
+
+    # -s let python and vim quit when test fails
+    tmux new -s $sessname -d $py' test/run.py -s '$casename || exit 1
+
+    while tmux has-session -t $sessname 2>/dev/null; do
+        sleep 1;
+    done
+
+    echo ">   done  test $casename: $(cat $casepath/rc)"
+
+    if cat $casepath/rc | grep -q "pass"; then
+        return 0
+    else
+        cat $casepath/rc
+        return 1
+    fi
+}
+
+list_running()
+{
+    local indent="$1"
+    tmux ls -F "$indent#{session_name}" | grep 'xpt-test-'
+}
+
+nr_running()
+{
+    list_running | wc -l | awk '{print $1}'
+}
+
+list_failed()
+{
+    grep fail `find ./test/cases -name "rc"`
+}
+
+wait_if_gt()
+{
+    local thre=$1
+    local verbose=${2-0}
+    while [ $(nr_running) -gt $thre ]; do
+        if [ ".$verbose" = ".1" ]; then
+            progress_stat
+        fi
+        sleep 1
+    done
+}
+
+progress_stat()
+{
+    local n_done=
+    local perc_start=
+    local perc_done=
+
+    let n_done=n_started-$(nr_running)
+    let perc_start=100*n_started/n_total
+    let perc_done=100*n_done/n_total
+    echo "$n_done ~ $n_started / $n_total  $perc_done% ~ $perc_start%"
+}
+
+echo test repo path: $tpath
+
+mkdir -p $tpath \
+    && git checkout-index -af --prefix=$tpath/ \
+    && cd $tpath || exit 1
+
+cases=$(ls $casedir)
+n_total=$(ls $casedir|wc -l| awk '{print $1}')
+n_started=0
+
+for c in $cases; do
+
+    { test_one_case $c; } &
+    sleep 0.1
+    let n_started=n_started+1
+
+    echo ""
+    echo "nr running: $(progress_stat):"
+    list_running "    "
+
+    failed=$(list_failed)
+    if [ ! -z "$failed" ]; then
+        echo ""
+        echo "failed:"
+        echo "$failed"
+    fi
+
+    wait_if_gt 8
+done
+
+wait_if_gt 0 1
+
+failed=$(list_failed)
+
+if [ -z "$failed" ]; then
+    echo "all passed. *** Congratulations! ***"
+else
+    echo ""
+    echo "failed:"
+    echo "$failed"
+fi
diff --git a/todo b/todo
index cac3bd9c..f7cb6b36 100644
--- a/todo
+++ b/todo
@@ -1,4 +1,20 @@
+wrapper: whether to add indent to empty line?
+
 test from 'factor'
 what's the right "test" snippet in 'factor'
 during rendering <CR> does not work the way super-tab setup, which is closing pum only.
 inclusion inside expandable should be parsed at runtime, or recursive inclusion is impossible.
+add functin to detect if it is expandable at current position
+check text before/after cursor as a condition to expand snippet
+add FAQ of Choose
+mv-flt-here
+readme-add-choose-and-pum-hint
+redefine _if should affect all snippet that includes it
+snippet handling current line text or else
+
+test ActionFinish indent issue
+test assign func-call to var
+test assigning var to var
+test tip: var,func
+test-build-ident-and-embed-indent
+test-priority-of-alias
diff --git a/xpt.ex b/xpt.ex
deleted file mode 100755
index 1759a480..00000000
--- a/xpt.ex
+++ /dev/null
@@ -1,113 +0,0 @@
-#!/bin/bash
-
-case $1 in
-    gentest)
-        cd ftplugin/
-        langs=`ls -d * | grep -v "^_" | awk '{printf($1" ");}'`
-        cd -
-
-        echo "vim -c \"XPTtestAll $langs\"" >test.bat
-        exit
-        ;;
-    tosvn)
-        rsync -Rrvc --delete \
-            --exclude=.git/ --exclude=.svn/ \
-            --exclude=dist-sub/ \
-            --exclude=.gitmodules \
-            --exclude=*.xpt.vimc \
-            --exclude-from=../.gitignore \
-            .././ \
-            ../../xptemplate.svn/trunk/./
-        exit
-        ;;
-    "")
-        echo "export"
-        ;;
-    *)
-        echo "error"
-        exit -1
-        ;;
-
-esac
-
-CurrentDir=$PWD
-ParentDir=${PWD%/*}
-ver=`cat VERSION`.`date +%y%m%d`
-
-dodist () {
-    DistName=$1
-    DistDir=$ParentDir/$DistName
-    vim -c 'helptags doc|qa'
-
-    # remove old files those may not exist in src
-    cd $DistDir && find -name "*.vim" | xargs rm -f
-
-    cp -R $CurrentDir/* $DistDir/
-
-
-    cd $DistDir
-    rm -rf `cat $CurrentDir/$0 | awk '/^# __TO_REMOVE__/,/^# __TO_REMOVE__ END/{ if ( $1 != "#" ) print $0; }'`
-
-    find -name "test.page*" | xargs rm
-
-    for file in `find plugin/ -name *.vim`;do
-
-        if [[ $file == "debug.vim" ]];then
-            continue
-        fi
-
-        echo remove Logs/Comments/Empty_Lines from $file
-
-        grep -v "call s:log.\(Log\|Debug\)(" $file |\
-            grep -v "^\s*Assert " |\
-            grep -v "^\s*\"" |\
-            grep -v "^\s*$" |\
-            sed 's/"\s*{{{//; s/"\s*}}}//' > .tmp
-
-        mv .tmp $file
-    done
-
-
-    cd $DistDir
-    cat > __ <<-END
-	" GetLatestVimScripts: 2611 1 :AutoInstall: xpt.tgz
-	" VERSION: $ver
-	END
-    cat $DistDir/plugin/xptemplate.vim >> __
-    mv __ $DistDir/plugin/xptemplate.vim
-
-
-    cd $ParentDir
-    rm -rf xpt
-    cp -R $DistName xpt
-
-    cd xpt
-    tar -czf ../xpt-$ver.tgz *
-
-    cd $CurrentDir
-}
-
-dodist dist
-dodist dist-sub
-
-
-
-
-exit
-
-# vim: set ts=64 :
-# __TO_REMOVE__
-plugin/xptemplateTest.vim
-plugin/xptTestKey.vim
-plugin/xptemplate.importer.vim
-xpt.testall.*
-xpt.ex
-genfile.vim
-doc/tags
-xpt.files.txt
-bench.vim
-test.bat
-test.sh
-tags
-todo
-# __TO_REMOVE__ END