diff --git a/vimwiki_0_8_3.vba b/vimwiki_0_9_0.vba
similarity index 87%
rename from vimwiki_0_8_3.vba
rename to vimwiki_0_9_0.vba
index b9c2c2a..e8c48f0 100644
--- a/vimwiki_0_8_3.vba
+++ b/vimwiki_0_9_0.vba
@@ -2,7 +2,7 @@
UseVimball
finish
doc\vimwiki.txt [[[1
-890
+948
*vimwiki.txt* A Personal Wiki for Vim
__ __ ______ __ __ ______ __ __ ______ ~
@@ -13,7 +13,7 @@ doc\vimwiki.txt [[[1
\ `\___/ /\_____\\ \_\\ \_\ `\___x___/ /\_____\\ \_\ \_\ /\_____\~
`\/__/ \/_____/ \/_/ \/_/'\/__//__/ \/_____/ \/_/\/_/ \/_____/~
- Version: 0.8.3 ~
+ Version: 0.8.4 ~
==============================================================================
CONTENTS *vimwiki-contents*
@@ -274,32 +274,42 @@ text should be decorated: >
------------------------------------------------------------------------------
5.2. Links *vimwiki-syntax-links*
-Internal links:
+Internal links~
+WikiWords: >
CapitalizedWordsConnected
-or:
- [[This is a link]]
-or:
- [[link source|Description of the link]]
-External links effects are visible after export to HTML.
-Plain link:
+You can limit linking of WikiWords by adding an exclamation mark in front of
+it: >
+ !CapitalizedWordsConnected
+
+Link with spaces in it: >
+ [[This is a link]]
+or: >
+ [[This is a link source|Description of the link]]
+
+
+External links~
+Plain link: >
http://code.google.com/p/vimwiki
-Link with description
+Link with description: >
[http://habamax.ru/blog habamax home page]
Image link is the link with one of jpg, png or gif endings.
-Plain image link:
+Plain image link: >
http://someaddr.com/picture.jpg
-Image thumbnail link:
+Image thumbnail link: >
[http://someaddr.com/bigpicture.jpg http://someaddr.com/thumbnail.jpg]
-Link to local image:
+
+
+Link to local image: >
[[images/pabloymoira.jpg|Pablo y Moira]]
Path to image (ie. images/pabloymoira.jpg) is relative to
-|g:vimwiki_home_html|.
+|vimwiki-option-path_html|.
+
------------------------------------------------------------------------------
5.3. Headers *vimwiki-syntax-headers*
@@ -338,7 +348,9 @@ two lines.
------------------------------------------------------------------------------
5.5. Lists *vimwiki-syntax-lists*
-Indent lists with at least one space:
+
+Indent list items with at least one space.
+Unordered lists: >
* Bulleted list item 1
* Bulleted list item 2
* Bulleted list sub item 1
@@ -349,7 +361,7 @@ Indent lists with at least one space:
* Bulleted list sub item 3
* etc.
-The same goes for numbered lists:
+Ordered lists: >
# Numbered list item 1
# Numbered list item 2
# Numbered list sub item 1
@@ -360,7 +372,19 @@ The same goes for numbered lists:
# Numbered list sub item 3
# etc.
-It is possible to mix bulleted and numbered lists.
+It is possible to mix bulleted and numbered lists: >
+ * Bulleted list item 1
+ * Bulleted list item 2
+ # Numbered list sub item 1
+ # Numbered list sub item 2
+
+
+Definition lists: >
+Term 1:: Definition 1
+Term 2::
+::Definition 2
+::Definition 3
+
------------------------------------------------------------------------------
5.6. Tables *vimwiki-syntax-tables*
@@ -407,7 +431,23 @@ Or use {{{ and }}} to define pre:
What the hand dare sieze the fire?
}}}
-It could be started from column 0.
+
+You can add optional information to {{{ tag: >
+{{{class="brush: python" >
+ def hello(world):
+ for x in range(10):
+ print("Hello {0} number {1}".format(world, x))
+}}}
+
+Result of HTML export: >
+
+ def hello(world):
+ for x in range(10):
+ print("Hello {0} number {1}".format(world, x))
+
+
+This might be useful for coloring some programming code with external js tools
+like google syntax highlighter.
------------------------------------------------------------------------------
@@ -711,6 +751,24 @@ Vim plugins website: http://www.vim.org/scripts/script.php?script_id=2226
==============================================================================
12. Changelog *vimwiki-changelog*
+0.9.0
+ * [new] You can add classes to 'pre' tag -- |vimwiki-syntax-preformatted|.
+ This might be useful for coloring some programming code with external js
+ tools like google syntax highlighter.
+ * [new] !WikiPage is not highlighted. It is just a plain word WikiPage in
+ HTML, without exclamation mark
+ * [new] Definition lists, see |vimwiki-syntax-lists|.
+ * [new] New implementation of |:VimwikiRenameWord|. CAUTION: It was tested
+ on 2 computers only, backup your wiki before use it. Email me if it
+ doesn't work for you.
+ * [new] HTML: convert [ ] to html checkboxes.
+ * [new] Default CSS: gray out checked items.
+ * [fix] Less than 3 characters are not highlighted in Bold and Italic.
+ * [fix] Added vimwiki autocmd group to avoid clashes with user defined
+ autocmds.
+ * [fix] Pressing ESC while |:VimwikiUISelect| opens current wiki index file.
+ Should cancel wiki selection.
+
0.8.3
* [new] on a list item creates checkbox.
* [fix] With * in the first column, shouldn't insert more * (default
@@ -894,7 +952,7 @@ it's free enough to suit your needs.
vim:tw=78:ts=8:ft=help
syntax\vimwiki.vim [[[1
-110
+111
" Vimwiki syntax file
" Author: Maxim Kim
" Home: http://code.google.com/p/vimwiki/
@@ -910,25 +968,25 @@ endif
"" use max highlighting - could be quite slow if there are too many wikifiles
if VimwikiGet('maxhi')
" Every WikiWord is nonexistent
- execute 'syntax match wikiNoExistsWord /'.g:vimwiki_word1.'/'
+ execute 'syntax match wikiNoExistsWord /\%(^\|[^!]\)\zs'.g:vimwiki_word1.'/'
execute 'syntax match wikiNoExistsWord /'.g:vimwiki_word2.'/'
" till we find them in vimwiki's path
call vimwiki#WikiHighlightWords()
else
" A WikiWord (unqualifiedWikiName)
- execute 'syntax match wikiWord /'.g:vimwiki_word1.'/'
+ execute 'syntax match wikiWord /\%(^\|[^!]\)\zs\<'.g:vimwiki_word1.'\>/'
" A [[bracketed wiki word]]
execute 'syntax match wikiWord /'.g:vimwiki_word2.'/'
endif
-let g:vimwiki_rxWeblink = '\("[^"(]\+\((\([^)]\+\))\)\?":\)\?\(https\?\|ftp\|gopher\|telnet\|file\|notes\|ms-help\):\(\(\(//\)\|\(\\\\\)\)\+[A-Za-z0-9:#@%/;$~_?+=.&\\\-]*\)'
+let g:vimwiki_rxWeblink = '\%("[^"(]\+\((\([^)]\+\))\)\?":\)\?\%(https\?\|ftp\|gopher\|telnet\|file\|notes\|ms-help\):\%(\%(\%(//\)\|\%(\\\\\)\)\+[A-Za-z0-9:#@%/;$~_?+=.&\\\-]*\)'
execute 'syntax match wikiLink `'.g:vimwiki_rxWeblink.'`'
" Emoticons: must come after the Textilisms, as later rules take precedence
" over earlier ones. This match is an approximation for the ~70 distinct
-syntax match wikiEmoticons /\((.)\|:[()|$@]\|:-[DOPS()\]|$@]\|;)\|:'(\)/
+syntax match wikiEmoticons /\%((.)\|:[()|$@]\|:-[DOPS()\]|$@]\|;)\|:'(\)/
-let g:vimwiki_rxTodo = '\(TODO:\|DONE:\|FIXME:\|FIXED:\)'
+let g:vimwiki_rxTodo = '\%(TODO:\|DONE:\|FIXME:\|FIXED:\)'
execute 'syntax match wikiTodo /'. g:vimwiki_rxTodo .'/'
" Load concrete Wiki syntax
@@ -965,6 +1023,7 @@ execute 'syntax match wikiTable /'.g:vimwiki_rxTable.'/'
" List items
execute 'syntax match wikiList /'.g:vimwiki_rxListBullet.'/'
execute 'syntax match wikiList /'.g:vimwiki_rxListNumber.'/'
+execute 'syntax match wikiList /'.g:vimwiki_rxListDefine.'/'
" Treat all other lines that start with spaces as PRE-formatted text.
execute 'syntax match wikiPre /'.g:vimwiki_rxPre1.'/ contains=wikiComment'
@@ -1006,7 +1065,7 @@ hi def link wikiComment Comment
let b:current_syntax="vimwiki"
syntax\vimwiki_default.vim [[[1
-69
+80
" Vimwiki syntax file
" Default syntax
" Author: Maxim Kim
@@ -1015,24 +1074,32 @@ syntax\vimwiki_default.vim [[[1
" text: *strong*
" let g:vimwiki_rxBold = '\*[^*]\+\*'
-let g:vimwiki_rxBold = '\(^\|\s\|[[:punct:]]\)\zs\*[^*`[:space:]]'.
- \'[^*`]\+'.
- \'[^*`[:space:]]\*\ze\([[:punct:]]\|\s\|$\)'
+let g:vimwiki_rxBold = '\%(^\|\s\|[[:punct:]]\)\zs'.
+ \'\*'.
+ \'\([^*`[:space:]][^*`]*[^*`[:space:]]\|[^*`]\)'.
+ \'\*'.
+ \'\ze\%([[:punct:]]\|\s\|$\)'
" text: _emphasis_
" let g:vimwiki_rxItalic = '_[^_]\+_'
-let g:vimwiki_rxItalic = '\(^\|\s\|[[:punct:]]\)\zs_[^_`[:space:]]'.
- \'[^_`]\+'.
- \'[^_`[:space:]]_\ze\([[:punct:]]\|\s\|$\)'
+let g:vimwiki_rxItalic = '\%(^\|\s\|[[:punct:]]\)\zs'.
+ \'_'.
+ \'\([^_`[:space:]][^_`]*[^_`[:space:]]\|[^_`]\)'.
+ \'_'.
+ \'\ze\%([[:punct:]]\|\s\|$\)'
" text: *_bold italic_* or _*italic bold*_
-let g:vimwiki_rxBoldItalic = '\(^\|\s\|[[:punct:]]\)\zs\*_[^*_`[:space:]]'.
- \'[^*_`]\+'.
- \'[^*_`[:space:]]_\*\ze\([[:punct:]]\|\s\|$\)'
+let g:vimwiki_rxBoldItalic = '\%(^\|\s\|[[:punct:]]\)\zs'.
+ \'\*_'.
+ \'\([^*_`[:space:]][^*_`]*[^*_`[:space:]]\|[^*_`]\)'.
+ \'_\*'.
+ \'\ze\%([[:punct:]]\|\s\|$\)'
-let g:vimwiki_rxItalicBold = '\(^\|\s\|[[:punct:]]\)\zs_\*[^*_`[:space:]]'.
- \'[^*_`]\+'.
- \'[^*_`[:space:]]\*_\ze\([[:punct:]]\|\s\|$\)'
+let g:vimwiki_rxItalicBold = '\%(^\|\s\|[[:punct:]]\)\zs'.
+ \'_\*'.
+ \'\([^*_`[:space:]][^*_`]*[^*_`[:space:]]\|[^*_`]\)'.
+ \'\*_'.
+ \'\ze\%([[:punct:]]\|\s\|$\)'
" text: `code`
let g:vimwiki_rxCode = '`[^`]\+`'
@@ -1053,12 +1120,12 @@ let g:vimwiki_rxH3 = '^\s*=\{3}[^=]\+.*[^=]\+=\{3}\s*$'
let g:vimwiki_rxH4 = '^\s*=\{4}[^=]\+.*[^=]\+=\{4}\s*$'
let g:vimwiki_rxH5 = '^\s*=\{5}[^=]\+.*[^=]\+=\{5}\s*$'
let g:vimwiki_rxH6 = '^\s*=\{6}[^=]\+.*[^=]\+=\{6}\s*$'
-let g:vimwiki_rxHeader = '\('.g:vimwiki_rxH1.'\)\|'.
- \ '\('.g:vimwiki_rxH2.'\)\|'.
- \ '\('.g:vimwiki_rxH3.'\)\|'.
- \ '\('.g:vimwiki_rxH4.'\)\|'.
- \ '\('.g:vimwiki_rxH5.'\)\|'.
- \ '\('.g:vimwiki_rxH6.'\)'
+let g:vimwiki_rxHeader = '\%('.g:vimwiki_rxH1.'\)\|'.
+ \ '\%('.g:vimwiki_rxH2.'\)\|'.
+ \ '\%('.g:vimwiki_rxH3.'\)\|'.
+ \ '\%('.g:vimwiki_rxH4.'\)\|'.
+ \ '\%('.g:vimwiki_rxH5.'\)\|'.
+ \ '\%('.g:vimwiki_rxH6.'\)'
" , horizontal rule
let g:vimwiki_rxHR = '^----.*$'
@@ -1070,6 +1137,9 @@ let g:vimwiki_rxTable = '||'
let g:vimwiki_rxListBullet = '^\s\+\*'
let g:vimwiki_rxListNumber = '^\s\+#'
+let g:vimwiki_rxListDefine = '::\(\s\|$\)'
+
+
" Treat all other lines that start with spaces as PRE-formatted text.
let g:vimwiki_rxPre1 = '^\s\+[^[:blank:]*#].*$'
@@ -1077,7 +1147,7 @@ let g:vimwiki_rxPre1 = '^\s\+[^[:blank:]*#].*$'
let g:vimwiki_rxPreStart = '{{{'
let g:vimwiki_rxPreEnd = '}}}'
syntax\vimwiki_media.vim [[[1
-59
+61
" Vimwiki syntax file
" MediaWiki syntax
" Author: Maxim Kim
@@ -1113,12 +1183,12 @@ let g:vimwiki_rxH3 = '^\s*=\{3}[^=]\+.*[^=]\+=\{3}\s*$'
let g:vimwiki_rxH4 = '^\s*=\{4}[^=]\+.*[^=]\+=\{4}\s*$'
let g:vimwiki_rxH5 = '^\s*=\{5}[^=]\+.*[^=]\+=\{5}\s*$'
let g:vimwiki_rxH6 = '^\s*=\{6}[^=]\+.*[^=]\+=\{6}\s*$'
-let g:vimwiki_rxHeader = '\('.g:vimwiki_rxH1.'\)\|'.
- \ '\('.g:vimwiki_rxH2.'\)\|'.
- \ '\('.g:vimwiki_rxH3.'\)\|'.
- \ '\('.g:vimwiki_rxH4.'\)\|'.
- \ '\('.g:vimwiki_rxH5.'\)\|'.
- \ '\('.g:vimwiki_rxH6.'\)'
+let g:vimwiki_rxHeader = '\%('.g:vimwiki_rxH1.'\)\|'.
+ \ '\%('.g:vimwiki_rxH2.'\)\|'.
+ \ '\%('.g:vimwiki_rxH3.'\)\|'.
+ \ '\%('.g:vimwiki_rxH4.'\)\|'.
+ \ '\%('.g:vimwiki_rxH5.'\)\|'.
+ \ '\%('.g:vimwiki_rxH6.'\)'
" , horizontal rule
let g:vimwiki_rxHR = '^----.*$'
@@ -1131,6 +1201,8 @@ let g:vimwiki_rxTable = '||'
let g:vimwiki_rxListBullet = '^\s*\*\+\([^*]*$\)\@='
let g:vimwiki_rxListNumber = '^\s*#\+'
+let g:vimwiki_rxListDefine = '^\%(;\|:\)\s'
+
" Treat all other lines that start with spaces as PRE-formatted text.
let g:vimwiki_rxPre1 = '^\s\+[^[:blank:]*#].*$'
@@ -1138,7 +1210,7 @@ let g:vimwiki_rxPre1 = '^\s\+[^[:blank:]*#].*$'
let g:vimwiki_rxPreStart = '
'
let g:vimwiki_rxPreEnd = '<\/pre>'
autoload\vimwiki_gtd.vim [[[1
-180
+187
" Vimwiki autoload plugin file
" GTD (Getting Things Done) related stuff here.
" Author: Maxim Kim
@@ -1149,6 +1221,7 @@ if exists("g:loaded_vimwiki_gtd_auto") || &cp
endif
let g:loaded_vimwiki_gtd_auto = 1
+" Script variables {{{
" used in various checks
let s:rx_list_item = '\('.
\ g:vimwiki_rxListBullet.'\|'.g:vimwiki_rxListNumber.
@@ -1159,7 +1232,9 @@ let s:rx_li_unchecked = '\[\s\?\]'
" used in substitutions
let s:rx_li_check = '\[x\]'
let s:rx_li_uncheck = '\[ \]'
+" }}}
+" Script functions {{{
" Set state of the list item on line number "lnum" to [ ] or [x]
function! s:set_state(lnum, on_off)"{{{
let line = getline(a:lnum)
@@ -1183,21 +1258,22 @@ function! s:get_state(lnum)"{{{
return state
endfunction"}}}
-" Returns: 1 if line is list item, 0 otherwise
+" Returns 1 if line is list item, 0 otherwise
function! s:is_cb_list_item(lnum)"{{{
return getline(a:lnum) =~ s:rx_cb_list_item
endfunction"}}}
-" Returns: 1 if line is list item, 0 otherwise
+" Returns 1 if line is list item, 0 otherwise
function! s:is_list_item(lnum)"{{{
return getline(a:lnum) =~ s:rx_list_item
endfunction"}}}
-function! s:get_li_pos(lnum)"{{{
- return stridx(getline(a:lnum), '[')
-endfunction"}}}
+" Returns char column of checkbox. Used in parent/child checks.
+function! s:get_li_pos(lnum) "{{{
+ return stridx(getline(a:lnum), '[')
+endfunction "}}}
-" Returns: list of line numbers of parent and all its child items.
+" Returns list of line numbers of parent and all its child items.
function! s:get_child_items(lnum)"{{{
let result = []
let lnum = a:lnum
@@ -1218,7 +1294,7 @@ function! s:get_child_items(lnum)"{{{
return result
endfunction"}}}
-" Returns: list of line numbers of all items of the same level.
+" Returns list of line numbers of all items of the same level.
function! s:get_sibling_items(lnum)"{{{
let result = []
let lnum = a:lnum
@@ -1248,7 +1324,7 @@ function! s:get_sibling_items(lnum)"{{{
return result
endfunction"}}}
-" Returns: line number of the parent of lnum item
+" Returns line number of the parent of lnum item
function! s:get_parent_item(lnum)"{{{
let lnum = a:lnum
let ind = s:get_li_pos(lnum)
@@ -1266,6 +1342,7 @@ function! s:get_parent_item(lnum)"{{{
endif
endfunction"}}}
+" Creates checkbox in a list item.
function s:create_cb_list_item(lnum) "{{{
let line = getline(a:lnum)
let m = matchstr(line, s:rx_list_item)
@@ -1275,6 +1352,8 @@ function s:create_cb_list_item(lnum) "{{{
endif
endfunction "}}}
+" Script functions }}}
+
" Toggle list item between [ ] and [x]
function! vimwiki_gtd#GTDToggleItem()"{{{
let current_lnum = line('.')
@@ -1320,7 +1399,7 @@ function! vimwiki_gtd#GTDToggleItem()"{{{
endwhile
endfunction"}}}
autoload\vimwiki_html.vim [[[1
-768
+844
" Vimwiki autoload plugin file
" Export to HTML
" Author: Maxim Kim
@@ -1366,14 +1445,16 @@ function! s:create_default_CSS(path) " {{{
call add(lines, 'h4 {color: #333333;}')
call add(lines, 'h5 {color: #555555;}')
call add(lines, 'h6 {color: #777777;}')
- call add(lines, 'p, ul, ol, pre {margin: 0.6em auto;}')
+ call add(lines, 'p, pre {margin: 0.6em auto;}')
+ call add(lines, 'ul, ol, dl, li {margin: 0.3em auto;}')
call add(lines, 'ul {margin-left: 2em; padding-left: 0.5em;}')
+ call add(lines, 'dt {font-weight: bold;}')
call add(lines, 'img {border: none;}')
call add(lines, 'pre {border-left: 1px solid #ccc; margin-left: 2em; padding-left: 0.5em;}')
call add(lines, 'td {border: 1px solid #ccc; padding: 0.3em;}')
call add(lines, 'hr {border: none; border-top: 1px solid #ccc; width: 100%;}')
call add(lines, '.todo {font-weight: bold; background-color: #f0ece8; color: #a03020;}')
- call add(lines, '.strike {text-decoration: line-through;}')
+ call add(lines, '.strike {text-decoration: line-through; color: #777777;}')
call writefile(lines, path.'style.css')
echomsg "Default style.css is created."
@@ -1410,7 +1491,6 @@ endfunction "}}}
function! s:get_html_header(title, charset) "{{{
let lines=[]
- " globals are bad, but...
if VimwikiGet('html_header') != ""
try
let lines = readfile(expand(VimwikiGet('html_header')))
@@ -1437,7 +1517,6 @@ endfunction "}}}
function! s:get_html_footer() "{{{
let lines=[]
- " globals are bad, but...
if VimwikiGet('html_footer') != ""
try
let lines = readfile(expand(VimwikiGet('html_footer')))
@@ -1495,17 +1574,31 @@ function! s:close_tag_list(lists, ldest) "{{{
endwhile
endfunction! "}}}
-function! s:process_tag_code(line, code) "{{{
+function! s:close_tag_def_list(deflist, ldest) "{{{
+ if a:deflist
+ call insert(a:ldest, "")
+ return 0
+ endif
+ return a:deflist
+endfunction! "}}}
+
+function! s:process_tag_pre_cl(line, code) "{{{
let lines = []
let code = a:code
let processed = 0
- if !code && a:line =~ '^{{{\s*$'
+ if !code && a:line =~ '{{{[^\(}}}\)]*\s*$'
+ let class = matchstr(a:line, '{{{\zs.*$')
+ let class = substitute(class, '\s\+$', '', 'g')
+ if class != ""
+ call add(lines, "
")
+ else
+ call add(lines, "
")
+ endif
let code = 1
- call add(lines, "
")
let processed = 1
elseif code && a:line =~ '^}}}\s*$'
let code = 0
- call add(lines, "
")
+ call add(lines, "
")
let processed = 1
elseif code
let processed = 1
@@ -1567,14 +1660,25 @@ function! s:process_tag_list(line, lists) "{{{
call add(lines, item[0])
endwhile
endif
+ let st_tag = '
'
+ let en_tag = '
'
+ let checkbox = '\s*\[\(.\?\)]'
" apply strikethrough for checked list items
- if a:line =~ '^\s\+\(\*\|#\)\s*\[x]'
- call add(lines, '