Merge pull request #122 from shlomif/master

Remove trailing space + Grammar Corrections.
This commit is contained in:
mattn
2013-05-15 06:30:54 -07:00
6 changed files with 35 additions and 33 deletions

View File

@@ -1,6 +1,8 @@
# ZenCoding-vim
[zencoding-vim](http://mattn.github.com/zencoding-vim) is vim script support for expanding abbreviation like zen-coding(emmet).
[zencoding-vim](http://mattn.github.com/zencoding-vim) is a vim plug-in
which provides support for expanding abbreviations similar to
[zen-coding](http://code.google.com/p/zen-coding/).
## Installation
@@ -9,14 +11,14 @@
cd ~/.vim
unzip zencoding-vim.zip
If you install pathogen.vim:
To install using pathogen.vim:
cd ~/.vim/bundle # or make directory
cd ~/.vim/bundle
unzip /path/to/zencoding-vim.zip
If you get source from repository:
To checkout the source from repository:
cd ~/.vim/bundle # or make directory
cd ~/.vim/bundle
git clone http://github.com/mattn/zencoding-vim.git
or:
@@ -30,15 +32,15 @@ or:
## Quick Tutorial
Open or create New File:
Open or create a New File:
vim index.html
Type ("_" is the cursor position):
Type ("\_" is the cursor position):
html:5_
Then type "<c-y>," (Ctrl + y + ','), you should see:
Then type "\<c-y\>," (Ctrl + y + ','), you should see:
<!DOCTYPE HTML>
<html lang="en">
@@ -56,9 +58,9 @@ Then type "<c-y>," (Ctrl + y + ','), you should see:
## Enable in different mode
If you don't want enable zencoding in all mode,
you can use set a option in `vimrc`:
If you don't want to enable zencoding in all modes,
you can use set these options in `vimrc`:
let g:user_zen_mode='n' "only enable normal mode functions.
let g:user_zen_mode='inv' "enable all functions, which is equal to
let g:user_zen_mode='a' "enable all function in all mode.
@@ -86,7 +88,7 @@ you can use set a option in `vimrc`:
> <http://mattn.kaoriya.net/software/vim/20100222103327.htm>
> <http://mattn.kaoriya.net/software/vim/20100306021632.htm>
### Japanese blog posts about zencoding-vim:
> <http://d.hatena.ne.jp/idesaku/20100424/1272092255>
@@ -97,7 +99,7 @@ you can use set a option in `vimrc`:
> <http://looxu.blogspot.jp/2010/02/zencodingvimhtml.html>
### tutorial translated in Chinese:
### A Chinese translation of the tutorial:
> <http://www.zfanw.com/blog/zencoding-vim-tutorial-chinese.html>

View File

@@ -68,7 +68,7 @@ Tutorial of zencoding.vim
---------------------
<img src="foo.png" />
---------------------
Type '<c-y>i' on img tag
Type '<c-y>i' on img tag
---------------------
<img src="foo.png" width="32" height="48" />
---------------------
@@ -101,7 +101,7 @@ Tutorial of zencoding.vim
Type '<c-y>k' in insert mode.
---------------------
<div class="foo">
</div>
---------------------

View File

@@ -10,7 +10,7 @@ function! zencoding#lang#css#parseIntoTree(abbr, type)
let settings = zencoding#getSettings()
let indent = zencoding#getIndentation(type)
let root = { 'name': '', 'attr': {}, 'child': [], 'snippet': '', 'multiplier': 1, 'parent': {}, 'value': '', 'pos': 0, 'important': 0 }
" emmet
@@ -45,7 +45,7 @@ function! zencoding#lang#css#parseIntoTree(abbr, type)
endif
endfor
endif
let tag_name = token
if tag_name =~ '.!$'
let tag_name = tag_name[:-2]
@@ -56,14 +56,14 @@ function! zencoding#lang#css#parseIntoTree(abbr, type)
" make default node
let current = { 'name': '', 'attr': {}, 'child': [], 'snippet': '', 'multiplier': 1, 'parent': {}, 'value': '', 'pos': 0, 'important': important }
let current.name = tag_name
" aliases
let aliases = zencoding#getResource(type, 'aliases', {})
if has_key(aliases, tag_name)
let current.name = aliases[tag_name]
endif
let use_pipe_for_cursor = zencoding#getResource(type, 'use_pipe_for_cursor', 1)
" snippets
let snippets = zencoding#getResource(type, 'snippets', {})
if !empty(snippets) && has_key(snippets, tag_name)
@@ -83,7 +83,7 @@ function! zencoding#lang#css#parseIntoTree(abbr, type)
let current.snippet .= "\n"
endif
endif
let current.pos = 0
let lg = matchlist(token, '^\%(linear-gradient\|lg\)(\s*\(\w\+\)\s*,\s*\([^,]\+\)\s*,\s*\([^)]\+\)\s*)$')
if len(lg)

View File

@@ -1,7 +1,7 @@
*zencoding.txt* ZenCoding for Vim
-------------------------------------------------------
ZenCoding: vim plugins for HTML and CSS hi-speed coding
ZenCoding: vim plugins for HTML and CSS hi-speed coding
-------------------------------------------------------
Author: Yasuhiro Matsumoto <mattn.jp@gmail.com>
@@ -160,7 +160,7 @@ You should copy this section and create new buffer, paste and write as
<div id="bar" class="bar"></li>
<
If cursor is at '*', |<C-Y>n| move a cursor into attribute value of div
specified id as 'foo'. And type again |<C-Y>n| move a cursor into inner of
specified id as 'foo'. And type again |<C-Y>n| move a cursor into inner of
div specified id as 'bar'.
6. Go to Previous Edit Point *zencoding-goto-previous-point* *<C-Y>N*
@@ -175,11 +175,11 @@ You should copy this section and create new buffer, paste and write as
7. Update <img> Size *zencoding-update-image-size* *<C-Y>i*
To expand or update size of image, type |<C-Y>i| on img tag
To expand or update size of image, type |<C-Y>i| on img tag
>
<img src="foo.png" />
<
Type '<c-y>i' on img tag
Type '<c-y>i' on img tag
>
<img src="foo.png" width="32" height="32" />
<
@@ -215,7 +215,7 @@ You should copy this section and create new buffer, paste and write as
Type |<C-Y>k| in insert mode, then
>
<div class="foo">
</div>
<
And type |<C-Y>k| in there again, then div will be removed.

View File

@@ -180,7 +180,7 @@ function! s:install_plugin_v()
endfunction
if exists('g:user_zen_mode')
if exists('g:user_zen_mode')
let imode = matchstr(g:user_zen_mode, '[ai]')
let nmode = matchstr(g:user_zen_mode, '[an]')
let vmode = matchstr(g:user_zen_mode, '[av]')

View File

@@ -13,10 +13,10 @@ detailed_description: |
There is a movie using zencoding.vim
ref: http://mattn.github.com/zencoding-vim
Source Repository.
ref: http://github.com/mattn/zencoding-vim
Type abbreviation
+-------------------------------------
| html:5_
@@ -49,7 +49,7 @@ detailed_description: |
|</div>
| _
+-------------------------------------
Tutorial:
http://github.com/mattn/zencoding-vim/raw/master/TUTORIAL
@@ -59,10 +59,10 @@ detailed_description: |
http://mattn.github.com/zencoding-vim
Tips:
You can customize behavior of expanding with overriding config.
This configuration will be merged at loading plugin.
This configuration will be merged at loading plugin.
let g:user_zen_settings = {
\ 'indentation' : ' ',
\ 'perl' : {