commit 84297c90516c40df5c6e224930c3bd92a8046efd
parent 78ee71394a23317746e752b86bf4eb08a25213dc
Author: Maxim Kim <habamax@gmail.com>
Date: Sat, 11 Jun 2011 00:00:00 +0000
Version 1.2
= Note =
Remove previous version of vimwiki before install - files in autoload dir is moved/renamed to autoload/vimwiki dir.
= Changelog =
* Issue 70: Table spanning cell support.
* Issue 72: Do not convert again for unchanged file. |:VimwikiAll2HTML|
converts only changed wiki files.
* Issue 117: |VimwikiDiaryIndex| command that opens diary index wiki page.
* Issue 120: Links in headers are not highlighted in vimwiki but are
highlighted in HTML.
* Issue 138: Added possibility to remap table-column move bindings. See
|:VimwikiTableMoveColumnLeft| and |:VimwikiTableMoveColumnRight|
commands. For remap instructions see |vimwiki_<A-Left>|
and |vimwiki_<A-Right>|.
* Issue 125: Problem with 'o' command given while at the of the file.
* Issue 131: FileType is not set up when GUIEnter autocommand is used in
vimrc. Use 'nested' in 'au GUIEnter * nested VimwikiIndex'
* Issue 132: Link to perl (or any non-wiki) file in vimwiki subdirectory
doesn't work as intended.
* Issue 135: %title and %toc used together cause TOC to appear in an
unexpected place in HTML.
* Issue 139: |:VimwikiTabnewLink| command is added.
* Fix of g:vimwiki_stripsym = '' (i.e. an empty string) -- it removes bad
symbols from filenames.
* Issue 145: With modeline 'set ft=vimwiki' links are not correctly
highlighted when open wiki files.
* Issue 146: Filetype difficulty with ".txt" as a vimwiki extension.
* Issue 148: There are no mailto links.
* Issue 151: Use location list instead of quickfix list for :VimwikiSearch
command result. Use :lopen instead of :copen, :lnext instead of :cnext
etc.
* Issue 152: Add the list of HTML files that would not be deleted after
|:VimwikiAll2HTML|.
* Issue 153: Delete HTML files that has no corresponding wiki ones with
|:VimwikiAll2HTML|.
* Issue 156: Add multiple HTML templates. See
|vimwiki-option-template_path|. Options html_header and html_footer are
no longer exist.
* Issue 173: When virtualedit=all option is enabled the 'o' command behave
strange.
* Issue 178: Problem with alike wikie's paths.
* Issue 182: Browser command does not quote url.
* Issue 183: Spelling error highlighting is not possible with nested
syntaxes.
* Issue 184: Wrong foldlevel in some cases.
* Issue 195: Page renaming issue.
* Issue 196: vim: modeline bug -- syn=vim doesn't work.
* Issue 199: Generated HTML for sublists is invalid.
* Issue 200: Generated HTML for todo lists does not show completion status
the fix relies on CSS, thus your old stylesheets need to be updated!;
may not work in obsolete browsers or font-deficient systems.
* Issue 205: Block code: highlighting differs from processing. Inline code
block {{{ ... }}} is removed. Use `...` instead.
* Issue 208: Default highlight colors are problematic in many
colorschemes. Headers are highlighted as |hl-Title| by default, use
|g:vimwiki_hl_headers| to restore previous default Red, Green, Blue or
custom header colors. Some other changes in highlighting.
* Issue 209: Wild comments slow down html generation. Comments are
changed, use %% to comment out entire line.
* Issue 210: HTML: para enclose header.
* Issue 214: External links containing Chinese characters get trimmed.
* Issue 218: Command to generate HTML file and open it in webbrowser. See
|:Vimwiki2HTMLBrowse|(bind to <leader>whh)
* NEW: Added <Leader>wh mapping to call |:Vimwiki2HTML|
Diffstat:
19 files changed, 4442 insertions(+), 3978 deletions(-)
diff --git a/README b/README
@@ -5,8 +5,7 @@ A Personal Wiki For Vim Plugin
Screenshots are available on http://code.google.com/p/vimwiki/
There are also zipped vimwiki files there in case you do not like vimball archives.
-Vimwiki quick reference card http://habamax.ru/myvim/data/vimwikiqrc.pdf by J.A.J. Pater.
-Thx Gager Jacob for the update.
+Vimwiki quick reference card http://vimwiki.googlecode.com/hg/misc/Vimwiki1.1.1QR.pdf.
Prerequisites
@@ -42,8 +41,8 @@ Feed it with the following example:
* ScratchPad -- various temporary stuff.
-Notice that ProjectGutenberg, MyUrgentTasks and ScratchPad highlighted as
-errors. These are links in CamelCase form that do not exists yet. (CamelCase
+Notice that !ProjectGutenberg, !MyUrgentTasks and !ScratchPad curly underlined.
+These are links in CamelCase form that do not exists yet. (CamelCase
form -- capitalized word connected with other capitalized words)
Place cursor on ProjectGutenberg and press <Enter>. Now you are in
diff --git a/autoload/vimwiki.vim b/autoload/vimwiki.vim
@@ -1,1088 +0,0 @@
-" vim:tabstop=2:shiftwidth=2:expandtab:foldmethod=marker:textwidth=79
-" Vimwiki autoload plugin file
-" Author: Maxim Kim <habamax@gmail.com>
-" Home: http://code.google.com/p/vimwiki/
-
-if exists("g:loaded_vimwiki_auto") || &cp
- finish
-endif
-let g:loaded_vimwiki_auto = 1
-
-if has("win32")
- let s:os_sep = '\'
-else
- let s:os_sep = '/'
-endif
-
-let s:badsymbols = '['.g:vimwiki_badsyms.g:vimwiki_stripsym.'<>|?*:"]'
-
-" MISC helper functions {{{
-
-function! vimwiki#chomp_slash(str) "{{{
- return substitute(a:str, '[/\\]\+$', '', '')
-endfunction "}}}
-
-function! vimwiki#mkdir(path) "{{{
- let path = expand(a:path)
- if !isdirectory(path) && exists("*mkdir")
- let path = vimwiki#chomp_slash(path)
- if s:is_windows() && !empty(g:vimwiki_w32_dir_enc)
- let path = iconv(path, &enc, g:vimwiki_w32_dir_enc)
- endif
- call mkdir(path, "p")
- endif
-endfunction
-" }}}
-
-function! vimwiki#safe_link(string) "{{{
- return substitute(a:string, s:badsymbols, g:vimwiki_stripsym, 'g')
-endfunction
-"}}}
-
-function! vimwiki#unsafe_link(string) "{{{
- return substitute(a:string, g:vimwiki_stripsym, s:badsymbols, 'g')
-endfunction
-"}}}
-
-function! vimwiki#subdir(path, filename)"{{{
- let path = expand(a:path)
- let filename = expand(a:filename)
- let idx = 0
- while path[idx] ==? filename[idx]
- let idx = idx + 1
- endwhile
-
- let p = split(strpart(filename, idx), '[/\\]')
- let res = join(p[:-2], s:os_sep)
- if len(res) > 0
- let res = res.s:os_sep
- endif
- return res
-endfunction"}}}
-
-function! vimwiki#current_subdir()"{{{
- return vimwiki#subdir(VimwikiGet('path'), expand('%:p'))
-endfunction"}}}
-
-function! vimwiki#open_link(cmd, link, ...) "{{{
- if vimwiki#is_non_wiki_link(a:link)
- call s:edit_file(a:cmd, a:link)
- else
- if a:0
- let vimwiki_prev_link = [a:1, []]
- elseif &ft == 'vimwiki'
- let vimwiki_prev_link = [expand('%:p'), getpos('.')]
- endif
-
- if vimwiki#is_link_to_dir(a:link)
- if g:vimwiki_dir_link == ''
- call s:edit_file(a:cmd, VimwikiGet('path').a:link)
- else
- call s:edit_file(a:cmd,
- \ VimwikiGet('path').a:link.
- \ g:vimwiki_dir_link.
- \ VimwikiGet('ext'))
- endif
- else
- call s:edit_file(a:cmd, VimwikiGet('path').a:link.VimwikiGet('ext'))
- endif
-
- if exists('vimwiki_prev_link')
- let b:vimwiki_prev_link = vimwiki_prev_link
- endif
- endif
-endfunction
-" }}}
-
-function! vimwiki#select(wnum)"{{{
- if a:wnum < 1 || a:wnum > len(g:vimwiki_list)
- return
- endif
- if &ft == 'vimwiki'
- let b:vimwiki_idx = g:vimwiki_current_idx
- endif
- let g:vimwiki_current_idx = a:wnum - 1
-endfunction
-" }}}
-
-function! vimwiki#generate_links()"{{{
- let links = s:get_links('*'.VimwikiGet('ext'))
-
- " We don't want link to itself.
- let cur_link = expand('%:t:r')
- call filter(links, 'v:val != cur_link')
-
- if len(links)
- call append(line('$'), '= Generated Links =')
- endif
-
- call sort(links)
-
- for link in links
- if s:is_wiki_word(link)
- call append(line('$'), '- '.link)
- else
- call append(line('$'), '- [['.link.']]')
- endif
- endfor
-endfunction " }}}
-
-function! vimwiki#goto(key) "{{{
- call s:edit_file(':e',
- \ VimwikiGet('path').
- \ a:key.
- \ VimwikiGet('ext'))
-endfunction "}}}
-
-function! s:is_windows() "{{{
- return has("win32") || has("win64") || has("win95") || has("win16")
-endfunction "}}}
-
-function! s:get_links(pat) "{{{
- " search all wiki files in 'path' and its subdirs.
- let subdir = vimwiki#current_subdir()
-
- " if current wiki is temporary -- was added by an arbitrary wiki file then do
- " not search wiki files in subdirectories. Or it would hang the system if
- " wiki file was created in $HOME or C:/ dirs.
- if VimwikiGet('temp')
- let search_dirs = ''
- else
- let search_dirs = '**/'
- endif
- let globlinks = glob(VimwikiGet('path').subdir.search_dirs.a:pat)
-
- " remove extensions (and backup extensions too: .wiki~)
- let globlinks = substitute(globlinks, '\'.VimwikiGet('ext').'\~\?', "", "g")
- let links = split(globlinks, '\n')
-
- " remove paths
- let rem_path = escape(expand(VimwikiGet('path')).subdir, '\')
- call map(links, 'substitute(v:val, rem_path, "", "g")')
-
- " Remove trailing slashes.
- call map(links, 'substitute(v:val, "[/\\\\]*$", "", "g")')
-
- return links
-endfunction "}}}
-
-" Builtin cursor doesn't work right with unicode characters.
-function! s:cursor(lnum, cnum) "{{{
- exe a:lnum
- exe 'normal! 0'.a:cnum.'|'
-endfunction "}}}
-
-function! s:filename(link) "{{{
- let result = vimwiki#safe_link(a:link)
- if a:link =~ '|'
- let result = vimwiki#safe_link(split(a:link, '|')[0])
- elseif a:link =~ ']['
- let result = vimwiki#safe_link(split(a:link, '][')[0])
- endif
- return result
-endfunction
-" }}}
-
-function! s:is_wiki_word(str) "{{{
- if a:str =~ g:vimwiki_rxWikiWord && a:str !~ '[[:space:]\\/]'
- return 1
- endif
- return 0
-endfunction
-" }}}
-
-function! s:edit_file(command, filename) "{{{
- let fname = escape(a:filename, '% ')
- call vimwiki#mkdir(fnamemodify(a:filename, ":p:h"))
- execute a:command.' '.fname
-endfunction
-" }}}
-
-function! s:search_word(wikiRx, cmd) "{{{
- let match_line = search(a:wikiRx, 's'.a:cmd)
- if match_line == 0
- echomsg "vimwiki: Wiki link not found."
- endif
-endfunction
-" }}}
-
-function! s:get_word_at_cursor(wikiRX) "{{{
- let col = col('.') - 1
- let line = getline('.')
- let ebeg = -1
- let cont = match(line, a:wikiRX, 0)
- while (ebeg >= 0 || (0 <= cont) && (cont <= col))
- let contn = matchend(line, a:wikiRX, cont)
- if (cont <= col) && (col < contn)
- let ebeg = match(line, a:wikiRX, cont)
- let elen = contn - ebeg
- break
- else
- let cont = match(line, a:wikiRX, contn)
- endif
- endwh
- if ebeg >= 0
- return strpart(line, ebeg, elen)
- else
- return ""
- endif
-endf "}}}
-
-function! s:strip_word(word) "{{{
- let result = a:word
- if strpart(a:word, 0, 2) == "[["
- " get rid of [[ and ]]
- let w = strpart(a:word, 2, strlen(a:word)-4)
-
- if w =~ '|'
- " we want "link" from [[link|link desc]]
- let w = split(w, "|")[0]
- elseif w =~ ']['
- " we want "link" from [[link][link desc]]
- let w = split(w, "][")[0]
- endif
-
- let result = vimwiki#safe_link(w)
- endif
- return result
-endfunction
-" }}}
-
-function! vimwiki#is_non_wiki_link(lnk) "{{{
- let exts = '.\+\.\%('.
- \ join(split(g:vimwiki_file_exts, '\s*,\s*'), '\|').
- \ '\)$'
- if a:lnk =~ exts
- return 1
- endif
- return 0
-endfunction "}}}
-
-function! vimwiki#is_link_to_dir(link) "{{{
- " Check if link is to a directory.
- " It should be ended with \ or /.
- if a:link =~ '.\+[/\\]$'
- return 1
- endif
- return 0
-endfunction " }}}
-
-function! s:print_wiki_list() "{{{
- let idx = 0
- while idx < len(g:vimwiki_list)
- if idx == g:vimwiki_current_idx
- let sep = ' * '
- echohl PmenuSel
- else
- let sep = ' '
- echohl None
- endif
- echo (idx + 1).sep.VimwikiGet('path', idx)
- let idx += 1
- endwhile
- echohl None
-endfunction
-" }}}
-
-function! s:update_wiki_link(fname, old, new) " {{{
- echo "Updating links in ".a:fname
- let has_updates = 0
- let dest = []
- for line in readfile(a:fname)
- if !has_updates && match(line, a:old) != -1
- let has_updates = 1
- endif
- call add(dest, substitute(line, a:old, escape(a:new, "&"), "g"))
- endfor
- " add exception handling...
- if has_updates
- call rename(a:fname, a:fname.'#vimwiki_upd#')
- call writefile(dest, a:fname)
- call delete(a:fname.'#vimwiki_upd#')
- endif
-endfunction
-" }}}
-
-function! s:update_wiki_links_dir(dir, old_fname, new_fname) " {{{
- let old_fname = substitute(a:old_fname, '[/\\]', '[/\\\\]', 'g')
- let new_fname = a:new_fname
- let old_fname_r = old_fname
- let new_fname_r = new_fname
-
- if !s:is_wiki_word(new_fname) && s:is_wiki_word(old_fname)
- let new_fname_r = '[['.new_fname.']]'
- endif
-
- if !s:is_wiki_word(old_fname)
- let old_fname_r = '\[\[\zs'.vimwiki#unsafe_link(old_fname).
- \ '\ze\%(|.*\)\?\%(\]\[.*\)\?\]\]'
- else
- let old_fname_r = '\<'.old_fname.'\>'
- endif
-
- let files = split(glob(VimwikiGet('path').a:dir.'*'.VimwikiGet('ext')), '\n')
- for fname in files
- call s:update_wiki_link(fname, old_fname_r, new_fname_r)
- endfor
-endfunction
-" }}}
-
-function! s:tail_name(fname) "{{{
- let result = substitute(a:fname, ":", "__colon__", "g")
- let result = fnamemodify(result, ":t:r")
- let result = substitute(result, "__colon__", ":", "g")
- return result
-endfunction "}}}
-
-function! s:update_wiki_links(old_fname, new_fname) " {{{
- let old_fname = s:tail_name(a:old_fname)
- let new_fname = s:tail_name(a:new_fname)
-
- let subdirs = split(a:old_fname, '[/\\]')[: -2]
-
- " TODO: Use Dictionary here...
- let dirs_keys = ['']
- let dirs_vals = ['']
- if len(subdirs) > 0
- let dirs_keys = ['']
- let dirs_vals = [join(subdirs, '/').'/']
- let idx = 0
- while idx < len(subdirs) - 1
- call add(dirs_keys, join(subdirs[: idx], '/').'/')
- call add(dirs_vals, join(subdirs[idx+1 :], '/').'/')
- let idx = idx + 1
- endwhile
- call add(dirs_keys,join(subdirs, '/').'/')
- call add(dirs_vals, '')
- endif
-
- let idx = 0
- while idx < len(dirs_keys)
- let dir = dirs_keys[idx]
- let new_dir = dirs_vals[idx]
- call s:update_wiki_links_dir(dir,
- \ new_dir.old_fname, new_dir.new_fname)
- let idx = idx + 1
- endwhile
-endfunction " }}}
-
-function! s:get_wiki_buffers() "{{{
- let blist = []
- let bcount = 1
- while bcount<=bufnr("$")
- if bufexists(bcount)
- let bname = fnamemodify(bufname(bcount), ":p")
- if bname =~ VimwikiGet('ext')."$"
- let bitem = [bname, getbufvar(bname, "vimwiki_prev_link")]
- call add(blist, bitem)
- endif
- endif
- let bcount = bcount + 1
- endwhile
- return blist
-endfunction " }}}
-
-function! s:open_wiki_buffer(item) "{{{
- call s:edit_file('e', a:item[0])
- if !empty(a:item[1])
- call setbufvar(a:item[0], "vimwiki_prev_link", a:item[1])
- endif
-endfunction " }}}
-
-" }}}
-
-" SYNTAX highlight {{{
-function! vimwiki#highlight_links() "{{{
- try
- syntax clear VimwikiNoExistsLink
- syntax clear VimwikiNoExistsLinkT
- syntax clear VimwikiLink
- syntax clear VimwikiLinkT
- catch
- endtry
-
- "" use max highlighting - could be quite slow if there are too many wikifiles
- if VimwikiGet('maxhi')
- " Every WikiWord is nonexistent
- if g:vimwiki_camel_case
- execute 'syntax match VimwikiNoExistsLink /'.g:vimwiki_rxWikiWord.'/ display'
- execute 'syntax match VimwikiNoExistsLinkT /'.g:vimwiki_rxWikiWord.'/ display contained'
- endif
- execute 'syntax match VimwikiNoExistsLink /'.g:vimwiki_rxWikiLink1.'/ display contains=VimwikiNoLinkChar'
- execute 'syntax match VimwikiNoExistsLink /'.g:vimwiki_rxWikiLink2.'/ display contains=VimwikiNoLinkChar'
-
- execute 'syntax match VimwikiNoExistsLinkT /'.g:vimwiki_rxWikiLink1.'/ display contained'
- execute 'syntax match VimwikiNoExistsLinkT /'.g:vimwiki_rxWikiLink2.'/ display contained'
-
- " till we find them in vimwiki's path
- call s:highlight_existed_links()
- else
- " A WikiWord (unqualifiedWikiName)
- execute 'syntax match VimwikiLink /\<'.g:vimwiki_rxWikiWord.'\>/'
- " A [[bracketed wiki word]]
- execute 'syntax match VimwikiLink /'.g:vimwiki_rxWikiLink1.'/ display contains=VimwikiLinkChar'
- execute 'syntax match VimwikiLink /'.g:vimwiki_rxWikiLink2.'/ display contains=VimwikiLinkChar'
-
- execute 'syntax match VimwikiLinkT /\<'.g:vimwiki_rxWikiWord.'\>/ display contained'
- execute 'syntax match VimwikiLinkT /'.g:vimwiki_rxWikiLink1.'/ display contained'
- execute 'syntax match VimwikiLinkT /'.g:vimwiki_rxWikiLink2.'/ display contained'
- endif
-
- execute 'syntax match VimwikiLink `'.g:vimwiki_rxWeblink.'` display contains=@NoSpell'
-endfunction "}}}
-
-function! s:highlight_existed_links() "{{{
- let links = s:get_links('*'.VimwikiGet('ext'))
-
- " Links with subdirs should be highlighted for linux and windows separators
- " Change \ or / to [/\\]
- let os_p = '[/\\]'
- let os_p2 = escape(os_p, '\')
- call map(links, 'substitute(v:val, os_p, os_p2, "g")')
-
- for link in links
- if g:vimwiki_camel_case &&
- \ link =~ g:vimwiki_rxWikiWord && !vimwiki#is_non_wiki_link(link)
- execute 'syntax match VimwikiLink /!\@<!\<'.link.'\>/ display'
- endif
- execute 'syntax match VimwikiLink /\[\['.
- \ escape(vimwiki#unsafe_link(link), '~&$.*').
- \ '\%(|\+.\{-}\)\{-}\]\]/ display contains=VimwikiLinkChar'
- execute 'syntax match VimwikiLink /\[\['.
- \ escape(vimwiki#unsafe_link(link), '~&$.*').
- \ '\]\[.\{-1,}\]\]/ display contains=VimwikiLinkChar'
-
- execute 'syntax match VimwikiLinkT /\[\['.
- \ escape(vimwiki#unsafe_link(link), '~&$.*').
- \ '\%(|\+.\{-}\)\{-}\]\]/ display contained'
- execute 'syntax match VimwikiLinkT /\[\['.
- \ escape(vimwiki#unsafe_link(link), '~&$.*').
- \ '\]\[.\{-1,}\]\]/ display contained'
- endfor
- execute 'syntax match VimwikiLink /\[\[.\+\.\%(jpg\|png\|gif\)\%(|\+.*\)*\]\]/ display contains=VimwikiLinkChar'
- execute 'syntax match VimwikiLink /\[\[.\+\.\%(jpg\|png\|gif\)\]\[.\+\]\]/ display contains=VimwikiLinkChar'
-
- execute 'syntax match VimwikiLinkT /\[\[.\+\.\%(jpg\|png\|gif\)\%(|\+.*\)*\]\]/ display contained'
- execute 'syntax match VimwikiLinkT /\[\[.\+\.\%(jpg\|png\|gif\)\]\[.\+\]\]/ display contained'
-
- " Issue 103: Always highlight links to non-wiki files as existed.
- execute 'syntax match VimwikiLink /\[\[.\+\.\%('.
- \join(split(g:vimwiki_file_exts, '\s*,\s*'), '\|').
- \'\)\%(|\+.*\)*\]\]/ display contains=VimwikiLinkChar'
- execute 'syntax match VimwikiLink /\[\[.\+\.\%('.
- \join(split(g:vimwiki_file_exts, '\s*,\s*'), '\|').
- \'\)\]\[.\+\]\]/ display contains=VimwikiLinkChar'
-
- execute 'syntax match VimwikiLinkT /\[\[.\+\.\%('.
- \join(split(g:vimwiki_file_exts, '\s*,\s*'), '\|').
- \'\)\%(|\+.*\)*\]\]/ display contained'
- execute 'syntax match VimwikiLinkT /\[\[.\+\.\%('.
- \join(split(g:vimwiki_file_exts, '\s*,\s*'), '\|').
- \'\)\]\[.\+\]\]/ display contained'
-
- " highlight dirs
- let dirs = s:get_links('*/')
- call map(dirs, 'substitute(v:val, os_p, os_p2, "g")')
- for dir in dirs
- execute 'syntax match VimwikiLink /\[\['.
- \ escape(vimwiki#unsafe_link(dir), '~&$.*').
- \ '[/\\]*\%(|\+.*\)*\]\]/ display contains=VimwikiLinkChar'
- execute 'syntax match VimwikiLink /\[\['.
- \ escape(vimwiki#unsafe_link(dir), '~&$.*').
- \ '[/\\]*\%(\]\[\+.*\)*\]\]/ display contains=VimwikiLinkChar'
-
- execute 'syntax match VimwikiLinkT /\[\['.
- \ escape(vimwiki#unsafe_link(dir), '~&$.*').
- \ '[/\\]*\%(|\+.*\)*\]\]/ display contained'
- execute 'syntax match VimwikiLinkT /\[\['.
- \ escape(vimwiki#unsafe_link(dir), '~&$.*').
- \ '[/\\]*\%(\]\[\+.*\)*\]\]/ display contained'
- endfor
-endfunction "}}}
-
-function! vimwiki#setup_colors() "{{{
-
- function! s:set_visible_ignore_color() "{{{
- if !exists("g:colors_name") || g:colors_name == 'default'
- if &background == 'light'
- hi VimwikiIgnore guifg=#d0d0d0
- else
- hi VimwikiIgnore guifg=#505050
- endif
- else
- hi link VimwikiIgnore Normal
- endif
- endfunction "}}}
-
- let hlfg_ignore = vimwiki#get_hl_param('Ignore', 'guifg')
- let hlbg_normal = vimwiki#get_hl_param('Normal', 'guibg')
- if hlfg_ignore == 'bg' || hlfg_ignore == hlbg_normal
- call s:set_visible_ignore_color()
- else
- hi link VimwikiIgnore Ignore
- endif
-
- if g:vimwiki_hl_headers == 0
- hi def link VimwikiHeader Title
- return
- endif
-
- if &background == 'light'
- hi def VimwikiHeader1 guibg=bg guifg=#aa5858 gui=bold ctermfg=DarkRed
- hi def VimwikiHeader2 guibg=bg guifg=#507030 gui=bold ctermfg=DarkGreen
- hi def VimwikiHeader3 guibg=bg guifg=#1030a0 gui=bold ctermfg=DarkBlue
- hi def VimwikiHeader4 guibg=bg guifg=#103040 gui=bold ctermfg=Black
- hi def VimwikiHeader5 guibg=bg guifg=#505050 gui=bold ctermfg=Black
- hi def VimwikiHeader6 guibg=bg guifg=#636363 gui=bold ctermfg=Black
- else
- hi def VimwikiHeader1 guibg=bg guifg=#e08090 gui=bold ctermfg=Red
- hi def VimwikiHeader2 guibg=bg guifg=#80e090 gui=bold ctermfg=Green
- hi def VimwikiHeader3 guibg=bg guifg=#6090e0 gui=bold ctermfg=Blue
- hi def VimwikiHeader4 guibg=bg guifg=#c0c0f0 gui=bold ctermfg=White
- hi def VimwikiHeader5 guibg=bg guifg=#e0e0f0 gui=bold ctermfg=White
- hi def VimwikiHeader6 guibg=bg guifg=#f0f0f0 gui=bold ctermfg=White
- endif
-endfunction "}}}
-
-function vimwiki#get_hl_param(hgroup, hparam) "{{{
- redir => hlstatus
- try
- exe "silent hi ".a:hgroup
- catch /E411/
- endtry
- redir END
- return matchstr(hlstatus, a:hparam.'\s*=\s*\zs\S\+')
-endfunction "}}}
-
-function! vimwiki#hl_exists(hl) "{{{
- if !hlexists(a:hl)
- return 0
- endif
- redir => hlstatus
- exe "silent hi" a:hl
- redir END
- return (hlstatus !~ "cleared")
-endfunction
-"}}}
-
-function! vimwiki#nested_syntax(filetype, start, end, textSnipHl) abort "{{{
-" From http://vim.wikia.com/wiki/VimTip857
- let ft=toupper(a:filetype)
- let group='textGroup'.ft
- if exists('b:current_syntax')
- let s:current_syntax=b:current_syntax
- " Remove current syntax definition, as some syntax files (e.g. cpp.vim)
- " do nothing if b:current_syntax is defined.
- unlet b:current_syntax
- endif
-
- " Some syntax files set up iskeyword which might scratch vimwiki a bit.
- " Let us save and restore it later.
- " let b:skip_set_iskeyword = 1
- let is_keyword = &iskeyword
-
- execute 'syntax include @'.group.' syntax/'.a:filetype.'.vim'
- try
- execute 'syntax include @'.group.' after/syntax/'.a:filetype.'.vim'
- catch
- endtry
-
- let &iskeyword = is_keyword
-
- if exists('s:current_syntax')
- let b:current_syntax=s:current_syntax
- else
- unlet b:current_syntax
- endif
- execute 'syntax region textSnip'.ft.
- \ ' matchgroup='.a:textSnipHl.
- \ ' start="'.a:start.'" end="'.a:end.'"'.
- \ ' contains=@'.group.' keepend'
-
- " A workaround to Issue 115: Nested Perl syntax highlighting differs from
- " regular one.
- " Perl syntax file has perlFunctionName which is usually has no effect due to
- " 'contained' flag. Now we have 'syntax include' that makes all the groups
- " included as 'contained' into specific group.
- " Here perlFunctionName (with quite an angry regexp "\h\w*[^:]") clashes with
- " the rest syntax rules as now it has effect being really 'contained'.
- " Clear it!
- if ft =~ 'perl'
- syntax clear perlFunctionName
- endif
-endfunction "}}}
-
-"}}}
-
-" WIKI functions {{{
-function! vimwiki#find_next_link() "{{{
- call s:search_word(g:vimwiki_rxWikiLink.'\|'.g:vimwiki_rxWeblink, '')
-endfunction
-" }}}
-
-function! vimwiki#find_prev_link() "{{{
- call s:search_word(g:vimwiki_rxWikiLink.'\|'.g:vimwiki_rxWeblink, 'b')
-endfunction
-" }}}
-
-function! vimwiki#follow_link(split) "{{{
- if a:split == "split"
- let cmd = ":split "
- elseif a:split == "vsplit"
- let cmd = ":vsplit "
- else
- let cmd = ":e "
- endif
-
- let link = s:strip_word(s:get_word_at_cursor(g:vimwiki_rxWikiLink))
- if link == ""
- let weblink = s:strip_word(s:get_word_at_cursor(g:vimwiki_rxWeblink))
- if weblink != ""
- call VimwikiWeblinkHandler(escape(weblink, '#'))
- else
- execute "normal! \n"
- endif
- return
- endif
-
- let subdir = vimwiki#current_subdir()
- call vimwiki#open_link(cmd, subdir.link)
-
-endfunction " }}}
-
-function! vimwiki#go_back_link() "{{{
- if exists("b:vimwiki_prev_link")
- " go back to saved WikiWord
- let prev_word = b:vimwiki_prev_link
- execute ":e ".substitute(prev_word[0], '\s', '\\\0', 'g')
- call setpos('.', prev_word[1])
- endif
-endfunction " }}}
-
-function! vimwiki#goto_index(index) "{{{
- call vimwiki#select(a:index)
- call vimwiki#mkdir(VimwikiGet('path'))
-
- try
- execute ':e '.fnameescape(
- \ VimwikiGet('path').VimwikiGet('index').VimwikiGet('ext'))
- catch /E37/ " catch 'No write since last change' error
- execute ':split '.
- \ VimwikiGet('path').
- \ VimwikiGet('index').
- \ VimwikiGet('ext')
- catch /E325/ " catch 'ATTENTION' error (:h E325)
- endtry
-endfunction "}}}
-
-function! vimwiki#delete_link() "{{{
- "" file system funcs
- "" Delete WikiWord you are in from filesystem
- let val = input('Delete ['.expand('%').'] (y/n)? ', "")
- if val != 'y'
- return
- endif
- let fname = expand('%:p')
- try
- call delete(fname)
- catch /.*/
- echomsg 'vimwiki: Cannot delete "'.expand('%:t:r').'"!'
- return
- endtry
- execute "bdelete! ".escape(fname, " ")
-
- " reread buffer => deleted WikiWord should appear as non-existent
- if expand('%:p') != ""
- execute "e"
- endif
-endfunction "}}}
-
-function! vimwiki#rename_link() "{{{
- "" Rename WikiWord, update all links to renamed WikiWord
- let subdir = vimwiki#current_subdir()
- let old_fname = subdir.expand('%:t')
-
- " there is no file (new one maybe)
- if glob(expand('%:p')) == ''
- echomsg 'vimwiki: Cannot rename "'.expand('%:p').
- \'". It does not exist! (New file? Save it before renaming.)'
- return
- endif
-
- let val = input('Rename "'.expand('%:t:r').'" (y/n)? ', "")
- if val!='y'
- return
- endif
-
- let new_link = input('Enter new name: ', "")
-
- if new_link =~ '[/\\]'
- " It is actually doable but I do not have free time to do it.
- echomsg 'vimwiki: Cannot rename to a filename with path!'
- return
- endif
-
- " check new_fname - it should be 'good', not empty
- if substitute(new_link, '\s', '', 'g') == ''
- echomsg 'vimwiki: Cannot rename to an empty filename!'
- return
- endif
- if vimwiki#is_non_wiki_link(new_link)
- echomsg 'vimwiki: Cannot rename to a filename with extension (ie .txt .html)!'
- return
- endif
-
- let new_link = subdir.new_link
- let new_link = s:strip_word(new_link)
- let new_fname = VimwikiGet('path').s:filename(new_link).VimwikiGet('ext')
-
- " do not rename if word with such name exists
- let fname = glob(new_fname)
- if fname != ''
- echomsg 'vimwiki: Cannot rename to "'.new_fname.
- \ '". File with that name exist!'
- return
- endif
- " rename WikiWord file
- try
- echomsg "Renaming ".VimwikiGet('path').old_fname." to ".new_fname
- let res = rename(expand('%:p'), expand(new_fname))
- if res != 0
- throw "Cannot rename!"
- end
- catch /.*/
- echomsg 'vimwiki: Cannot rename "'.expand('%:t:r').'" to "'.new_fname.'"'
- return
- endtry
-
- let &buftype="nofile"
-
- let cur_buffer = [expand('%:p'),
- \getbufvar(expand('%:p'), "vimwiki_prev_link")]
-
- let blist = s:get_wiki_buffers()
-
- " save wiki buffers
- for bitem in blist
- execute ':b '.escape(bitem[0], ' ')
- execute ':update'
- endfor
-
- execute ':b '.escape(cur_buffer[0], ' ')
-
- " remove wiki buffers
- for bitem in blist
- execute 'bwipeout '.escape(bitem[0], ' ')
- endfor
-
- let setting_more = &more
- setlocal nomore
-
- " update links
- call s:update_wiki_links(old_fname, new_link)
-
- " restore wiki buffers
- for bitem in blist
- if bitem[0] != cur_buffer[0]
- call s:open_wiki_buffer(bitem)
- endif
- endfor
-
- call s:open_wiki_buffer([new_fname,
- \ cur_buffer[1]])
- " execute 'bwipeout '.escape(cur_buffer[0], ' ')
-
- echomsg old_fname." is renamed to ".new_fname
-
- let &more = setting_more
-endfunction " }}}
-
-function! vimwiki#ui_select()"{{{
- call s:print_wiki_list()
- let idx = input("Select Wiki (specify number): ")
- if idx == ""
- return
- endif
- call vimwiki#goto_index(idx)
-endfunction
-"}}}
-
-" }}}
-
-" TEXT OBJECTS functions {{{
-
-function! vimwiki#TO_header(inner, visual) "{{{
- if !search('^\(=\+\).\+\1\s*$', 'bcW')
- return
- endif
-
- let sel_start = line("'<")
- let sel_end = line("'>")
- let block_start = line(".")
- let advance = 0
-
- let level = vimwiki#count_first_sym(getline('.'))
-
- let is_header_selected = sel_start == block_start
- \ && sel_start != sel_end
-
- if a:visual && is_header_selected
- if level > 1
- let level -= 1
- call search('^\(=\{'.level.'\}\).\+\1\s*$', 'bcW')
- else
- let advance = 1
- endif
- endif
-
- normal! V
-
- if a:visual && is_header_selected
- call cursor(sel_end + advance, 0)
- endif
-
- if search('^\(=\{1,'.level.'}\).\+\1\s*$', 'W')
- call cursor(line('.') - 1, 0)
- else
- call cursor(line('$'), 0)
- endif
-
- if a:inner && getline(line('.')) =~ '^\s*$'
- let lnum = prevnonblank(line('.') - 1)
- call cursor(lnum, 0)
- endif
-endfunction
-"}}}
-
-function! vimwiki#TO_table_cell(inner, visual) "{{{
- if col('.') == col('$')-1
- return
- endif
-
- if a:visual
- normal! `>
- let sel_end = getpos('.')
- normal! `<
- let sel_start = getpos('.')
-
- let firsttime = sel_start == sel_end
-
- if firsttime
- if !search('|\|\(-+-\)', 'cb', line('.'))
- return
- endif
- if getline('.')[virtcol('.')] == '+'
- normal! l
- endif
- if a:inner
- normal! 2l
- endif
- let sel_start = getpos('.')
- endif
-
- normal! `>
- call search('|\|\(-+-\)', '', line('.'))
- if getline('.')[virtcol('.')] == '+'
- normal! l
- endif
- if a:inner
- if firsttime || abs(sel_end[2] - getpos('.')[2]) != 2
- normal! 2h
- endif
- endif
- let sel_end = getpos('.')
-
- call setpos('.', sel_start)
- exe "normal! \<C-v>"
- call setpos('.', sel_end)
-
- " XXX: WORKAROUND.
- " if blockwise selection is ended at | character then pressing j to extend
- " selection furhter fails. But if we shake the cursor left and right then
- " it works.
- normal! hl
- else
- if !search('|\|\(-+-\)', 'cb', line('.'))
- return
- endif
- if a:inner
- normal! 2l
- endif
- normal! v
- call search('|\|\(-+-\)', '', line('.'))
- if !a:inner && getline('.')[virtcol('.')-1] == '|'
- normal! h
- elseif a:inner
- normal! 2h
- endif
- endif
-endfunction "}}}
-
-function! vimwiki#TO_table_col(inner, visual) "{{{
- let t_rows = vimwiki_tbl#get_rows(line('.'))
- if empty(t_rows)
- return
- endif
-
- " TODO: refactor it!
- if a:visual
- normal! `>
- let sel_end = getpos('.')
- normal! `<
- let sel_start = getpos('.')
-
- let firsttime = sel_start == sel_end
-
- if firsttime
- " place cursor to the top row of the table
- call s:cursor(t_rows[0][0], virtcol('.'))
- " do not accept the match at cursor position if cursor is next to column
- " separator of the table separator (^ is a cursor):
- " |-----^-+-------|
- " | bla | bla |
- " |-------+-------|
- " or it will select wrong column.
- if strpart(getline('.'), virtcol('.')-1) =~ '^-+'
- let s_flag = 'b'
- else
- let s_flag = 'cb'
- endif
- " search the column separator backwards
- if !search('|\|\(-+-\)', s_flag, line('.'))
- return
- endif
- " -+- column separator is matched --> move cursor to the + sign
- if getline('.')[virtcol('.')] == '+'
- normal! l
- endif
- " inner selection --> reduce selection
- if a:inner
- normal! 2l
- endif
- let sel_start = getpos('.')
- endif
-
- normal! `>
- if !firsttime && getline('.')[virtcol('.')] == '|'
- normal! l
- elseif a:inner && getline('.')[virtcol('.')+1] =~ '[|+]'
- normal! 2l
- endif
- " search for the next column separator
- call search('|\|\(-+-\)', '', line('.'))
- " Outer selection selects a column without border on the right. So we move
- " our cursor left if the previous search finds | border, not -+-.
- if getline('.')[virtcol('.')] != '+'
- normal! h
- endif
- if a:inner
- " reduce selection a bit more if inner.
- normal! h
- endif
- " expand selection to the bottom line of the table
- call s:cursor(t_rows[-1][0], virtcol('.'))
- let sel_end = getpos('.')
-
- call setpos('.', sel_start)
- exe "normal! \<C-v>"
- call setpos('.', sel_end)
-
- else
- " place cursor to the top row of the table
- call s:cursor(t_rows[0][0], virtcol('.'))
- " do not accept the match at cursor position if cursor is next to column
- " separator of the table separator (^ is a cursor):
- " |-----^-+-------|
- " | bla | bla |
- " |-------+-------|
- " or it will select wrong column.
- if strpart(getline('.'), virtcol('.')-1) =~ '^-+'
- let s_flag = 'b'
- else
- let s_flag = 'cb'
- endif
- " search the column separator backwards
- if !search('|\|\(-+-\)', s_flag, line('.'))
- return
- endif
- " -+- column separator is matched --> move cursor to the + sign
- if getline('.')[virtcol('.')] == '+'
- normal! l
- endif
- " inner selection --> reduce selection
- if a:inner
- normal! 2l
- endif
-
- exe "normal! \<C-V>"
-
- " search for the next column separator
- call search('|\|\(-+-\)', '', line('.'))
- " Outer selection selects a column without border on the right. So we move
- " our cursor left if the previous search finds | border, not -+-.
- if getline('.')[virtcol('.')] != '+'
- normal! h
- endif
- " reduce selection a bit more if inner.
- if a:inner
- normal! h
- endif
- " expand selection to the bottom line of the table
- call s:cursor(t_rows[-1][0], virtcol('.'))
- endif
-endfunction "}}}
-
-function! vimwiki#count_first_sym(line) "{{{
- let first_sym = matchstr(a:line, '\S')
- return len(matchstr(a:line, first_sym.'\+'))
-endfunction "}}}
-
-function! vimwiki#AddHeaderLevel() "{{{
- let lnum = line('.')
- let line = getline(lnum)
-
- if line =~ '^\s*$'
- return
- endif
-
- if line =~ '^\s*\(=\+\).\+\1\s*$'
- let level = vimwiki#count_first_sym(line)
- if level < 6
- let line = substitute(line, '\(=\+\).\+\1', '=&=', '')
- call setline(lnum, line)
- endif
- else
- let line = substitute(line, '^\s*', '&= ', '')
- let line = substitute(line, '\s*$', ' =&', '')
- call setline(lnum, line)
- endif
-endfunction
-"}}}
-
-function! vimwiki#RemoveHeaderLevel() "{{{
- let lnum = line('.')
- let line = getline(lnum)
-
- if line =~ '^\s*$'
- return
- endif
-
- if line =~ '^\s*\(=\+\).\+\1\s*$'
- let level = vimwiki#count_first_sym(line)
- let old = repeat('=', level)
- let new = repeat('=', level - 1)
-
- let chomp = line =~ '=\s'
-
- let line = substitute(line, old, new, 'g')
-
- if level == 1 && chomp
- let line = substitute(line, '^\s', '', 'g')
- let line = substitute(line, '\s$', '', 'g')
- endif
- call setline(lnum, line)
- endif
-endfunction
-" }}}
-
-" }}}
diff --git a/autoload/vimwiki/base.vim b/autoload/vimwiki/base.vim
@@ -0,0 +1,1056 @@
+" vim:tabstop=2:shiftwidth=2:expandtab:foldmethod=marker:textwidth=79
+" Vimwiki autoload plugin file
+" Author: Maxim Kim <habamax@gmail.com>
+" Home: http://code.google.com/p/vimwiki/
+
+if exists("g:loaded_vimwiki_auto") || &cp
+ finish
+endif
+let g:loaded_vimwiki_auto = 1
+
+if has("win32")
+ let s:os_sep = '\'
+else
+ let s:os_sep = '/'
+endif
+
+let s:badsymbols = '['.g:vimwiki_badsyms.g:vimwiki_stripsym.'<>|?*:"]'
+
+" MISC helper functions {{{
+
+function! vimwiki#base#chomp_slash(str) "{{{
+ return substitute(a:str, '[/\\]\+$', '', '')
+endfunction "}}}
+
+function! vimwiki#base#path_norm(path) "{{{
+ return substitute(a:path, '\', '/', 'g')
+endfunction "}}}
+
+function! vimwiki#base#mkdir(path) "{{{
+ let path = expand(a:path)
+ if !isdirectory(path) && exists("*mkdir")
+ let path = vimwiki#base#chomp_slash(path)
+ if s:is_windows() && !empty(g:vimwiki_w32_dir_enc)
+ let path = iconv(path, &enc, g:vimwiki_w32_dir_enc)
+ endif
+ call mkdir(path, "p")
+ endif
+endfunction
+" }}}
+
+function! vimwiki#base#safe_link(link) "{{{
+ " handling Windows absolute paths
+ if a:link =~ '^[[:alpha:]]:[/\\].*'
+ let link_start = a:link[0 : 2]
+ let link = a:link[3 : ]
+ else
+ let link_start = ''
+ let link = a:link
+ endif
+ let link = substitute(link, s:badsymbols, g:vimwiki_stripsym, 'g')
+ return link_start.link
+endfunction
+"}}}
+
+function! vimwiki#base#unsafe_link(string) "{{{
+ if len(g:vimwiki_stripsym) > 0
+ return substitute(a:string, g:vimwiki_stripsym, s:badsymbols, 'g')
+ else
+ return a:string
+ endif
+endfunction
+"}}}
+
+function! vimwiki#base#subdir(path, filename)"{{{
+ let path = expand(a:path)
+ let filename = expand(a:filename)
+ let idx = 0
+ while path[idx] ==? filename[idx]
+ let idx = idx + 1
+ endwhile
+
+ let p = split(strpart(filename, idx), '[/\\]')
+ let res = join(p[:-2], s:os_sep)
+ if len(res) > 0
+ let res = res.s:os_sep
+ endif
+ return res
+endfunction"}}}
+
+function! vimwiki#base#current_subdir()"{{{
+ return vimwiki#base#subdir(VimwikiGet('path'), expand('%:p'))
+endfunction"}}}
+
+function! vimwiki#base#open_link(cmd, link, ...) "{{{
+ if vimwiki#base#is_non_wiki_link(a:link)
+ if s:is_path_absolute(a:link)
+ call vimwiki#base#edit_file(a:cmd, a:link)
+ else
+ call vimwiki#base#edit_file(a:cmd, VimwikiGet('path').a:link)
+ endif
+ else
+ if a:0
+ let vimwiki_prev_link = [a:1, []]
+ elseif &ft == 'vimwiki'
+ let vimwiki_prev_link = [expand('%:p'), getpos('.')]
+ endif
+
+ if vimwiki#base#is_link_to_dir(a:link)
+ if g:vimwiki_dir_link == ''
+ call vimwiki#base#edit_file(a:cmd, VimwikiGet('path').a:link)
+ else
+ call vimwiki#base#edit_file(a:cmd,
+ \ VimwikiGet('path').a:link.
+ \ g:vimwiki_dir_link.
+ \ VimwikiGet('ext'))
+ endif
+ else
+ call vimwiki#base#edit_file(a:cmd, VimwikiGet('path').a:link.VimwikiGet('ext'))
+ endif
+
+ if exists('vimwiki_prev_link')
+ let b:vimwiki_prev_link = vimwiki_prev_link
+ endif
+ endif
+endfunction
+" }}}
+
+function! vimwiki#base#select(wnum)"{{{
+ if a:wnum < 1 || a:wnum > len(g:vimwiki_list)
+ return
+ endif
+ if &ft == 'vimwiki'
+ let b:vimwiki_idx = g:vimwiki_current_idx
+ endif
+ let g:vimwiki_current_idx = a:wnum - 1
+endfunction
+" }}}
+
+function! vimwiki#base#generate_links()"{{{
+ let links = s:get_links('*'.VimwikiGet('ext'))
+
+ " We don't want link to itself.
+ let cur_link = expand('%:t:r')
+ call filter(links, 'v:val != cur_link')
+
+ if len(links)
+ call append(line('$'), '= Generated Links =')
+ endif
+
+ call sort(links)
+
+ for link in links
+ if s:is_wiki_word(link)
+ call append(line('$'), '- '.link)
+ else
+ call append(line('$'), '- [['.link.']]')
+ endif
+ endfor
+endfunction " }}}
+
+function! vimwiki#base#goto(key) "{{{
+ call vimwiki#base#edit_file(':e',
+ \ VimwikiGet('path').
+ \ a:key.
+ \ VimwikiGet('ext'))
+endfunction "}}}
+
+function! s:is_windows() "{{{
+ return has("win32") || has("win64") || has("win95") || has("win16")
+endfunction "}}}
+
+function! s:is_path_absolute(path) "{{{
+ return a:path =~ '^/.*' || a:path =~ '^[[:alpha:]]:[/\\].*'
+endfunction "}}}
+
+function! s:get_links(pat) "{{{
+ " search all wiki files in 'path' and its subdirs.
+ let subdir = vimwiki#base#current_subdir()
+
+ " if current wiki is temporary -- was added by an arbitrary wiki file then do
+ " not search wiki files in subdirectories. Or it would hang the system if
+ " wiki file was created in $HOME or C:/ dirs.
+ if VimwikiGet('temp')
+ let search_dirs = ''
+ else
+ let search_dirs = '**/'
+ endif
+ let globlinks = glob(VimwikiGet('path').subdir.search_dirs.a:pat)
+
+ " remove extensions (and backup extensions too: .wiki~)
+ let globlinks = substitute(globlinks, '\'.VimwikiGet('ext').'\~\?', "", "g")
+ let links = split(globlinks, '\n')
+
+ " remove paths
+ let rem_path = escape(expand(VimwikiGet('path')).subdir, '\')
+ call map(links, 'substitute(v:val, rem_path, "", "g")')
+
+ " Remove trailing slashes.
+ call map(links, 'substitute(v:val, "[/\\\\]*$", "", "g")')
+
+ return links
+endfunction "}}}
+
+" Builtin cursor doesn't work right with unicode characters.
+function! s:cursor(lnum, cnum) "{{{
+ exe a:lnum
+ exe 'normal! 0'.a:cnum.'|'
+endfunction "}}}
+
+function! s:filename(link) "{{{
+ let result = vimwiki#base#safe_link(a:link)
+ if a:link =~ '|'
+ let result = vimwiki#base#safe_link(split(a:link, '|')[0])
+ elseif a:link =~ ']['
+ let result = vimwiki#base#safe_link(split(a:link, '][')[0])
+ endif
+ return result
+endfunction
+" }}}
+
+function! s:is_wiki_word(str) "{{{
+ if a:str =~ g:vimwiki_rxWikiWord && a:str !~ '[[:space:]\\/]'
+ return 1
+ endif
+ return 0
+endfunction
+" }}}
+
+function! vimwiki#base#edit_file(command, filename) "{{{
+ let fname = escape(a:filename, '% ')
+ call vimwiki#base#mkdir(fnamemodify(a:filename, ":p:h"))
+ try
+ execute a:command.' '.fname
+ catch /E37/ " catch 'No write since last change' error
+ execute ':split '.fname
+ catch /E325/ " catch 'ATTENTION' error (:h E325)
+ endtry
+endfunction
+" }}}
+
+function! s:search_word(wikiRx, cmd) "{{{
+ let match_line = search(a:wikiRx, 's'.a:cmd)
+ if match_line == 0
+ echomsg "vimwiki: Wiki link not found."
+ endif
+endfunction
+" }}}
+
+function! s:get_word_at_cursor(wikiRX) "{{{
+ let col = col('.') - 1
+ let line = getline('.')
+ let ebeg = -1
+ let cont = match(line, a:wikiRX, 0)
+ while (ebeg >= 0 || (0 <= cont) && (cont <= col))
+ let contn = matchend(line, a:wikiRX, cont)
+ if (cont <= col) && (col < contn)
+ let ebeg = match(line, a:wikiRX, cont)
+ let elen = contn - ebeg
+ break
+ else
+ let cont = match(line, a:wikiRX, contn)
+ endif
+ endwh
+ if ebeg >= 0
+ return strpart(line, ebeg, elen)
+ else
+ return ""
+ endif
+endf "}}}
+
+function! s:strip_word(word) "{{{
+ let result = a:word
+ if strpart(a:word, 0, 2) == "[["
+ " get rid of [[ and ]]
+ let w = strpart(a:word, 2, strlen(a:word)-4)
+
+ if w =~ '|'
+ " we want "link" from [[link|link desc]]
+ let w = split(w, "|")[0]
+ elseif w =~ ']['
+ " we want "link" from [[link][link desc]]
+ let w = split(w, "][")[0]
+ endif
+
+ let result = vimwiki#base#safe_link(w)
+ endif
+ return result
+endfunction
+" }}}
+
+function! vimwiki#base#is_non_wiki_link(lnk) "{{{
+ let exts = '.\+\.\%('.
+ \ join(split(g:vimwiki_file_exts, '\s*,\s*'), '\|').
+ \ '\)$'
+ if a:lnk =~ exts
+ return 1
+ endif
+ return 0
+endfunction "}}}
+
+function! vimwiki#base#is_link_to_dir(link) "{{{
+ " Check if link is to a directory.
+ " It should be ended with \ or /.
+ if a:link =~ '.\+[/\\]$'
+ return 1
+ endif
+ return 0
+endfunction " }}}
+
+function! s:print_wiki_list() "{{{
+ let idx = 0
+ while idx < len(g:vimwiki_list)
+ if idx == g:vimwiki_current_idx
+ let sep = ' * '
+ echohl PmenuSel
+ else
+ let sep = ' '
+ echohl None
+ endif
+ echo (idx + 1).sep.VimwikiGet('path', idx)
+ let idx += 1
+ endwhile
+ echohl None
+endfunction
+" }}}
+
+function! s:update_wiki_link(fname, old, new) " {{{
+ echo "Updating links in ".a:fname
+ let has_updates = 0
+ let dest = []
+ for line in readfile(a:fname)
+ if !has_updates && match(line, a:old) != -1
+ let has_updates = 1
+ endif
+ call add(dest, substitute(line, a:old, escape(a:new, "&"), "g"))
+ endfor
+ " add exception handling...
+ if has_updates
+ call rename(a:fname, a:fname.'#vimwiki_upd#')
+ call writefile(dest, a:fname)
+ call delete(a:fname.'#vimwiki_upd#')
+ endif
+endfunction
+" }}}
+
+function! s:update_wiki_links_dir(dir, old_fname, new_fname) " {{{
+ let old_fname = substitute(a:old_fname, '[/\\]', '[/\\\\]', 'g')
+ let new_fname = a:new_fname
+ let old_fname_r = old_fname
+ let new_fname_r = new_fname
+
+ if !s:is_wiki_word(new_fname) && s:is_wiki_word(old_fname)
+ let new_fname_r = '[['.new_fname.']]'
+ endif
+
+ if !s:is_wiki_word(old_fname)
+ let old_fname_r = '\[\[\zs'.vimwiki#base#unsafe_link(old_fname).
+ \ '\ze\%(|.*\)\?\%(\]\[.*\)\?\]\]'
+ else
+ let old_fname_r = '!\@<!\<'.old_fname.'\>'
+ endif
+
+ let files = split(glob(VimwikiGet('path').a:dir.'*'.VimwikiGet('ext')), '\n')
+ for fname in files
+ call s:update_wiki_link(fname, old_fname_r, new_fname_r)
+ endfor
+endfunction
+" }}}
+
+function! s:tail_name(fname) "{{{
+ let result = substitute(a:fname, ":", "__colon__", "g")
+ let result = fnamemodify(result, ":t:r")
+ let result = substitute(result, "__colon__", ":", "g")
+ return result
+endfunction "}}}
+
+function! s:update_wiki_links(old_fname, new_fname) " {{{
+ let old_fname = s:tail_name(a:old_fname)
+ let new_fname = s:tail_name(a:new_fname)
+
+ let subdirs = split(a:old_fname, '[/\\]')[: -2]
+
+ " TODO: Use Dictionary here...
+ let dirs_keys = ['']
+ let dirs_vals = ['']
+ if len(subdirs) > 0
+ let dirs_keys = ['']
+ let dirs_vals = [join(subdirs, '/').'/']
+ let idx = 0
+ while idx < len(subdirs) - 1
+ call add(dirs_keys, join(subdirs[: idx], '/').'/')
+ call add(dirs_vals, join(subdirs[idx+1 :], '/').'/')
+ let idx = idx + 1
+ endwhile
+ call add(dirs_keys,join(subdirs, '/').'/')
+ call add(dirs_vals, '')
+ endif
+
+ let idx = 0
+ while idx < len(dirs_keys)
+ let dir = dirs_keys[idx]
+ let new_dir = dirs_vals[idx]
+ call s:update_wiki_links_dir(dir,
+ \ new_dir.old_fname, new_dir.new_fname)
+ let idx = idx + 1
+ endwhile
+endfunction " }}}
+
+function! s:get_wiki_buffers() "{{{
+ let blist = []
+ let bcount = 1
+ while bcount<=bufnr("$")
+ if bufexists(bcount)
+ let bname = fnamemodify(bufname(bcount), ":p")
+ if bname =~ VimwikiGet('ext')."$"
+ let bitem = [bname, getbufvar(bname, "vimwiki_prev_link")]
+ call add(blist, bitem)
+ endif
+ endif
+ let bcount = bcount + 1
+ endwhile
+ return blist
+endfunction " }}}
+
+function! s:open_wiki_buffer(item) "{{{
+ call vimwiki#base#edit_file(':e', a:item[0])
+ if !empty(a:item[1])
+ call setbufvar(a:item[0], "vimwiki_prev_link", a:item[1])
+ endif
+endfunction " }}}
+
+" }}}
+
+" SYNTAX highlight {{{
+function! vimwiki#base#highlight_links() "{{{
+ try
+ syntax clear VimwikiNoExistsLink
+ syntax clear VimwikiNoExistsLinkT
+ syntax clear VimwikiLink
+ syntax clear VimwikiLinkT
+ catch
+ endtry
+
+ "" use max highlighting - could be quite slow if there are too many wikifiles
+ if VimwikiGet('maxhi')
+ " Every WikiWord is nonexistent
+ if g:vimwiki_camel_case
+ execute 'syntax match VimwikiNoExistsLink /'.g:vimwiki_rxWikiWord.'/ display'
+ execute 'syntax match VimwikiNoExistsLinkT /'.g:vimwiki_rxWikiWord.'/ display contained'
+ endif
+ execute 'syntax match VimwikiNoExistsLink /'.g:vimwiki_rxWikiLink1.'/ display contains=VimwikiNoLinkChar'
+ execute 'syntax match VimwikiNoExistsLink /'.g:vimwiki_rxWikiLink2.'/ display contains=VimwikiNoLinkChar'
+
+ execute 'syntax match VimwikiNoExistsLinkT /'.g:vimwiki_rxWikiLink1.'/ display contained'
+ execute 'syntax match VimwikiNoExistsLinkT /'.g:vimwiki_rxWikiLink2.'/ display contained'
+
+ " till we find them in vimwiki's path
+ call s:highlight_existed_links()
+ else
+ " A WikiWord (unqualifiedWikiName)
+ execute 'syntax match VimwikiLink /\<'.g:vimwiki_rxWikiWord.'\>/'
+ " A [[bracketed wiki word]]
+ execute 'syntax match VimwikiLink /'.g:vimwiki_rxWikiLink1.'/ display contains=VimwikiLinkChar'
+ execute 'syntax match VimwikiLink /'.g:vimwiki_rxWikiLink2.'/ display contains=VimwikiLinkChar'
+
+ execute 'syntax match VimwikiLinkT /\<'.g:vimwiki_rxWikiWord.'\>/ display contained'
+ execute 'syntax match VimwikiLinkT /'.g:vimwiki_rxWikiLink1.'/ display contained'
+ execute 'syntax match VimwikiLinkT /'.g:vimwiki_rxWikiLink2.'/ display contained'
+ endif
+
+ execute 'syntax match VimwikiLink `'.g:vimwiki_rxWeblink.'` display contains=@NoSpell'
+endfunction "}}}
+
+function! s:highlight_existed_links() "{{{
+ let links = s:get_links('*'.VimwikiGet('ext'))
+
+ " Links with subdirs should be highlighted for linux and windows separators
+ " Change \ or / to [/\\]
+ let os_p = '[/\\]'
+ let os_p2 = escape(os_p, '\')
+ call map(links, 'substitute(v:val, os_p, os_p2, "g")')
+
+ for link in links
+ if g:vimwiki_camel_case &&
+ \ link =~ g:vimwiki_rxWikiWord && !vimwiki#base#is_non_wiki_link(link)
+ execute 'syntax match VimwikiLink /!\@<!\<'.link.'\>/ display'
+ endif
+ execute 'syntax match VimwikiLink /\[\['.
+ \ escape(vimwiki#base#unsafe_link(link), '~&$.*').
+ \ '\%(|\+.\{-}\)\{-}\]\]/ display contains=VimwikiLinkChar'
+ execute 'syntax match VimwikiLink /\[\['.
+ \ escape(vimwiki#base#unsafe_link(link), '~&$.*').
+ \ '\]\[.\{-1,}\]\]/ display contains=VimwikiLinkChar'
+
+ execute 'syntax match VimwikiLinkT /\[\['.
+ \ escape(vimwiki#base#unsafe_link(link), '~&$.*').
+ \ '\%(|\+.\{-}\)\{-}\]\]/ display contained'
+ execute 'syntax match VimwikiLinkT /\[\['.
+ \ escape(vimwiki#base#unsafe_link(link), '~&$.*').
+ \ '\]\[.\{-1,}\]\]/ display contained'
+ endfor
+ execute 'syntax match VimwikiLink /\[\[.\+\.\%(jpg\|png\|gif\)\%(|\+.*\)*\]\]/ display contains=VimwikiLinkChar'
+ execute 'syntax match VimwikiLink /\[\[.\+\.\%(jpg\|png\|gif\)\]\[.\+\]\]/ display contains=VimwikiLinkChar'
+
+ execute 'syntax match VimwikiLinkT /\[\[.\+\.\%(jpg\|png\|gif\)\%(|\+.*\)*\]\]/ display contained'
+ execute 'syntax match VimwikiLinkT /\[\[.\+\.\%(jpg\|png\|gif\)\]\[.\+\]\]/ display contained'
+
+ " Issue 103: Always highlight links to non-wiki files as existed.
+ execute 'syntax match VimwikiLink /\[\[.\+\.\%('.
+ \join(split(g:vimwiki_file_exts, '\s*,\s*'), '\|').
+ \'\)\%(|\+.*\)*\]\]/ display contains=VimwikiLinkChar'
+ execute 'syntax match VimwikiLink /\[\[.\+\.\%('.
+ \join(split(g:vimwiki_file_exts, '\s*,\s*'), '\|').
+ \'\)\]\[.\+\]\]/ display contains=VimwikiLinkChar'
+
+ execute 'syntax match VimwikiLinkT /\[\[.\+\.\%('.
+ \join(split(g:vimwiki_file_exts, '\s*,\s*'), '\|').
+ \'\)\%(|\+.*\)*\]\]/ display contained'
+ execute 'syntax match VimwikiLinkT /\[\[.\+\.\%('.
+ \join(split(g:vimwiki_file_exts, '\s*,\s*'), '\|').
+ \'\)\]\[.\+\]\]/ display contained'
+
+ " highlight dirs
+ let dirs = s:get_links('*/')
+ call map(dirs, 'substitute(v:val, os_p, os_p2, "g")')
+ for dir in dirs
+ execute 'syntax match VimwikiLink /\[\['.
+ \ escape(vimwiki#base#unsafe_link(dir), '~&$.*').
+ \ '[/\\]*\%(|\+.*\)*\]\]/ display contains=VimwikiLinkChar'
+ execute 'syntax match VimwikiLink /\[\['.
+ \ escape(vimwiki#base#unsafe_link(dir), '~&$.*').
+ \ '[/\\]*\%(\]\[\+.*\)*\]\]/ display contains=VimwikiLinkChar'
+
+ execute 'syntax match VimwikiLinkT /\[\['.
+ \ escape(vimwiki#base#unsafe_link(dir), '~&$.*').
+ \ '[/\\]*\%(|\+.*\)*\]\]/ display contained'
+ execute 'syntax match VimwikiLinkT /\[\['.
+ \ escape(vimwiki#base#unsafe_link(dir), '~&$.*').
+ \ '[/\\]*\%(\]\[\+.*\)*\]\]/ display contained'
+ endfor
+endfunction "}}}
+
+function! vimwiki#base#hl_exists(hl) "{{{
+ if !hlexists(a:hl)
+ return 0
+ endif
+ redir => hlstatus
+ exe "silent hi" a:hl
+ redir END
+ return (hlstatus !~ "cleared")
+endfunction
+"}}}
+
+function! vimwiki#base#nested_syntax(filetype, start, end, textSnipHl) abort "{{{
+" From http://vim.wikia.com/wiki/VimTip857
+ let ft=toupper(a:filetype)
+ let group='textGroup'.ft
+ if exists('b:current_syntax')
+ let s:current_syntax=b:current_syntax
+ " Remove current syntax definition, as some syntax files (e.g. cpp.vim)
+ " do nothing if b:current_syntax is defined.
+ unlet b:current_syntax
+ endif
+
+ " Some syntax files set up iskeyword which might scratch vimwiki a bit.
+ " Let us save and restore it later.
+ " let b:skip_set_iskeyword = 1
+ let is_keyword = &iskeyword
+
+ execute 'syntax include @'.group.' syntax/'.a:filetype.'.vim'
+ try
+ execute 'syntax include @'.group.' after/syntax/'.a:filetype.'.vim'
+ catch
+ endtry
+
+ let &iskeyword = is_keyword
+
+ if exists('s:current_syntax')
+ let b:current_syntax=s:current_syntax
+ else
+ unlet b:current_syntax
+ endif
+ execute 'syntax region textSnip'.ft.
+ \ ' matchgroup='.a:textSnipHl.
+ \ ' start="'.a:start.'" end="'.a:end.'"'.
+ \ ' contains=@'.group.' keepend'
+
+ " A workaround to Issue 115: Nested Perl syntax highlighting differs from
+ " regular one.
+ " Perl syntax file has perlFunctionName which is usually has no effect due to
+ " 'contained' flag. Now we have 'syntax include' that makes all the groups
+ " included as 'contained' into specific group.
+ " Here perlFunctionName (with quite an angry regexp "\h\w*[^:]") clashes with
+ " the rest syntax rules as now it has effect being really 'contained'.
+ " Clear it!
+ if ft =~ 'perl'
+ syntax clear perlFunctionName
+ endif
+endfunction "}}}
+
+"}}}
+
+" WIKI functions {{{
+function! vimwiki#base#find_next_link() "{{{
+ call s:search_word(g:vimwiki_rxWikiLink.'\|'.g:vimwiki_rxWeblink, '')
+endfunction
+" }}}
+
+function! vimwiki#base#find_prev_link() "{{{
+ call s:search_word(g:vimwiki_rxWikiLink.'\|'.g:vimwiki_rxWeblink, 'b')
+endfunction
+" }}}
+
+function! vimwiki#base#follow_link(split) "{{{
+ if a:split == "split"
+ let cmd = ":split "
+ elseif a:split == "vsplit"
+ let cmd = ":vsplit "
+ elseif a:split == "tabnew"
+ let cmd = ":tabnew "
+ else
+ let cmd = ":e "
+ endif
+
+ let link = s:strip_word(s:get_word_at_cursor(g:vimwiki_rxWikiLink))
+ if link == ""
+ let weblink = s:strip_word(s:get_word_at_cursor(g:vimwiki_rxWeblink))
+ if weblink != ""
+ call VimwikiWeblinkHandler(escape(weblink, '#'))
+ else
+ execute "normal! \n"
+ endif
+ return
+ endif
+
+ let subdir = vimwiki#base#current_subdir()
+ call vimwiki#base#open_link(cmd, subdir.link)
+
+endfunction " }}}
+
+function! vimwiki#base#go_back_link() "{{{
+ if exists("b:vimwiki_prev_link")
+ " go back to saved WikiWord
+ let prev_word = b:vimwiki_prev_link
+ execute ":e ".substitute(prev_word[0], '\s', '\\\0', 'g')
+ call setpos('.', prev_word[1])
+ endif
+endfunction " }}}
+
+function! vimwiki#base#goto_index(index) "{{{
+ call vimwiki#base#select(a:index)
+ call vimwiki#base#edit_file('e',
+ \ VimwikiGet('path').VimwikiGet('index').VimwikiGet('ext'))
+endfunction "}}}
+
+function! vimwiki#base#delete_link() "{{{
+ "" file system funcs
+ "" Delete WikiWord you are in from filesystem
+ let val = input('Delete ['.expand('%').'] (y/n)? ', "")
+ if val != 'y'
+ return
+ endif
+ let fname = expand('%:p')
+ try
+ call delete(fname)
+ catch /.*/
+ echomsg 'vimwiki: Cannot delete "'.expand('%:t:r').'"!'
+ return
+ endtry
+ execute "bdelete! ".escape(fname, " ")
+
+ " reread buffer => deleted WikiWord should appear as non-existent
+ if expand('%:p') != ""
+ execute "e"
+ endif
+endfunction "}}}
+
+function! vimwiki#base#rename_link() "{{{
+ "" Rename WikiWord, update all links to renamed WikiWord
+ let subdir = vimwiki#base#current_subdir()
+ let old_fname = subdir.expand('%:t')
+
+ " there is no file (new one maybe)
+ if glob(expand('%:p')) == ''
+ echomsg 'vimwiki: Cannot rename "'.expand('%:p').
+ \'". It does not exist! (New file? Save it before renaming.)'
+ return
+ endif
+
+ let val = input('Rename "'.expand('%:t:r').'" (y/n)? ', "")
+ if val!='y'
+ return
+ endif
+
+ let new_link = input('Enter new name: ', "")
+
+ if new_link =~ '[/\\]'
+ " It is actually doable but I do not have free time to do it.
+ echomsg 'vimwiki: Cannot rename to a filename with path!'
+ return
+ endif
+
+ " check new_fname - it should be 'good', not empty
+ if substitute(new_link, '\s', '', 'g') == ''
+ echomsg 'vimwiki: Cannot rename to an empty filename!'
+ return
+ endif
+ if vimwiki#base#is_non_wiki_link(new_link)
+ echomsg 'vimwiki: Cannot rename to a filename with extension (ie .txt .html)!'
+ return
+ endif
+
+ let new_link = subdir.new_link
+ let new_link = s:strip_word(new_link)
+ let new_fname = VimwikiGet('path').s:filename(new_link).VimwikiGet('ext')
+
+ " do not rename if word with such name exists
+ let fname = glob(new_fname)
+ if fname != ''
+ echomsg 'vimwiki: Cannot rename to "'.new_fname.
+ \ '". File with that name exist!'
+ return
+ endif
+ " rename WikiWord file
+ try
+ echomsg "Renaming ".VimwikiGet('path').old_fname." to ".new_fname
+ let res = rename(expand('%:p'), expand(new_fname))
+ if res != 0
+ throw "Cannot rename!"
+ end
+ catch /.*/
+ echomsg 'vimwiki: Cannot rename "'.expand('%:t:r').'" to "'.new_fname.'"'
+ return
+ endtry
+
+ let &buftype="nofile"
+
+ let cur_buffer = [expand('%:p'),
+ \getbufvar(expand('%:p'), "vimwiki_prev_link")]
+
+ let blist = s:get_wiki_buffers()
+
+ " save wiki buffers
+ for bitem in blist
+ execute ':b '.escape(bitem[0], ' ')
+ execute ':update'
+ endfor
+
+ execute ':b '.escape(cur_buffer[0], ' ')
+
+ " remove wiki buffers
+ for bitem in blist
+ execute 'bwipeout '.escape(bitem[0], ' ')
+ endfor
+
+ let setting_more = &more
+ setlocal nomore
+
+ " update links
+ call s:update_wiki_links(old_fname, new_link)
+
+ " restore wiki buffers
+ for bitem in blist
+ if bitem[0] != cur_buffer[0]
+ call s:open_wiki_buffer(bitem)
+ endif
+ endfor
+
+ call s:open_wiki_buffer([new_fname,
+ \ cur_buffer[1]])
+ " execute 'bwipeout '.escape(cur_buffer[0], ' ')
+
+ echomsg old_fname." is renamed to ".new_fname
+
+ let &more = setting_more
+endfunction " }}}
+
+function! vimwiki#base#ui_select()"{{{
+ call s:print_wiki_list()
+ let idx = input("Select Wiki (specify number): ")
+ if idx == ""
+ return
+ endif
+ call vimwiki#base#goto_index(idx)
+endfunction
+"}}}
+
+" }}}
+
+" TEXT OBJECTS functions {{{
+
+function! vimwiki#base#TO_header(inner, visual) "{{{
+ if !search('^\(=\+\).\+\1\s*$', 'bcW')
+ return
+ endif
+
+ let sel_start = line("'<")
+ let sel_end = line("'>")
+ let block_start = line(".")
+ let advance = 0
+
+ let level = vimwiki#base#count_first_sym(getline('.'))
+
+ let is_header_selected = sel_start == block_start
+ \ && sel_start != sel_end
+
+ if a:visual && is_header_selected
+ if level > 1
+ let level -= 1
+ call search('^\(=\{'.level.'\}\).\+\1\s*$', 'bcW')
+ else
+ let advance = 1
+ endif
+ endif
+
+ normal! V
+
+ if a:visual && is_header_selected
+ call cursor(sel_end + advance, 0)
+ endif
+
+ if search('^\(=\{1,'.level.'}\).\+\1\s*$', 'W')
+ call cursor(line('.') - 1, 0)
+ else
+ call cursor(line('$'), 0)
+ endif
+
+ if a:inner && getline(line('.')) =~ '^\s*$'
+ let lnum = prevnonblank(line('.') - 1)
+ call cursor(lnum, 0)
+ endif
+endfunction
+"}}}
+
+function! vimwiki#base#TO_table_cell(inner, visual) "{{{
+ if col('.') == col('$')-1
+ return
+ endif
+
+ if a:visual
+ normal! `>
+ let sel_end = getpos('.')
+ normal! `<
+ let sel_start = getpos('.')
+
+ let firsttime = sel_start == sel_end
+
+ if firsttime
+ if !search('|\|\(-+-\)', 'cb', line('.'))
+ return
+ endif
+ if getline('.')[virtcol('.')] == '+'
+ normal! l
+ endif
+ if a:inner
+ normal! 2l
+ endif
+ let sel_start = getpos('.')
+ endif
+
+ normal! `>
+ call search('|\|\(-+-\)', '', line('.'))
+ if getline('.')[virtcol('.')] == '+'
+ normal! l
+ endif
+ if a:inner
+ if firsttime || abs(sel_end[2] - getpos('.')[2]) != 2
+ normal! 2h
+ endif
+ endif
+ let sel_end = getpos('.')
+
+ call setpos('.', sel_start)
+ exe "normal! \<C-v>"
+ call setpos('.', sel_end)
+
+ " XXX: WORKAROUND.
+ " if blockwise selection is ended at | character then pressing j to extend
+ " selection furhter fails. But if we shake the cursor left and right then
+ " it works.
+ normal! hl
+ else
+ if !search('|\|\(-+-\)', 'cb', line('.'))
+ return
+ endif
+ if a:inner
+ normal! 2l
+ endif
+ normal! v
+ call search('|\|\(-+-\)', '', line('.'))
+ if !a:inner && getline('.')[virtcol('.')-1] == '|'
+ normal! h
+ elseif a:inner
+ normal! 2h
+ endif
+ endif
+endfunction "}}}
+
+function! vimwiki#base#TO_table_col(inner, visual) "{{{
+ let t_rows = vimwiki_tbl#get_rows(line('.'))
+ if empty(t_rows)
+ return
+ endif
+
+ " TODO: refactor it!
+ if a:visual
+ normal! `>
+ let sel_end = getpos('.')
+ normal! `<
+ let sel_start = getpos('.')
+
+ let firsttime = sel_start == sel_end
+
+ if firsttime
+ " place cursor to the top row of the table
+ call s:cursor(t_rows[0][0], virtcol('.'))
+ " do not accept the match at cursor position if cursor is next to column
+ " separator of the table separator (^ is a cursor):
+ " |-----^-+-------|
+ " | bla | bla |
+ " |-------+-------|
+ " or it will select wrong column.
+ if strpart(getline('.'), virtcol('.')-1) =~ '^-+'
+ let s_flag = 'b'
+ else
+ let s_flag = 'cb'
+ endif
+ " search the column separator backwards
+ if !search('|\|\(-+-\)', s_flag, line('.'))
+ return
+ endif
+ " -+- column separator is matched --> move cursor to the + sign
+ if getline('.')[virtcol('.')] == '+'
+ normal! l
+ endif
+ " inner selection --> reduce selection
+ if a:inner
+ normal! 2l
+ endif
+ let sel_start = getpos('.')
+ endif
+
+ normal! `>
+ if !firsttime && getline('.')[virtcol('.')] == '|'
+ normal! l
+ elseif a:inner && getline('.')[virtcol('.')+1] =~ '[|+]'
+ normal! 2l
+ endif
+ " search for the next column separator
+ call search('|\|\(-+-\)', '', line('.'))
+ " Outer selection selects a column without border on the right. So we move
+ " our cursor left if the previous search finds | border, not -+-.
+ if getline('.')[virtcol('.')] != '+'
+ normal! h
+ endif
+ if a:inner
+ " reduce selection a bit more if inner.
+ normal! h
+ endif
+ " expand selection to the bottom line of the table
+ call s:cursor(t_rows[-1][0], virtcol('.'))
+ let sel_end = getpos('.')
+
+ call setpos('.', sel_start)
+ exe "normal! \<C-v>"
+ call setpos('.', sel_end)
+
+ else
+ " place cursor to the top row of the table
+ call s:cursor(t_rows[0][0], virtcol('.'))
+ " do not accept the match at cursor position if cursor is next to column
+ " separator of the table separator (^ is a cursor):
+ " |-----^-+-------|
+ " | bla | bla |
+ " |-------+-------|
+ " or it will select wrong column.
+ if strpart(getline('.'), virtcol('.')-1) =~ '^-+'
+ let s_flag = 'b'
+ else
+ let s_flag = 'cb'
+ endif
+ " search the column separator backwards
+ if !search('|\|\(-+-\)', s_flag, line('.'))
+ return
+ endif
+ " -+- column separator is matched --> move cursor to the + sign
+ if getline('.')[virtcol('.')] == '+'
+ normal! l
+ endif
+ " inner selection --> reduce selection
+ if a:inner
+ normal! 2l
+ endif
+
+ exe "normal! \<C-V>"
+
+ " search for the next column separator
+ call search('|\|\(-+-\)', '', line('.'))
+ " Outer selection selects a column without border on the right. So we move
+ " our cursor left if the previous search finds | border, not -+-.
+ if getline('.')[virtcol('.')] != '+'
+ normal! h
+ endif
+ " reduce selection a bit more if inner.
+ if a:inner
+ normal! h
+ endif
+ " expand selection to the bottom line of the table
+ call s:cursor(t_rows[-1][0], virtcol('.'))
+ endif
+endfunction "}}}
+
+function! vimwiki#base#count_first_sym(line) "{{{
+ let first_sym = matchstr(a:line, '\S')
+ return len(matchstr(a:line, first_sym.'\+'))
+endfunction "}}}
+
+function! vimwiki#base#AddHeaderLevel() "{{{
+ let lnum = line('.')
+ let line = getline(lnum)
+
+ if line =~ '^\s*$'
+ return
+ endif
+
+ if line =~ '^\s*\(=\+\).\+\1\s*$'
+ let level = vimwiki#base#count_first_sym(line)
+ if level < 6
+ let line = substitute(line, '\(=\+\).\+\1', '=&=', '')
+ call setline(lnum, line)
+ endif
+ else
+ let line = substitute(line, '^\s*', '&= ', '')
+ let line = substitute(line, '\s*$', ' =&', '')
+ call setline(lnum, line)
+ endif
+endfunction
+"}}}
+
+function! vimwiki#base#RemoveHeaderLevel() "{{{
+ let lnum = line('.')
+ let line = getline(lnum)
+
+ if line =~ '^\s*$'
+ return
+ endif
+
+ if line =~ '^\s*\(=\+\).\+\1\s*$'
+ let level = vimwiki#base#count_first_sym(line)
+ let old = repeat('=', level)
+ let new = repeat('=', level - 1)
+
+ let chomp = line =~ '=\s'
+
+ let line = substitute(line, old, new, 'g')
+
+ if level == 1 && chomp
+ let line = substitute(line, '^\s', '', 'g')
+ let line = substitute(line, '\s$', '', 'g')
+ endif
+ call setline(lnum, line)
+ endif
+endfunction
+" }}}
+
+" }}}
diff --git a/autoload/vimwiki/default.tpl b/autoload/vimwiki/default.tpl
@@ -0,0 +1,11 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<link rel="Stylesheet" type="text/css" href="%root_path%%css%">
+<title>%title%</title>
+<meta http-equiv="Content-Type" content="text/html; charset=%encoding%">
+</head>
+<body>
+%content%
+</body>
+</html>
diff --git a/autoload/vimwiki/diary.vim b/autoload/vimwiki/diary.vim
@@ -0,0 +1,286 @@
+" vim:tabstop=2:shiftwidth=2:expandtab:foldmethod=marker:textwidth=79
+" Vimwiki autoload plugin file
+" Desc: Handle diary notes
+" Author: Maxim Kim <habamax@gmail.com>
+" Home: http://code.google.com/p/vimwiki/
+
+" Load only once {{{
+if exists("g:loaded_vimwiki_diary_auto") || &cp
+ finish
+endif
+let g:loaded_vimwiki_diary_auto = 1
+"}}}
+
+function! s:prefix_zero(num) "{{{
+ if a:num < 10
+ return '0'.a:num
+ endif
+ return a:num
+endfunction "}}}
+
+function! s:desc(d1, d2) "{{{
+ return a:d1 == a:d2 ? 0 : a:d1 < a:d2 ? 1 : -1
+endfunction "}}}
+
+function! s:get_date_link(fmt) "{{{
+ return strftime(a:fmt)
+endfunction "}}}
+
+function! s:link_exists(lines, link) "{{{
+ let link_exists = 0
+ for line in a:lines
+ if line =~ escape(a:link, '[]\')
+ let link_exists = 1
+ break
+ endif
+ endfor
+ return link_exists
+endfunction "}}}
+
+function! s:diary_path() "{{{
+ return VimwikiGet('path').VimwikiGet('diary_rel_path')
+endfunction "}}}
+
+function! s:diary_index() "{{{
+ return s:diary_path().VimwikiGet('diary_index').VimwikiGet('ext')
+endfunction "}}}
+
+function! s:get_diary_range(lines, header) "{{{
+ let rx = '\[\[\d\{4}-\d\d-\d\d\]\]'
+ let idx = 0
+ let ln_start = -1
+ let ln_end = -1
+ for line in a:lines
+ if ln_start != -1
+ if line =~ '^\s*\(=\)\+.*\1\s*$' || (line !~ rx && line !~ '^\s*$')
+ break
+ endif
+ endif
+ if line =~ '^\s*\(=\)\+\s*'.a:header.'\s*\1\s*$'
+ let ln_start = idx + 1
+ endif
+ let idx += 1
+ endfor
+
+ let ln_end = idx
+ return [ln_start, ln_end]
+endfunction "}}}
+
+function! s:diary_date_link() "{{{
+ return s:get_date_link(VimwikiGet('diary_link_fmt'))
+endfunction "}}}
+
+function! s:get_file_contents(file_name) "{{{
+ let lines = []
+ let bufnr = bufnr(expand(a:file_name))
+ if bufnr != -1
+ let lines = getbufline(bufnr, 1, '$')
+ else
+ try
+ let lines = readfile(expand(a:file_name))
+ catch
+ endtry
+ endif
+ return [lines, bufnr]
+endfunction "}}}
+
+function! s:get_links() "{{{
+ let rx = '\d\{4}-\d\d-\d\d'
+ let s_links = glob(VimwikiGet('path').VimwikiGet('diary_rel_path').
+ \ '*'.VimwikiGet('ext'))
+
+ let s_links = substitute(s_links, '\'.VimwikiGet('ext'), "", "g")
+ let links = split(s_links, '\n')
+
+ " remove backup files (.wiki~)
+ call filter(links, 'v:val !~ ''.*\~$''')
+
+ " remove paths
+ call map(links, 'fnamemodify(v:val, ":t")')
+
+ call filter(links, 'v:val =~ "'.escape(rx, '\').'"')
+ return links
+endfunction "}}}
+
+function! s:get_position_links(link) "{{{
+ let idx = -1
+ let links = []
+ if a:link =~ '\d\{4}-\d\d-\d\d'
+ let links = s:get_links()
+ " include 'today' into links
+ if index(links, s:diary_date_link()) == -1
+ call add(links, s:diary_date_link())
+ endif
+ call sort(links)
+ let idx = index(links, a:link)
+ endif
+ return [idx, links]
+endfunction "}}}
+
+function! s:format_links(links) "{{{
+ let lines = []
+ let line = '| '
+ let idx = 0
+ let trigger = 0
+ while idx < len(a:links)
+ if idx/VimwikiGet('diary_link_count') > trigger
+ let trigger = idx/VimwikiGet('diary_link_count')
+ call add(lines, substitute(line, '\s\+$', '', ''))
+ let line = '| '
+ endif
+ let line .= a:links[idx].' | '
+ let idx += 1
+ endwhile
+ call add(lines, substitute(line, '\s\+$', '', ''))
+ call extend(lines, [''])
+
+ return lines
+endfunction "}}}
+
+function! s:add_link(page, header, link) "{{{
+ let [lines, bufnr] = s:get_file_contents(a:page)
+
+ let [ln_start, ln_end] = s:get_diary_range(lines, a:header)
+
+ let link = '[['.a:link.']]'
+
+ let link_exists = s:link_exists(lines[ln_start : ln_end], link)
+
+ if !link_exists
+
+ if ln_start == -1
+ call insert(lines, '= '.a:header.' =')
+ let ln_start = 1
+ let ln_end = 1
+ endif
+
+ " removing 'old' links
+ let idx = ln_end - ln_start
+ while idx > 0
+ call remove(lines, ln_start)
+ let idx -= 1
+ endwhile
+
+ " get all diary links from filesystem
+ let links = s:get_links()
+ call map(links, '"[[".v:val."]]"')
+
+ " add current link
+ if index(links, link) == -1
+ call add(links, link)
+ endif
+
+ let links = sort(links, 's:desc')
+ call extend(lines, s:format_links(links), ln_start)
+
+ if bufnr != -1
+ exe 'buffer '.bufnr
+ if !&readonly
+ 1,$delete _
+ call append(1, lines)
+ 1,1delete _
+ endif
+ else
+ call writefile(lines, expand(a:page))
+ endif
+ endif
+endfunction "}}}
+
+function! s:make_date_link(...) "{{{
+ if a:0
+ let link = a:1
+ else
+ let link = s:diary_date_link()
+ endif
+ let header = VimwikiGet('diary_header')
+ call s:add_link(s:diary_index(), header, link)
+ return VimwikiGet('diary_rel_path').link
+endfunction "}}}
+
+function! vimwiki#diary#make_note(index, ...) "{{{
+ call vimwiki#base#select(a:index)
+ call vimwiki#base#mkdir(VimwikiGet('path').VimwikiGet('diary_rel_path'))
+ if a:0
+ let link = s:make_date_link(a:1)
+ else
+ let link = s:make_date_link()
+ endif
+ call vimwiki#base#open_link(':e ', link, s:diary_index())
+endfunction "}}}
+
+function! vimwiki#diary#goto_index(index) "{{{
+ call vimwiki#base#select(a:index)
+ call vimwiki#base#edit_file(':e', s:diary_index())
+endfunction "}}}
+
+" Calendar.vim callback function.
+function! vimwiki#diary#calendar_action(day, month, year, week, dir) "{{{
+ let day = s:prefix_zero(a:day)
+ let month = s:prefix_zero(a:month)
+
+ let link = a:year.'-'.month.'-'.day
+ if winnr('#') == 0
+ if a:dir == 'V'
+ vsplit
+ else
+ split
+ endif
+ else
+ wincmd p
+ if !&hidden && &modified
+ new
+ endif
+ endif
+
+ " Create diary note for a selected date in default wiki.
+ call vimwiki#diary#make_note(1, link)
+endfunction "}}}
+
+" Calendar.vim sign function.
+function vimwiki#diary#calendar_sign(day, month, year) "{{{
+ let day = s:prefix_zero(a:day)
+ let month = s:prefix_zero(a:month)
+ let sfile = VimwikiGet('path').VimwikiGet('diary_rel_path').
+ \ a:year.'-'.month.'-'.day.VimwikiGet('ext')
+ return filereadable(expand(sfile))
+endfunction "}}}
+
+function! vimwiki#diary#goto_next_day() "{{{
+ let link = ''
+ let [idx, links] = s:get_position_links(expand('%:t:r'))
+
+ if idx == (len(links) - 1)
+ return
+ endif
+
+ if idx != -1 && idx < len(links) - 1
+ let link = VimwikiGet('diary_rel_path').links[idx+1]
+ else
+ " goto today
+ let link = VimwikiGet('diary_rel_path').s:diary_date_link()
+ endif
+
+ if len(link)
+ call vimwiki#base#open_link(':e ', link)
+ endif
+endfunction "}}}
+
+function! vimwiki#diary#goto_prev_day() "{{{
+ let link = ''
+ let [idx, links] = s:get_position_links(expand('%:t:r'))
+
+ if idx == 0
+ return
+ endif
+
+ if idx > 0
+ let link = VimwikiGet('diary_rel_path').links[idx-1]
+ else
+ " goto today
+ let link = VimwikiGet('diary_rel_path').s:diary_date_link()
+ endif
+
+ if len(link)
+ call vimwiki#base#open_link(':e ', link)
+ endif
+endfunction "}}}
diff --git a/autoload/vimwiki/html.vim b/autoload/vimwiki/html.vim
@@ -0,0 +1,1441 @@
+" vim:tabstop=2:shiftwidth=2:expandtab:foldmethod=marker:textwidth=79
+" Vimwiki autoload plugin file
+" Export to HTML
+" Author: Maxim Kim <habamax@gmail.com>
+" Home: http://code.google.com/p/vimwiki/
+
+" XXX: This file should be refactored!
+
+" Load only once {{{
+if exists("g:loaded_vimwiki_html_auto") || &cp
+ finish
+endif
+let g:loaded_vimwiki_html_auto = 1
+"}}}
+
+" UTILITY "{{{
+function! s:root_path(subdir) "{{{
+ return repeat('../', len(split(a:subdir, '[/\\]')))
+endfunction "}}}
+
+function! s:syntax_supported() " {{{
+ return VimwikiGet('syntax') == "default"
+endfunction " }}}
+
+function! s:remove_blank_lines(lines) " {{{
+ while !empty(a:lines) && a:lines[-1] =~ '^\s*$'
+ call remove(a:lines, -1)
+ endwhile
+endfunction "}}}
+
+function! s:is_web_link(lnk) "{{{
+ if a:lnk =~ '^\%(https://\|http://\|www.\|ftp://\|file://\|mailto:\)'
+ return 1
+ endif
+ return 0
+endfunction "}}}
+
+function! s:is_img_link(lnk) "{{{
+ if a:lnk =~ '\.\%(png\|jpg\|gif\|jpeg\)$'
+ return 1
+ endif
+ return 0
+endfunction "}}}
+
+function! s:has_abs_path(fname) "{{{
+ if a:fname =~ '\(^.:\)\|\(^/\)'
+ return 1
+ endif
+ return 0
+endfunction "}}}
+
+function! s:find_autoload_file(name) " {{{
+ for path in split(&runtimepath, ',')
+ let fname = path.'/autoload/vimwiki/'.a:name
+ if glob(fname) != ''
+ return fname
+ endif
+ endfor
+ return ''
+endfunction " }}}
+
+function! s:create_default_CSS(path) " {{{
+ let path = expand(a:path)
+ let css_full_name = path.VimwikiGet('css_name')
+ if glob(css_full_name) == ""
+ call vimwiki#base#mkdir(fnamemodify(css_full_name, ':p:h'))
+ let default_css = s:find_autoload_file('style.css')
+ if default_css != ''
+ let lines = readfile(default_css)
+ call writefile(lines, css_full_name)
+ echomsg "Default style.css has been created."
+ endif
+ endif
+endfunction "}}}
+
+function! s:template_full_name(name) "{{{
+ if a:name == ''
+ let name = VimwikiGet('template_default')
+ else
+ let name = a:name
+ endif
+
+ let fname = expand(VimwikiGet('template_path').
+ \name.
+ \VimwikiGet('template_ext'))
+
+ if filereadable(fname)
+ return fname
+ else
+ return ''
+ endif
+endfunction "}}}
+
+function! s:get_html_template(wikifile, template) "{{{
+ " TODO: refactor it!!!
+ let lines=[]
+
+ let template_name = s:template_full_name(a:template)
+ if template_name != ''
+ try
+ let lines = readfile(template_name)
+ return lines
+ catch /E484/
+ echomsg 'vimwiki: html template '.template_name.
+ \ ' does not exist!'
+ endtry
+ endif
+
+ " if no VimwikiGet('html_template') set up or error while reading template
+ " file -- use default one.
+ let default_tpl = s:find_autoload_file('default.tpl')
+ if default_tpl != ''
+ let lines = readfile(default_tpl)
+ endif
+ return lines
+endfunction "}}}
+
+function! s:safe_html(line) "{{{
+ "" htmlize symbols: < > &
+
+ let line = substitute(a:line, '&', '\&', 'g')
+
+ let tags = join(split(g:vimwiki_valid_html_tags, '\s*,\s*'), '\|')
+ let line = substitute(line,'<\%(/\?\%('
+ \.tags.'\)\%(\s\{-1}\S\{-}\)\{-}/\?>\)\@!',
+ \'\<', 'g')
+ let line = substitute(line,'\%(</\?\%('
+ \.tags.'\)\%(\s\{-1}\S\{-}\)\{-}/\?\)\@<!>',
+ \'\>', 'g')
+ return line
+endfunction "}}}
+
+function! s:delete_html_files(path) "{{{
+ let htmlfiles = split(glob(a:path.'**/*.html'), '\n')
+ for fname in htmlfiles
+ " ignore user html files, e.g. search.html,404.html
+ if stridx(g:vimwiki_user_htmls, fnamemodify(fname, ":t")) >= 0
+ continue
+ endif
+
+ " delete if there is no corresponding wiki file
+ let subdir = vimwiki#base#subdir(VimwikiGet('path_html'), fname)
+ let wikifile = VimwikiGet("path").subdir.
+ \fnamemodify(fname, ":t:r").VimwikiGet("ext")
+ if filereadable(wikifile)
+ continue
+ endif
+
+ try
+ call delete(fname)
+ catch
+ echomsg 'vimwiki: Cannot delete '.fname
+ endtry
+ endfor
+endfunction "}}}
+
+function! s:mid(value, cnt) "{{{
+ return strpart(a:value, a:cnt, len(a:value) - 2 * a:cnt)
+endfunction "}}}
+
+function! s:subst_func(line, regexp, func) " {{{
+ " Substitute text found by regexp with result of
+ " func(matched) function.
+
+ let pos = 0
+ let lines = split(a:line, a:regexp, 1)
+ let res_line = ""
+ for line in lines
+ let res_line = res_line.line
+ let matched = matchstr(a:line, a:regexp, pos)
+ if matched != ""
+ let res_line = res_line.{a:func}(matched)
+ endif
+ let pos = matchend(a:line, a:regexp, pos)
+ endfor
+ return res_line
+endfunction " }}}
+
+function! s:save_vimwiki_buffer() "{{{
+ if &filetype == 'vimwiki'
+ silent update
+ endif
+endfunction "}}}
+
+function! s:trim(string) "{{{
+ let res = substitute(a:string, '^\s\+', '', '')
+ let res = substitute(res, '\s\+$', '', '')
+ return res
+endfunction "}}}
+
+function! s:get_html_toc(toc_list) "{{{
+ " toc_list is list of [level, header_text, header_id]
+ " ex: [[1, "Header", "toc1"], [2, "Header2", "toc2"], ...]
+ function! s:close_list(toc, plevel, level) "{{{
+ let plevel = a:plevel
+ while plevel > a:level
+ call add(a:toc, '</ul>')
+ let plevel -= 1
+ endwhile
+ return plevel
+ endfunction "}}}
+
+ if empty(a:toc_list)
+ return []
+ endif
+
+ let toc = ['<div class="toc">']
+ let level = 0
+ let plevel = 0
+ for [level, text, id] in a:toc_list
+ if level > plevel
+ call add(toc, '<ul>')
+ elseif level < plevel
+ let plevel = s:close_list(toc, plevel, level)
+ endif
+
+ let toc_text = s:process_tags_remove_links(text)
+ let toc_text = s:process_tags_typefaces(toc_text)
+ call add(toc, '<li><a href="#'.id.'">'.toc_text.'</a>')
+ let plevel = level
+ endfor
+ call s:close_list(toc, level, 0)
+ call add(toc, '</div>')
+ return toc
+endfunction "}}}
+
+" insert toc into dest.
+function! s:process_toc(dest, placeholders, toc) "{{{
+ let toc_idx = 0
+ if !empty(a:placeholders)
+ for [placeholder, row, idx] in a:placeholders
+ let [type, param] = placeholder
+ if type == 'toc'
+ let toc = a:toc[:]
+ if !empty(param)
+ call insert(toc, '<h1>'.param.'</h1>')
+ endif
+ let shift = toc_idx * len(toc)
+ call extend(a:dest, toc, row + shift)
+ let toc_idx += 1
+ endif
+ endfor
+ endif
+endfunction "}}}
+
+" get title.
+function! s:process_title(placeholders, default_title) "{{{
+ if !empty(a:placeholders)
+ for [placeholder, row, idx] in a:placeholders
+ let [type, param] = placeholder
+ if type == 'title' && !empty(param)
+ return param
+ endif
+ endfor
+ endif
+ return a:default_title
+endfunction "}}}
+
+function! s:is_html_uptodate(wikifile) "{{{
+ let tpl_time = -1
+
+ let tpl_file = s:template_full_name('')
+ if tpl_file != ''
+ let tpl_time = getftime(tpl_file)
+ endif
+
+ let wikifile = fnamemodify(a:wikifile, ":p")
+ let subdir = vimwiki#base#subdir(VimwikiGet('path'), wikifile)
+ let htmlfile = expand(VimwikiGet('path_html').subdir.
+ \fnamemodify(wikifile, ":t:r").".html")
+
+ if getftime(wikifile) <= getftime(htmlfile) && tpl_time <= getftime(htmlfile)
+ return 1
+ endif
+ return 0
+endfunction "}}}
+
+function! s:html_insert_contents(html_lines, content) "{{{
+ let lines = []
+ for line in a:html_lines
+ if line =~ '%content%'
+ let parts = split(line, '%content%', 1)
+ if empty(parts)
+ call extend(lines, a:content)
+ else
+ for idx in range(len(parts))
+ call add(lines, parts[idx])
+ if idx < len(parts) - 1
+ call extend(lines, a:content)
+ endif
+ endfor
+ endif
+ else
+ call add(lines, line)
+ endif
+ endfor
+ return lines
+endfunction "}}}
+"}}}
+
+" INLINE TAGS "{{{
+function! s:tag_em(value) "{{{
+ return '<em>'.s:mid(a:value, 1).'</em>'
+endfunction "}}}
+
+function! s:tag_strong(value) "{{{
+ return '<strong>'.s:mid(a:value, 1).'</strong>'
+endfunction "}}}
+
+function! s:tag_todo(value) "{{{
+ return '<span class="todo">'.a:value.'</span>'
+endfunction "}}}
+
+function! s:tag_strike(value) "{{{
+ return '<del>'.s:mid(a:value, 2).'</del>'
+endfunction "}}}
+
+function! s:tag_super(value) "{{{
+ return '<sup><small>'.s:mid(a:value, 1).'</small></sup>'
+endfunction "}}}
+
+function! s:tag_sub(value) "{{{
+ return '<sub><small>'.s:mid(a:value, 2).'</small></sub>'
+endfunction "}}}
+
+function! s:tag_code(value) "{{{
+ return '<code>'.s:mid(a:value, 1).'</code>'
+endfunction "}}}
+
+function! s:tag_pre(value) "{{{
+ return '<code>'.s:mid(a:value, 3).'</code>'
+endfunction "}}}
+
+function! s:tag_internal_link(value) "{{{
+ " Make <a href="This is a link">This is a link</a>
+ " from [[This is a link]]
+ " Make <a href="link">This is a link</a>
+ " from [[link|This is a link]]
+ " Make <a href="link">This is a link</a>
+ " from [[link][This is a link]]
+ " TODO: rename function -- it makes not only internal links.
+ " TODO: refactor it.
+
+ function! s:linkify(src, caption, style) "{{{
+ if a:style == ''
+ let style_str = ''
+ else
+ let style_str = ' style="'.a:style.'"'
+ endif
+
+ if s:is_img_link(a:caption)
+ let link = '<a href="'.a:src.'"><img src="'.a:caption.'"'.style_str.' />'.
+ \ '</a>'
+ elseif vimwiki#base#is_non_wiki_link(a:src)
+ let link = '<a href="'.a:src.'">'.a:caption.'</a>'
+ elseif s:is_img_link(a:src)
+ let link = '<img src="'.a:src.'" alt="'.a:caption.'"'. style_str.' />'
+ elseif vimwiki#base#is_link_to_dir(a:src)
+ if g:vimwiki_dir_link == ''
+ let link = '<a href="'.vimwiki#base#safe_link(a:src).'">'.a:caption.'</a>'
+ else
+ let link = '<a href="'.vimwiki#base#safe_link(a:src).
+ \ g:vimwiki_dir_link.'.html">'.a:caption.'</a>'
+ endif
+ else
+ let link = '<a href="'.vimwiki#base#safe_link(a:src).
+ \ '.html">'.a:caption.'</a>'
+ endif
+
+ return link
+ endfunction "}}}
+
+ let value = s:mid(a:value, 2)
+
+ let line = ''
+ if value =~ '|'
+ let link_parts = split(value, "|", 1)
+ else
+ let link_parts = split(value, "][", 1)
+ endif
+
+
+ if len(link_parts) > 1
+ if len(link_parts) < 3
+ let style = ""
+ else
+ let style = link_parts[2]
+ endif
+
+ let line = s:linkify(link_parts[0], link_parts[1], style)
+
+ else
+ let line = s:linkify(value, value, '')
+ endif
+ return line
+endfunction "}}}
+
+function! s:tag_external_link(value) "{{{
+ "" Make <a href="link">link desc</a>
+ "" from [link link desc]
+
+ let value = s:mid(a:value, 1)
+
+ let line = ''
+ if s:is_web_link(value)
+ let lnkElements = split(value)
+ let head = lnkElements[0]
+ let rest = join(lnkElements[1:])
+ if rest==""
+ let rest=head
+ endif
+ if s:is_img_link(rest)
+ if rest!=head
+ let line = '<a href="'.head.'"><img src="'.rest.'" /></a>'
+ else
+ let line = '<img src="'.rest.'" />'
+ endif
+ else
+ let line = '<a href="'.head.'">'.rest.'</a>'
+ endif
+ elseif s:is_img_link(value)
+ let line = '<img src="'.value.'" />'
+ else
+ " [alskfj sfsf] shouldn't be a link. So return it as it was --
+ " enclosed in [...]
+ let line = '['.value.']'
+ endif
+ return line
+endfunction "}}}
+
+function! s:tag_wikiword_link(value) "{{{
+ " Make <a href="WikiWord">WikiWord</a> from WikiWord
+ if a:value[0] == '!'
+ return a:value[1:]
+ elseif g:vimwiki_camel_case
+ let line = '<a href="'.a:value.'.html">'.a:value.'</a>'
+ return line
+ else
+ return a:value
+ endif
+endfunction "}}}
+
+function! s:tag_barebone_link(value) "{{{
+ "" Make <a href="http://habamax.ru">http://habamax.ru</a>
+ "" from http://habamax.ru
+
+ if s:is_img_link(a:value)
+ let line = '<img src="'.a:value.'" />'
+ else
+ let line = '<a href="'.a:value.'">'.a:value.'</a>'
+ endif
+ return line
+endfunction "}}}
+
+function! s:tag_no_wikiword_link(value) "{{{
+ if a:value[0] == '!'
+ return a:value[1:]
+ else
+ return a:value
+ endif
+endfunction "}}}
+
+function! s:tag_remove_internal_link(value) "{{{
+ let value = s:mid(a:value, 2)
+
+ let line = ''
+ if value =~ '|'
+ let link_parts = split(value, "|", 1)
+ else
+ let link_parts = split(value, "][", 1)
+ endif
+
+ if len(link_parts) > 1
+ if len(link_parts) < 3
+ let style = ""
+ else
+ let style = link_parts[2]
+ endif
+ let line = link_parts[1]
+ else
+ let line = value
+ endif
+ return line
+endfunction "}}}
+
+function! s:tag_remove_external_link(value) "{{{
+ let value = s:mid(a:value, 1)
+
+ let line = ''
+ if s:is_web_link(value)
+ let lnkElements = split(value)
+ let head = lnkElements[0]
+ let rest = join(lnkElements[1:])
+ if rest==""
+ let rest=head
+ endif
+ let line = rest
+ elseif s:is_img_link(value)
+ let line = '<img src="'.value.'" />'
+ else
+ " [alskfj sfsf] shouldn't be a link. So return it as it was --
+ " enclosed in [...]
+ let line = '['.value.']'
+ endif
+ return line
+endfunction "}}}
+
+function! s:make_tag(line, regexp, func) "{{{
+ " Make tags for a given matched regexp.
+ " Exclude preformatted text and href links.
+
+ let patt_splitter = '\(`[^`]\+`\)\|\({{{.\+}}}\)\|'.
+ \ '\(<a href.\{-}</a>\)\|\(<img src.\{-}/>\)'
+ if '`[^`]\+`' == a:regexp || '{{{.\+}}}' == a:regexp
+ let res_line = s:subst_func(a:line, a:regexp, a:func)
+ else
+ let pos = 0
+ " split line with patt_splitter to have parts of line before and after
+ " href links, preformatted text
+ " ie:
+ " hello world `is just a` simple <a href="link.html">type of</a> prg.
+ " result:
+ " ['hello world ', ' simple ', 'type of', ' prg']
+ let lines = split(a:line, patt_splitter, 1)
+ let res_line = ""
+ for line in lines
+ let res_line = res_line.s:subst_func(line, a:regexp, a:func)
+ let res_line = res_line.matchstr(a:line, patt_splitter, pos)
+ let pos = matchend(a:line, patt_splitter, pos)
+ endfor
+ endif
+ return res_line
+endfunction "}}}
+
+function! s:process_tags_remove_links(line) " {{{
+ let line = a:line
+ let line = s:make_tag(line, '\[\[.\{-}\]\]', 's:tag_remove_internal_link')
+ let line = s:make_tag(line, '\[.\{-}\]', 's:tag_remove_external_link')
+ return line
+endfunction " }}}
+
+function! s:process_tags_typefaces(line) "{{{
+ let line = a:line
+ let line = s:make_tag(line, g:vimwiki_rxNoWikiWord, 's:tag_no_wikiword_link')
+ let line = s:make_tag(line, g:vimwiki_rxItalic, 's:tag_em')
+ let line = s:make_tag(line, g:vimwiki_rxBold, 's:tag_strong')
+ let line = s:make_tag(line, g:vimwiki_rxTodo, 's:tag_todo')
+ let line = s:make_tag(line, g:vimwiki_rxDelText, 's:tag_strike')
+ let line = s:make_tag(line, g:vimwiki_rxSuperScript, 's:tag_super')
+ let line = s:make_tag(line, g:vimwiki_rxSubScript, 's:tag_sub')
+ let line = s:make_tag(line, g:vimwiki_rxCode, 's:tag_code')
+ return line
+endfunction " }}}
+
+function! s:process_tags_links(line) " {{{
+ let line = a:line
+ let line = s:make_tag(line, '\[\[.\{-}\]\]', 's:tag_internal_link')
+ let line = s:make_tag(line, '\[.\{-}\]', 's:tag_external_link')
+ let line = s:make_tag(line, g:vimwiki_rxWeblink, 's:tag_barebone_link')
+ let line = s:make_tag(line, g:vimwiki_rxWikiWord, 's:tag_wikiword_link')
+ return line
+endfunction " }}}
+
+function! s:process_inline_tags(line) "{{{
+ let line = s:process_tags_links(a:line)
+ let line = s:process_tags_typefaces(line)
+ return line
+endfunction " }}}
+"}}}
+
+" BLOCK TAGS {{{
+function! s:close_tag_pre(pre, ldest) "{{{
+ if a:pre[0]
+ call insert(a:ldest, "</pre>")
+ return 0
+ endif
+ return a:pre
+endfunction "}}}
+
+function! s:close_tag_quote(quote, ldest) "{{{
+ if a:quote
+ call insert(a:ldest, "</blockquote>")
+ return 0
+ endif
+ return a:quote
+endfunction "}}}
+
+function! s:close_tag_para(para, ldest) "{{{
+ if a:para
+ call insert(a:ldest, "</p>")
+ return 0
+ endif
+ return a:para
+endfunction "}}}
+
+function! s:close_tag_table(table, ldest) "{{{
+ " The first element of table list is a string which tells us if table should be centered.
+ " The rest elements are rows which are lists of columns:
+ " ['center',
+ " [ CELL1, CELL2, CELL3 ],
+ " [ CELL1, CELL2, CELL3 ],
+ " [ CELL1, CELL2, CELL3 ],
+ " ]
+ " And CELLx is: { 'body': 'col_x', 'rowspan': r, 'colspan': c }
+
+ function! s:sum_rowspan(table) "{{{
+ let table = a:table
+
+ " Get max cells
+ let max_cells = 0
+ for row in table[1:]
+ let n_cells = len(row)
+ if n_cells > max_cells
+ let max_cells = n_cells
+ end
+ endfor
+
+ " Sum rowspan
+ for cell_idx in range(max_cells)
+ let rows = 1
+
+ for row_idx in range(len(table)-1, 1, -1)
+ if cell_idx >= len(table[row_idx])
+ let rows = 1
+ continue
+ endif
+
+ if table[row_idx][cell_idx].rowspan == 0
+ let rows += 1
+ else " table[row_idx][cell_idx].rowspan == 1
+ let table[row_idx][cell_idx].rowspan = rows
+ let rows = 1
+ endif
+ endfor
+ endfor
+ endfunction "}}}
+
+ function! s:sum_colspan(table) "{{{
+ for row in a:table[1:]
+ let cols = 1
+
+ for cell_idx in range(len(row)-1, 0, -1)
+ if row[cell_idx].colspan == 0
+ let cols += 1
+ else "row[cell_idx].colspan == 1
+ let row[cell_idx].colspan = cols
+ let cols = 1
+ endif
+ endfor
+ endfor
+ endfunction "}}}
+
+ function! s:close_tag_row(row, header, ldest) "{{{
+ call add(a:ldest, '<tr>')
+
+ " Set tag element of columns
+ if a:header
+ let tag_name = 'th'
+ else
+ let tag_name = 'td'
+ end
+
+ " Close tag of columns
+ for cell in a:row
+ if cell.rowspan == 0 || cell.colspan == 0
+ continue
+ endif
+
+ if cell.rowspan > 1
+ let rowspan_attr = ' rowspan="' . cell.rowspan . '"'
+ else "cell.rowspan == 1
+ let rowspan_attr = ''
+ endif
+ if cell.colspan > 1
+ let colspan_attr = ' colspan="' . cell.colspan . '"'
+ else "cell.colspan == 1
+ let colspan_attr = ''
+ endif
+
+ call add(a:ldest, '<' . tag_name . rowspan_attr . colspan_attr .'>')
+ call add(a:ldest, s:process_inline_tags(cell.body))
+ call add(a:ldest, '</'. tag_name . '>')
+ endfor
+
+ call add(a:ldest, '</tr>')
+ endfunction "}}}
+
+ let table = a:table
+ let ldest = a:ldest
+ if len(table)
+ call s:sum_rowspan(table)
+ call s:sum_colspan(table)
+
+ if table[0] == 'center'
+ call add(ldest, "<table class='center'>")
+ else
+ call add(ldest, "<table>")
+ endif
+
+ " Empty lists are table separators.
+ " Search for the last empty list. All the above rows would be a table header.
+ " We should exclude the first element of the table list as it is a text tag
+ " that shows if table should be centered or not.
+ let head = 0
+ for idx in range(len(table)-1, 1, -1)
+ if empty(table[idx])
+ let head = idx
+ break
+ endif
+ endfor
+ if head > 0
+ for row in table[1 : head-1]
+ if !empty(filter(row, '!empty(v:val)'))
+ call s:close_tag_row(row, 1, ldest)
+ endif
+ endfor
+ for row in table[head+1 :]
+ call s:close_tag_row(row, 0, ldest)
+ endfor
+ else
+ for row in table[1 :]
+ call s:close_tag_row(row, 0, ldest)
+ endfor
+ endif
+ call add(ldest, "</table>")
+ let table = []
+ endif
+ return table
+endfunction "}}}
+
+function! s:close_tag_list(lists, ldest) "{{{
+ while len(a:lists)
+ let item = remove(a:lists, 0)
+ call insert(a:ldest, item[0])
+ endwhile
+endfunction! "}}}
+
+function! s:close_tag_def_list(deflist, ldest) "{{{
+ if a:deflist
+ call insert(a:ldest, "</dl>")
+ return 0
+ endif
+ return a:deflist
+endfunction! "}}}
+
+function! s:process_tag_pre(line, pre) "{{{
+ " pre is the list of [is_in_pre, indent_of_pre]
+ let lines = []
+ let pre = a:pre
+ let processed = 0
+ if !pre[0] && a:line =~ '^\s*{{{[^\(}}}\)]*\s*$'
+ let class = matchstr(a:line, '{{{\zs.*$')
+ let class = substitute(class, '\s\+$', '', 'g')
+ if class != ""
+ call add(lines, "<pre ".class.">")
+ else
+ call add(lines, "<pre>")
+ endif
+ let pre = [1, len(matchstr(a:line, '^\s*\ze{{{'))]
+ let processed = 1
+ elseif pre[0] && a:line =~ '^\s*}}}\s*$'
+ let pre = [0, 0]
+ call add(lines, "</pre>")
+ let processed = 1
+ elseif pre[0]
+ let processed = 1
+ call add(lines, substitute(a:line, '^\s\{'.pre[1].'}', '', ''))
+ endif
+ return [processed, lines, pre]
+endfunction "}}}
+
+function! s:process_tag_quote(line, quote) "{{{
+ let lines = []
+ let quote = a:quote
+ let processed = 0
+ if a:line =~ '^\s\{4,}\S'
+ if !quote
+ call add(lines, "<blockquote>")
+ let quote = 1
+ endif
+ let processed = 1
+ call add(lines, substitute(a:line, '^\s*', '', ''))
+ elseif quote
+ call add(lines, "</blockquote>")
+ let quote = 0
+ endif
+ return [processed, lines, quote]
+endfunction "}}}
+
+function! s:process_tag_list(line, lists) "{{{
+
+ function! s:add_checkbox(line, rx_list, st_tag, en_tag) "{{{
+ let st_tag = a:st_tag
+ let en_tag = a:en_tag
+
+ let chk = matchlist(a:line, a:rx_list)
+ if len(chk) > 0
+ if len(chk[1])>0
+ "wildcard characters are difficult to match correctly
+ if chk[1] =~ '[.*\\^$~]'
+ let chk[1] ='\'.chk[1]
+ endif
+ let completion = match(g:vimwiki_listsyms, '\C' . chk[1])
+ if completion >= 0 && completion <=4
+ let st_tag = '<li class="done'.completion.'">'
+ endif
+ endif
+ endif
+ return [st_tag, en_tag]
+ endfunction "}}}
+
+ let in_list = (len(a:lists) > 0)
+
+ " If it is not list yet then do not process line that starts from *bold*
+ " text.
+ if !in_list
+ let pos = match(a:line, g:vimwiki_rxBold)
+ if pos != -1 && strpart(a:line, 0, pos) =~ '^\s*$'
+ return [0, []]
+ endif
+ endif
+
+ let lines = []
+ let processed = 0
+
+ if a:line =~ g:vimwiki_rxListBullet
+ let lstSym = matchstr(a:line, '[*-]')
+ let lstTagOpen = '<ul>'
+ let lstTagClose = '</ul>'
+ let lstRegExp = g:vimwiki_rxListBullet
+ elseif a:line =~ g:vimwiki_rxListNumber
+ let lstSym = '#'
+ let lstTagOpen = '<ol>'
+ let lstTagClose = '</ol>'
+ let lstRegExp = g:vimwiki_rxListNumber
+ else
+ let lstSym = ''
+ let lstTagOpen = ''
+ let lstTagClose = ''
+ let lstRegExp = ''
+ endif
+
+ if lstSym != ''
+ " To get proper indent level 'retab' the line -- change all tabs
+ " to spaces*tabstop
+ let line = substitute(a:line, '\t', repeat(' ', &tabstop), 'g')
+ let indent = stridx(line, lstSym)
+
+ let checkbox = '\s*\[\(.\?\)\]\s*'
+ let [st_tag, en_tag] = s:add_checkbox(line,
+ \ lstRegExp.checkbox, '<li>', '')
+
+ if !in_list
+ call add(a:lists, [lstTagClose, indent])
+ call add(lines, lstTagOpen)
+ elseif (in_list && indent > a:lists[-1][1])
+ let item = remove(a:lists, -1)
+ call add(lines, item[0])
+
+ call add(a:lists, [lstTagClose, indent])
+ call add(lines, lstTagOpen)
+ elseif (in_list && indent < a:lists[-1][1])
+ while len(a:lists) && indent < a:lists[-1][1]
+ let item = remove(a:lists, -1)
+ call add(lines, item[0])
+ endwhile
+ elseif in_list
+ let item = remove(a:lists, -1)
+ call add(lines, item[0])
+ endif
+
+ call add(a:lists, [en_tag, indent])
+ call add(lines, st_tag)
+ call add(lines,
+ \ substitute(a:line, lstRegExp.'\%('.checkbox.'\)\?', '', ''))
+ let processed = 1
+ elseif in_list > 0 && a:line =~ '^\s\+\S\+'
+ if g:vimwiki_list_ignore_newline
+ call add(lines, a:line)
+ else
+ call add(lines, '<br />'.a:line)
+ endif
+ let processed = 1
+ else
+ call s:close_tag_list(a:lists, lines)
+ endif
+ return [processed, lines]
+endfunction "}}}
+
+function! s:process_tag_def_list(line, deflist) "{{{
+ let lines = []
+ let deflist = a:deflist
+ let processed = 0
+ let matches = matchlist(a:line, '\(^.*\)::\%(\s\|$\)\(.*\)')
+ if !deflist && len(matches) > 0
+ call add(lines, "<dl>")
+ let deflist = 1
+ endif
+ if deflist && len(matches) > 0
+ if matches[1] != ''
+ call add(lines, "<dt>".matches[1]."</dt>")
+ endif
+ if matches[2] != ''
+ call add(lines, "<dd>".matches[2]."</dd>")
+ endif
+ let processed = 1
+ elseif deflist
+ let deflist = 0
+ call add(lines, "</dl>")
+ endif
+ return [processed, lines, deflist]
+endfunction "}}}
+
+function! s:process_tag_para(line, para) "{{{
+ let lines = []
+ let para = a:para
+ let processed = 0
+ if a:line =~ '^\s\{,3}\S'
+ if !para
+ call add(lines, "<p>")
+ let para = 1
+ endif
+ let processed = 1
+ call add(lines, a:line)
+ elseif para && a:line =~ '^\s*$'
+ call add(lines, "</p>")
+ let para = 0
+ endif
+ return [processed, lines, para]
+endfunction "}}}
+
+function! s:process_tag_h(line, id) "{{{
+ let line = a:line
+ let processed = 0
+ let h_level = 0
+ let h_text = ''
+ let h_id = ''
+ if a:line =~ g:vimwiki_rxH6
+ let h_level = 6
+ elseif a:line =~ g:vimwiki_rxH5
+ let h_level = 5
+ elseif a:line =~ g:vimwiki_rxH4
+ let h_level = 4
+ elseif a:line =~ g:vimwiki_rxH3
+ let h_level = 3
+ elseif a:line =~ g:vimwiki_rxH2
+ let h_level = 2
+ elseif a:line =~ g:vimwiki_rxH1
+ let h_level = 1
+ endif
+ if h_level > 0
+ let a:id[h_level] += 1
+ " reset higher level ids
+ for level in range(h_level+1, 6)
+ let a:id[level] = 0
+ endfor
+
+ let centered = 0
+ if a:line =~ '^\s\+'
+ let centered = 1
+ endif
+
+ let line = s:trim(line)
+
+ let h_number = ''
+ for l in range(1, h_level-1)
+ let h_number .= a:id[l].'.'
+ endfor
+ let h_number .= a:id[h_level]
+
+ let h_id = 'toc_'.h_number
+
+ let h_part = '<h'.h_level.' id="'.h_id.'"'
+
+ if centered
+ let h_part .= ' class="justcenter">'
+ else
+ let h_part .= '>'
+ endif
+
+ let h_text = s:trim(strpart(line, h_level, len(line) - h_level * 2))
+ if g:vimwiki_html_header_numbering
+ let num = matchstr(h_number,
+ \ '^\(\d.\)\{'.(g:vimwiki_html_header_numbering-1).'}\zs.*')
+ if !empty(num)
+ let num .= g:vimwiki_html_header_numbering_sym
+ endif
+ let h_text = num.' '.h_text
+ endif
+
+ let line = h_part.h_text.'</h'.h_level.'>'
+ let processed = 1
+ endif
+ return [processed, line, h_level, h_text, h_id]
+endfunction "}}}
+
+function! s:process_tag_hr(line) "{{{
+ let line = a:line
+ let processed = 0
+ if a:line =~ '^-----*$'
+ let line = '<hr />'
+ let processed = 1
+ endif
+ return [processed, line]
+endfunction "}}}
+
+function! s:process_tag_table(line, table) "{{{
+ function! s:table_empty_cell(value) "{{{
+ let cell = {}
+
+ if a:value =~ '^\s*\\/\s*$'
+ let cell.body = ''
+ let cell.rowspan = 0
+ let cell.colspan = 1
+ elseif a:value =~ '^\s*>\s*$'
+ let cell.body = ''
+ let cell.rowspan = 1
+ let cell.colspan = 0
+ elseif a:value =~ '^\s*$'
+ let cell.body = ' '
+ let cell.rowspan = 1
+ let cell.colspan = 1
+ else
+ let cell.body = a:value
+ let cell.rowspan = 1
+ let cell.colspan = 1
+ endif
+
+ return cell
+ endfunction "}}}
+
+ function! s:table_add_row(table, line) "{{{
+ if empty(a:table)
+ if a:line =~ '^\s\+'
+ let row = ['center', []]
+ else
+ let row = ['normal', []]
+ endif
+ else
+ let row = [[]]
+ endif
+ return row
+ endfunction "}}}
+
+ let table = a:table
+ let lines = []
+ let processed = 0
+
+ if a:line =~ '^\s*|[-+]\+|\s*$'
+ call extend(table, s:table_add_row(a:table, a:line))
+ let processed = 1
+ elseif a:line =~ '^\s*|.\+|\s*$'
+ call extend(table, s:table_add_row(a:table, a:line))
+
+ let processed = 1
+ let cells = split(a:line, '\s*|\s*', 1)[1: -2]
+ call map(cells, 's:table_empty_cell(v:val)')
+ call extend(table[-1], cells)
+ else
+ let table = s:close_tag_table(table, lines)
+ endif
+ return [processed, lines, table]
+endfunction "}}}
+
+"}}}
+
+" }}}
+
+" WIKI2HTML "{{{
+function! s:parse_line(line, state) " {{{
+ let state = {}
+ let state.para = a:state.para
+ let state.quote = a:state.quote
+ let state.pre = a:state.pre[:]
+ let state.table = a:state.table[:]
+ let state.lists = a:state.lists[:]
+ let state.deflist = a:state.deflist
+ let state.placeholder = a:state.placeholder
+ let state.toc = a:state.toc
+ let state.toc_id = a:state.toc_id
+
+ let res_lines = []
+
+ let line = s:safe_html(a:line)
+
+ let processed = 0
+
+ if !processed
+ if line =~ g:vimwiki_rxComment
+ let processed = 1
+ endif
+ endif
+
+ " nohtml -- placeholder
+ if !processed
+ if line =~ '^\s*%nohtml'
+ let processed = 1
+ let state.placeholder = ['nohtml']
+ endif
+ endif
+
+ " title -- placeholder
+ if !processed
+ if line =~ '^\s*%title'
+ let processed = 1
+ let param = matchstr(line, '^\s*%title\s\zs.*')
+ let state.placeholder = ['title', param]
+ endif
+ endif
+
+ " html template -- placeholder "{{{
+ if !processed
+ if line =~ '^\s*%template'
+ let processed = 1
+ let param = matchstr(line, '^\s*%template\s\zs.*')
+ let state.placeholder = ['template', param]
+ endif
+ endif
+ "}}}
+
+ " toc -- placeholder "{{{
+ if !processed
+ if line =~ '^\s*%toc'
+ let processed = 1
+ let param = matchstr(line, '^\s*%toc\s\zs.*')
+ let state.placeholder = ['toc', param]
+ endif
+ endif
+ "}}}
+
+ " pres "{{{
+ if !processed
+ let [processed, lines, state.pre] = s:process_tag_pre(line, state.pre)
+ " pre is just fine to be in the list -- do not close list item here.
+ " if processed && len(state.lists)
+ " call s:close_tag_list(state.lists, lines)
+ " endif
+ if processed && len(state.table)
+ let state.table = s:close_tag_table(state.table, lines)
+ endif
+ if processed && state.deflist
+ let state.deflist = s:close_tag_def_list(state.deflist, lines)
+ endif
+ if processed && state.quote
+ let state.quote = s:close_tag_quote(state.quote, lines)
+ endif
+ if processed && state.para
+ let state.para = s:close_tag_para(state.para, lines)
+ endif
+ call extend(res_lines, lines)
+ endif
+ "}}}
+
+ " lists "{{{
+ if !processed
+ let [processed, lines] = s:process_tag_list(line, state.lists)
+ if processed && state.quote
+ let state.quote = s:close_tag_quote(state.quote, lines)
+ endif
+ if processed && state.pre[0]
+ let state.pre = s:close_tag_pre(state.pre, lines)
+ endif
+ if processed && len(state.table)
+ let state.table = s:close_tag_table(state.table, lines)
+ endif
+ if processed && state.deflist
+ let state.deflist = s:close_tag_def_list(state.deflist, lines)
+ endif
+ if processed && state.para
+ let state.para = s:close_tag_para(state.para, lines)
+ endif
+
+ call map(lines, 's:process_inline_tags(v:val)')
+
+ call extend(res_lines, lines)
+ endif
+ "}}}
+
+ " headers "{{{
+ if !processed
+ let [processed, line, h_level, h_text, h_id] = s:process_tag_h(line, state.toc_id)
+ if processed
+ call s:close_tag_list(state.lists, res_lines)
+ let state.table = s:close_tag_table(state.table, res_lines)
+ let state.pre = s:close_tag_pre(state.pre, res_lines)
+ let state.quote = s:close_tag_quote(state.quote, res_lines)
+ let state.para = s:close_tag_para(state.para, res_lines)
+
+ let line = s:process_inline_tags(line)
+
+ call add(res_lines, line)
+
+ " gather information for table of contents
+ call add(state.toc, [h_level, h_text, h_id])
+ endif
+ endif
+ "}}}
+
+ " tables "{{{
+ if !processed
+ let [processed, lines, state.table] = s:process_tag_table(line, state.table)
+ call extend(res_lines, lines)
+ endif
+ "}}}
+
+ " quotes "{{{
+ if !processed
+ let [processed, lines, state.quote] = s:process_tag_quote(line, state.quote)
+ if processed && len(state.lists)
+ call s:close_tag_list(state.lists, lines)
+ endif
+ if processed && state.deflist
+ let state.deflist = s:close_tag_def_list(state.deflist, lines)
+ endif
+ if processed && len(state.table)
+ let state.table = s:close_tag_table(state.table, lines)
+ endif
+ if processed && state.pre[0]
+ let state.pre = s:close_tag_pre(state.pre, lines)
+ endif
+ if processed && state.para
+ let state.para = s:close_tag_para(state.para, lines)
+ endif
+
+ call map(lines, 's:process_inline_tags(v:val)')
+
+ call extend(res_lines, lines)
+ endif
+ "}}}
+
+ " horizontal rules "{{{
+ if !processed
+ let [processed, line] = s:process_tag_hr(line)
+ if processed
+ call s:close_tag_list(state.lists, res_lines)
+ let state.table = s:close_tag_table(state.table, res_lines)
+ let state.pre = s:close_tag_pre(state.pre, res_lines)
+ call add(res_lines, line)
+ endif
+ endif
+ "}}}
+
+ " definition lists "{{{
+ if !processed
+ let [processed, lines, state.deflist] = s:process_tag_def_list(line, state.deflist)
+
+ call map(lines, 's:process_inline_tags(v:val)')
+
+ call extend(res_lines, lines)
+ endif
+ "}}}
+
+ "" P "{{{
+ if !processed
+ let [processed, lines, state.para] = s:process_tag_para(line, state.para)
+ if processed && len(state.lists)
+ call s:close_tag_list(state.lists, lines)
+ endif
+ if processed && state.quote
+ let state.quote = s:close_tag_quote(state.quote, res_lines)
+ endif
+ if processed && state.pre[0]
+ let state.pre = s:close_tag_pre(state.pre, res_lines)
+ endif
+ if processed && len(state.table)
+ let state.table = s:close_tag_table(state.table, res_lines)
+ endif
+
+ call map(lines, 's:process_inline_tags(v:val)')
+
+ call extend(res_lines, lines)
+ endif
+ "}}}
+
+ "" add the rest
+ if !processed
+ call add(res_lines, line)
+ endif
+
+ return [res_lines, state]
+
+endfunction " }}}
+
+function! vimwiki#html#Wiki2HTML(path, wikifile) "{{{
+
+ let starttime = reltime() " start the clock
+ echo 'Generating HTML ... '
+ if !s:syntax_supported()
+ echomsg 'vimwiki: Only vimwiki_default syntax supported!!!'
+ return
+ endif
+
+ let wikifile = fnamemodify(a:wikifile, ":p")
+ let subdir = vimwiki#base#subdir(VimwikiGet('path'), wikifile)
+
+ let path = expand(a:path).subdir
+ let htmlfile = fnamemodify(wikifile, ":t:r").'.html'
+
+ let lsource = readfile(wikifile)
+ let ldest = []
+
+ call vimwiki#base#mkdir(path)
+
+ " nohtml placeholder -- to skip html generation.
+ let nohtml = 0
+
+ " template placeholder
+ let template_name = ''
+
+ " for table of contents placeholders.
+ let placeholders = []
+
+ " current state of converter
+ let state = {}
+ let state.para = 0
+ let state.quote = 0
+ let state.pre = [0, 0] " [in_pre, indent_pre]
+ let state.table = []
+ let state.deflist = 0
+ let state.lists = []
+ let state.placeholder = []
+ let state.toc = []
+ let state.toc_id = {1: 0, 2: 0, 3: 0, 4: 0, 5: 0, 6: 0 }
+
+ for line in lsource
+ let oldquote = state.quote
+ let [lines, state] = s:parse_line(line, state)
+
+ " Hack: There could be a lot of empty strings before s:process_tag_quote
+ " find out `quote` is over. So we should delete them all. Think of the way
+ " to refactor it out.
+ if oldquote != state.quote
+ call s:remove_blank_lines(ldest)
+ endif
+
+ if !empty(state.placeholder)
+ if state.placeholder[0] == 'nohtml'
+ let nohtml = 1
+ break
+ elseif state.placeholder[0] == 'template'
+ let template_name = state.placeholder[1]
+ else
+ call add(placeholders, [state.placeholder, len(ldest), len(placeholders)])
+ endif
+ let state.placeholder = []
+ endif
+
+ call extend(ldest, lines)
+ endfor
+
+
+ if nohtml
+ echon "\r"."%nohtml placeholder found"
+ return
+ endif
+
+ let toc = s:get_html_toc(state.toc)
+ call s:process_toc(ldest, placeholders, toc)
+ call s:remove_blank_lines(ldest)
+
+ "" process end of file
+ "" close opened tags if any
+ let lines = []
+ call s:close_tag_quote(state.quote, lines)
+ call s:close_tag_para(state.para, lines)
+ call s:close_tag_pre(state.pre, lines)
+ call s:close_tag_list(state.lists, lines)
+ call s:close_tag_def_list(state.deflist, lines)
+ call s:close_tag_table(state.table, lines)
+ call extend(ldest, lines)
+
+ let title = s:process_title(placeholders, fnamemodify(a:wikifile, ":t:r"))
+
+ let html_lines = s:get_html_template(a:wikifile, template_name)
+
+ " processing template variables (refactor to a function)
+ call map(html_lines, 'substitute(v:val, "%title%", "'. title .'", "g")')
+ call map(html_lines, 'substitute(v:val, "%root_path%", "'.
+ \ s:root_path(subdir) .'", "g")')
+
+ let css_name = expand(VimwikiGet('css_name'))
+ let css_name = substitute(css_name, '\', '/', 'g')
+ call map(html_lines, 'substitute(v:val, "%css%", "'. css_name .'", "g")')
+
+ let enc = &fileencoding
+ if enc == ''
+ let enc = &encoding
+ endif
+ call map(html_lines, 'substitute(v:val, "%encoding%", "'. enc .'", "g")')
+
+ let html_lines = s:html_insert_contents(html_lines, ldest) " %contents%
+
+ "" make html file.
+ call writefile(html_lines, path.htmlfile)
+
+ " measure the elapsed time and cut away miliseconds and smaller
+ let elapsedtimestr = matchstr(reltimestr(reltime(starttime)),'\d\+\(\.\d\d\)\=')
+ echon "\r".htmlfile.' written (time: '.elapsedtimestr.'s)'
+ return path.htmlfile
+endfunction "}}}
+
+
+function! vimwiki#html#WikiAll2HTML(path) "{{{
+ if !s:syntax_supported()
+ echomsg 'vimwiki: Only vimwiki_default syntax supported!!!'
+ return
+ endif
+
+ echomsg 'Saving vimwiki files...'
+ let save_eventignore = &eventignore
+ let &eventignore = "all"
+ let cur_buf = bufname('%')
+ bufdo call s:save_vimwiki_buffer()
+ exe 'buffer '.cur_buf
+ let &eventignore = save_eventignore
+
+ let path = expand(a:path)
+ call vimwiki#base#mkdir(path)
+
+ echomsg 'Deleting non-wiki html files...'
+ call s:delete_html_files(path)
+
+ echomsg 'Converting wiki to html files...'
+ let setting_more = &more
+ setlocal nomore
+
+ let wikifiles = split(glob(VimwikiGet('path').'**/*'.VimwikiGet('ext')), '\n')
+ for wikifile in wikifiles
+ if !s:is_html_uptodate(wikifile)
+ echomsg 'Processing '.wikifile
+ call vimwiki#html#Wiki2HTML(path, wikifile)
+ else
+ echomsg 'Skipping '.wikifile
+ endif
+ endfor
+ call s:create_default_CSS(path)
+ echomsg 'Done!'
+
+ let &more = setting_more
+endfunction "}}}
+"}}}
diff --git a/autoload/vimwiki/lst.vim b/autoload/vimwiki/lst.vim
@@ -0,0 +1,369 @@
+" vim:tabstop=2:shiftwidth=2:expandtab:foldmethod=marker:textwidth=79
+" Vimwiki autoload plugin file
+" Todo lists related stuff here.
+" Author: Maxim Kim <habamax@gmail.com>
+" Home: http://code.google.com/p/vimwiki/
+
+if exists("g:loaded_vimwiki_list_auto") || &cp
+ finish
+endif
+let g:loaded_vimwiki_lst_auto = 1
+
+" Script variables {{{
+let s:rx_li_box = '\[.\?\]'
+" }}}
+
+" Script functions {{{
+
+" Get checkbox regexp
+function! s:rx_li_symbol(rate) "{{{
+ let result = ''
+ if a:rate == 100
+ let result = g:vimwiki_listsyms[4]
+ elseif a:rate == 0
+ let result = g:vimwiki_listsyms[0]
+ elseif a:rate >= 67
+ let result = g:vimwiki_listsyms[3]
+ elseif a:rate >= 34
+ let result = g:vimwiki_listsyms[2]
+ else
+ let result = g:vimwiki_listsyms[1]
+ endif
+
+ return '\['.result.'\]'
+endfunction "}}}
+
+" Get regexp of the list item.
+function! s:rx_list_item() "{{{
+ return '\('.g:vimwiki_rxListBullet.'\|'.g:vimwiki_rxListNumber.'\)'
+endfunction "}}}
+
+" Get regexp of the list item with checkbox.
+function! s:rx_cb_list_item() "{{{
+ return s:rx_list_item().'\s*\zs\[.\?\]'
+endfunction "}}}
+
+" Get level of the list item.
+function! s:get_level(lnum) "{{{
+ if VimwikiGet('syntax') == 'media'
+ let level = vimwiki#base#count_first_sym(getline(a:lnum))
+ else
+ let level = indent(a:lnum)
+ endif
+ return level
+endfunction "}}}
+
+" Get previous list item.
+" Returns: line number or 0.
+function! s:prev_list_item(lnum) "{{{
+ let c_lnum = a:lnum - 1
+ while c_lnum >= 1
+ let line = getline(c_lnum)
+ if line =~ s:rx_list_item()
+ return c_lnum
+ endif
+ if line =~ '^\s*$'
+ return 0
+ endif
+ let c_lnum -= 1
+ endwhile
+ return 0
+endfunction "}}}
+
+" Get next list item in the list.
+" Returns: line number or 0.
+function! s:next_list_item(lnum) "{{{
+ let c_lnum = a:lnum + 1
+ while c_lnum <= line('$')
+ let line = getline(c_lnum)
+ if line =~ s:rx_list_item()
+ return c_lnum
+ endif
+ if line =~ '^\s*$'
+ return 0
+ endif
+ let c_lnum += 1
+ endwhile
+ return 0
+endfunction "}}}
+
+" Find next list item in the buffer.
+" Returns: line number or 0.
+function! s:find_next_list_item(lnum) "{{{
+ let c_lnum = a:lnum + 1
+ while c_lnum <= line('$')
+ let line = getline(c_lnum)
+ if line =~ s:rx_list_item()
+ return c_lnum
+ endif
+ let c_lnum += 1
+ endwhile
+ return 0
+endfunction "}}}
+
+" Set state of the list item on line number "lnum" to [ ] or [x]
+function! s:set_state(lnum, rate) "{{{
+ let line = getline(a:lnum)
+ let state = s:rx_li_symbol(a:rate)
+ let line = substitute(line, s:rx_li_box, state, '')
+ call setline(a:lnum, line)
+endfunction "}}}
+
+" Get state of the list item on line number "lnum"
+function! s:get_state(lnum) "{{{
+ let state = 0
+ let line = getline(a:lnum)
+ let opt = matchstr(line, s:rx_cb_list_item())
+ if opt =~ s:rx_li_symbol(100)
+ let state = 100
+ elseif opt =~ s:rx_li_symbol(0)
+ let state = 0
+ elseif opt =~ s:rx_li_symbol(25)
+ let state = 25
+ elseif opt =~ s:rx_li_symbol(50)
+ let state = 50
+ elseif opt =~ s:rx_li_symbol(75)
+ let state = 75
+ endif
+ return state
+endfunction "}}}
+
+" Returns 1 if there is checkbox on a list item, 0 otherwise.
+function! s:is_cb_list_item(lnum) "{{{
+ return getline(a:lnum) =~ s:rx_cb_list_item()
+endfunction "}}}
+
+" Returns start line number of list item, 0 if it is not a list.
+function! s:is_list_item(lnum) "{{{
+ let c_lnum = a:lnum
+ while c_lnum >= 1
+ let line = getline(c_lnum)
+ if line =~ s:rx_list_item()
+ return c_lnum
+ endif
+ if line =~ '^\s*$'
+ return 0
+ endif
+ if indent(c_lnum) > indent(a:lnum)
+ return 0
+ endif
+ let c_lnum -= 1
+ endwhile
+ return 0
+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.
+function! s:get_child_items(lnum) "{{{
+ let result = []
+ let lnum = a:lnum
+ let p_pos = s:get_level(lnum)
+
+ " add parent
+ call add(result, lnum)
+
+ let lnum = s:next_list_item(lnum)
+ while lnum != 0 && s:is_list_item(lnum) && s:get_level(lnum) > p_pos
+ call add(result, lnum)
+ let lnum = s:next_list_item(lnum)
+ endwhile
+
+ return result
+endfunction "}}}
+
+" Returns list of line numbers of all items of the same level.
+function! s:get_sibling_items(lnum) "{{{
+ let result = []
+ let lnum = a:lnum
+ let ind = s:get_level(lnum)
+
+ while lnum != 0 && s:get_level(lnum) >= ind
+ if s:get_level(lnum) == ind && s:is_cb_list_item(lnum)
+ call add(result, lnum)
+ endif
+ let lnum = s:next_list_item(lnum)
+ endwhile
+
+ let lnum = s:prev_list_item(a:lnum)
+ while lnum != 0 && s:get_level(lnum) >= ind
+ if s:get_level(lnum) == ind && s:is_cb_list_item(lnum)
+ call add(result, lnum)
+ endif
+ let lnum = s:prev_list_item(lnum)
+ endwhile
+
+ return result
+endfunction "}}}
+
+" Returns line number of the parent of lnum item
+function! s:get_parent_item(lnum) "{{{
+ let lnum = a:lnum
+ let ind = s:get_level(lnum)
+
+ let lnum = s:prev_list_item(lnum)
+ while lnum != 0 && s:is_list_item(lnum) && s:get_level(lnum) >= ind
+ let lnum = s:prev_list_item(lnum)
+ endwhile
+
+ if s:is_cb_list_item(lnum)
+ return lnum
+ else
+ return a: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())
+ if m != ''
+ let li_content = substitute(strpart(line, len(m)), '^\s*', '', '')
+ let line = substitute(m, '\s*$', ' ', '').'[ ] '.li_content
+ call setline(a:lnum, line)
+ endif
+endfunction "}}}
+
+" Tells if all of the sibling list items are checked or not.
+function! s:all_siblings_checked(lnum) "{{{
+ let result = 0
+ let cnt = 0
+ let siblings = s:get_sibling_items(a:lnum)
+ for lnum in siblings
+ let cnt += s:get_state(lnum)
+ endfor
+ let result = cnt/len(siblings)
+ return result
+endfunction "}}}
+
+" Creates checkbox on a list item if there is no one.
+function! s:TLI_create_checkbox(lnum) "{{{
+ if a:lnum && !s:is_cb_list_item(a:lnum)
+ if g:vimwiki_auto_checkbox
+ call s:create_cb_list_item(a:lnum)
+ endif
+ return 1
+ endif
+ return 0
+endfunction "}}}
+
+" Switch state of the child list items.
+function! s:TLI_switch_child_state(lnum) "{{{
+ let current_state = s:get_state(a:lnum)
+ if current_state == 100
+ let new_state = 0
+ else
+ let new_state = 100
+ endif
+ for lnum in s:get_child_items(a:lnum)
+ call s:set_state(lnum, new_state)
+ endfor
+endfunction "}}}
+
+" Switch state of the parent list items.
+function! s:TLI_switch_parent_state(lnum) "{{{
+ let c_lnum = a:lnum
+ while s:is_cb_list_item(c_lnum)
+ let parent_lnum = s:get_parent_item(c_lnum)
+ if parent_lnum == c_lnum
+ break
+ endif
+ call s:set_state(parent_lnum, s:all_siblings_checked(c_lnum))
+
+ let c_lnum = parent_lnum
+ endwhile
+endfunction "}}}
+
+function! s:TLI_toggle(lnum) "{{{
+ if !s:TLI_create_checkbox(a:lnum)
+ call s:TLI_switch_child_state(a:lnum)
+ endif
+ call s:TLI_switch_parent_state(a:lnum)
+endfunction "}}}
+
+" Script functions }}}
+
+" Toggle list item between [ ] and [X]
+function! vimwiki#lst#ToggleListItem(line1, line2) "{{{
+ let line1 = a:line1
+ let line2 = a:line2
+
+ if line1 != line2 && !s:is_list_item(line1)
+ let line1 = s:find_next_list_item(line1)
+ endif
+
+ let c_lnum = line1
+ while c_lnum != 0 && c_lnum <= line2
+ let li_lnum = s:is_list_item(c_lnum)
+
+ if li_lnum
+ let li_level = s:get_level(li_lnum)
+ if c_lnum == line1
+ let start_li_level = li_level
+ endif
+
+ if li_level <= start_li_level
+ call s:TLI_toggle(li_lnum)
+ let start_li_level = li_level
+ endif
+ endif
+
+ let c_lnum = s:find_next_list_item(c_lnum)
+ endwhile
+
+endfunction "}}}
+
+function! vimwiki#lst#kbd_cr() "{{{
+ " This function is heavily relies on proper 'set comments' option.
+ let cr = "\<CR>"
+ if getline('.') =~ s:rx_cb_list_item()
+ let cr .= '[ ] '
+ endif
+ return cr
+endfunction "}}}
+
+function! vimwiki#lst#kbd_oO(cmd) "{{{
+ " cmd should be 'o' or 'O'
+
+ let l:count = v:count1
+ while l:count > 0
+
+ let beg_lnum = foldclosed('.')
+ let end_lnum = foldclosedend('.')
+ if end_lnum != -1 && a:cmd ==# 'o'
+ let lnum = end_lnum
+ let line = getline(beg_lnum)
+ else
+ let line = getline('.')
+ let lnum = line('.')
+ endif
+
+ " let line = substitute(m, '\s*$', ' ', '').'[ ] '.li_content
+ let m = matchstr(line, s:rx_list_item())
+ let res = ''
+ if line =~ s:rx_cb_list_item()
+ let res = substitute(m, '\s*$', ' ', '').'[ ] '
+ elseif line =~ s:rx_list_item()
+ let res = substitute(m, '\s*$', ' ', '')
+ elseif &autoindent || &smartindent
+ let res = matchstr(line, '^\s*')
+ endif
+
+ if a:cmd ==# 'o'
+ call append(lnum, res)
+ call cursor(lnum + 1, col('$'))
+ else
+ call append(lnum - 1, res)
+ call cursor(lnum, col('$'))
+ endif
+
+ let l:count -= 1
+ endwhile
+
+ startinsert!
+
+endfunction "}}}
+
diff --git a/autoload/vimwiki/style.css b/autoload/vimwiki/style.css
@@ -0,0 +1,39 @@
+body {font-family: Tahoma, Geneva, sans-serif; margin: 1em 2em 1em 2em; font-size: 100%; line-height: 130%;}
+h1, h2, h3, h4, h5, h6 {font-family: Trebuchet MS, Helvetica, sans-serif; font-weight: bold; line-height:100%; margin-top: 1.5em; margin-bottom: 0.5em;}
+h1 {font-size: 2.6em; color: #000000;}
+h2 {font-size: 2.2em; color: #404040;}
+h3 {font-size: 1.8em; color: #707070;}
+h4 {font-size: 1.4em; color: #909090;}
+h5 {font-size: 1.3em; color: #989898;}
+h6 {font-size: 1.2em; color: #9c9c9c;}
+p, pre, blockquote, table, ul, ol, dl {margin-top: 1em; margin-bottom: 1em;}
+ul ul, ul ol, ol ol, ol ul {margin-top: 0.5em; margin-bottom: 0.5em;}
+li {margin: 0.3em auto;}
+ul {margin-left: 2em; padding-left: 0.5em;}
+dt {font-weight: bold;}
+img {border: none;}
+pre {border-left: 1px solid #ccc; margin-left: 2em; padding-left: 0.5em;}
+blockquote {padding: 0.4em; background-color: #f6f5eb;}
+th, td {border: 1px solid #ccc; padding: 0.3em;}
+th {background-color: #f0f0f0;}
+hr {border: none; border-top: 1px solid #ccc; width: 100%;}
+del {text-decoration: line-through; color: #777777;}
+.toc li {list-style-type: none;}
+.todo {font-weight: bold; background-color: #f0ece8; color: #a03020;}
+.justleft {text-align: left;}
+.justright {text-align: right;}
+.justcenter {text-align: center;}
+.center {margin-left: auto; margin-right: auto;}
+/* classes for items of todo lists */
+.done0:before {content: "\2592\2592\2592\2592"; color: SkyBlue;}
+.done1:before {content: "\2588\2592\2592\2592"; color: SkyBlue;}
+.done2:before {content: "\2588\2588\2592\2592"; color: SkyBlue;}
+.done3:before {content: "\2588\2588\2588\2592"; color: SkyBlue;}
+.done4:before {content: "\2588\2588\2588\2588"; color: SkyBlue;}
+/* comment the next four or five lines out *
+ * if you do not want color-coded todo lists */
+.done0 {color: #c00000;}
+.done1 {color: #c08000;}
+.done2 {color: #80a000;}
+.done3 {color: #00c000;}
+.done4 {color: #7f7f7f; text-decoration: line-through;}
diff --git a/autoload/vimwiki/tbl.vim b/autoload/vimwiki/tbl.vim
@@ -0,0 +1,510 @@
+" vim:tabstop=2:shiftwidth=2:expandtab:foldmethod=marker:textwidth=79
+" Vimwiki autoload plugin file
+" Desc: Tables
+" | Easily | manageable | text | tables | ! |
+" |--------+------------+-------+--------+---------|
+" | Have | fun! | Drink | tea | Period. |
+"
+" Author: Maxim Kim <habamax@gmail.com>
+" Home: http://code.google.com/p/vimwiki/
+
+" Load only once {{{
+if exists("g:loaded_vimwiki_tbl_auto") || &cp
+ finish
+endif
+let g:loaded_vimwiki_tbl_auto = 1
+"}}}
+
+let s:textwidth = &tw
+
+" Misc functions {{{
+function! s:wide_len(str) "{{{
+ " vim73 has new function that gives correct string width.
+ if exists("*strdisplaywidth")
+ return strdisplaywidth(a:str)
+ endif
+
+ " get str display width in vim ver < 7.2
+ if !g:vimwiki_CJK_length
+ let ret = strlen(substitute(a:str, '.', 'x', 'g'))
+ else
+ let savemodified = &modified
+ let save_cursor = getpos('.')
+ exe "norm! o\<esc>"
+ call setline(line("."), a:str)
+ let ret = virtcol("$") - 1
+ d
+ call setpos('.', save_cursor)
+ let &modified = savemodified
+ endif
+ return ret
+endfunction "}}}
+
+function! s:is_table(line) "{{{
+ return a:line =~ '^\s*\%(|[^|]\+\)\+|\s*$' || s:is_separator(a:line)
+endfunction "}}}
+
+function! s:is_separator(line) "{{{
+ return a:line =~ '^\s*[|+]\s*--[-|+]\+'
+endfunction "}}}
+
+function! s:is_last_column(lnum, cnum) "{{{
+ return strpart(getline(a:lnum), a:cnum - 1) =~ '^[^|]*|\s*$'
+endfunction "}}}
+
+function! s:is_first_column(lnum, cnum) "{{{
+ let line = strpart(getline(a:lnum), 0, a:cnum - 1)
+ return line =~ '^\s*|[^|]*$' || line =~ '^\s*$'
+endfunction "}}}
+
+function! s:count_separators_up(lnum) "{{{
+ let lnum = a:lnum - 1
+ while lnum > 1
+ if !s:is_separator(getline(lnum))
+ break
+ endif
+ let lnum -= 1
+ endwhile
+
+ return (a:lnum-lnum)
+endfunction "}}}
+
+function! s:count_separators_down(lnum) "{{{
+ let lnum = a:lnum + 1
+ while lnum < line('$')
+ if !s:is_separator(getline(lnum))
+ break
+ endif
+ let lnum += 1
+ endwhile
+
+ return (lnum-a:lnum)
+endfunction "}}}
+
+function! s:create_empty_row(cols) "{{{
+ let first_cell = "| |"
+ let cell = " |"
+ let row = first_cell
+
+ for c in range(a:cols - 1)
+ let row .= cell
+ endfor
+
+ return row
+endfunction "}}}
+
+function! s:create_row_sep(cols) "{{{
+ let first_cell = "|---+"
+ let cell = "---+"
+ let last_cell = "---|"
+
+ if a:cols < 2
+ return "|---|"
+ endif
+
+ let row = first_cell
+
+ for c in range(a:cols - 2)
+ let row .= cell
+ endfor
+
+ let row .= last_cell
+
+ return row
+endfunction "}}}
+
+function! s:get_values(line) "{{{
+ return split(a:line, '\s*|\s*', 1)[1:-2]
+endfunction "}}}
+
+function! s:col_count(lnum) "{{{
+ let line = getline(a:lnum)
+ if !s:is_separator(line)
+ return len(split(line, '\s*|\s*', 1)[1:-2])
+ else
+ return len(split(line, '-+-', 1))
+ endif
+endfunction "}}}
+
+function! s:get_indent(lnum) "{{{
+ if !s:is_table(getline(a:lnum))
+ return
+ endif
+
+ let indent = 0
+
+ let lnum = a:lnum - 1
+ while lnum > 1
+ let line = getline(lnum)
+ if !s:is_table(line)
+ let indent = indent(lnum+1)
+ break
+ endif
+ let lnum -= 1
+ endwhile
+
+ return indent
+endfunction " }}}
+
+function! s:get_rows(lnum) "{{{
+ if !s:is_table(getline(a:lnum))
+ return
+ endif
+
+ let upper_rows = []
+ let lower_rows = []
+
+ let lnum = a:lnum - 1
+ while lnum > 1
+ let line = getline(lnum)
+ if s:is_table(line)
+ call add(upper_rows, [lnum, line])
+ else
+ break
+ endif
+ let lnum -= 1
+ endwhile
+ call reverse(upper_rows)
+
+ let lnum = a:lnum
+ while lnum <= line('$')
+ let line = getline(lnum)
+ if s:is_table(line)
+ call add(lower_rows, [lnum, line])
+ else
+ break
+ endif
+ let lnum += 1
+ endwhile
+
+ return upper_rows + lower_rows
+endfunction "}}}
+
+function! s:get_cell_max_lens(lnum) "{{{
+ let max_lens = {}
+ for [lnum, row] in s:get_rows(a:lnum)
+ if s:is_separator(row)
+ continue
+ endif
+ let cells = s:get_values(row)
+ for idx in range(len(cells))
+ let value = cells[idx]
+ if has_key(max_lens, idx)
+ let max_lens[idx] = max([s:wide_len(value), max_lens[idx]])
+ else
+ let max_lens[idx] = s:wide_len(value)
+ endif
+ endfor
+ endfor
+ return max_lens
+endfunction "}}}
+
+function! s:get_aligned_rows(lnum, col1, col2) "{{{
+ let max_lens = s:get_cell_max_lens(a:lnum)
+ let rows = []
+ for [lnum, row] in s:get_rows(a:lnum)
+ if s:is_separator(row)
+ let new_row = s:fmt_sep(max_lens, a:col1, a:col2)
+ else
+ let new_row = s:fmt_row(row, max_lens, a:col1, a:col2)
+ endif
+ call add(rows, [lnum, new_row])
+ endfor
+ return rows
+endfunction "}}}
+
+" Number of the current column. Starts from 0.
+function! s:cur_column() "{{{
+ let line = getline('.')
+ if !s:is_table(line)
+ return -1
+ endif
+ if s:is_separator(line)
+ let sep = '[+|]'
+ else
+ let sep = '|'
+ endif
+
+ let curs_pos = col('.')
+ let mpos = match(line, '|', 0)
+ let col = -1
+ while mpos < curs_pos && mpos != -1
+ let mpos = match(line, sep, mpos+1)
+ if mpos != -1
+ let col += 1
+ endif
+ endwhile
+ return col
+endfunction "}}}
+
+" }}}
+
+" Format functions {{{
+function! s:fmt_cell(cell, max_len) "{{{
+ let cell = ' '.a:cell.' '
+
+ let diff = a:max_len - s:wide_len(a:cell)
+ if diff == 0 && empty(a:cell)
+ let diff = 1
+ endif
+
+ let cell .= repeat(' ', diff)
+ return cell
+endfunction "}}}
+
+function! s:fmt_row(line, max_lens, col1, col2) "{{{
+ let new_line = '|'
+ let cells = s:get_values(a:line)
+ for idx in range(len(cells))
+ if idx == a:col1
+ let idx = a:col2
+ elseif idx == a:col2
+ let idx = a:col1
+ endif
+ let value = cells[idx]
+ let new_line .= s:fmt_cell(value, a:max_lens[idx]).'|'
+ endfor
+
+ let idx = len(cells)
+ while idx < len(a:max_lens)
+ let new_line .= s:fmt_cell('', a:max_lens[idx]).'|'
+ let idx += 1
+ endwhile
+ return new_line
+endfunction "}}}
+
+function! s:fmt_cell_sep(max_len) "{{{
+ if a:max_len == 0
+ return repeat('-', 3)
+ else
+ return repeat('-', a:max_len+2)
+ endif
+endfunction "}}}
+
+function! s:fmt_sep(max_lens, col1, col2) "{{{
+ let sep = '|'
+ for idx in range(len(a:max_lens))
+ if idx == a:col1
+ let idx = a:col2
+ elseif idx == a:col2
+ let idx = a:col1
+ endif
+ let sep .= s:fmt_cell_sep(a:max_lens[idx]).'+'
+ endfor
+ let sep = substitute(sep, '+$', '|', '')
+ return sep
+endfunction "}}}
+"}}}
+
+" Keyboard functions "{{{
+function! s:kbd_create_new_row(cols, goto_first) "{{{
+ let cmd = "\<ESC>o".s:create_empty_row(a:cols)
+ let cmd .= "\<ESC>:call vimwiki#tbl#format(line('.'))\<CR>"
+ if a:goto_first
+ let cmd .= "\<ESC>0:call search('|', 'c', line('.'))\<CR>la"
+ else
+ let cmd .= "0".(col('.')-1)."lT|a"
+ endif
+ return cmd
+endfunction "}}}
+
+function! s:kbd_goto_next_row() "{{{
+ let cmd = "\<ESC>jt|T|a"
+ return cmd
+endfunction "}}}
+
+function! s:kbd_goto_prev_row() "{{{
+ let cmd = "\<ESC>jt|T|a"
+ return cmd
+endfunction "}}}
+
+function! s:kbd_goto_next_col(last) "{{{
+ if a:last
+ let seps = s:count_separators_down(line('.'))
+ let cmd = "\<ESC>".seps."j0:call search('|', 'c', line('.'))\<CR>la"
+ else
+ let cmd = "\<ESC>:call search('|', 'c', line('.'))\<CR>la"
+ endif
+ return cmd
+endfunction "}}}
+
+function! s:kbd_goto_prev_col(first) "{{{
+ if a:first
+ let seps = s:count_separators_up(line('.'))
+ let cmd = "\<ESC>".seps."k$:call search('|', 'b', line('.'))\<CR>la"
+ else
+ let cmd = "\<ESC>2F|la"
+ endif
+ return cmd
+endfunction "}}}
+
+"}}}
+
+" Global functions {{{
+function! vimwiki#tbl#kbd_cr() "{{{
+ let lnum = line('.')
+ if !s:is_table(getline(lnum))
+ return "\<CR>"
+ endif
+
+ if s:is_separator(getline(lnum+1)) || !s:is_table(getline(lnum+1))
+ let cols = len(s:get_values(getline(lnum)))
+ return s:kbd_create_new_row(cols, 0)
+ else
+ return s:kbd_goto_next_row()
+ endif
+endfunction "}}}
+
+function! vimwiki#tbl#kbd_tab() "{{{
+ let lnum = line('.')
+ if !s:is_table(getline(lnum))
+ return "\<Tab>"
+ endif
+
+ let last = s:is_last_column(lnum, col('.'))
+ if last && !s:is_table(getline(lnum+1))
+ let cols = len(s:get_values(getline(lnum)))
+ return s:kbd_create_new_row(cols, 1)
+ endif
+ return s:kbd_goto_next_col(last)
+endfunction "}}}
+
+function! vimwiki#tbl#kbd_shift_tab() "{{{
+ let lnum = line('.')
+ if !s:is_table(getline(lnum))
+ return "\<S-Tab>"
+ endif
+
+ let first = s:is_first_column(lnum, col('.'))
+ if first && !s:is_table(getline(lnum-1))
+ return ""
+ endif
+ return s:kbd_goto_prev_col(first)
+endfunction "}}}
+
+function! vimwiki#tbl#format(lnum, ...) "{{{
+ let line = getline(a:lnum)
+ if !s:is_table(line)
+ return
+ endif
+
+ if a:0 == 2
+ let col1 = a:1
+ let col2 = a:2
+ else
+ let col1 = 0
+ let col2 = 0
+ endif
+
+ let indent = s:get_indent(a:lnum)
+
+ for [lnum, row] in s:get_aligned_rows(a:lnum, col1, col2)
+ let row = repeat(' ', indent).row
+ call setline(lnum, row)
+ endfor
+
+ let &tw = s:textwidth
+endfunction "}}}
+
+function! vimwiki#tbl#create(...) "{{{
+ if a:0 > 1
+ let cols = a:1
+ let rows = a:2
+ elseif a:0 == 1
+ let cols = a:1
+ let rows = 2
+ elseif a:0 == 0
+ let cols = 5
+ let rows = 2
+ endif
+
+ if cols < 1
+ let cols = 5
+ endif
+
+ if rows < 1
+ let rows = 2
+ endif
+
+ let lines = []
+ let row = s:create_empty_row(cols)
+
+ call add(lines, row)
+ if rows > 1
+ call add(lines, s:create_row_sep(cols))
+ endif
+
+ for r in range(rows - 1)
+ call add(lines, row)
+ endfor
+
+ call append(line('.'), lines)
+endfunction "}}}
+
+function! vimwiki#tbl#align_or_cmd(cmd) "{{{
+ if s:is_table(getline('.'))
+ call vimwiki#tbl#format(line('.'))
+ else
+ exe 'normal! '.a:cmd
+ endif
+endfunction "}}}
+
+function! vimwiki#tbl#reset_tw(lnum) "{{{
+ let line = getline(a:lnum)
+ if !s:is_table(line)
+ return
+ endif
+
+ let s:textwidth = &tw
+ let &tw = 0
+endfunction "}}}
+
+" TODO: move_column_left and move_column_right are good candidates to be
+" refactored.
+function! vimwiki#tbl#move_column_left() "{{{
+ if !s:is_table(getline('.'))
+ return
+ endif
+
+ let cur_col = s:cur_column()
+ if cur_col == -1
+ return
+ endif
+
+ if cur_col > 0
+ call vimwiki#tbl#format(line('.'), cur_col-1, cur_col)
+ call cursor(line('.'), 1)
+ if !s:is_separator(getline('.'))
+ call search('\%(|[^|]\+\)\{'.(cur_col-1).'}| .', 'eW')
+ else
+ call search('|\%([^+]\++\)\{'.(cur_col-1).'}--', 'eW')
+ endif
+ endif
+endfunction "}}}
+
+function! vimwiki#tbl#move_column_right() "{{{
+ if !s:is_table(getline('.'))
+ return
+ endif
+
+ let cur_col = s:cur_column()
+ if cur_col == -1
+ return
+ endif
+
+ if cur_col < s:col_count(line('.'))-1
+ call vimwiki#tbl#format(line('.'), cur_col, cur_col+1)
+ call cursor(line('.'), 1)
+ if !s:is_separator(getline('.'))
+ call search('\%(|[^|]\+\)\{'.(cur_col+1).'}| .', 'eW')
+ else
+ call search('|\%([^+]\++\)\{'.(cur_col+1).'}--', 'eW')
+ endif
+ endif
+endfunction "}}}
+
+function! vimwiki#tbl#get_rows(lnum) "{{{
+ return s:get_rows(a:lnum)
+endfunction "}}}
+
+"}}}
diff --git a/autoload/vimwiki_diary.vim b/autoload/vimwiki_diary.vim
@@ -1,281 +0,0 @@
-" vim:tabstop=2:shiftwidth=2:expandtab:foldmethod=marker:textwidth=79
-" Vimwiki autoload plugin file
-" Desc: Handle diary notes
-" Author: Maxim Kim <habamax@gmail.com>
-" Home: http://code.google.com/p/vimwiki/
-
-" Load only once {{{
-if exists("g:loaded_vimwiki_diary_auto") || &cp
- finish
-endif
-let g:loaded_vimwiki_diary_auto = 1
-"}}}
-
-function! s:prefix_zero(num) "{{{
- if a:num < 10
- return '0'.a:num
- endif
- return a:num
-endfunction "}}}
-
-function! s:desc(d1, d2) "{{{
- return a:d1 == a:d2 ? 0 : a:d1 < a:d2 ? 1 : -1
-endfunction "}}}
-
-function! s:get_date_link(fmt) "{{{
- return strftime(a:fmt)
-endfunction "}}}
-
-function! s:link_exists(lines, link) "{{{
- let link_exists = 0
- for line in a:lines
- if line =~ escape(a:link, '[]\')
- let link_exists = 1
- break
- endif
- endfor
- return link_exists
-endfunction "}}}
-
-function! s:diary_path() "{{{
- return VimwikiGet('path').VimwikiGet('diary_rel_path')
-endfunction "}}}
-
-function! s:diary_index() "{{{
- return s:diary_path().VimwikiGet('diary_index').VimwikiGet('ext')
-endfunction "}}}
-
-function! s:get_diary_range(lines, header) "{{{
- let rx = '\[\[\d\{4}-\d\d-\d\d\]\]'
- let idx = 0
- let ln_start = -1
- let ln_end = -1
- for line in a:lines
- if ln_start != -1
- if line =~ '^\s*\(=\)\+.*\1\s*$' || (line !~ rx && line !~ '^\s*$')
- break
- endif
- endif
- if line =~ '^\s*\(=\)\+\s*'.a:header.'\s*\1\s*$'
- let ln_start = idx + 1
- endif
- let idx += 1
- endfor
-
- let ln_end = idx
- return [ln_start, ln_end]
-endfunction "}}}
-
-function! s:diary_date_link() "{{{
- return s:get_date_link(VimwikiGet('diary_link_fmt'))
-endfunction "}}}
-
-function! s:get_file_contents(file_name) "{{{
- let lines = []
- let bufnr = bufnr(expand(a:file_name))
- if bufnr != -1
- let lines = getbufline(bufnr, 1, '$')
- else
- try
- let lines = readfile(expand(a:file_name))
- catch
- endtry
- endif
- return [lines, bufnr]
-endfunction "}}}
-
-function! s:get_links() "{{{
- let rx = '\d\{4}-\d\d-\d\d'
- let s_links = glob(VimwikiGet('path').VimwikiGet('diary_rel_path').
- \ '*'.VimwikiGet('ext'))
-
- let s_links = substitute(s_links, '\'.VimwikiGet('ext'), "", "g")
- let links = split(s_links, '\n')
-
- " remove backup files (.wiki~)
- call filter(links, 'v:val !~ ''.*\~$''')
-
- " remove paths
- call map(links, 'fnamemodify(v:val, ":t")')
-
- call filter(links, 'v:val =~ "'.escape(rx, '\').'"')
- return links
-endfunction "}}}
-
-function! s:get_position_links(link) "{{{
- let idx = -1
- let links = []
- if a:link =~ '\d\{4}-\d\d-\d\d'
- let links = s:get_links()
- " include 'today' into links
- if index(links, s:diary_date_link()) == -1
- call add(links, s:diary_date_link())
- endif
- call sort(links)
- let idx = index(links, a:link)
- endif
- return [idx, links]
-endfunction "}}}
-
-function! s:format_links(links) "{{{
- let lines = []
- let line = '| '
- let idx = 0
- let trigger = 0
- while idx < len(a:links)
- if idx/VimwikiGet('diary_link_count') > trigger
- let trigger = idx/VimwikiGet('diary_link_count')
- call add(lines, substitute(line, '\s\+$', '', ''))
- let line = '| '
- endif
- let line .= a:links[idx].' | '
- let idx += 1
- endwhile
- call add(lines, substitute(line, '\s\+$', '', ''))
- call extend(lines, [''])
-
- return lines
-endfunction "}}}
-
-function! s:add_link(page, header, link) "{{{
- let [lines, bufnr] = s:get_file_contents(a:page)
-
- let [ln_start, ln_end] = s:get_diary_range(lines, a:header)
-
- let link = '[['.a:link.']]'
-
- let link_exists = s:link_exists(lines[ln_start : ln_end], link)
-
- if !link_exists
-
- if ln_start == -1
- call insert(lines, '= '.a:header.' =')
- let ln_start = 1
- let ln_end = 1
- endif
-
- " removing 'old' links
- let idx = ln_end - ln_start
- while idx > 0
- call remove(lines, ln_start)
- let idx -= 1
- endwhile
-
- " get all diary links from filesystem
- let links = s:get_links()
- call map(links, '"[[".v:val."]]"')
-
- " add current link
- if index(links, link) == -1
- call add(links, link)
- endif
-
- let links = sort(links, 's:desc')
- call extend(lines, s:format_links(links), ln_start)
-
- if bufnr != -1
- exe 'buffer '.bufnr
- if !&readonly
- 1,$delete _
- call append(1, lines)
- 1,1delete _
- endif
- else
- call writefile(lines, expand(a:page))
- endif
- endif
-endfunction "}}}
-
-function! s:make_date_link(...) "{{{
- if a:0
- let link = a:1
- else
- let link = s:diary_date_link()
- endif
- let header = VimwikiGet('diary_header')
- call s:add_link(s:diary_index(), header, link)
- return VimwikiGet('diary_rel_path').link
-endfunction "}}}
-
-function! vimwiki_diary#make_note(index, ...) "{{{
- call vimwiki#select(a:index)
- call vimwiki#mkdir(VimwikiGet('path').VimwikiGet('diary_rel_path'))
- if a:0
- let link = s:make_date_link(a:1)
- else
- let link = s:make_date_link()
- endif
- call vimwiki#open_link(':e ', link, s:diary_index())
-endfunction "}}}
-
-" Calendar.vim callback function.
-function! vimwiki_diary#calendar_action(day, month, year, week, dir) "{{{
- let day = s:prefix_zero(a:day)
- let month = s:prefix_zero(a:month)
-
- let link = a:year.'-'.month.'-'.day
- if winnr('#') == 0
- if a:dir == 'V'
- vsplit
- else
- split
- endif
- else
- wincmd p
- if !&hidden && &modified
- new
- endif
- endif
-
- " Create diary note for a selected date in default wiki.
- call vimwiki_diary#make_note(1, link)
-endfunction "}}}
-
-" Calendar.vim sign function.
-function vimwiki_diary#calendar_sign(day, month, year) "{{{
- let day = s:prefix_zero(a:day)
- let month = s:prefix_zero(a:month)
- let sfile = VimwikiGet('path').VimwikiGet('diary_rel_path').
- \ a:year.'-'.month.'-'.day.VimwikiGet('ext')
- return filereadable(expand(sfile))
-endfunction "}}}
-
-function! vimwiki_diary#goto_next_day() "{{{
- let link = ''
- let [idx, links] = s:get_position_links(expand('%:t:r'))
-
- if idx == (len(links) - 1)
- return
- endif
-
- if idx != -1 && idx < len(links) - 1
- let link = VimwikiGet('diary_rel_path').links[idx+1]
- else
- " goto today
- let link = VimwikiGet('diary_rel_path').s:diary_date_link()
- endif
-
- if len(link)
- call vimwiki#open_link(':e ', link)
- endif
-endfunction "}}}
-
-function! vimwiki_diary#goto_prev_day() "{{{
- let link = ''
- let [idx, links] = s:get_position_links(expand('%:t:r'))
-
- if idx == 0
- return
- endif
-
- if idx > 0
- let link = VimwikiGet('diary_rel_path').links[idx-1]
- else
- " goto today
- let link = VimwikiGet('diary_rel_path').s:diary_date_link()
- endif
-
- if len(link)
- call vimwiki#open_link(':e ', link)
- endif
-endfunction "}}}
diff --git a/autoload/vimwiki_html.vim b/autoload/vimwiki_html.vim
@@ -1,1311 +0,0 @@
-" vim:tabstop=2:shiftwidth=2:expandtab:foldmethod=marker:textwidth=79
-" Vimwiki autoload plugin file
-" Export to HTML
-" Author: Maxim Kim <habamax@gmail.com>
-" Home: http://code.google.com/p/vimwiki/
-
-" XXX: This file should be refactored!
-
-" Load only once {{{
-if exists("g:loaded_vimwiki_html_auto") || &cp
- finish
-endif
-let g:loaded_vimwiki_html_auto = 1
-"}}}
-
-" SCRIPT VARS "{{{
-" Warn if html header or html footer do not exist only once.
-let s:warn_html_header = 0
-let s:warn_html_footer = 0
-"}}}
-
-" UTILITY "{{{
-function! s:root_path(subdir) "{{{
- return repeat('../', len(split(a:subdir, '[/\\]')))
-endfunction "}}}
-
-function! s:syntax_supported() " {{{
- return VimwikiGet('syntax') == "default"
-endfunction " }}}
-
-function! s:remove_blank_lines(lines) " {{{
- while !empty(a:lines) && a:lines[-1] =~ '^\s*$'
- call remove(a:lines, -1)
- endwhile
-endfunction "}}}
-
-function! s:is_web_link(lnk) "{{{
- if a:lnk =~ '^\%(https://\|http://\|www.\|ftp://\|file://\)'
- return 1
- endif
- return 0
-endfunction "}}}
-
-function! s:is_img_link(lnk) "{{{
- if a:lnk =~ '\.\%(png\|jpg\|gif\|jpeg\)$'
- return 1
- endif
- return 0
-endfunction "}}}
-
-function! s:has_abs_path(fname) "{{{
- if a:fname =~ '\(^.:\)\|\(^/\)'
- return 1
- endif
- return 0
-endfunction "}}}
-
-function! s:create_default_CSS(path) " {{{
- let path = expand(a:path)
- let css_full_name = path.VimwikiGet('css_name')
- if glob(css_full_name) == ""
- call vimwiki#mkdir(fnamemodify(css_full_name, ':p:h'))
- let lines = []
-
- call add(lines, 'body {font-family: Tahoma, sans-serif; margin: 1em 2em 1em 2em; font-size: 100%; line-height: 130%;}')
- call add(lines, 'h1, h2, h3, h4, h5, h6 {font-family: Trebuchet MS, serif; margin-top: 1.5em; margin-bottom: 0.5em;}')
- call add(lines, 'h1 {font-size: 2.0em; color: #a77070;}')
- call add(lines, 'h2 {font-size: 1.6em; color: #779977;}')
- call add(lines, 'h3 {font-size: 1.3em; color: #555577;}')
- call add(lines, 'h4 {font-size: 1.2em; color: #222244;}')
- call add(lines, 'h5 {font-size: 1.1em; color: #222244;}')
- call add(lines, 'h6 {font-size: 1.0em; color: #222244;}')
- call add(lines, 'p, pre, blockquote, table, ul, ol, dl {margin-top: 1em; margin-bottom: 1em;}')
- call add(lines, 'ul ul, ul ol, ol ol, ol ul {margin-top: 0.5em; margin-bottom: 0.5em;}')
- call add(lines, '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, 'blockquote {padding: 0.4em; background-color: #f6f5eb;}')
- call add(lines, 'th, td {border: 1px solid #ccc; padding: 0.3em;}')
- call add(lines, 'th {background-color: #f0f0f0;}')
- call add(lines, 'hr {border: none; border-top: 1px solid #ccc; width: 100%;}')
- call add(lines, 'del {text-decoration: line-through; color: #777777;}')
- call add(lines, '.toc li {list-style-type: none;}')
- call add(lines, '.todo {font-weight: bold; background-color: #f0ece8; color: #a03020;}')
- call add(lines, '.justleft {text-align: left;}')
- call add(lines, '.justright {text-align: right;}')
- call add(lines, '.justcenter {text-align: center;}')
- call add(lines, '.center {margin-left: auto; margin-right: auto;}')
-
- call writefile(lines, css_full_name)
- echomsg "Default style.css is created."
- endif
-endfunction "}}}
-
-function! s:get_html_header(title, subdir, charset) "{{{
- let lines=[]
-
- if VimwikiGet('html_header') != "" && !s:warn_html_header
- try
- let lines = readfile(expand(VimwikiGet('html_header')))
- call map(lines, 'substitute(v:val, "%title%", "'. a:title .'", "g")')
- call map(lines, 'substitute(v:val, "%root_path%", "'.
- \ s:root_path(a:subdir) .'", "g")')
- return lines
- catch /E484/
- let s:warn_html_header = 1
- echomsg 'vimwiki: Header template '.VimwikiGet('html_header').
- \ ' does not exist!'
- endtry
- endif
-
- let css_name = expand(VimwikiGet('css_name'))
- let css_name = substitute(css_name, '\', '/', 'g')
- if !s:has_abs_path(css_name)
- " Relative css file for deep links: [[dir1/dir2/dir3/filename]]
- let css_name = s:root_path(a:subdir).css_name
- endif
-
- " if no VimwikiGet('html_header') set up or error while reading template
- " file -- use default header.
- call add(lines, '<html>')
- call add(lines, '<head>')
- call add(lines, '<link rel="Stylesheet" type="text/css" href="'.
- \ css_name.'" />')
- call add(lines, '<title>'.a:title.'</title>')
- call add(lines, '<meta http-equiv="Content-Type" content="text/html;'.
- \ ' charset='.a:charset.'" />')
- call add(lines, '</head>')
- call add(lines, '<body>')
-
- return lines
-endfunction "}}}
-
-function! s:get_html_footer() "{{{
- let lines=[]
-
- if VimwikiGet('html_footer') != "" && !s:warn_html_footer
- try
- let lines = readfile(expand(VimwikiGet('html_footer')))
- return lines
- catch /E484/
- let s:warn_html_footer = 1
- echomsg 'vimwiki: Footer template '.VimwikiGet('html_footer').
- \ ' does not exist!'
- endtry
- endif
-
- " if no VimwikiGet('html_footer') set up or error while reading template
- " file -- use default footer.
- call add(lines, "")
- call add(lines, '</body>')
- call add(lines, '</html>')
-
- return lines
-endfunction "}}}
-
-function! s:safe_html(line) "{{{
- "" htmlize symbols: < > &
-
- let line = substitute(a:line, '&', '\&', 'g')
-
- let tags = join(split(g:vimwiki_valid_html_tags, '\s*,\s*'), '\|')
- let line = substitute(line,'<\%(/\?\%('
- \.tags.'\)\%(\s\{-1}\S\{-}\)\{-}/\?>\)\@!',
- \'\<', 'g')
- let line = substitute(line,'\%(</\?\%('
- \.tags.'\)\%(\s\{-1}\S\{-}\)\{-}/\?\)\@<!>',
- \'\>', 'g')
- return line
-endfunction "}}}
-
-function! s:delete_html_files(path) "{{{
- let htmlfiles = split(glob(a:path.'**/*.html'), '\n')
- for fname in htmlfiles
- try
- call delete(fname)
- catch
- echomsg 'vimwiki: Cannot delete '.fname
- endtry
- endfor
-endfunction "}}}
-
-function! s:remove_comments(lines) "{{{
- let res = []
- let multiline_comment = 0
-
- let idx = 0
- while idx < len(a:lines)
- let line = a:lines[idx]
- let idx += 1
-
- if multiline_comment
- let col = matchend(line, '-->',)
- if col != -1
- let multiline_comment = 0
- let line = strpart(line, col)
- else
- continue
- endif
- endif
-
- if !multiline_comment && line =~ '<!--.*-->'
- let line = substitute(line, '<!--.*-->', '', 'g')
- if line =~ '^\s*$'
- continue
- endif
- endif
-
- if !multiline_comment
- let col = match(line, '<!--',)
- if col != -1
- let multiline_comment = 1
- let line = strpart(line, 1, col - 1)
- endif
- endif
-
- call add(res, line)
- endwhile
- return res
-endfunction "}}}
-
-function! s:mid(value, cnt) "{{{
- return strpart(a:value, a:cnt, len(a:value) - 2 * a:cnt)
-endfunction "}}}
-
-function! s:subst_func(line, regexp, func) " {{{
- " Substitute text found by regexp with result of
- " func(matched) function.
-
- let pos = 0
- let lines = split(a:line, a:regexp, 1)
- let res_line = ""
- for line in lines
- let res_line = res_line.line
- let matched = matchstr(a:line, a:regexp, pos)
- if matched != ""
- let res_line = res_line.{a:func}(matched)
- endif
- let pos = matchend(a:line, a:regexp, pos)
- endfor
- return res_line
-endfunction " }}}
-
-function! s:save_vimwiki_buffer() "{{{
- if &filetype == 'vimwiki'
- silent update
- endif
-endfunction "}}}
-
-function! s:trim(string) "{{{
- let res = substitute(a:string, '^\s\+', '', '')
- let res = substitute(res, '\s\+$', '', '')
- return res
-endfunction "}}}
-
-function! s:get_html_toc(toc_list) "{{{
- " toc_list is list of [level, header_text, header_id]
- " ex: [[1, "Header", "toc1"], [2, "Header2", "toc2"], ...]
- function! s:close_list(toc, plevel, level) "{{{
- let plevel = a:plevel
- while plevel > a:level
- call add(a:toc, '</ul>')
- let plevel -= 1
- endwhile
- return plevel
- endfunction "}}}
-
- if empty(a:toc_list)
- return []
- endif
-
- let toc = ['<div class="toc">']
- let level = 0
- let plevel = 0
- for [level, text, id] in a:toc_list
- if level > plevel
- call add(toc, '<ul>')
- elseif level < plevel
- let plevel = s:close_list(toc, plevel, level)
- endif
-
- let toc_text = s:process_tags_remove_links(text)
- let toc_text = s:process_tags_typefaces(toc_text)
- call add(toc, '<li><a href="#'.id.'">'.toc_text.'</a></li>')
- let plevel = level
- endfor
- call s:close_list(toc, level, 0)
- call add(toc, '</div>')
- return toc
-endfunction "}}}
-
-" insert toc into dest.
-function! s:process_toc(dest, placeholders, toc) "{{{
- if !empty(a:placeholders)
- for [placeholder, row, idx] in a:placeholders
- let [type, param] = placeholder
- if type == 'toc'
- let toc = a:toc[:]
- if !empty(param)
- call insert(toc, '<h1>'.param.'</h1>')
- endif
- let shift = idx * len(toc)
- call extend(a:dest, toc, row + shift)
- endif
- endfor
- endif
-endfunction "}}}
-
-" get title.
-function! s:process_title(placeholders, default_title) "{{{
- if !empty(a:placeholders)
- for [placeholder, row, idx] in a:placeholders
- let [type, param] = placeholder
- if type == 'title' && !empty(param)
- return param
- endif
- endfor
- endif
- return a:default_title
-endfunction "}}}
-
-"}}}
-
-" INLINE TAGS "{{{
-function! s:tag_em(value) "{{{
- return '<em>'.s:mid(a:value, 1).'</em>'
-endfunction "}}}
-
-function! s:tag_strong(value) "{{{
- return '<strong>'.s:mid(a:value, 1).'</strong>'
-endfunction "}}}
-
-function! s:tag_todo(value) "{{{
- return '<span class="todo">'.a:value.'</span>'
-endfunction "}}}
-
-function! s:tag_strike(value) "{{{
- return '<del>'.s:mid(a:value, 2).'</del>'
-endfunction "}}}
-
-function! s:tag_super(value) "{{{
- return '<sup><small>'.s:mid(a:value, 1).'</small></sup>'
-endfunction "}}}
-
-function! s:tag_sub(value) "{{{
- return '<sub><small>'.s:mid(a:value, 2).'</small></sub>'
-endfunction "}}}
-
-function! s:tag_code(value) "{{{
- return '<code>'.s:mid(a:value, 1).'</code>'
-endfunction "}}}
-
-function! s:tag_pre(value) "{{{
- return '<code>'.s:mid(a:value, 3).'</code>'
-endfunction "}}}
-
-function! s:tag_internal_link(value) "{{{
- " Make <a href="This is a link">This is a link</a>
- " from [[This is a link]]
- " Make <a href="link">This is a link</a>
- " from [[link|This is a link]]
- " Make <a href="link">This is a link</a>
- " from [[link][This is a link]]
- " TODO: rename function -- it makes not only internal links.
- " TODO: refactor it.
-
- function! s:linkify(src, caption, style) "{{{
- if a:style == ''
- let style_str = ''
- else
- let style_str = ' style="'.a:style.'"'
- endif
-
- if s:is_img_link(a:caption)
- let link = '<a href="'.a:src.'"><img src="'.a:caption.'"'.style_str.' />'.
- \ '</a>'
- elseif vimwiki#is_non_wiki_link(a:src)
- let link = '<a href="'.a:src.'">'.a:caption.'</a>'
- elseif s:is_img_link(a:src)
- let link = '<img src="'.a:src.'" alt="'.a:caption.'"'. style_str.' />'
- elseif vimwiki#is_link_to_dir(a:src)
- if g:vimwiki_dir_link == ''
- let link = '<a href="'.vimwiki#safe_link(a:src).'">'.a:caption.'</a>'
- else
- let link = '<a href="'.vimwiki#safe_link(a:src).
- \ g:vimwiki_dir_link.'.html">'.a:caption.'</a>'
- endif
- else
- let link = '<a href="'.vimwiki#safe_link(a:src).
- \ '.html">'.a:caption.'</a>'
- endif
-
- return link
- endfunction "}}}
-
- let value = s:mid(a:value, 2)
-
- let line = ''
- if value =~ '|'
- let link_parts = split(value, "|", 1)
- else
- let link_parts = split(value, "][", 1)
- endif
-
-
- if len(link_parts) > 1
- if len(link_parts) < 3
- let style = ""
- else
- let style = link_parts[2]
- endif
-
- let line = s:linkify(link_parts[0], link_parts[1], style)
-
- else
- let line = s:linkify(value, value, '')
- endif
- return line
-endfunction "}}}
-
-function! s:tag_external_link(value) "{{{
- "" Make <a href="link">link desc</a>
- "" from [link link desc]
-
- let value = s:mid(a:value, 1)
-
- let line = ''
- if s:is_web_link(value)
- let lnkElements = split(value)
- let head = lnkElements[0]
- let rest = join(lnkElements[1:])
- if rest==""
- let rest=head
- endif
- if s:is_img_link(rest)
- if rest!=head
- let line = '<a href="'.head.'"><img src="'.rest.'" /></a>'
- else
- let line = '<img src="'.rest.'" />'
- endif
- else
- let line = '<a href="'.head.'">'.rest.'</a>'
- endif
- elseif s:is_img_link(value)
- let line = '<img src="'.value.'" />'
- else
- " [alskfj sfsf] shouldn't be a link. So return it as it was --
- " enclosed in [...]
- let line = '['.value.']'
- endif
- return line
-endfunction "}}}
-
-function! s:tag_wikiword_link(value) "{{{
- " Make <a href="WikiWord">WikiWord</a> from WikiWord
- if a:value[0] == '!'
- return a:value[1:]
- elseif g:vimwiki_camel_case
- let line = '<a href="'.a:value.'.html">'.a:value.'</a>'
- return line
- else
- return a:value
- endif
-endfunction "}}}
-
-function! s:tag_barebone_link(value) "{{{
- "" Make <a href="http://habamax.ru">http://habamax.ru</a>
- "" from http://habamax.ru
-
- if s:is_img_link(a:value)
- let line = '<img src="'.a:value.'" />'
- else
- let line = '<a href="'.a:value.'">'.a:value.'</a>'
- endif
- return line
-endfunction "}}}
-
-function! s:tag_no_wikiword_link(value) "{{{
- if a:value[0] == '!'
- return a:value[1:]
- else
- return a:value
- endif
-endfunction "}}}
-
-function! s:tag_remove_internal_link(value) "{{{
- let value = s:mid(a:value, 2)
-
- let line = ''
- if value =~ '|'
- let link_parts = split(value, "|", 1)
- else
- let link_parts = split(value, "][", 1)
- endif
-
- if len(link_parts) > 1
- if len(link_parts) < 3
- let style = ""
- else
- let style = link_parts[2]
- endif
- let line = link_parts[1]
- else
- let line = value
- endif
- return line
-endfunction "}}}
-
-function! s:tag_remove_external_link(value) "{{{
- let value = s:mid(a:value, 1)
-
- let line = ''
- if s:is_web_link(value)
- let lnkElements = split(value)
- let head = lnkElements[0]
- let rest = join(lnkElements[1:])
- if rest==""
- let rest=head
- endif
- let line = rest
- elseif s:is_img_link(value)
- let line = '<img src="'.value.'" />'
- else
- " [alskfj sfsf] shouldn't be a link. So return it as it was --
- " enclosed in [...]
- let line = '['.value.']'
- endif
- return line
-endfunction "}}}
-
-function! s:make_tag(line, regexp, func) "{{{
- " Make tags for a given matched regexp.
- " Exclude preformatted text and href links.
-
- let patt_splitter = '\(`[^`]\+`\)\|\({{{.\+}}}\)\|'.
- \ '\(<a href.\{-}</a>\)\|\(<img src.\{-}/>\)'
- if '`[^`]\+`' == a:regexp || '{{{.\+}}}' == a:regexp
- let res_line = s:subst_func(a:line, a:regexp, a:func)
- else
- let pos = 0
- " split line with patt_splitter to have parts of line before and after
- " href links, preformatted text
- " ie:
- " hello world `is just a` simple <a href="link.html">type of</a> prg.
- " result:
- " ['hello world ', ' simple ', 'type of', ' prg']
- let lines = split(a:line, patt_splitter, 1)
- let res_line = ""
- for line in lines
- let res_line = res_line.s:subst_func(line, a:regexp, a:func)
- let res_line = res_line.matchstr(a:line, patt_splitter, pos)
- let pos = matchend(a:line, patt_splitter, pos)
- endfor
- endif
- return res_line
-endfunction "}}}
-
-function! s:process_tags_remove_links(line) " {{{
- let line = a:line
- let line = s:make_tag(line, '\[\[.\{-}\]\]', 's:tag_remove_internal_link')
- let line = s:make_tag(line, '\[.\{-}\]', 's:tag_remove_external_link')
- return line
-endfunction " }}}
-
-function! s:process_tags_typefaces(line) "{{{
- let line = a:line
- let line = s:make_tag(line, g:vimwiki_rxNoWikiWord, 's:tag_no_wikiword_link')
- let line = s:make_tag(line, g:vimwiki_rxItalic, 's:tag_em')
- let line = s:make_tag(line, g:vimwiki_rxBold, 's:tag_strong')
- let line = s:make_tag(line, g:vimwiki_rxTodo, 's:tag_todo')
- let line = s:make_tag(line, g:vimwiki_rxDelText, 's:tag_strike')
- let line = s:make_tag(line, g:vimwiki_rxSuperScript, 's:tag_super')
- let line = s:make_tag(line, g:vimwiki_rxSubScript, 's:tag_sub')
- let line = s:make_tag(line, g:vimwiki_rxCode, 's:tag_code')
- let line = s:make_tag(line, g:vimwiki_rxPreStart.'.\+'.g:vimwiki_rxPreEnd,
- \ 's:tag_pre')
- return line
-endfunction " }}}
-
-function! s:process_tags_links(line) " {{{
- let line = a:line
- let line = s:make_tag(line, '\[\[.\{-}\]\]', 's:tag_internal_link')
- let line = s:make_tag(line, '\[.\{-}\]', 's:tag_external_link')
- let line = s:make_tag(line, g:vimwiki_rxWeblink, 's:tag_barebone_link')
- let line = s:make_tag(line, g:vimwiki_rxWikiWord, 's:tag_wikiword_link')
- return line
-endfunction " }}}
-
-function! s:process_inline_tags(line) "{{{
- let line = s:process_tags_links(a:line)
- let line = s:process_tags_typefaces(line)
- return line
-endfunction " }}}
-"}}}
-
-" BLOCK TAGS {{{
-function! s:close_tag_pre(pre, ldest) "{{{
- if a:pre[0]
- call insert(a:ldest, "</pre>")
- return 0
- endif
- return a:pre
-endfunction "}}}
-
-function! s:close_tag_quote(quote, ldest) "{{{
- if a:quote
- call insert(a:ldest, "</blockquote>")
- return 0
- endif
- return a:quote
-endfunction "}}}
-
-function! s:close_tag_para(para, ldest) "{{{
- if a:para
- call insert(a:ldest, "</p>")
- return 0
- endif
- return a:para
-endfunction "}}}
-
-function! s:close_tag_table(table, ldest) "{{{
- " The first element of table list is a string which tells us if table should be centered.
- " The rest elements are rows which are lists of columns:
- " ['center',
- " ['col1', 'col2', 'col3'],
- " ['col1', 'col2', 'col3'],
- " ['col1', 'col2', 'col3']
- " ]
- let table = a:table
- let ldest = a:ldest
- if len(table)
- if table[0] == 'center'
- call add(ldest, "<table class='center'>")
- else
- call add(ldest, "<table>")
- endif
-
- " Empty lists are table separators.
- " Search for the last empty list. All the above rows would be a table header.
- " We should exclude the first element of the table list as it is a text tag
- " that shows if table should be centered or not.
- let head = 0
- for idx in range(len(table)-1, 1, -1)
- if empty(table[idx])
- let head = idx
- break
- endif
- endfor
- if head > 0
- for row in table[1 : head-1]
- if !empty(filter(row, '!empty(v:val)'))
- call add(ldest, '<tr>')
- call extend(ldest, map(row, '"<th>".s:process_inline_tags(v:val)."</th>"'))
- call add(ldest, '</tr>')
- endif
- endfor
- for row in table[head+1 :]
- call add(ldest, '<tr>')
- call extend(ldest, map(row, '"<td>".s:process_inline_tags(v:val)."</td>"'))
- call add(ldest, '</tr>')
- endfor
- else
- for row in table[1 :]
- call add(ldest, '<tr>')
- call extend(ldest, map(row, '"<td>".s:process_inline_tags(v:val)."</td>"'))
- call add(ldest, '</tr>')
- endfor
- endif
- call add(ldest, "</table>")
- let table = []
- endif
- return table
-endfunction "}}}
-
-function! s:close_tag_list(lists, ldest) "{{{
- while len(a:lists)
- let item = remove(a:lists, 0)
- call insert(a:ldest, item[0])
- endwhile
-endfunction! "}}}
-
-function! s:close_tag_def_list(deflist, ldest) "{{{
- if a:deflist
- call insert(a:ldest, "</dl>")
- return 0
- endif
- return a:deflist
-endfunction! "}}}
-
-function! s:process_tag_pre(line, pre) "{{{
- " pre is the list of [is_in_pre, indent_of_pre]
- let lines = []
- let pre = a:pre
- let processed = 0
- if !pre[0] && a:line =~ '^\s*{{{[^\(}}}\)]*\s*$'
- let class = matchstr(a:line, '{{{\zs.*$')
- let class = substitute(class, '\s\+$', '', 'g')
- if class != ""
- call add(lines, "<pre ".class.">")
- else
- call add(lines, "<pre>")
- endif
- let pre = [1, len(matchstr(a:line, '^\s*\ze{{{'))]
- let processed = 1
- elseif pre[0] && a:line =~ '^\s*}}}\s*$'
- let pre = [0, 0]
- call add(lines, "</pre>")
- let processed = 1
- elseif pre[0]
- let processed = 1
- call add(lines, substitute(a:line, '^\s\{'.pre[1].'}', '', ''))
- endif
- return [processed, lines, pre]
-endfunction "}}}
-
-function! s:process_tag_quote(line, quote) "{{{
- let lines = []
- let quote = a:quote
- let processed = 0
- if a:line =~ '^\s\{4,}\S'
- if !quote
- call add(lines, "<blockquote>")
- let quote = 1
- endif
- let processed = 1
- call add(lines, substitute(a:line, '^\s*', '', ''))
- elseif quote
- call add(lines, "</blockquote>")
- let quote = 0
- endif
- return [processed, lines, quote]
-endfunction "}}}
-
-function! s:process_tag_list(line, lists) "{{{
-
- function! s:add_checkbox(line, rx_list, st_tag, en_tag) "{{{
- let st_tag = a:st_tag
- let en_tag = a:en_tag
-
- let chk = matchlist(a:line, a:rx_list)
- if len(chk) > 0
- if chk[1] == g:vimwiki_listsyms[4]
- let st_tag .= '<del><input type="checkbox" checked />'
- let en_tag = '</del>'.a:en_tag
- else
- let st_tag .= '<input type="checkbox" />'
- endif
- endif
- return [st_tag, en_tag]
- endfunction "}}}
-
- let in_list = (len(a:lists) > 0)
-
- " If it is not list yet then do not process line that starts from *bold*
- " text.
- if !in_list
- let pos = match(a:line, g:vimwiki_rxBold)
- if pos != -1 && strpart(a:line, 0, pos) =~ '^\s*$'
- return [0, []]
- endif
- endif
-
- let lines = []
- let processed = 0
-
- if a:line =~ g:vimwiki_rxListBullet
- let lstSym = matchstr(a:line, '[*-]')
- let lstTagOpen = '<ul>'
- let lstTagClose = '</ul>'
- let lstRegExp = g:vimwiki_rxListBullet
- elseif a:line =~ g:vimwiki_rxListNumber
- let lstSym = '#'
- let lstTagOpen = '<ol>'
- let lstTagClose = '</ol>'
- let lstRegExp = g:vimwiki_rxListNumber
- else
- let lstSym = ''
- let lstTagOpen = ''
- let lstTagClose = ''
- let lstRegExp = ''
- endif
-
- if lstSym != ''
- " To get proper indent level 'retab' the line -- change all tabs
- " to spaces*tabstop
- let line = substitute(a:line, '\t', repeat(' ', &tabstop), 'g')
- let indent = stridx(line, lstSym)
-
- let checkbox = '\s*\[\(.\?\)\]\s*'
- let [st_tag, en_tag] = s:add_checkbox(line,
- \ lstRegExp.checkbox, '<li>', '</li>')
-
- if !in_list
- call add(a:lists, [lstTagClose, indent])
- call add(lines, lstTagOpen)
- elseif (in_list && indent > a:lists[-1][1])
- let item = remove(a:lists, -1)
- call add(lines, item[0])
-
- call add(a:lists, [lstTagClose, indent])
- call add(lines, lstTagOpen)
- elseif (in_list && indent < a:lists[-1][1])
- while len(a:lists) && indent < a:lists[-1][1]
- let item = remove(a:lists, -1)
- call add(lines, item[0])
- endwhile
- elseif in_list
- let item = remove(a:lists, -1)
- call add(lines, item[0])
- endif
-
- call add(a:lists, [en_tag, indent])
- call add(lines, st_tag)
- call add(lines,
- \ substitute(a:line, lstRegExp.'\%('.checkbox.'\)\?', '', ''))
- let processed = 1
- elseif in_list > 0 && a:line =~ '^\s\+\S\+'
- if g:vimwiki_list_ignore_newline
- call add(lines, a:line)
- else
- call add(lines, '<br />'.a:line)
- endif
- let processed = 1
- else
- call s:close_tag_list(a:lists, lines)
- endif
- return [processed, lines]
-endfunction "}}}
-
-function! s:process_tag_def_list(line, deflist) "{{{
- let lines = []
- let deflist = a:deflist
- let processed = 0
- let matches = matchlist(a:line, '\(^.*\)::\%(\s\|$\)\(.*\)')
- if !deflist && len(matches) > 0
- call add(lines, "<dl>")
- let deflist = 1
- endif
- if deflist && len(matches) > 0
- if matches[1] != ''
- call add(lines, "<dt>".matches[1]."</dt>")
- endif
- if matches[2] != ''
- call add(lines, "<dd>".matches[2]."</dd>")
- endif
- let processed = 1
- elseif deflist
- let deflist = 0
- call add(lines, "</dl>")
- endif
- return [processed, lines, deflist]
-endfunction "}}}
-
-function! s:process_tag_para(line, para) "{{{
- let lines = []
- let para = a:para
- let processed = 0
- if a:line =~ '^\s\{,3}\S'
- if !para
- call add(lines, "<p>")
- let para = 1
- endif
- let processed = 1
- call add(lines, a:line)
- elseif para && a:line =~ '^\s*$'
- call add(lines, "</p>")
- let para = 0
- endif
- return [processed, lines, para]
-endfunction "}}}
-
-function! s:process_tag_h(line, id) "{{{
- let line = a:line
- let processed = 0
- let h_level = 0
- let h_text = ''
- let h_id = ''
- if a:line =~ g:vimwiki_rxH6
- let h_level = 6
- elseif a:line =~ g:vimwiki_rxH5
- let h_level = 5
- elseif a:line =~ g:vimwiki_rxH4
- let h_level = 4
- elseif a:line =~ g:vimwiki_rxH3
- let h_level = 3
- elseif a:line =~ g:vimwiki_rxH2
- let h_level = 2
- elseif a:line =~ g:vimwiki_rxH1
- let h_level = 1
- endif
- if h_level > 0
- let a:id[h_level] += 1
- " reset higher level ids
- for level in range(h_level+1, 6)
- let a:id[level] = 0
- endfor
-
- let centered = 0
- if a:line =~ '^\s\+'
- let centered = 1
- endif
-
- let line = s:trim(line)
-
- let h_number = ''
- for l in range(1, h_level-1)
- let h_number .= a:id[l].'.'
- endfor
- let h_number .= a:id[h_level]
-
- let h_id = 'toc_'.h_number
-
- let h_part = '<h'.h_level.' id="'.h_id.'"'
-
- if centered
- let h_part .= ' class="justcenter">'
- else
- let h_part .= '>'
- endif
-
- let h_text = s:trim(strpart(line, h_level, len(line) - h_level * 2))
- if g:vimwiki_html_header_numbering
- let num = matchstr(h_number,
- \ '^\(\d.\)\{'.(g:vimwiki_html_header_numbering-1).'}\zs.*')
- if !empty(num)
- let num .= g:vimwiki_html_header_numbering_sym
- endif
- let h_text = num.' '.h_text
- endif
-
- let line = h_part.h_text.'</h'.h_level.'>'
- let processed = 1
- endif
- return [processed, line, h_level, h_text, h_id]
-endfunction "}}}
-
-function! s:process_tag_hr(line) "{{{
- let line = a:line
- let processed = 0
- if a:line =~ '^-----*$'
- let line = '<hr />'
- let processed = 1
- endif
- return [processed, line]
-endfunction "}}}
-
-function! s:process_tag_table(line, table) "{{{
- function! s:table_empty_cell(value) "{{{
- if a:value =~ '^\s*$'
- return ' '
- endif
- return a:value
- endfunction "}}}
-
- function! s:table_add_row(table, line) "{{{
- if empty(a:table)
- if a:line =~ '^\s\+'
- let row = ['center', []]
- else
- let row = ['normal', []]
- endif
- else
- let row = [[]]
- endif
- return row
- endfunction "}}}
-
- let table = a:table
- let lines = []
- let processed = 0
-
- if a:line =~ '^\s*|[-+]\+|\s*$'
- call extend(table, s:table_add_row(a:table, a:line))
- let processed = 1
- elseif a:line =~ '^\s*|.\+|\s*$'
- call extend(table, s:table_add_row(a:table, a:line))
-
- let processed = 1
- let cells = split(a:line, '\s*|\s*', 1)[1: -2]
- call map(cells, 's:table_empty_cell(v:val)')
- call extend(table[-1], cells)
- else
- let table = s:close_tag_table(table, lines)
- endif
- return [processed, lines, table]
-endfunction "}}}
-
-"}}}
-
-" }}}
-
-" WIKI2HTML "{{{
-function! s:parse_line(line, state) " {{{
- let state = {}
- let state.para = a:state.para
- let state.quote = a:state.quote
- let state.pre = a:state.pre[:]
- let state.table = a:state.table[:]
- let state.lists = a:state.lists[:]
- let state.deflist = a:state.deflist
- let state.placeholder = a:state.placeholder
- let state.toc = a:state.toc
- let state.toc_id = a:state.toc_id
-
- let res_lines = []
-
- let line = s:safe_html(a:line)
-
- let processed = 0
-
- " nohtml -- placeholder
- if !processed
- if line =~ '^\s*%nohtml'
- let processed = 1
- let state.placeholder = ['nohtml']
- endif
- endif
-
- " title -- placeholder
- if !processed
- if line =~ '^\s*%title'
- let processed = 1
- let param = matchstr(line, '^\s*%title\s\zs.*')
- let state.placeholder = ['title', param]
- endif
- endif
-
- " toc -- placeholder "{{{
- if !processed
- if line =~ '^\s*%toc'
- let processed = 1
- let param = matchstr(line, '^\s*%toc\s\zs.*')
- let state.placeholder = ['toc', param]
- endif
- endif
- "}}}
-
- " pres "{{{
- if !processed
- let [processed, lines, state.pre] = s:process_tag_pre(line, state.pre)
- " pre is just fine to be in the list -- do not close list item here.
- " if processed && len(state.lists)
- " call s:close_tag_list(state.lists, lines)
- " endif
- if processed && len(state.table)
- let state.table = s:close_tag_table(state.table, lines)
- endif
- if processed && state.deflist
- let state.deflist = s:close_tag_def_list(state.deflist, lines)
- endif
- if processed && state.quote
- let state.quote = s:close_tag_quote(state.quote, lines)
- endif
- if processed && state.para
- let state.para = s:close_tag_para(state.para, lines)
- endif
- call extend(res_lines, lines)
- endif
- "}}}
-
- " lists "{{{
- if !processed
- let [processed, lines] = s:process_tag_list(line, state.lists)
- if processed && state.quote
- let state.quote = s:close_tag_quote(state.quote, lines)
- endif
- if processed && state.pre[0]
- let state.pre = s:close_tag_pre(state.pre, lines)
- endif
- if processed && len(state.table)
- let state.table = s:close_tag_table(state.table, lines)
- endif
- if processed && state.deflist
- let state.deflist = s:close_tag_def_list(state.deflist, lines)
- endif
- if processed && state.para
- let state.para = s:close_tag_para(state.para, lines)
- endif
-
- call map(lines, 's:process_inline_tags(v:val)')
-
- call extend(res_lines, lines)
- endif
- "}}}
-
- " headers "{{{
- if !processed
- let [processed, line, h_level, h_text, h_id] = s:process_tag_h(line, state.toc_id)
- if processed
- call s:close_tag_list(state.lists, res_lines)
- let state.table = s:close_tag_table(state.table, res_lines)
- let state.pre = s:close_tag_pre(state.pre, res_lines)
- let state.quote = s:close_tag_quote(state.quote, res_lines)
-
- let line = s:process_inline_tags(line)
-
- call add(res_lines, line)
-
- " gather information for table of contents
- call add(state.toc, [h_level, h_text, h_id])
- endif
- endif
- "}}}
-
- " tables "{{{
- if !processed
- let [processed, lines, state.table] = s:process_tag_table(line, state.table)
- call extend(res_lines, lines)
- endif
- "}}}
-
- " quotes "{{{
- if !processed
- let [processed, lines, state.quote] = s:process_tag_quote(line, state.quote)
- if processed && len(state.lists)
- call s:close_tag_list(state.lists, lines)
- endif
- if processed && state.deflist
- let state.deflist = s:close_tag_def_list(state.deflist, lines)
- endif
- if processed && len(state.table)
- let state.table = s:close_tag_table(state.table, lines)
- endif
- if processed && state.pre[0]
- let state.pre = s:close_tag_pre(state.pre, lines)
- endif
- if processed && state.para
- let state.para = s:close_tag_para(state.para, lines)
- endif
-
- call map(lines, 's:process_inline_tags(v:val)')
-
- call extend(res_lines, lines)
- endif
- "}}}
-
- " horizontal rules "{{{
- if !processed
- let [processed, line] = s:process_tag_hr(line)
- if processed
- call s:close_tag_list(state.lists, res_lines)
- let state.table = s:close_tag_table(state.table, res_lines)
- let state.pre = s:close_tag_pre(state.pre, res_lines)
- call add(res_lines, line)
- endif
- endif
- "}}}
-
- " definition lists "{{{
- if !processed
- let [processed, lines, state.deflist] = s:process_tag_def_list(line, state.deflist)
-
- call map(lines, 's:process_inline_tags(v:val)')
-
- call extend(res_lines, lines)
- endif
- "}}}
-
- "" P "{{{
- if !processed
- let [processed, lines, state.para] = s:process_tag_para(line, state.para)
- if processed && len(state.lists)
- call s:close_tag_list(state.lists, lines)
- endif
- if processed && state.quote
- let state.quote = s:close_tag_quote(state.quote, res_lines)
- endif
- if processed && state.pre[0]
- let state.pre = s:close_tag_pre(state.pre, res_lines)
- endif
- if processed && len(state.table)
- let state.table = s:close_tag_table(state.table, res_lines)
- endif
-
- call map(lines, 's:process_inline_tags(v:val)')
-
- call extend(res_lines, lines)
- endif
- "}}}
-
- "" add the rest
- if !processed
- call add(res_lines, line)
- endif
-
- return [res_lines, state]
-
-endfunction " }}}
-
-function! vimwiki_html#Wiki2HTML(path, wikifile) "{{{
-
- if !s:syntax_supported()
- echomsg 'vimwiki: Only vimwiki_default syntax supported!!!'
- return
- endif
-
- let wikifile = fnamemodify(a:wikifile, ":p")
- let subdir = vimwiki#subdir(VimwikiGet('path'), wikifile)
-
- let lsource = s:remove_comments(readfile(wikifile))
- let ldest = []
-
- let path = expand(a:path).subdir
- call vimwiki#mkdir(path)
-
- " nohtml placeholder -- to skip html generation.
- let nohtml = 0
-
- " for table of contents placeholders.
- let placeholders = []
-
- " current state of converter
- let state = {}
- let state.para = 0
- let state.quote = 0
- let state.pre = [0, 0] " [in_pre, indent_pre]
- let state.table = []
- let state.deflist = 0
- let state.lists = []
- let state.placeholder = []
- let state.toc = []
- let state.toc_id = {1: 0, 2: 0, 3: 0, 4: 0, 5: 0, 6: 0 }
-
- for line in lsource
- let oldquote = state.quote
- let [lines, state] = s:parse_line(line, state)
-
- " Hack: There could be a lot of empty strings before s:process_tag_quote
- " find out `quote` is over. So we should delete them all. Think of the way
- " to refactor it out.
- if oldquote != state.quote
- call s:remove_blank_lines(ldest)
- endif
-
- if !empty(state.placeholder)
- if state.placeholder[0] == 'nohtml'
- let nohtml = 1
- break
- else
- call add(placeholders, [state.placeholder, len(ldest), len(placeholders)])
- let state.placeholder = []
- endif
- endif
-
- call extend(ldest, lines)
- endfor
-
-
- if !nohtml
- let toc = s:get_html_toc(state.toc)
- call s:process_toc(ldest, placeholders, toc)
- call s:remove_blank_lines(ldest)
-
- "" process end of file
- "" close opened tags if any
- let lines = []
- call s:close_tag_quote(state.quote, lines)
- call s:close_tag_para(state.para, lines)
- call s:close_tag_pre(state.pre, lines)
- call s:close_tag_list(state.lists, lines)
- call s:close_tag_def_list(state.deflist, lines)
- call s:close_tag_table(state.table, lines)
- call extend(ldest, lines)
-
- let title = s:process_title(placeholders, fnamemodify(a:wikifile, ":t:r"))
- call extend(ldest, s:get_html_header(title, subdir, &fileencoding), 0)
- call extend(ldest, s:get_html_footer())
-
- "" make html file.
- let wwFileNameOnly = fnamemodify(wikifile, ":t:r")
- call writefile(ldest, path.wwFileNameOnly.'.html')
- endif
-endfunction "}}}
-
-function! vimwiki_html#WikiAll2HTML(path) "{{{
- if !s:syntax_supported()
- echomsg 'vimwiki: Only vimwiki_default syntax supported!!!'
- return
- endif
-
- echomsg 'Saving vimwiki files...'
- let save_eventignore = &eventignore
- let &eventignore = "all"
- let cur_buf = bufname('%')
- bufdo call s:save_vimwiki_buffer()
- exe 'buffer '.cur_buf
- let &eventignore = save_eventignore
-
- let path = expand(a:path)
- call vimwiki#mkdir(path)
-
- echomsg 'Deleting old html files...'
- call s:delete_html_files(path)
-
- echomsg 'Converting wiki to html files...'
- let setting_more = &more
- setlocal nomore
-
- let wikifiles = split(glob(VimwikiGet('path').'**/*'.VimwikiGet('ext')), '\n')
- for wikifile in wikifiles
- echomsg 'Processing '.wikifile
- call vimwiki_html#Wiki2HTML(path, wikifile)
- endfor
- call s:create_default_CSS(path)
- echomsg 'Done!'
-
- let &more = setting_more
-endfunction "}}}
-"}}}
diff --git a/autoload/vimwiki_lst.vim b/autoload/vimwiki_lst.vim
@@ -1,359 +0,0 @@
-" vim:tabstop=2:shiftwidth=2:expandtab:foldmethod=marker:textwidth=79
-" Vimwiki autoload plugin file
-" Todo lists related stuff here.
-" Author: Maxim Kim <habamax@gmail.com>
-" Home: http://code.google.com/p/vimwiki/
-
-if exists("g:loaded_vimwiki_list_auto") || &cp
- finish
-endif
-let g:loaded_vimwiki_lst_auto = 1
-
-" Script variables {{{
-let s:rx_li_box = '\[.\?\]'
-" }}}
-
-" Script functions {{{
-
-" Get checkbox regexp
-function! s:rx_li_symbol(rate) "{{{
- let result = ''
- if a:rate == 100
- let result = g:vimwiki_listsyms[4]
- elseif a:rate == 0
- let result = g:vimwiki_listsyms[0]
- elseif a:rate >= 67
- let result = g:vimwiki_listsyms[3]
- elseif a:rate >= 34
- let result = g:vimwiki_listsyms[2]
- else
- let result = g:vimwiki_listsyms[1]
- endif
-
- return '\['.result.'\]'
-endfunction "}}}
-
-" Get regexp of the list item.
-function! s:rx_list_item() "{{{
- return '\('.g:vimwiki_rxListBullet.'\|'.g:vimwiki_rxListNumber.'\)'
-endfunction "}}}
-
-" Get regexp of the list item with checkbox.
-function! s:rx_cb_list_item() "{{{
- return s:rx_list_item().'\s*\zs\[.\?\]'
-endfunction "}}}
-
-" Get level of the list item.
-function! s:get_level(lnum) "{{{
- if VimwikiGet('syntax') == 'media'
- let level = vimwiki#count_first_sym(getline(a:lnum))
- else
- let level = indent(a:lnum)
- endif
- return level
-endfunction "}}}
-
-" Get previous list item.
-" Returns: line number or 0.
-function! s:prev_list_item(lnum) "{{{
- let c_lnum = a:lnum - 1
- while c_lnum >= 1
- let line = getline(c_lnum)
- if line =~ s:rx_list_item()
- return c_lnum
- endif
- if line =~ '^\s*$'
- return 0
- endif
- let c_lnum -= 1
- endwhile
- return 0
-endfunction "}}}
-
-" Get next list item in the list.
-" Returns: line number or 0.
-function! s:next_list_item(lnum) "{{{
- let c_lnum = a:lnum + 1
- while c_lnum <= line('$')
- let line = getline(c_lnum)
- if line =~ s:rx_list_item()
- return c_lnum
- endif
- if line =~ '^\s*$'
- return 0
- endif
- let c_lnum += 1
- endwhile
- return 0
-endfunction "}}}
-
-" Find next list item in the buffer.
-" Returns: line number or 0.
-function! s:find_next_list_item(lnum) "{{{
- let c_lnum = a:lnum + 1
- while c_lnum <= line('$')
- let line = getline(c_lnum)
- if line =~ s:rx_list_item()
- return c_lnum
- endif
- let c_lnum += 1
- endwhile
- return 0
-endfunction "}}}
-
-" Set state of the list item on line number "lnum" to [ ] or [x]
-function! s:set_state(lnum, rate) "{{{
- let line = getline(a:lnum)
- let state = s:rx_li_symbol(a:rate)
- let line = substitute(line, s:rx_li_box, state, '')
- call setline(a:lnum, line)
-endfunction "}}}
-
-" Get state of the list item on line number "lnum"
-function! s:get_state(lnum) "{{{
- let state = 0
- let line = getline(a:lnum)
- let opt = matchstr(line, s:rx_cb_list_item())
- if opt =~ s:rx_li_symbol(100)
- let state = 100
- elseif opt =~ s:rx_li_symbol(0)
- let state = 0
- elseif opt =~ s:rx_li_symbol(25)
- let state = 25
- elseif opt =~ s:rx_li_symbol(50)
- let state = 50
- elseif opt =~ s:rx_li_symbol(75)
- let state = 75
- endif
- return state
-endfunction "}}}
-
-" Returns 1 if there is checkbox on a list item, 0 otherwise.
-function! s:is_cb_list_item(lnum) "{{{
- return getline(a:lnum) =~ s:rx_cb_list_item()
-endfunction "}}}
-
-" Returns start line number of list item, 0 if it is not a list.
-function! s:is_list_item(lnum) "{{{
- let c_lnum = a:lnum
- while c_lnum >= 1
- let line = getline(c_lnum)
- if line =~ s:rx_list_item()
- return c_lnum
- endif
- if line =~ '^\s*$'
- return 0
- endif
- if indent(c_lnum) > indent(a:lnum)
- return 0
- endif
- let c_lnum -= 1
- endwhile
- return 0
-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.
-function! s:get_child_items(lnum) "{{{
- let result = []
- let lnum = a:lnum
- let p_pos = s:get_level(lnum)
-
- " add parent
- call add(result, lnum)
-
- let lnum = s:next_list_item(lnum)
- while lnum != 0 && s:is_list_item(lnum) && s:get_level(lnum) > p_pos
- call add(result, lnum)
- let lnum = s:next_list_item(lnum)
- endwhile
-
- return result
-endfunction "}}}
-
-" Returns list of line numbers of all items of the same level.
-function! s:get_sibling_items(lnum) "{{{
- let result = []
- let lnum = a:lnum
- let ind = s:get_level(lnum)
-
- while lnum != 0 && s:get_level(lnum) >= ind
- if s:get_level(lnum) == ind && s:is_cb_list_item(lnum)
- call add(result, lnum)
- endif
- let lnum = s:next_list_item(lnum)
- endwhile
-
- let lnum = s:prev_list_item(a:lnum)
- while lnum != 0 && s:get_level(lnum) >= ind
- if s:get_level(lnum) == ind && s:is_cb_list_item(lnum)
- call add(result, lnum)
- endif
- let lnum = s:prev_list_item(lnum)
- endwhile
-
- return result
-endfunction "}}}
-
-" Returns line number of the parent of lnum item
-function! s:get_parent_item(lnum) "{{{
- let lnum = a:lnum
- let ind = s:get_level(lnum)
-
- let lnum = s:prev_list_item(lnum)
- while lnum != 0 && s:is_list_item(lnum) && s:get_level(lnum) >= ind
- let lnum = s:prev_list_item(lnum)
- endwhile
-
- if s:is_cb_list_item(lnum)
- return lnum
- else
- return a: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())
- if m != ''
- let li_content = substitute(strpart(line, len(m)), '^\s*', '', '')
- let line = substitute(m, '\s*$', ' ', '').'[ ] '.li_content
- call setline(a:lnum, line)
- endif
-endfunction "}}}
-
-" Tells if all of the sibling list items are checked or not.
-function! s:all_siblings_checked(lnum) "{{{
- let result = 0
- let cnt = 0
- let siblings = s:get_sibling_items(a:lnum)
- for lnum in siblings
- let cnt += s:get_state(lnum)
- endfor
- let result = cnt/len(siblings)
- return result
-endfunction "}}}
-
-" Creates checkbox on a list item if there is no one.
-function! s:TLI_create_checkbox(lnum) "{{{
- if a:lnum && !s:is_cb_list_item(a:lnum)
- if g:vimwiki_auto_checkbox
- call s:create_cb_list_item(a:lnum)
- endif
- return 1
- endif
- return 0
-endfunction "}}}
-
-" Switch state of the child list items.
-function! s:TLI_switch_child_state(lnum) "{{{
- let current_state = s:get_state(a:lnum)
- if current_state == 100
- let new_state = 0
- else
- let new_state = 100
- endif
- for lnum in s:get_child_items(a:lnum)
- call s:set_state(lnum, new_state)
- endfor
-endfunction "}}}
-
-" Switch state of the parent list items.
-function! s:TLI_switch_parent_state(lnum) "{{{
- let c_lnum = a:lnum
- while s:is_cb_list_item(c_lnum)
- let parent_lnum = s:get_parent_item(c_lnum)
- if parent_lnum == c_lnum
- break
- endif
- call s:set_state(parent_lnum, s:all_siblings_checked(c_lnum))
-
- let c_lnum = parent_lnum
- endwhile
-endfunction "}}}
-
-function! s:TLI_toggle(lnum) "{{{
- if !s:TLI_create_checkbox(a:lnum)
- call s:TLI_switch_child_state(a:lnum)
- endif
- call s:TLI_switch_parent_state(a:lnum)
-endfunction "}}}
-
-" Script functions }}}
-
-" Toggle list item between [ ] and [X]
-function! vimwiki_lst#ToggleListItem(line1, line2) "{{{
- let line1 = a:line1
- let line2 = a:line2
-
- if line1 != line2 && !s:is_list_item(line1)
- let line1 = s:find_next_list_item(line1)
- endif
-
- let c_lnum = line1
- while c_lnum != 0 && c_lnum <= line2
- let li_lnum = s:is_list_item(c_lnum)
-
- if li_lnum
- let li_level = s:get_level(li_lnum)
- if c_lnum == line1
- let start_li_level = li_level
- endif
-
- if li_level <= start_li_level
- call s:TLI_toggle(li_lnum)
- let start_li_level = li_level
- endif
- endif
-
- let c_lnum = s:find_next_list_item(c_lnum)
- endwhile
-
-endfunction "}}}
-
-function! vimwiki_lst#kbd_cr() "{{{
- " This function is heavily relies on proper 'set comments' option.
- let cr = "\<CR>"
- if getline('.') =~ s:rx_cb_list_item()
- let cr .= '[ ] '
- endif
- return cr
-endfunction "}}}
-
-function! vimwiki_lst#kbd_oO(cmd) "{{{
- " cmd should be 'o' or 'O'
-
- let beg_lnum = foldclosed('.')
- let end_lnum = foldclosedend('.')
- if end_lnum != -1 && a:cmd ==# 'o'
- let lnum = end_lnum
- let line = getline(beg_lnum)
- else
- let line = getline('.')
- let lnum = line('.')
- endif
-
- " let line = substitute(m, '\s*$', ' ', '').'[ ] '.li_content
- let m = matchstr(line, s:rx_list_item())
- let res = ''
- if line =~ s:rx_cb_list_item()
- let res = substitute(m, '\s*$', ' ', '').'[ ] '
- elseif line =~ s:rx_list_item()
- let res = substitute(m, '\s*$', ' ', '')
- elseif &autoindent || &smartindent
- let res = matchstr(line, '^\s*')
- endif
- if a:cmd ==# 'o'
- call append(lnum, res)
- call cursor(lnum + 1, col('$'))
- else
- call append(lnum - 1, res)
- call cursor(lnum, col('$'))
- endif
-endfunction "}}}
-
diff --git a/autoload/vimwiki_tbl.vim b/autoload/vimwiki_tbl.vim
@@ -1,510 +0,0 @@
-" vim:tabstop=2:shiftwidth=2:expandtab:foldmethod=marker:textwidth=79
-" Vimwiki autoload plugin file
-" Desc: Tables
-" | Easily | manageable | text | tables | ! |
-" |--------+------------+-------+--------+---------|
-" | Have | fun! | Drink | tea | Period. |
-"
-" Author: Maxim Kim <habamax@gmail.com>
-" Home: http://code.google.com/p/vimwiki/
-
-" Load only once {{{
-if exists("g:loaded_vimwiki_tbl_auto") || &cp
- finish
-endif
-let g:loaded_vimwiki_tbl_auto = 1
-"}}}
-
-let s:textwidth = &tw
-
-" Misc functions {{{
-function! s:wide_len(str) "{{{
- " vim73 has new function that gives correct string width.
- if exists("*strdisplaywidth")
- return strdisplaywidth(a:str)
- endif
-
- " get str display width in vim ver < 7.2
- if !g:vimwiki_CJK_length
- let ret = strlen(substitute(a:str, '.', 'x', 'g'))
- else
- let savemodified = &modified
- let save_cursor = getpos('.')
- exe "norm! o\<esc>"
- call setline(line("."), a:str)
- let ret = virtcol("$") - 1
- d
- call setpos('.', save_cursor)
- let &modified = savemodified
- endif
- return ret
-endfunction "}}}
-
-function! s:is_table(line) "{{{
- return a:line =~ '^\s*\%(|[^|]\+\)\+|\s*$' || s:is_separator(a:line)
-endfunction "}}}
-
-function! s:is_separator(line) "{{{
- return a:line =~ '^\s*[|+]\s*--[-|+]\+'
-endfunction "}}}
-
-function! s:is_last_column(lnum, cnum) "{{{
- return strpart(getline(a:lnum), a:cnum - 1) =~ '^[^|]*|\s*$'
-endfunction "}}}
-
-function! s:is_first_column(lnum, cnum) "{{{
- let line = strpart(getline(a:lnum), 0, a:cnum - 1)
- return line =~ '^\s*|[^|]*$' || line =~ '^\s*$'
-endfunction "}}}
-
-function! s:count_separators_up(lnum) "{{{
- let lnum = a:lnum - 1
- while lnum > 1
- if !s:is_separator(getline(lnum))
- break
- endif
- let lnum -= 1
- endwhile
-
- return (a:lnum-lnum)
-endfunction "}}}
-
-function! s:count_separators_down(lnum) "{{{
- let lnum = a:lnum + 1
- while lnum < line('$')
- if !s:is_separator(getline(lnum))
- break
- endif
- let lnum += 1
- endwhile
-
- return (lnum-a:lnum)
-endfunction "}}}
-
-function! s:create_empty_row(cols) "{{{
- let first_cell = "| |"
- let cell = " |"
- let row = first_cell
-
- for c in range(a:cols - 1)
- let row .= cell
- endfor
-
- return row
-endfunction "}}}
-
-function! s:create_row_sep(cols) "{{{
- let first_cell = "|---+"
- let cell = "---+"
- let last_cell = "---|"
-
- if a:cols < 2
- return "|---|"
- endif
-
- let row = first_cell
-
- for c in range(a:cols - 2)
- let row .= cell
- endfor
-
- let row .= last_cell
-
- return row
-endfunction "}}}
-
-function! s:get_values(line) "{{{
- return split(a:line, '\s*|\s*', 1)[1:-2]
-endfunction "}}}
-
-function! s:col_count(lnum) "{{{
- let line = getline(a:lnum)
- if !s:is_separator(line)
- return len(split(line, '\s*|\s*', 1)[1:-2])
- else
- return len(split(line, '-+-', 1))
- endif
-endfunction "}}}
-
-function! s:get_indent(lnum) "{{{
- if !s:is_table(getline(a:lnum))
- return
- endif
-
- let indent = 0
-
- let lnum = a:lnum - 1
- while lnum > 1
- let line = getline(lnum)
- if !s:is_table(line)
- let indent = indent(lnum+1)
- break
- endif
- let lnum -= 1
- endwhile
-
- return indent
-endfunction " }}}
-
-function! s:get_rows(lnum) "{{{
- if !s:is_table(getline(a:lnum))
- return
- endif
-
- let upper_rows = []
- let lower_rows = []
-
- let lnum = a:lnum - 1
- while lnum > 1
- let line = getline(lnum)
- if s:is_table(line)
- call add(upper_rows, [lnum, line])
- else
- break
- endif
- let lnum -= 1
- endwhile
- call reverse(upper_rows)
-
- let lnum = a:lnum
- while lnum <= line('$')
- let line = getline(lnum)
- if s:is_table(line)
- call add(lower_rows, [lnum, line])
- else
- break
- endif
- let lnum += 1
- endwhile
-
- return upper_rows + lower_rows
-endfunction "}}}
-
-function! s:get_cell_max_lens(lnum) "{{{
- let max_lens = {}
- for [lnum, row] in s:get_rows(a:lnum)
- if s:is_separator(row)
- continue
- endif
- let cells = s:get_values(row)
- for idx in range(len(cells))
- let value = cells[idx]
- if has_key(max_lens, idx)
- let max_lens[idx] = max([s:wide_len(value), max_lens[idx]])
- else
- let max_lens[idx] = s:wide_len(value)
- endif
- endfor
- endfor
- return max_lens
-endfunction "}}}
-
-function! s:get_aligned_rows(lnum, col1, col2) "{{{
- let max_lens = s:get_cell_max_lens(a:lnum)
- let rows = []
- for [lnum, row] in s:get_rows(a:lnum)
- if s:is_separator(row)
- let new_row = s:fmt_sep(max_lens, a:col1, a:col2)
- else
- let new_row = s:fmt_row(row, max_lens, a:col1, a:col2)
- endif
- call add(rows, [lnum, new_row])
- endfor
- return rows
-endfunction "}}}
-
-" Number of the current column. Starts from 0.
-function! s:cur_column() "{{{
- let line = getline('.')
- if !s:is_table(line)
- return -1
- endif
- if s:is_separator(line)
- let sep = '[+|]'
- else
- let sep = '|'
- endif
-
- let curs_pos = col('.')
- let mpos = match(line, '|', 0)
- let col = -1
- while mpos < curs_pos && mpos != -1
- let mpos = match(line, sep, mpos+1)
- if mpos != -1
- let col += 1
- endif
- endwhile
- return col
-endfunction "}}}
-
-" }}}
-
-" Format functions {{{
-function! s:fmt_cell(cell, max_len) "{{{
- let cell = ' '.a:cell.' '
-
- let diff = a:max_len - s:wide_len(a:cell)
- if diff == 0 && empty(a:cell)
- let diff = 1
- endif
-
- let cell .= repeat(' ', diff)
- return cell
-endfunction "}}}
-
-function! s:fmt_row(line, max_lens, col1, col2) "{{{
- let new_line = '|'
- let cells = s:get_values(a:line)
- for idx in range(len(cells))
- if idx == a:col1
- let idx = a:col2
- elseif idx == a:col2
- let idx = a:col1
- endif
- let value = cells[idx]
- let new_line .= s:fmt_cell(value, a:max_lens[idx]).'|'
- endfor
-
- let idx = len(cells)
- while idx < len(a:max_lens)
- let new_line .= s:fmt_cell('', a:max_lens[idx]).'|'
- let idx += 1
- endwhile
- return new_line
-endfunction "}}}
-
-function! s:fmt_cell_sep(max_len) "{{{
- if a:max_len == 0
- return repeat('-', 3)
- else
- return repeat('-', a:max_len+2)
- endif
-endfunction "}}}
-
-function! s:fmt_sep(max_lens, col1, col2) "{{{
- let sep = '|'
- for idx in range(len(a:max_lens))
- if idx == a:col1
- let idx = a:col2
- elseif idx == a:col2
- let idx = a:col1
- endif
- let sep .= s:fmt_cell_sep(a:max_lens[idx]).'+'
- endfor
- let sep = substitute(sep, '+$', '|', '')
- return sep
-endfunction "}}}
-"}}}
-
-" Keyboard functions "{{{
-function! s:kbd_create_new_row(cols, goto_first) "{{{
- let cmd = "\<ESC>o".s:create_empty_row(a:cols)
- let cmd .= "\<ESC>:call vimwiki_tbl#format(line('.'))\<CR>"
- if a:goto_first
- let cmd .= "\<ESC>0:call search('|', 'c', line('.'))\<CR>la"
- else
- let cmd .= "0".(col('.')-1)."lT|a"
- endif
- return cmd
-endfunction "}}}
-
-function! s:kbd_goto_next_row() "{{{
- let cmd = "\<ESC>jt|T|a"
- return cmd
-endfunction "}}}
-
-function! s:kbd_goto_prev_row() "{{{
- let cmd = "\<ESC>jt|T|a"
- return cmd
-endfunction "}}}
-
-function! s:kbd_goto_next_col(last) "{{{
- if a:last
- let seps = s:count_separators_down(line('.'))
- let cmd = "\<ESC>".seps."j0:call search('|', 'c', line('.'))\<CR>la"
- else
- let cmd = "\<ESC>:call search('|', 'c', line('.'))\<CR>la"
- endif
- return cmd
-endfunction "}}}
-
-function! s:kbd_goto_prev_col(first) "{{{
- if a:first
- let seps = s:count_separators_up(line('.'))
- let cmd = "\<ESC>".seps."k$:call search('|', 'b', line('.'))\<CR>la"
- else
- let cmd = "\<ESC>2F|la"
- endif
- return cmd
-endfunction "}}}
-
-"}}}
-
-" Global functions {{{
-function! vimwiki_tbl#kbd_cr() "{{{
- let lnum = line('.')
- if !s:is_table(getline(lnum))
- return "\<CR>"
- endif
-
- if s:is_separator(getline(lnum+1)) || !s:is_table(getline(lnum+1))
- let cols = len(s:get_values(getline(lnum)))
- return s:kbd_create_new_row(cols, 0)
- else
- return s:kbd_goto_next_row()
- endif
-endfunction "}}}
-
-function! vimwiki_tbl#kbd_tab() "{{{
- let lnum = line('.')
- if !s:is_table(getline(lnum))
- return "\<Tab>"
- endif
-
- let last = s:is_last_column(lnum, col('.'))
- if last && !s:is_table(getline(lnum+1))
- let cols = len(s:get_values(getline(lnum)))
- return s:kbd_create_new_row(cols, 1)
- endif
- return s:kbd_goto_next_col(last)
-endfunction "}}}
-
-function! vimwiki_tbl#kbd_shift_tab() "{{{
- let lnum = line('.')
- if !s:is_table(getline(lnum))
- return "\<S-Tab>"
- endif
-
- let first = s:is_first_column(lnum, col('.'))
- if first && !s:is_table(getline(lnum-1))
- return ""
- endif
- return s:kbd_goto_prev_col(first)
-endfunction "}}}
-
-function! vimwiki_tbl#format(lnum, ...) "{{{
- let line = getline(a:lnum)
- if !s:is_table(line)
- return
- endif
-
- if a:0 == 2
- let col1 = a:1
- let col2 = a:2
- else
- let col1 = 0
- let col2 = 0
- endif
-
- let indent = s:get_indent(a:lnum)
-
- for [lnum, row] in s:get_aligned_rows(a:lnum, col1, col2)
- let row = repeat(' ', indent).row
- call setline(lnum, row)
- endfor
-
- let &tw = s:textwidth
-endfunction "}}}
-
-function! vimwiki_tbl#create(...) "{{{
- if a:0 > 1
- let cols = a:1
- let rows = a:2
- elseif a:0 == 1
- let cols = a:1
- let rows = 2
- elseif a:0 == 0
- let cols = 5
- let rows = 2
- endif
-
- if cols < 1
- let cols = 5
- endif
-
- if rows < 1
- let rows = 2
- endif
-
- let lines = []
- let row = s:create_empty_row(cols)
-
- call add(lines, row)
- if rows > 1
- call add(lines, s:create_row_sep(cols))
- endif
-
- for r in range(rows - 1)
- call add(lines, row)
- endfor
-
- call append(line('.'), lines)
-endfunction "}}}
-
-function! vimwiki_tbl#align_or_cmd(cmd) "{{{
- if s:is_table(getline('.'))
- call vimwiki_tbl#format(line('.'))
- else
- exe 'normal! '.a:cmd
- endif
-endfunction "}}}
-
-function! vimwiki_tbl#reset_tw(lnum) "{{{
- let line = getline(a:lnum)
- if !s:is_table(line)
- return
- endif
-
- let s:textwidth = &tw
- let &tw = 0
-endfunction "}}}
-
-" TODO: move_column_left and move_column_right are good candidates to be
-" refactored.
-function! vimwiki_tbl#move_column_left() "{{{
- if !s:is_table(getline('.'))
- return
- endif
-
- let cur_col = s:cur_column()
- if cur_col == -1
- return
- endif
-
- if cur_col > 0
- call vimwiki_tbl#format(line('.'), cur_col-1, cur_col)
- call cursor(line('.'), 1)
- if !s:is_separator(getline('.'))
- call search('\%(|[^|]\+\)\{'.(cur_col-1).'}| .', 'eW')
- else
- call search('|\%([^+]\++\)\{'.(cur_col-1).'}--', 'eW')
- endif
- endif
-endfunction "}}}
-
-function! vimwiki_tbl#move_column_right() "{{{
- if !s:is_table(getline('.'))
- return
- endif
-
- let cur_col = s:cur_column()
- if cur_col == -1
- return
- endif
-
- if cur_col < s:col_count(line('.'))-1
- call vimwiki_tbl#format(line('.'), cur_col, cur_col+1)
- call cursor(line('.'), 1)
- if !s:is_separator(getline('.'))
- call search('\%(|[^|]\+\)\{'.(cur_col+1).'}| .', 'eW')
- else
- call search('|\%([^+]\++\)\{'.(cur_col+1).'}--', 'eW')
- endif
- endif
-endfunction "}}}
-
-function! vimwiki_tbl#get_rows(lnum) "{{{
- return s:get_rows(a:lnum)
-endfunction "}}}
-
-"}}}
diff --git a/doc/vimwiki.txt b/doc/vimwiki.txt
@@ -9,7 +9,7 @@
|___| |___| |_| |_||__| |__||___| |___| |_||___| ~
- Version: 1.1.1
+ Version: 1.2
==============================================================================
CONTENTS *vimwiki-contents*
@@ -33,6 +33,7 @@ CONTENTS *vimwiki-contents*
5.7. Preformatted text |vimwiki-syntax-preformatted|
5.8. Blockquotes |vimwiki-syntax-blockquotes|
5.9. Comments |vimwiki-syntax-comments|
+ 5.10. Horizontal line |vimwiki-syntax-hr|
6. Folding/Outline |vimwiki-folding|
7. Placeholders |vimwiki-placeholders|
8. Todo lists |vimwiki-todo-lists|
@@ -68,7 +69,7 @@ Feed it with the following example:
* ScratchPad -- various temporary stuff.
-Notice that ProjectGutenberg, MyUrgentTasks and ScratchPad highlighted as
+Notice that ProjectGutenberg, MyUrgentTasks and ScratchPad are highlighted as
errors. These are links in CamelCase form that do not exists yet. (CamelCase
form -- capitalized word connected with other capitalized words)
@@ -100,10 +101,10 @@ There are global and local mappings in vimwiki.
[count]<Leader>ww or <Plug>VimwikiIndex
Open index file of the [count]'s wiki.
- <Leader>ww opens first wiki from |g:vimwiki_list|.
- 1<Leader>ww as above opens first wiki from |g:vimwiki_list|.
- 2<Leader>ww opens second wiki from |g:vimwiki_list|.
- 3<Leader>ww opens third wiki from |g:vimwiki_list|.
+ <Leader>ww opens the first wiki from |g:vimwiki_list|.
+ 1<Leader>ww as above, opens the first wiki from |g:vimwiki_list|.
+ 2<Leader>ww opens the second wiki from |g:vimwiki_list|.
+ 3<Leader>ww opens the third wiki from |g:vimwiki_list|.
etc.
To remap: >
:map <Leader>w <Plug>VimwikiIndex
@@ -114,10 +115,10 @@ See also |:VimwikiIndex|
[count]<Leader>wt or <Plug>VimwikiTabIndex
Open index file of the [count]'s wiki in a new tab.
- <Leader>wt tabopens first wiki from |g:vimwiki_list|.
- 1<Leader>wt as above tabopens first wiki from |g:vimwiki_list|.
- 2<Leader>wt tabopens second wiki from |g:vimwiki_list|.
- 3<Leader>wt tabopens third wiki from |g:vimwiki_list|.
+ <Leader>wt tabopens the first wiki from |g:vimwiki_list|.
+ 1<Leader>wt as above tabopens the first wiki from |g:vimwiki_list|.
+ 2<Leader>wt tabopens the second wiki from |g:vimwiki_list|.
+ 3<Leader>wt tabopens the third wiki from |g:vimwiki_list|.
etc.
To remap: >
:map <Leader>t <Plug>VimwikiTabIndex
@@ -130,7 +131,22 @@ See also |:VimwikiTabIndex|
To remap: >
:map <Leader>wq <Plug>VimwikiUISelect
<
-See also|:VimwikiUISelect|
+See also |:VimwikiUISelect|
+
+
+[count]<Leader>wi or <Plug>VimwikiDiaryIndex
+ Open diary index file of the [count]'s wiki.
+
+ <Leader>wi opens diary index file of the first wiki from
+ |g:vimwiki_list|.
+ 1<Leader>wi the same as above.
+ 2<Leader>wi opens diary index file of the second wiki from
+ |g:vimwiki_list|.
+ etc.
+ To remap: >
+ :map <Leader>i <Plug>VimwikiDiaryIndex
+
+See also |:VimwikiDiaryIndex|
[count]<Leader>w<Leader>w or <Plug>VimwikiMakeDiaryNote
@@ -148,7 +164,7 @@ See also|:VimwikiUISelect|
To remap: >
:map <Leader>d <Plug>VimwikiMakeDiaryNote
<
-See also|:VimwikiMakeDiaryNote|
+See also |:VimwikiMakeDiaryNote|
[count]<Leader>w<Leader>t or <Plug>VimwikiTabMakeDiaryNote
@@ -166,57 +182,81 @@ See also|:VimwikiMakeDiaryNote|
To remap: >
:map <Leader>dt <Plug>VimwikiTabMakeDiaryNote
<
-See also|:VimwikiTabMakeDiaryNote|
+See also |:VimwikiTabMakeDiaryNote|
------------------------------------------------------------------------------
3.2. Local mappings
NORMAL MODE *vimwiki-local-mappings*
+ *vimwiki_<Leader>wh*
+<Leader>wh Convert current wiki page to HTML.
+ Maps to |:Vimwiki2HTML|
+ To remap: >
+ :map <Leader>wc <Plug>Vimwiki2HTML
+<
+ *vimwiki_<Leader>whh*
+<Leader>whh Convert current wiki page to HTML and open it in
+ webbrowser.
+ Maps to |:Vimwiki2HTML|
+ To remap: >
+ :map <Leader>wcc <Plug>Vimwiki2HTMLBrowse
+<
*vimwiki_<CR>*
-<CR> Follow/Create wiki link.
+<CR> Follow wiki link (create target wiki page if needed).
Maps to |:VimwikiFollowLink|.
To remap: >
:map <Leader>wf <Plug>VimwikiFollowLink
<
*vimwiki_<S-CR>*
-<S-CR> Split and follow/create wiki link.
+<S-CR> Split and follow (create target wiki page if needed).
+ May not work in some terminals. Remapping could help.
Maps to |:VimwikiSplitLink|.
To remap: >
:map <Leader>we <Plug>VimwikiSplitLink
<
*vimwiki_<C-CR>*
-<C-CR> Vertical split and follow/create wiki link.
+<C-CR> Vertical split and follow (create target wiki page if
+ needed).
+ May not work in some terminals. Remapping could help.
Maps to |:VimwikiVSplitLink|.
To remap: >
:map <Leader>wq <Plug>VimwikiVSplitLink
<
+ *vimwiki_<C-S-CR>* *vimwiki_<D-CR>*
+<C-S-CR>, <D-CR> Follow wiki link (create target wiki page if needed),
+ opening in a new tab.
+ May not work in some terminals. Remapping could help.
+ Maps to |:VimwikiTabnewLink|.
+ To remap: >
+ :map <Leader>wt <Plug>VimwikiTabnewLink
+<
*vimwiki_<Backspace>*
-<Backspace> Go back to previous wiki link
+<Backspace> Go back to previous wiki page.
Maps to |:VimwikiGoBackLink|.
To remap: >
:map <Leader>wb <Plug>VimwikiGoBackLink
<
*vimwiki_<Tab>*
-<Tab> Find next wiki link.
+<Tab> Find next link on the current page.
Maps to |:VimwikiNextLink|.
To remap: >
:map <Leader>wn <Plug>VimwikiNextLink
<
*vimwiki_<S-Tab>*
-<S-Tab> Find previous wiki link.
+<S-Tab> Find previous link on the current page.
Maps to |:VimwikiPrevLink|.
To remap: >
:map <Leader>wp <Plug>VimwikiPrevLink
<
*vimwiki_<Leader>wd*
-<Leader>wd Delete wiki link you are in.
+<Leader>wd Delete wiki page you are in.
Maps to |:VimwikiDeleteLink|.
To remap: >
:map <Leader>dd <Plug>VimwikiDeleteLink
<
*vimwiki_<Leader>wr*
-<Leader>wr Rename wiki link you are in.
+<Leader>wr Rename wiki page you are in.
Maps to |:VimwikiRenameLink|.
To remap: >
:map <Leader>rr <Plug>VimwikiRenameLink
@@ -238,35 +278,41 @@ NORMAL MODE *vimwiki-local-mappings*
*vimwiki_gqq* *vimwiki_gww*
-gqq Format table. If you did some changes to a table
+gqq Format table. If you made some changes to a table
or without swapping insert/normal modes this command
-gww reformat it.
+gww will reformat it.
*vimwiki_<A-Left>*
<A-Left> Move current table column to the left.
See |:VimwikiTableMoveColumnLeft|
-
+ To remap: >
+ :map <Leader>wtl <Plug>VimwikiTableMoveColumnLeft
+<
*vimwiki_<A-Right>*
<A-Right> Move current table column to the right.
See |:VimwikiTableMoveColumnRight|
-
+ To remap: >
+ :map <Leader>wtr <Plug>VimwikiTableMoveColumnRight
+<
*vimwiki_<C-Up>*
-<C-Up> Open previous day diary link if available.
+<C-Up> Open the previous day's diary link if available.
See |:VimwikiDiaryPrevDay|
*vimwiki_<C-Down>*
-<C-Down> Open next day diary link if available.
+<C-Down> Open the next day's diary link if available.
See |:VimwikiDiaryNextDay|
Works only if |g:vimwiki_use_mouse| is set to 1.
-<2-LeftMouse> Follow/Create wiki link.
+<2-LeftMouse> Follow wiki link (create target wiki page if needed).
-<S-2-LeftMouse> Split and follow/create wiki link.
+<S-2-LeftMouse> Split and follow wiki link (create target wiki page if
+ needed).
-<C-2-LeftMouse> Vertical split and follow/create wiki link.
+<C-2-LeftMouse> Vertical split and follow wiki link (create target
+ wiki page if needed).
-<RightMouse><LeftMouse> Go back to previous wiki link.
+<RightMouse><LeftMouse> Go back to previous wiki page.
Note: <2-LeftMouse> is just left double click.
@@ -274,12 +320,12 @@ Note: <2-LeftMouse> is just left double click.
INSERT MODE *vimwiki-table-mappings*
*vimwiki_i_<CR>*
-<CR> Goto table cell down to the current, create new row if
- on the last one.
+<CR> Go to the table cell beneath the current one, create
+ a new row if on the last one.
*vimwiki_i_<Tab>*
-<Tab> Goto next table cell, create new row if on the last
- cell.
+<Tab> Go to the next table cell, create a new row if on the
+ last cell.
*vimwiki_i_<S-CR>*
<S-CR> Insert <br /> and a newline.
@@ -288,16 +334,18 @@ INSERT MODE *vimwiki-table-mappings*
------------------------------------------------------------------------------
3.3. Text objects *vimwiki-text-objects*
-ah A Header with leading empty lines.
-ih Inner Header without leading empty lines.
+ah A section segment (the area between two consecutive
+ headings) including trailing empty lines.
+ih A section segment without trailing empty lines.
-You can 'vah' to select a header with its contents or 'dah' to delete it or
-'yah' to yank it or 'cah' to change it.
+You can 'vah' to select a section segment with its contents or 'dah' to delete
+it or 'yah' to yank it or 'cah' to change it.
a\ A cell in a table.
-i\ Inner cell in a table.
+i\ An inner cell in a table.
ac A column in a table.
-ic Inner column in a table.
+ic An inner column in a table.
+
==============================================================================
4. Commands *vimwiki-commands*
@@ -314,37 +362,39 @@ ic Inner column in a table.
*:VimwikiUISelect*
Open index file of the selected wiki.
+*:VimwikiDiaryIndex*
+ Open diary index file of the current wiki.
+
*:VimwikiMakeDiaryNote*
Open diary wiki-file for today of the current wiki.
*:VimwikiTabMakeDiaryNote*
Open diary wiki-file for today of the current wiki in a new tab.
+
------------------------------------------------------------------------------
4.2. Local commands *vimwiki-local-commands*
*:VimwikiFollowLink*
- Follow/create wiki link..
-
+ Follow wiki link (create target wiki page if needed).
*:VimwikiGoBackLink*
- Go back to previous wiki link. you come from.
-
+ Go back to the wiki page you came from.
*:VimwikiSplitLink*
- Split and follow/create wiki link..
-
+ Split and follow wiki link (create target wiki page if needed).
*:VimwikiVSplitLink*
- Vertical split and follow/create wiki link..
+ Vertical split and follow wiki link (create target wiki page if needed).
+*:VimwikiTabnewLink*
+ Follow wiki link in a new tab (create target wiki page if needed).
*:VimwikiNextLink*
- Find next wiki link..
-
+ Find next link on the current page.
*:VimwikiPrevLink*
- Find previous wiki link..
+ Find previous link on the current page.
*:VimwikiGoto*
Goto link provided by an argument. For example: >
@@ -352,41 +402,41 @@ ic Inner column in a table.
< opens opens/creates HelloWorld wiki page.
*:VimwikiDeleteLink*
- Delete wiki link. you are in.
-
+ Delete the wiki page that you are in.
*:VimwikiRenameLink*
- Rename wiki link. you are in.
-
+ Rename the wiki page that you are in.
*:Vimwiki2HTML*
- Convert current WikiPage to HTML.
+ Convert current wiki page to HTML.
+*:Vimwiki2HTMLBrowse*
+ Convert current wiki page to HTML and open in in webbrowser.
*:VimwikiAll2HTML*
- Convert all WikiPages to HTML.
-
+ Convert all wiki pages to HTML.
*:VimwikiToggleListItem*
Toggle list item on/off (checked/unchecked)
See |vimwiki-todo-lists|.
-
*:VimwikiSearch* /pattern/
*:VWS* /pattern/
Search for /pattern/ in all files of current wiki.
- To display next match use |:cnext| command.
- To display previous match use |:cprevious| command.
+ To display all matches use |:lopen| command.
+ To display next match use |:lnext| command.
+ To display previous match use |:lprevious| command.
*:VimwikiTable*
Create a table with 5 cols and 2 rows.
:VimwikiTable cols rows
- Create a table with a given cols and rows
+ Create a table with the given cols and rows
:VimwikiTable cols
- Create a table with a given cols and 2 rows
+ Create a table with the given cols and 2 rows
+
*:VimwikiTableMoveColumnLeft* , *:VimwikiTableMoveColumnRight*
Move current column to the left or to the right:
@@ -442,7 +492,7 @@ See |vimwiki-option-syntax|.
------------------------------------------------------------------------------
5.1. Typefaces *vimwiki-syntax-typefaces*
-There are a few typefaces that gives you a bit of control on how your
+There are a few typefaces that gives you a bit of control over how your
text should be decorated: >
*bold text*
_italic text_
@@ -451,6 +501,7 @@ text should be decorated: >
super^script^
sub,,script,,
+
------------------------------------------------------------------------------
5.2. Links *vimwiki-syntax-links*
@@ -458,8 +509,8 @@ Internal links~
WikiWords: >
CapitalizedWordsConnected
-You can limit linking of WikiWords by adding an exclamation mark in front of
-it: >
+You can prevent linking of WikiWords by adding an exclamation mark in front of
+them: >
!CapitalizedWordsConnected
Or disable it completely with |g:vimwiki_camel_case|.
@@ -471,53 +522,54 @@ or: >
or: >
[[This is a link source][Description of the link]]
-
External links~
Plain link: >
http://code.google.com/p/vimwiki
+ mailto:habamax@gmail.com
+ ftp://vim.org
Link with description: >
[http://habamax.ru/blog habamax home page]
-
+ [mailto:habamax@gmail.com Drop a line to Maxim Kim]
Images and image links~
-Image link is the link with one of jpg, png or gif endings.
+An image link is a link to a file with a jpg, png or gif extension.
Plain image link: >
http://someaddr.com/picture.jpg
-in html: >
+in HTML: >
<img src="http://someaddr.com/picture.jpg" />
Link to a local image: >
[[images/pabloymoira.jpg]]
-in html: >
+in HTML: >
<img src="images/pabloymoira.jpg" />
Path to image (ie. images/pabloymoira.jpg) is relative to
|vimwiki-option-path_html|.
Double bracketed link to an image: >
[[http://habamax.ru/blog/wp-content/uploads/2009/01/2740254sm.jpg]]
-in html: >
+in HTML: >
<img src="http://habamax.ru/ ... /.jpg" />
Double bracketed link to an image with description text: >
[[http://habamax.ru/blog/wp-content/uploads/2009/01/2740254sm.jpg|dance]]
-in html: >
+in HTML: >
<a href="http://habamax.ru/ ... /.jpg">dance</a>
Double bracketed link to an image with alternate text: >
[[http://habamax.ru/blog/wp-content/uploads/2009/01/2740254sm.jpg|dance|]]
-in html: >
+in HTML: >
<img src="http://habamax.ru/ ... /.jpg" alt="dance"/>
Double bracketed link to an image with alternate text and some style: >
[[http://helloworld.com/blabla.jpg|cool stuff|width:150px; height: 120px;]]
-in html: >
+in HTML: >
<img src="http://helloworld.com/ ... /.jpg" alt="cool stuff"
style="width:150px; height:120px"/>
Double bracketed link to an image without alternate text and some style: >
[[http://helloworld.com/blabla.jpg||width:150px; height: 120px;]]
-in html: >
+in HTML: >
<img src="http://helloworld.com/ ... /.jpg" alt=""
style="width:150px; height:120px"/>
@@ -525,7 +577,7 @@ Thumbnail link: >
[http://someaddr.com/bigpicture.jpg http://someaddr.com/thumbnail.jpg]
or >
[[http://someaddr.com/bigpicture.jpg|http://someaddr.com/thumbnail.jpg]]
-in html: >
+in HTML: >
<a href="http://someaddr.com/ ... /.jpg">
<img src="http://../thumbnail.jpg /></a>
@@ -547,23 +599,20 @@ You can set up different colors for each header level: >
Set up colors for all 6 header levels or none at all.
=== Header level 3 ===~
-Check |g:vimwiki_hl_headers|.
-
==== Header level 4 ====~
===== Header level 5 =====~
====== Header level 6 ======~
-You can center your headers in html by placing spaces before the first '=':
+You can center your headers in HTML by placing spaces before the first '=':
= Centered Header L1 =~
-
------------------------------------------------------------------------------
5.4. Paragraphs *vimwiki-syntax-paragraphs*
-Paragraph is group of lines started from column 1 (no indentation). Paragraphs
-divided by a blank line:
+A paragraph is a group of lines starting in column 1 (no indentation).
+Paragraphs are separated by a blank line:
This is first paragraph
with two lines.
@@ -571,6 +620,7 @@ with two lines.
This is a second paragraph with
two lines.
+
------------------------------------------------------------------------------
5.5. Lists *vimwiki-syntax-lists*
@@ -623,7 +673,7 @@ It is possible to mix bulleted and numbered lists: >
# Numbered list sub item 1
# Numbered list sub item 2
-Note that space after *, - or # is essential.
+Note that a space after *, - or # is essential.
Multiline list items: >
* Bulleted list item 1
@@ -639,8 +689,8 @@ Multiline list items: >
Definition lists: >
Term 1:: Definition 1
Term 2::
-::Definition 2
-::Definition 3
+:: Definition 2
+:: Definition 3
------------------------------------------------------------------------------
@@ -660,13 +710,23 @@ For example: >
| 1940 | -2 | 40 |
>
-In html the following part >
+In HTML the following part >
| Year | Temperature (low) | Temperature (high) |
|------+-------------------+--------------------|
>
is higlighted as a table header.
-If you indent table then it would be centered in html.
+If you indent a table then it will be centered in HTML.
+
+If you set > in a cell, the cell spans the left column.
+If you set \/ in a cell, the cell spans the above row.
+For example: >
+
+ | a | b | c | d |
+ | \/ | e | > | f |
+ | \/ | \/ | > | g |
+ | h | > | > | > |
+>
See |vimwiki-tables| for more details on how to manage tables.
@@ -677,7 +737,7 @@ Note: You can not use [[link|description]] type of links in tables. Use
------------------------------------------------------------------------------
5.7. Preformatted text *vimwiki-syntax-preformatted*
-Use {{{ and }}} to define block of preformatted text:
+Use {{{ and }}} to define a block of preformatted text:
{{{ >
Tyger! Tyger! burning bright
In the forests of the night,
@@ -704,29 +764,40 @@ Result of HTML export: >
print("Hello {0} number {1}".format(world, x))
</pre>
-This might be useful for coloring some programming code with external js tools
-like google syntax highlighter.
+This might be useful for coloring program code with external js tools
+such as google's syntax highlighter.
You can setup vimwiki to highlight code snippets in preformatted text.
See |vimwiki-option-nested_syntaxes|
+
------------------------------------------------------------------------------
5.8. Blockquotes *vimwiki-syntax-blockquotes*
Text started with 4 or more spaces is a blockquote.
This would be a blockquote in vimwiki. It is not highlighted in vim but
- could be styled by css in html. Blockquotes are usually used to quote a
+ could be styled by CSS in HTML. Blockquotes are usually used to quote a
long piece of text from another source.
+
------------------------------------------------------------------------------
5.9. Comments *vimwiki-syntax-comments*
-Text between <!-- and --> is a comment.
-Ex: >
- <!-- this text would not be in HTML -->
+Text line started with %% is a comment.
+E.g.: >
+ %% this text would not be in HTML
+<
+
+
+------------------------------------------------------------------------------
+5.10. Horizontal line *vimwiki-syntax-hr*
+
+4 or more dashes at the start of the line is a 'horizontal line' (<hr />): >
+ ----
<
+
==============================================================================
6. Folding/Outline *vimwiki-folding*
@@ -761,25 +832,26 @@ Hit |zr| one more time:
* [ ] Do stuff 2~
* [ ] Do stuff 3~
-NOTE: Whether you use default syntax, folding on list items should work
+NOTE:If you use default vimwiki syntax, folding on list items will work
properly only if all of them are indented using current |shiftwidth|.
-For MediaWiki * or # should be in the first column.
+For MediaWiki, * or # should be in the first column.
To turn folding on/off check |g:vimwiki_folding|.
+
==============================================================================
7. Placeholders *vimwiki-placeholders*
------------------------------------------------------------------------------
%toc Table of Contents *vimwiki-toc* *vimwiki-table-of-contents*
-You can add 'table of contents' to your html page generated from wiki one.
+You can add 'table of contents' to your HTML page generated from wiki one.
Just place >
%toc
into your wiki page.
-You can also add caption to your 'toc': >
+You can also add a caption to your 'toc': >
%toc Table of Contents
@@ -791,9 +863,8 @@ or >
------------------------------------------------------------------------------
%title Title of the page *vimwiki-title*
-When you htmlize your wiki page you have default title which is the filename
-of the page.
-Place >
+When you htmlize your wiki page, the default title is the filename of the
+page. Place >
%title My books
@@ -803,13 +874,25 @@ into your wiki page if you want another title.
------------------------------------------------------------------------------
%nohtml *vimwiki-nohtml*
-If you do not want a wiki page to be converted to html, place:
+If you do not want a wiki page to be converted to HTML, place:
%nohtml
into it.
+------------------------------------------------------------------------------
+%template *vimwiki-template*
+
+To apply a concrete HTML template to a wiki page, place:
+
+%template name
+
+into it.
+
+See |vimwiki-option-template_path| for details.
+
+
==============================================================================
8. Todo lists *vimwiki-todo-lists*
@@ -826,33 +909,33 @@ Consider the following example:
* [X] Add highlighting to list item boxes
* [X] Add [ ] to the next created with o, O and <CR> list item.
-
-Pressing <C-Space> on the first list item will toggle it and all of it's child
+Pressing <C-Space> on the first list item will toggle it and all of its child
items:
= Toggleable list of todo items =
* [ ] Toggle list item on/off.
* [ ] Simple toggling between [ ] and [X].
- * [ ] All list's subitems should be toggled on/off appropriately.
- * [ ] Toggle child subitems only if current line is list item
- * [ ] Parent list item should be toggled depending on it's child items.
- * [X] Make numbered list items toggleable too
- * [X] Add highlighting to list item boxes
- * [X] Add [ ] to the next created with o, O and <CR> list item.
-
-Pressing <C-Space> on the third list item will toggle it and all of it's
+ * [ ] All of a list's subitems should be toggled on/off appropriately.
+ * [ ] Toggle child subitems only if the current line is a list item.
+ * [ ] Parent list item should be toggled depending on their child items.
+ * [X] Make numbered list items toggleable too.
+ * [X] Add highlighting to list item boxes.
+ * [X] Add [ ] to the next list item created using o, O or <CR>.
+
+Pressing <C-Space> on the third list item will toggle it and adjust all of its
parent items:
= Toggleable list of todo items =
* [.] Toggle list item on/off.
* [ ] Simple toggling between [ ] and [X].
- * [X] All list's subitems should be toggled on/off appropriately.
- * [ ] Toggle child subitems only if current line is list item
+ * [X] All of a list's subitems should be toggled on/off appropriately.
+ * [ ] Toggle child subitems only if current line is list item.
* [ ] Parent list item should be toggled depending on it's child items.
- * [ ] Make numbered list items toggleable too
- * [ ] Add highlighting to list item boxes
- * [ ] Add [ ] to the next created with o, O and <CR> list item.
+ * [ ] Make numbered list items toggleable too.
+ * [ ] Add highlighting to list item boxes.
+ * [ ] Add [ ] to the next list item created using o, O or <CR>.
-Parent items could be toggled by its child items. Symbol inside [ ] depends on
-percentage of toggled child items(see also |g:vimwiki_listsyms|): >
+Parent items could be changed when their child items change. The symbol
+between [ ] depends on the percentage of toggled child items (see also
+|g:vimwiki_listsyms|): >
[ ] -- 0%
[.] -- 1-33%
[o] -- 34-66%
@@ -865,7 +948,8 @@ It is possible to toggle several list items using visual mode.
==============================================================================
9. Tables *vimwiki-tables*
-Use :VimwikiTable command to create default table with 5 columns and 2 rows: >
+Use the :VimwikiTable command to create a default table with 5 columns and 2
+rows: >
| | | | | |
|---+---+---+---+---|
@@ -879,14 +963,14 @@ Tables are auto-formattable. Let's add some text into first cell: >
| | | | | |
<
-Whenever you press <TAB>, <CR> or leave Insert mode table is formatted: >
+Whenever you press <TAB>, <CR> or leave Insert mode, the table is formatted: >
| First Name | | | | |
|------------+---+---+---+---|
| | | | | |
<
-You can easily create nice looking text tables, just press <TAB> and enter new
+You can easily create nice-looking text tables, just press <TAB> and enter new
values: >
| First Name | Last Name | Age | City | e-mail |
@@ -898,11 +982,10 @@ values: >
To indent table indent the first row. Then format it with 'gqq'.
-
==============================================================================
10. Diary *vimwiki-diary*
-Diary helps you make daily notes. You can really easy add information into
+The diary helps you make daily notes. You can easily add information into
vimwiki that should be sorted out later. Just hit <Leader>w<Leader>w to create
new daily note with name based on current date. The link to this newly created
file is added to a diary wiki file.
@@ -937,30 +1020,29 @@ By default there are 4 links on the line. All links are sorted by their dates.
Calendar integration *vimwiki-calendar*
------------------------------------------------------------------------------
If you have Calendar.vim installed you can use it to create diary notes.
-Just open calendar with :Calendar and tap <Enter> on the date. Wiki file would
-be created in default wiki's diary.
+Just open calendar with :Calendar and tap <Enter> on the date. A wiki file
+will be created in the default wiki's diary.
Get it from http://www.vim.org/scripts/script.php?script_id=52
See |g:vimwiki_use_calendar| option to turn it off/on.
-
==============================================================================
11. Options *vimwiki-options*
-There are global and per wiki(local) options available to tune vimwiki.
-All global options are set using the following template: >
+There are global and per-wiki (local) options available to tune vimwiki.
+All global options are set using the following pattern: >
let g:option_name=option_value
-All per wiki options are |Dictionary|'s pairs in a list of wikies
-(dictionaries). See |g:vimwiki_list| option for more details.
+All per-wiki options are dictionaries (see |Dictionary|) in a list of wikies.
+See |g:vimwiki_list| option for more details.
------------------------------------------------------------------------------
*g:vimwiki_list* *vimwiki-multiple-wikies*
Each item in g:vimwiki_list is a |Dictionary| that holds all customization
-available for a wiki represented by that item. It is in form of >
+available for a wiki represented by that item. It is in the form: >
{'option1': 'value1', 'option2: 'value2', ...}
Consider the following example: >
@@ -972,20 +1054,20 @@ It gives us one wiki located at ~/my_site/ that could be htmlized to
The next example: >
let g:vimwiki_list = [{'path': '~/my_site/', 'path_html': '~/public_html/'},
\ {'path': '~/my_docs/', 'ext': '.mdox'}]
-gives us 2 wikies, first wiki as in previous example, second one is located in
-~/my_docs/ and its files have .mdox extension.
+gives us 2 wikies, the first wiki as in the previous example, and the second
+one located in ~/my_docs/, with files that have the .mdox extension.
-Empty |Dictionary| in the g:vimwiki_list is the wiki with default options: >
+An empty |Dictionary| in g:vimwiki_list is the wiki with default options: >
let g:vimwiki_list = [{},
\ {'path': '~/my_docs/', 'ext': '.mdox'}]
<
-You can also create wikis as a separate |Dictionary|s. >
+You can also create wikis as separate |Dictionary|s. >
let wiki_1 = {}
let wiki_1.path = '~/my_docs/'
- let wiki_1.html_header = '~/public_html/header.tpl'
+ let wiki_1.html_template = '~/public_html/template.tpl'
let wiki_1.nested_syntaxes = {'python': 'python', 'c++': 'cpp'}
let wiki_2 = {}
@@ -999,7 +1081,6 @@ You can also create wikis as a separate |Dictionary|s. >
PER WIKI OPTIONS *viwmiki-local-options*
-
*vimwiki-option-path*
------------------------------------------------------------------------------
Key Default value~
@@ -1016,14 +1097,15 @@ Key Default value~
path_html ~/vimwiki_html/
Description~
-HTML files converted from wiki files location: >
+Location of HTML files converted from wiki files: >
let g:vimwiki_list = [{'path': '~/my_site/',
\ 'path_html': '~/my_site_html/'}]
-If you omit this option path_html would be path - '/' + '_html/': >
+If you omit this option, the value of path_html would be set to the value of
+path with the trailing slash ('/') removed and '_html' added; i.e. for: >
let g:vimwiki_list = [{'path': '~/okidoki/'}]
-ie, path_html = '~/okidoki_html/'
+path_html will be set to '~/okidoki_html/'.
*vimwiki-option-auto_export*
------------------------------------------------------------------------------
@@ -1031,11 +1113,11 @@ Key Default value Values~
auto_export 0 0, 1
Description~
-Set this option to 1 to automatically generate HTML file when corresponding
-wiki page is saved: >
+Set this option to 1 to automatically generate the HTML file when the
+corresponding wiki page is saved: >
let g:vimwiki_list = [{'path': '~/my_site/', 'auto_export': 1}]
-This will keep you HTML files up to date.
+This will keep your HTML files up to date.
*vimwiki-option-index*
------------------------------------------------------------------------------
@@ -1046,7 +1128,7 @@ Description~
Name of wiki index file: >
let g:vimwiki_list = [{'path': '~/my_site/', 'index': 'main'}]
-NOTE: Do not add extension.
+NOTE: Do not include the extension.
*vimwiki-option-ext*
@@ -1068,23 +1150,32 @@ syntax default default, media
Description~
Wiki syntax.
You can use different markup languages (currently default vimwiki and
-MediaWiki) but only vimwiki's default markup could be converted to HTML at the
+MediaWiki), but only vimwiki's default markup will be converted to HTML at the
moment.
To use MediaWiki's wiki markup: >
let g:vimwiki_list = [{'path': '~/my_site/', 'syntax': 'media'}]
<
-*vimwiki-option-html_header*
+*vimwiki-option-template_path*
------------------------------------------------------------------------------
-Key Default value~
-html_header
+Key Default value~
+template_path ~/vimwiki/templates/
Description~
-Set up file name for html header template: >
+Setup path for HTML templates: >
let g:vimwiki_list = [{'path': '~/my_site/',
- \ 'html_header': '~/public_html/header.tpl'}]
+ \ 'template_path': '~/public_html/templates/',
+ \ 'template_default': 'def_template',
+ \ 'template_ext': '.html'}]
+
+There could be a bunch of templates: >
+ def_template.html
+ index.html
+ bio.html
+ person.html
+etc.
-This header.tpl could look like: >
+Each template could look like: >
<html>
<head>
<link rel="Stylesheet" type="text/css" href="%root_path%style.css" />
@@ -1092,7 +1183,11 @@ This header.tpl could look like: >
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
</head>
<body>
- <div class="contents">
+ <div class="content">
+ %content%
+ </div>
+ </body>
+ </html>
where
%title% is replaced by a wiki page name or by a |vimwiki-title|
@@ -1100,22 +1195,37 @@ where
if you have wikilink [[dir1/dir2/dir3/my page in a subdir]] then
%root_path% is replaced by '../../../'.
+ %content% is replaced by a wiki file content.
+
-*vimwiki-option-html_footer*
+The default template will be applied to all wiki pages unless a page specifies
+a template. Consider you have wiki page named 'Maxim.wiki' and you want apply
+'person.html' template to it. Just add: >
+ %template person
+to that page.
+
+
+*vimwiki-option-template_default*
------------------------------------------------------------------------------
-Key Default value~
-html_footer
+Key Default value~
+template_default default
Description~
-Set up file name for html footer template: >
- let g:vimwiki_list = [{'path': '~/my_site/',
- \ 'html_footer': '~/public_html/footer.tpl'}]
+Setup default template name (without extension).
+
+See |vimwiki-option-template_path| for details.
+
+
+*vimwiki-option-template_ext*
+------------------------------------------------------------------------------
+Key Default value~
+template_ext .html
+
+Description~
+Setup template filename extension.
+
+See |vimwiki-option-template_path| for details.
-This footer.tpl could look like: >
- </div>
- </body>
- </html>
-<
*vimwiki-option-css_name*
------------------------------------------------------------------------------
@@ -1123,7 +1233,7 @@ Key Default value~
css_name style.css
Description~
-Set up css file name: >
+Setup CSS file name: >
let g:vimwiki_list = [{'path': '~/my_pages/',
\ 'css_name': 'main.css'}]
<
@@ -1139,8 +1249,8 @@ Key Default value Values~
maxhi 1 0, 1
Description~
-Non-existent wiki links highlighting could be quite slow and if you don't want
-it set maxhi to 0: >
+Non-existent wiki links highlighting can be quite slow. If you don't want it,
+set maxhi to 0: >
let g:vimwiki_list = [{'path': '~/my_site/', 'maxhi': 0}]
This disables filesystem checks for wiki links.
@@ -1152,7 +1262,7 @@ Key Default value Values~
nested_syntaxes {} pairs of highlight keyword and vim filetype
Description~
-You can make preformatted text to be highlighted with a different syntaxes
+You can configure preformatted text to be highlighted with any syntax
available for vim.
For example the following setup in your vimrc: >
let wiki = {}
@@ -1160,7 +1270,7 @@ For example the following setup in your vimrc: >
let wiki.nested_syntaxes = {'python': 'python', 'c++': 'cpp'}
let g:vimwiki_list = [wiki]
-would give you python and c++ highlighting in: >
+would give you Python and C++ highlighting in: >
{{{class="brush: python"
for i in range(1, 5):
print(i)
@@ -1189,7 +1299,6 @@ or in: >
}}}
-
*vimwiki-option-diary_rel_path*
------------------------------------------------------------------------------
Key Default value~
@@ -1239,25 +1348,24 @@ Use: >
let g:option_name=option_value
to set them.
-------------------------------------------------------------------------------
+-----------------------------------------------------------------------------
*g:vimwiki_hl_headers*
Highlight headers with =Reddish=, ==Greenish==, ===Blueish=== colors.
Value Description~
-1 Use predefined colors to highlight different header levels.
-0 Use |hl-Title| or VimwikiHeader1-VimwikiHeader6 (if defined
- in a colorscheme)
-
-Default: 1
+1 Use VimwikiHeader1-VimwikiHeader6 group colors to highlight
+ different header levels.
+0 Use |hl-Title| color for headers.
+Default: 0
------------------------------------------------------------------------------
*g:vimwiki_hl_cb_checked*
-Checked list items could be highlighted with a color:
+Checked list items can be highlighted with a color:
- * [X] the whole line could be highlighted with the option set to 1.
+ * [X] the whole line can be highlighted with the option set to 1.
* [ ] I wish vim could use strikethru.
Value Description~
@@ -1270,12 +1378,20 @@ Default: 0
------------------------------------------------------------------------------
*g:vimwiki_global_ext* *vimwiki-temporary-wiki*
-If a file with a registered wiki extension is opened in a dir that is not
-listed in |g:vimwiki_list| then:
+If a file with a registered wiki extension is opened in a directory that is
+not listed in |g:vimwiki_list| then:
Value Description~
1 make a temporary wiki in that dir.
-0 don't make temporary wiki it that dir.
+0 don't make temporary wiki in that dir.
+
+A temporary wiki is created to scan the filesystem for available links to
+highlight.
+
+Consider your wiki extension is .txt then you can >
+ let g:vimwiki_global_ext = 0
+to make it local to vimwiki paths listed in g:vimwiki_list. So other text
+files wouldn't be treated as wiki pages.
Default: 1
@@ -1293,7 +1409,7 @@ You can set up your own: >
------------------------------------------------------------------------------
*g:vimwiki_auto_checkbox*
-if on, creates checkbox while toggling list item.
+If on, creates checkbox while toggling list item.
Value Description~
0 Do not create checkbox.
@@ -1301,11 +1417,11 @@ Value Description~
Default: 1
-Ex:
+E.g.:
Press <C-Space> (|:VimwikiToggleListItem|) on a list item without checkbox to
create it: >
* List item
-result: >
+Result: >
* [ ] List item
@@ -1322,21 +1438,23 @@ etc.
Default: 'Vimwiki'
+
------------------------------------------------------------------------------
*g:vimwiki_stripsym*
-Change strip symbol -- in Windows you cannot use /*?<>:" in file names so
-vimwiki replaces them with neutral symbol (_ is default): >
+Change strip symbol -- in Windows you cannot use /*?<>:" in filenames, so
+vimwiki replaces them with a neutral symbol (_ is default): >
let g:vimwiki_stripsym = '_'
You can change it to a <space> for example: >
let g:vimwiki_stripsym = ' '
+
------------------------------------------------------------------------------
*g:vimwiki_badsyms*
-Consider you do not like spaces in filenames (as some vimwiki users do).
-In that case you can set up bad symbols that would be converted to
+If you do not like spaces in filenames (as some vimwiki users do), you can set
+up bad symbols to include spaces, so that they are also converted:
|g:vimwiki_stripsym|: >
let g:vimwiki_badsyms = ' '
@@ -1345,6 +1463,7 @@ Now files for all [[links with spaces]] would be created like
This option is a complement one to |g:vimwiki_stripsym|.
+
------------------------------------------------------------------------------
*g:vimwiki_listsyms*
@@ -1354,6 +1473,7 @@ Default value is ' .oOX'.
g:vimwiki_listsyms[0] is for 0% done items.
g:vimwiki_listsyms[4] is for 100% done items.
+
------------------------------------------------------------------------------
*g:vimwiki_use_mouse*
@@ -1365,11 +1485,12 @@ Value Description~
Default: 0
+
------------------------------------------------------------------------------
*g:vimwiki_folding*
-Enable/disable vimwiki's folding/outline. Folding in vimwiki is using 'expr'
-foldmethod which is very flexible but really slow.
+Enable/disable vimwiki's folding/outline functionality. Folding in vimwiki
+uses the 'expr' foldmethod which is very flexible but really slow.
Value Description~
0 Disable folding.
@@ -1377,6 +1498,7 @@ Value Description~
Default: 0
+
------------------------------------------------------------------------------
*g:vimwiki_fold_lists*
@@ -1388,21 +1510,23 @@ Value Description~
Default: 0
+
------------------------------------------------------------------------------
*g:vimwiki_fold_trailing_empty_lines*
Fold or do not fold empty lines between folded headers.
Value Description~
-0 Fold only one empty line. The rest empty lines are unfolded.
+0 Fold only one empty line. Leave the rest of the empty lines.
1 Fold in all empty lines.
Default: 0
+
------------------------------------------------------------------------------
*g:vimwiki_camel_case*
-If you do not want WikiWord to be a link this setting is just for you.
+If you do not want WikiWord to be a link, this setting is just for you.
Value Description~
0 Do not make links from CamelCased words.
@@ -1410,18 +1534,20 @@ Value Description~
Default: 1
+
------------------------------------------------------------------------------
*g:vimwiki_list_ignore_newline*
This is HTML related.
-Convert newlines to <BR />s in multiline list items.
+Convert newlines to <br />s in multiline list items.
Value Description~
-0 Newlines in a list item are converted to <BR />s.
+0 Newlines in a list item are converted to <br />s.
1 Ignore newlines.
Default: 1
+
------------------------------------------------------------------------------
*g:vimwiki_use_calendar*
@@ -1444,9 +1570,9 @@ You can open external weblinks in a webbrowser. Webbrowsers are listed in
For win32 it is: chrome, opera, firefox and explorer.
For other OSes it is: opera, firefox and konqueror.
-The first available browser from the list is used to open weblink.
-If you have opera and firefox and want weblinks to be opened in the latter
-just: >
+The first available browser from the list is used to open the weblink.
+If you have opera and firefox and want weblinks to be opened in the latter,
+just specify: >
let g:vimwiki_browsers=['C:\Program Files\Firefox\firefox.exe']
or redefine VimwikiWeblinkHandler function: >
@@ -1488,8 +1614,8 @@ Default: ''
------------------------------------------------------------------------------
*g:vimwiki_CJK_length*
-Use special method to calculate correct length of the strings with double wide
-characters. (To align table cells properly)
+Use special method to calculate correct length of the strings with double-wide
+characters (to align table cells properly).
Value Description~
0 Do not use it.
@@ -1497,8 +1623,8 @@ Value Description~
Default: 0
-Note: Vim73 has new function |strdisplaywidth|, so for Vim73 users this option
-is obsolete.
+Note: Vim73 has a new function |strdisplaywidth|, so for Vim73 users this
+option is obsolete.
------------------------------------------------------------------------------
@@ -1519,9 +1645,9 @@ Default: '' (empty string)
------------------------------------------------------------------------------
*g:vimwiki_html_header_numbering*
-Set this option if you want headers to be auto numbered in html.
+Set this option if you want headers to be auto-numbered in HTML.
-ex: >
+E.g.: >
1 Header1
1.1 Header2
1.2 Header2
@@ -1560,8 +1686,8 @@ Default: 0
Ending symbol for |g:vimwiki_html_header_numbering|.
Value Description~
-'.' Dot would be added to the end of header's number.
-')' Closing bracket would be added to the end of header's number.
+'.' Dot will be added after a header's number.
+')' Closing bracket will be added after a header's number.
etc.
With
@@ -1583,11 +1709,11 @@ Default: '' (empty)
------------------------------------------------------------------------------
*g:vimwiki_file_exts*
-Comma separated list of file extensions.
+Comma-separated list of file extensions.
Consider you have the following link: [[my_script.php][my script]].
-If there is 'php' extension in g:vimwiki_file_exts this link would be htmlized
-to <a href="my_script.php">my script</a>.
+If there is a 'php' extension in g:vimwiki_file_exts, this link would be
+htmlized to <a href="my_script.php">my script</a>.
Otherwise it would be <a href="my_script.php.html">my script</a> (note .html)
@@ -1597,12 +1723,27 @@ Default: 'pdf,txt,doc,rtf,xls,php,zip,rar,7z,html,gz'
------------------------------------------------------------------------------
*g:vimwiki_valid_html_tags*
-Comma separated list of html tags that can be used in vimwiki.
+Comma-separated list of HTML tags that can be used in vimwiki.
Default: 'b,i,s,u,sub,sup,kbd,br,hr'
------------------------------------------------------------------------------
+*g:vimwiki_user_htmls*
+
+Comma-separated list of HTML files that have no corresponding wiki files and
+should not be deleted after |:VimwikiAll2HTML|.
+
+Default: ''
+
+Example:
+Consider you have 404.html and search.html in your vimwiki 'path_html'.
+With: >
+ let g:vimwiki_user_htmls = '404.html,search.html'
+they would not be deleted after |:VimwikiAll2HTML|.
+
+
+------------------------------------------------------------------------------
*g:vimwiki_conceallevel*
In vim73 |conceallevel| is local to window, thus if you open viwmiki buffer in
@@ -1614,42 +1755,93 @@ is entered.
Default: 3
-
-
==============================================================================
12. Help *vimwiki-help*
Your help in making vimwiki better is really appreciated!
-Any help. Would it be spell correction or code snippet to patch -- everything
-is welcomed.
+Any help, whether it is a spelling correction or a code snippet to patch --
+everything is welcomed.
-Issues could be filled in at http://code.google.com/p/vimwiki/issues .
+Issues can be filed at http://code.google.com/p/vimwiki/issues .
==============================================================================
13. Developers *vimwiki-developers*
- - Maxim Kim <habamax@gmail.com>
- Original author.
- - Mikhail Trishchenkov <kriomant(at)gmail.com>
- Joined in at Dec 2009.
-
-Vimwiki's website: http://code.google.com/p/vimwiki/
-Vim plugins website: http://www.vim.org/scripts/script.php?script_id=2226
-
-... afterword
+ - Maxim Kim <habamax@gmail.com> as original author.
+ - See the http://code.google.com/p/vimwiki/people/list for the others.
-Many thanks to all of you for voting vimwiki up on www.vim.org. I do vimwiki
-in my spare time I could use to dance argentine tango with beautiful women.
-Your votes are kind of a good replacement. ;)
-
-Sincerely yours,
-Maxim Kim.
+Web: http://code.google.com/p/vimwiki/
+Mail-List: https://groups.google.com/forum/#!forum/vimwiki
+Vim plugins: http://www.vim.org/scripts/script.php?script_id=2226
==============================================================================
14. Changelog *vimwiki-changelog*
+1.2~
+ * Issue 70: Table spanning cell support.
+ * Issue 72: Do not convert again for unchanged file. |:VimwikiAll2HTML|
+ converts only changed wiki files.
+ * Issue 117: |VimwikiDiaryIndex| command that opens diary index wiki page.
+ * Issue 120: Links in headers are not highlighted in vimwiki but are
+ highlighted in HTML.
+ * Issue 138: Added possibility to remap table-column move bindings. See
+ |:VimwikiTableMoveColumnLeft| and |:VimwikiTableMoveColumnRight|
+ commands. For remap instructions see |vimwiki_<A-Left>|
+ and |vimwiki_<A-Right>|.
+ * Issue 125: Problem with 'o' command given while at the of the file.
+ * Issue 131: FileType is not set up when GUIEnter autocommand is used in
+ vimrc. Use 'nested' in 'au GUIEnter * nested VimwikiIndex'
+ * Issue 132: Link to perl (or any non-wiki) file in vimwiki subdirectory
+ doesn't work as intended.
+ * Issue 135: %title and %toc used together cause TOC to appear in an
+ unexpected place in HTML.
+ * Issue 139: |:VimwikiTabnewLink| command is added.
+ * Fix of g:vimwiki_stripsym = '' (i.e. an empty string) -- it removes bad
+ symbols from filenames.
+ * Issue 145: With modeline 'set ft=vimwiki' links are not correctly
+ highlighted when open wiki files.
+ * Issue 146: Filetype difficulty with ".txt" as a vimwiki extension.
+ * Issue 148: There are no mailto links.
+ * Issue 151: Use location list instead of quickfix list for :VimwikiSearch
+ command result. Use :lopen instead of :copen, :lnext instead of :cnext
+ etc.
+ * Issue 152: Add the list of HTML files that would not be deleted after
+ |:VimwikiAll2HTML|.
+ * Issue 153: Delete HTML files that has no corresponding wiki ones with
+ |:VimwikiAll2HTML|.
+ * Issue 156: Add multiple HTML templates. See
+ |vimwiki-option-template_path|. Options html_header and html_footer are
+ no longer exist.
+ * Issue 173: When virtualedit=all option is enabled the 'o' command behave
+ strange.
+ * Issue 178: Problem with alike wikie's paths.
+ * Issue 182: Browser command does not quote url.
+ * Issue 183: Spelling error highlighting is not possible with nested
+ syntaxes.
+ * Issue 184: Wrong foldlevel in some cases.
+ * Issue 195: Page renaming issue.
+ * Issue 196: vim: modeline bug -- syn=vim doesn't work.
+ * Issue 199: Generated HTML for sublists is invalid.
+ * Issue 200: Generated HTML for todo lists does not show completion status
+ the fix relies on CSS, thus your old stylesheets need to be updated!;
+ may not work in obsolete browsers or font-deficient systems.
+ * Issue 205: Block code: highlighting differs from processing. Inline code
+ block {{{ ... }}} is removed. Use `...` instead.
+ * Issue 208: Default highlight colors are problematic in many
+ colorschemes. Headers are highlighted as |hl-Title| by default, use
+ |g:vimwiki_hl_headers| to restore previous default Red, Green, Blue or
+ custom header colors. Some other changes in highlighting.
+ * Issue 209: Wild comments slow down html generation. Comments are
+ changed, use %% to comment out entire line.
+ * Issue 210: HTML: para enclose header.
+ * Issue 214: External links containing Chinese characters get trimmed.
+ * Issue 218: Command to generate HTML file and open it in webbrowser. See
+ |:Vimwiki2HTMLBrowse|(bind to <leader>whh)
+ * NEW: Added <Leader>wh mapping to call |:Vimwiki2HTML|
+
+
1.1.1~
* FIX: Issue 122: Dot character in vimwiki's directory path isn't escaped.
* FIX: Issue 123: Where is Vimwiki2HTML and other commands? Sometimes
@@ -1667,7 +1859,7 @@ Maxim Kim.
highlighted as a single link.
* FIX: Issue 88: Underline text. See |g:vimwiki_valid_html_tags|.
* FIX: Issue 92: Wikies in a subdir could be renamed to an empty file.
- * FIX: Issue 93: Use alias name in html title. See |vimwiki-title|.
+ * FIX: Issue 93: Use alias name in HTML title. See |vimwiki-title|.
* FIX: Issue 94: Relative links to PHP files are broken. See
|g:vimwiki_file_exts| for details.
* FIX: Issue 96: Closing bracket at the end of weblink shouldn't be a part
@@ -1702,7 +1894,7 @@ Maxim Kim.
|:VimwikiTableMoveColumnLeft| and |:VimwikiTableMoveColumnRight|.
* NEW: Issue 44: <S-Tab> should move cursor to the previous table cell.
* NEW: Issue 45: It should be possible to indent tables. Indented tables
- are centered in html.
+ are centered in HTML.
* NEW: Issue 46: Do not htmlize some wiki pages (blacklist). New
placeholder is added: %nohtml. See |vimwiki-nohtml|.
* FIX: Issue 47: Lists aren't HTMLized properly.
@@ -1725,11 +1917,11 @@ Maxim Kim.
* NEW: Issue 60: Links inside completed gtd-items.
* NEW: Issue 61: Headers numbering. See |g:vimwiki_html_header_numbering|
and |g:vimwiki_html_header_numbering_sym| options.
- * FIX: Issue 63: Table cannot have leading empty cells in html.
+ * FIX: Issue 63: Table cannot have leading empty cells in HTML.
* FIX: Issue 65: Table separator is not htmlized right if on top of the
table.
- * FIX: Issue 66: Table empty cells are very small in html.
- * FIX: Issue 67: Wrong html conversion of multilined list item with bold
+ * FIX: Issue 66: Table empty cells are very small in HTML.
+ * FIX: Issue 67: Wrong HTML conversion of multilined list item with bold
text on the start of next line.
* FIX: Issue 68: auto-indent problem with langmap.
* FIX: Issue 73: Link navigation by Tab. "Escaped" wiki-word should be
@@ -1741,7 +1933,7 @@ Maxim Kim.
date if it has corresponding diary page.
* FIX: Issue 80: Debian Lenny GUI Vim 7.2 has problems with toggling inner
todo list items.
- * FIX: Issue 81: Don't convert WikiWord as a link in html when
+ * FIX: Issue 81: Don't convert WikiWord as a link in HTML when
`let g:vimwiki_camel_case = 0`
0.9.9~
@@ -1754,7 +1946,7 @@ Maxim Kim.
* NEW: Keyword STARTED: is added.
* NEW: Words TODO:, DONE:, STARTED:, XXX:, FIXME:, FIXED: are highlighed
inside headers.
- * FIX: Export to html external links with 'file://' protocol. Ex:
+ * FIX: Export to HTML external links with 'file://' protocol. Ex:
[file:///home/user1/book.pdf my book].
* FIX: Menu is corrupted if wiki's path contains spaces.
* FIX: Settings |wrap| and |linebreak| are removed from ftplugin. Add them
@@ -1780,10 +1972,10 @@ Maxim Kim.
* NEW: Speed up vimwiki's folding a bit. Should lag a bit less in a long
todo lists.
* NEW: Centered headers. Start header with at least one space to make it
- html centered.
- * NEW: Change in default css: header's colors.
+ HTML centered.
+ * NEW: Change in default CSS: header's colors.
* NEW: Vimwiki is aware of |GetLatestVimScripts| now.
- * FIX: Use <del> tag instead of custom <span class="strike"> in html.
+ * FIX: Use <del> tag instead of custom <span class="strike"> in HTML.
* FIX: There are no text styling in htmlized quoted text.
* FIX: set default value of g:vimwiki_fold_lists to 0 as written in this
help.
@@ -1813,8 +2005,8 @@ Maxim Kim.
(in VISUAL and in VISUAL LINE modes)
* NEW: Issue 26: Highlight code snippets in vimwiki's pre. See
|vimwiki-option-nested_syntaxes|. Thanks kriomant.
- * NEW: Issue 27: Automatic garbage deletion from html directory.
- * NEW: Save all open vimwiki buffers before export to html.
+ * NEW: Issue 27: Automatic garbage deletion from HTML directory.
+ * NEW: Save all open vimwiki buffers before export to HTML.
* NEW: Issue 29: Custom :Search command.
* NEW: Header text objects are now expandable in VISUAL mode. Tap 'vah' to
select a header. Tap again 'ah' to expand selection further. Thanks Andy
@@ -1822,12 +2014,12 @@ Maxim Kim.
* FIX: Folding settings are reset to vim defaults in a new tab (think of
\wt) so you cannot hide things in folds.
* FIX: https links in form of [https://hello.world.com] are not exported
- into html. Thanks Saurabh Sarpal for the patch.
+ into HTML. Thanks Saurabh Sarpal for the patch.
0.9.6~
* NEW: You can have multiline list items. See |vimwiki-syntax-lists|.
* NEW: You can ignore newlines in multiline list items when do export to
- html. See |g:vimwiki_list_ignore_newline| option.
+ HTML. See |g:vimwiki_list_ignore_newline| option.
* NEW: Different checkbox symbols [.], [:], [o] are added. See
|vimwiki-todo-lists|.
* NEW: Now there is no longer syntax of preformatted text that is started
@@ -1843,7 +2035,7 @@ Maxim Kim.
wikies opened at the same time with different syntaxes.
* FIX: Command |:VimwikiToggleListItem| do not switch parent checkboxes if
there are non-checkbox list items available.
- * FIX: Issue 24: Link error in html when write [[one.two.three]].
+ * FIX: Issue 24: Link error in HTML when write [[one.two.three]].
* FIX: Rename WikiWord to something with a colon (:) does nasty things.
* FIX: Command |:VimwikiToggleListItem| do not switch right if there are
list items without checkboxes in the list.
@@ -1864,9 +2056,9 @@ Maxim Kim.
* FIX: indent/vimwiki.vim is obsolete. If you upgrade from previous
versions remove it. It causes wrong list indentation if noexpandtab is
set.
- * FIX: If tabs and spaces are used to indent list items html export gives
+ * FIX: If tabs and spaces are used to indent list items HTML export gives
error. Thanks Klaus Ethgen for report.
- * FIX: Some html export fixes.
+ * FIX: Some HTML export fixes.
0.9.4~
* NEW: Links with directories: [[dir1/dir2/Link|Text]]. Thanks Jie Wu.
@@ -1874,12 +2066,12 @@ Maxim Kim.
path_html. See |vimwiki-option-html_header|.
* FIX: Indent is incorrect for vim without "float" compile option. Thanks
Julian Kooij.
- * FIX: Convert to html doesn't work right with links like [[foo::bar]].
+ * FIX: Convert to HTML doesn't work right with links like [[foo::bar]].
* FIX: Rename wikiword doesn't work right when rename WikiWord to
[[WikiWord blablabla]].
* FIX: Renaming of links with description doesn't work.
* FIX: Weblinks with commas are not highlighted.
- * MISC: Some changes in default css file.
+ * MISC: Some changes in default CSS file.
0.9.3~
* NEW: g:vimwiki_menu option is a string which is menu path. So one can
@@ -1899,7 +2091,7 @@ Maxim Kim.
* FIX: Clear out FlexWiki ftplugin's setup. Now you don't have to hack
filetype.vim to get rid of unexpected ':setlocal bomb' from FlexWiki's
ftplugin.
- * FIX: When write done: it will show another done: in html file.
+ * FIX: When write done: it will show another done: in HTML file.
0.9.2a~
* FIX: Installation on Linux doesn't work. (Dos line endings in
@@ -1910,7 +2102,7 @@ Maxim Kim.
* NEW: Header text object. See |vimwiki-text-objects|.
* NEW: Add/remove Header levels with '=' and '-'. See |vimwiki_=|.
* NEW: Vimwiki GUI menu to select available wikies. See |g:vimwiki_menu|.
- * NEW: You can specify the name of your css file now. See
+ * NEW: You can specify the name of your CSS file now. See
|vimwiki-option-css_name|
* NEW: You can add styles to image links, see |vimwiki-syntax-links|.
* FIX: History doesn't work after |VimwikiRenameWord|.
@@ -1963,7 +2155,7 @@ Maxim Kim.
* DEL: Removed setlocal textwidth = 0 from ftplugin.
* FIX: New regexps for bold, italic, bolditalic.
* FIX: The last item in List sometimes fold-in incorrectly.
- * FIX: Minor tweaks on default css.
+ * FIX: Minor tweaks on default CSS.
0.8.1~
* NEW: Vimwiki's foldmethod changed from syntax to expr. Foldtext is
diff --git a/ftplugin/vimwiki.vim b/ftplugin/vimwiki.vim
@@ -20,7 +20,7 @@ let b:undo_ftplugin = "setlocal ".
" MISC STUFF {{{
setlocal autowriteall
-setlocal commentstring=<!--%s-->
+setlocal commentstring=%%%s
if g:vimwiki_conceallevel && exists("+conceallevel")
let &conceallevel = g:vimwiki_conceallevel
@@ -47,12 +47,12 @@ if !empty(&langmap)
" Valid only if langmap is a comma separated pairs of chars
let l_o = matchstr(&langmap, '\C,\zs.\zeo,')
if l_o
- exe 'nnoremap <buffer> '.l_o.' :call vimwiki_lst#kbd_oO("o")<CR>a'
+ exe 'nnoremap <buffer> '.l_o.' :call vimwiki#lst#kbd_oO("o")<CR>a'
endif
let l_O = matchstr(&langmap, '\C,\zs.\zeO,')
if l_O
- exe 'nnoremap <buffer> '.l_O.' :call vimwiki_lst#kbd_oO("O")<CR>a'
+ exe 'nnoremap <buffer> '.l_O.' :call vimwiki#lst#kbd_oO("O")<CR>a'
endif
endif
@@ -64,18 +64,18 @@ function! VimwikiFoldLevel(lnum) "{{{
" Header folding...
if line =~ g:vimwiki_rxHeader
- let n = vimwiki#count_first_sym(line)
+ let n = vimwiki#base#count_first_sym(line)
return '>'.n
endif
- if g:vimwiki_fold_trailing_empty_lines == 0
- if line =~ '^\s*$'
- let nnline = getline(nextnonblank(a:lnum + 1))
- if nnline =~ g:vimwiki_rxHeader
- let n = vimwiki#count_first_sym(nnline)
- return '<'.n
- endif
- endif
+ if g:vimwiki_fold_trailing_empty_lines == 0 && line =~ '^\s*$'
+ let nnline = getline(nextnonblank(a:lnum + 1))
+ else
+ let nnline = getline(a:lnum + 1)
+ endif
+ if nnline =~ g:vimwiki_rxHeader
+ let n = vimwiki#base#count_first_sym(nnline)
+ return '<'.n
endif
" List item folding...
@@ -129,7 +129,7 @@ function! s:get_base_level(lnum) "{{{
let lnum = a:lnum - 1
while lnum > 0
if getline(lnum) =~ g:vimwiki_rxHeader
- return vimwiki#count_first_sym(getline(lnum))
+ return vimwiki#base#count_first_sym(getline(lnum))
endif
let lnum -= 1
endwhile
@@ -169,7 +169,7 @@ endfunction "}}}
function! s:get_li_level(lnum) "{{{
if VimwikiGet('syntax') == 'media'
- let level = vimwiki#count_first_sym(getline(a:lnum))
+ let level = vimwiki#base#count_first_sym(getline(a:lnum))
else
let level = (indent(a:lnum) / &sw)
endif
@@ -198,42 +198,48 @@ endfunction "}}}
" COMMANDS {{{
command! -buffer Vimwiki2HTML
- \ call vimwiki_html#Wiki2HTML(expand(VimwikiGet('path_html')),
+ \ w <bar> call vimwiki#html#Wiki2HTML(expand(VimwikiGet('path_html')),
\ expand('%'))
+command! -buffer Vimwiki2HTMLBrowse
+ \ w <bar> call VimwikiWeblinkHandler(
+ \ vimwiki#html#Wiki2HTML(expand(VimwikiGet('path_html')),
+ \ expand('%')))
command! -buffer VimwikiAll2HTML
- \ call vimwiki_html#WikiAll2HTML(expand(VimwikiGet('path_html')))
+ \ call vimwiki#html#WikiAll2HTML(expand(VimwikiGet('path_html')))
-command! -buffer VimwikiNextLink call vimwiki#find_next_link()
-command! -buffer VimwikiPrevLink call vimwiki#find_prev_link()
-command! -buffer VimwikiDeleteLink call vimwiki#delete_link()
-command! -buffer VimwikiRenameLink call vimwiki#rename_link()
-command! -buffer VimwikiFollowLink call vimwiki#follow_link('nosplit')
-command! -buffer VimwikiGoBackLink call vimwiki#go_back_link()
-command! -buffer VimwikiSplitLink call vimwiki#follow_link('split')
-command! -buffer VimwikiVSplitLink call vimwiki#follow_link('vsplit')
+command! -buffer VimwikiNextLink call vimwiki#base#find_next_link()
+command! -buffer VimwikiPrevLink call vimwiki#base#find_prev_link()
+command! -buffer VimwikiDeleteLink call vimwiki#base#delete_link()
+command! -buffer VimwikiRenameLink call vimwiki#base#rename_link()
+command! -buffer VimwikiFollowLink call vimwiki#base#follow_link('nosplit')
+command! -buffer VimwikiGoBackLink call vimwiki#base#go_back_link()
+command! -buffer VimwikiSplitLink call vimwiki#base#follow_link('split')
+command! -buffer VimwikiVSplitLink call vimwiki#base#follow_link('vsplit')
-command! -buffer -range VimwikiToggleListItem call vimwiki_lst#ToggleListItem(<line1>, <line2>)
+command! -buffer VimwikiTabnewLink call vimwiki#base#follow_link('tabnew')
-command! -buffer VimwikiGenerateLinks call vimwiki#generate_links()
+command! -buffer -range VimwikiToggleListItem call vimwiki#lst#ToggleListItem(<line1>, <line2>)
-exe 'command! -buffer -nargs=* VimwikiSearch vimgrep <args> '.
+command! -buffer VimwikiGenerateLinks call vimwiki#base#generate_links()
+
+exe 'command! -buffer -nargs=* VimwikiSearch lvimgrep <args> '.
\ escape(VimwikiGet('path').'**/*'.VimwikiGet('ext'), ' ')
-exe 'command! -buffer -nargs=* VWS vimgrep <args> '.
+exe 'command! -buffer -nargs=* VWS lvimgrep <args> '.
\ escape(VimwikiGet('path').'**/*'.VimwikiGet('ext'), ' ')
-command! -buffer -nargs=1 VimwikiGoto call vimwiki#goto("<args>")
+command! -buffer -nargs=1 VimwikiGoto call vimwiki#base#goto("<args>")
" table commands
-command! -buffer -nargs=* VimwikiTable call vimwiki_tbl#create(<f-args>)
-command! -buffer VimwikiTableAlignQ call vimwiki_tbl#align_or_cmd('gqq')
-command! -buffer VimwikiTableAlignW call vimwiki_tbl#align_or_cmd('gww')
-command! -buffer VimwikiTableMoveColumnLeft call vimwiki_tbl#move_column_left()
-command! -buffer VimwikiTableMoveColumnRight call vimwiki_tbl#move_column_right()
+command! -buffer -nargs=* VimwikiTable call vimwiki#tbl#create(<f-args>)
+command! -buffer VimwikiTableAlignQ call vimwiki#tbl#align_or_cmd('gqq')
+command! -buffer VimwikiTableAlignW call vimwiki#tbl#align_or_cmd('gww')
+command! -buffer VimwikiTableMoveColumnLeft call vimwiki#tbl#move_column_left()
+command! -buffer VimwikiTableMoveColumnRight call vimwiki#tbl#move_column_right()
" diary commands
-command! -buffer VimwikiDiaryNextDay call vimwiki_diary#goto_next_day()
-command! -buffer VimwikiDiaryPrevDay call vimwiki_diary#goto_prev_day()
+command! -buffer VimwikiDiaryNextDay call vimwiki#diary#goto_next_day()
+command! -buffer VimwikiDiaryPrevDay call vimwiki#diary#goto_prev_day()
" COMMANDS }}}
@@ -241,58 +247,78 @@ command! -buffer VimwikiDiaryPrevDay call vimwiki_diary#goto_prev_day()
if g:vimwiki_use_mouse
nmap <buffer> <S-LeftMouse> <NOP>
nmap <buffer> <C-LeftMouse> <NOP>
- noremap <silent><buffer> <2-LeftMouse> :VimwikiFollowLink<CR>
- noremap <silent><buffer> <S-2-LeftMouse> <LeftMouse>:VimwikiSplitLink<CR>
- noremap <silent><buffer> <C-2-LeftMouse> <LeftMouse>:VimwikiVSplitLink<CR>
- noremap <silent><buffer> <RightMouse><LeftMouse> :VimwikiGoBackLink<CR>
+ nnoremap <silent><buffer> <2-LeftMouse> :VimwikiFollowLink<CR>
+ nnoremap <silent><buffer> <S-2-LeftMouse> <LeftMouse>:VimwikiSplitLink<CR>
+ nnoremap <silent><buffer> <C-2-LeftMouse> <LeftMouse>:VimwikiVSplitLink<CR>
+ nnoremap <silent><buffer> <RightMouse><LeftMouse> :VimwikiGoBackLink<CR>
+endif
+
+
+if !hasmapto('<Plug>Vimwiki2HTML')
+ nmap <buffer> <Leader>wh <Plug>Vimwiki2HTML
+endif
+nnoremap <script><buffer>
+ \ <Plug>Vimwiki2HTML :Vimwiki2HTML<CR>
+
+if !hasmapto('<Plug>Vimwiki2HTMLBrowse')
+ nmap <buffer> <Leader>whh <Plug>Vimwiki2HTMLBrowse
endif
+nnoremap <script><buffer>
+ \ <Plug>Vimwiki2HTMLBrowse :Vimwiki2HTMLBrowse<CR>
if !hasmapto('<Plug>VimwikiFollowLink')
nmap <silent><buffer> <CR> <Plug>VimwikiFollowLink
endif
-noremap <silent><script><buffer>
+nnoremap <silent><script><buffer>
\ <Plug>VimwikiFollowLink :VimwikiFollowLink<CR>
if !hasmapto('<Plug>VimwikiSplitLink')
nmap <silent><buffer> <S-CR> <Plug>VimwikiSplitLink
endif
-noremap <silent><script><buffer>
+nnoremap <silent><script><buffer>
\ <Plug>VimwikiSplitLink :VimwikiSplitLink<CR>
if !hasmapto('<Plug>VimwikiVSplitLink')
nmap <silent><buffer> <C-CR> <Plug>VimwikiVSplitLink
endif
-noremap <silent><script><buffer>
+nnoremap <silent><script><buffer>
\ <Plug>VimwikiVSplitLink :VimwikiVSplitLink<CR>
+if !hasmapto('<Plug>VimwikiTabnewLink')
+ nmap <silent><buffer> <D-CR> <Plug>VimwikiTabnewLink
+ nmap <silent><buffer> <C-S-CR> <Plug>VimwikiTabnewLink
+endif
+nnoremap <silent><script><buffer>
+ \ <Plug>VimwikiTabnewLink :VimwikiTabnewLink<CR>
+
if !hasmapto('<Plug>VimwikiGoBackLink')
nmap <silent><buffer> <BS> <Plug>VimwikiGoBackLink
endif
-noremap <silent><script><buffer>
+nnoremap <silent><script><buffer>
\ <Plug>VimwikiGoBackLink :VimwikiGoBackLink<CR>
if !hasmapto('<Plug>VimwikiNextLink')
nmap <silent><buffer> <TAB> <Plug>VimwikiNextLink
endif
-noremap <silent><script><buffer>
+nnoremap <silent><script><buffer>
\ <Plug>VimwikiNextLink :VimwikiNextLink<CR>
if !hasmapto('<Plug>VimwikiPrevLink')
nmap <silent><buffer> <S-TAB> <Plug>VimwikiPrevLink
endif
-noremap <silent><script><buffer>
+nnoremap <silent><script><buffer>
\ <Plug>VimwikiPrevLink :VimwikiPrevLink<CR>
if !hasmapto('<Plug>VimwikiDeleteLink')
nmap <silent><buffer> <Leader>wd <Plug>VimwikiDeleteLink
endif
-noremap <silent><script><buffer>
+nnoremap <silent><script><buffer>
\ <Plug>VimwikiDeleteLink :VimwikiDeleteLink<CR>
if !hasmapto('<Plug>VimwikiRenameLink')
nmap <silent><buffer> <Leader>wr <Plug>VimwikiRenameLink
endif
-noremap <silent><script><buffer>
+nnoremap <silent><script><buffer>
\ <Plug>VimwikiRenameLink :VimwikiRenameLink<CR>
if !hasmapto('<Plug>VimwikiToggleListItem')
@@ -302,25 +328,25 @@ if !hasmapto('<Plug>VimwikiToggleListItem')
nmap <silent><buffer> <C-@> <Plug>VimwikiToggleListItem
endif
endif
-noremap <silent><script><buffer>
+nnoremap <silent><script><buffer>
\ <Plug>VimwikiToggleListItem :VimwikiToggleListItem<CR>
if !hasmapto('<Plug>VimwikiDiaryNextDay')
nmap <silent><buffer> <C-Down> <Plug>VimwikiDiaryNextDay
endif
-noremap <silent><script><buffer>
+nnoremap <silent><script><buffer>
\ <Plug>VimwikiDiaryNextDay :VimwikiDiaryNextDay<CR>
if !hasmapto('<Plug>VimwikiDiaryPrevDay')
nmap <silent><buffer> <C-Up> <Plug>VimwikiDiaryPrevDay
endif
-noremap <silent><script><buffer>
+nnoremap <silent><script><buffer>
\ <Plug>VimwikiDiaryPrevDay :VimwikiDiaryPrevDay<CR>
function! s:CR() "{{{
- let res = vimwiki_lst#kbd_cr()
+ let res = vimwiki#lst#kbd_cr()
if res == "\<CR>" && g:vimwiki_table_auto_fmt
- let res = vimwiki_tbl#kbd_cr()
+ let res = vimwiki#tbl#kbd_cr()
endif
return res
endfunction "}}}
@@ -329,45 +355,53 @@ endfunction "}}}
inoremap <buffer> <expr> <CR> <SID>CR()
" List mappings
-nnoremap <buffer> o :call vimwiki_lst#kbd_oO('o')<CR>a
-nnoremap <buffer> O :call vimwiki_lst#kbd_oO('O')<CR>a
+nnoremap <buffer> o :<C-U>call vimwiki#lst#kbd_oO('o')<CR>
+nnoremap <buffer> O :<C-U>call vimwiki#lst#kbd_oO('O')<CR>
" Table mappings
if g:vimwiki_table_auto_fmt
- inoremap <expr> <buffer> <Tab> vimwiki_tbl#kbd_tab()
- inoremap <expr> <buffer> <S-Tab> vimwiki_tbl#kbd_shift_tab()
+ inoremap <expr> <buffer> <Tab> vimwiki#tbl#kbd_tab()
+ inoremap <expr> <buffer> <S-Tab> vimwiki#tbl#kbd_shift_tab()
endif
nnoremap <buffer> gqq :VimwikiTableAlignQ<CR>
nnoremap <buffer> gww :VimwikiTableAlignW<CR>
-nnoremap <buffer> <A-Left> :VimwikiTableMoveColumnLeft<CR>
-nnoremap <buffer> <A-Right> :VimwikiTableMoveColumnRight<CR>
+if !hasmapto('<Plug>VimwikiTableMoveColumnLeft')
+ nmap <silent><buffer> <A-Left> <Plug>VimwikiTableMoveColumnLeft
+endif
+nnoremap <silent><script><buffer>
+ \ <Plug>VimwikiTableMoveColumnLeft :VimwikiTableMoveColumnLeft<CR>
+if !hasmapto('<Plug>VimwikiTableMoveColumnRight')
+ nmap <silent><buffer> <A-Right> <Plug>VimwikiTableMoveColumnRight
+endif
+nnoremap <silent><script><buffer>
+ \ <Plug>VimwikiTableMoveColumnRight :VimwikiTableMoveColumnRight<CR>
" Misc mappings
inoremap <buffer> <S-CR> <br /><CR>
" Text objects {{{
-onoremap <silent><buffer> ah :<C-U>call vimwiki#TO_header(0, 0)<CR>
-vnoremap <silent><buffer> ah :<C-U>call vimwiki#TO_header(0, 1)<CR>
+onoremap <silent><buffer> ah :<C-U>call vimwiki#base#TO_header(0, 0)<CR>
+vnoremap <silent><buffer> ah :<C-U>call vimwiki#base#TO_header(0, 1)<CR>
-onoremap <silent><buffer> ih :<C-U>call vimwiki#TO_header(1, 0)<CR>
-vnoremap <silent><buffer> ih :<C-U>call vimwiki#TO_header(1, 1)<CR>
+onoremap <silent><buffer> ih :<C-U>call vimwiki#base#TO_header(1, 0)<CR>
+vnoremap <silent><buffer> ih :<C-U>call vimwiki#base#TO_header(1, 1)<CR>
-onoremap <silent><buffer> a\ :<C-U>call vimwiki#TO_table_cell(0, 0)<CR>
-vnoremap <silent><buffer> a\ :<C-U>call vimwiki#TO_table_cell(0, 1)<CR>
+onoremap <silent><buffer> a\ :<C-U>call vimwiki#base#TO_table_cell(0, 0)<CR>
+vnoremap <silent><buffer> a\ :<C-U>call vimwiki#base#TO_table_cell(0, 1)<CR>
-onoremap <silent><buffer> i\ :<C-U>call vimwiki#TO_table_cell(1, 0)<CR>
-vnoremap <silent><buffer> i\ :<C-U>call vimwiki#TO_table_cell(1, 1)<CR>
+onoremap <silent><buffer> i\ :<C-U>call vimwiki#base#TO_table_cell(1, 0)<CR>
+vnoremap <silent><buffer> i\ :<C-U>call vimwiki#base#TO_table_cell(1, 1)<CR>
-onoremap <silent><buffer> ac :<C-U>call vimwiki#TO_table_col(0, 0)<CR>
-vnoremap <silent><buffer> ac :<C-U>call vimwiki#TO_table_col(0, 1)<CR>
+onoremap <silent><buffer> ac :<C-U>call vimwiki#base#TO_table_col(0, 0)<CR>
+vnoremap <silent><buffer> ac :<C-U>call vimwiki#base#TO_table_col(0, 1)<CR>
-onoremap <silent><buffer> ic :<C-U>call vimwiki#TO_table_col(1, 0)<CR>
-vnoremap <silent><buffer> ic :<C-U>call vimwiki#TO_table_col(1, 1)<CR>
+onoremap <silent><buffer> ic :<C-U>call vimwiki#base#TO_table_col(1, 0)<CR>
+vnoremap <silent><buffer> ic :<C-U>call vimwiki#base#TO_table_col(1, 1)<CR>
-noremap <silent><buffer> = :call vimwiki#AddHeaderLevel()<CR>
-noremap <silent><buffer> - :call vimwiki#RemoveHeaderLevel()<CR>
+nnoremap <silent><buffer> = :call vimwiki#base#AddHeaderLevel()<CR>
+nnoremap <silent><buffer> - :call vimwiki#base#RemoveHeaderLevel()<CR>
" }}}
diff --git a/plugin/vimwiki.vim b/plugin/vimwiki.vim
@@ -19,22 +19,30 @@ function! s:default(varname, value) "{{{
endif
endfunction "}}}
-" return longest common prefix of 2 given strings.
-" 'Hello world', 'Hello worm' => 'Hello wor'
-function! s:str_common_pfx(str1, str2) "{{{
+" return longest common path prefix of 2 given paths.
+" '~/home/usrname/wiki', '~/home/usrname/wiki/shmiki' => '~/home/usrname/wiki'
+function! s:path_common_pfx(path1, path2) "{{{
+ let p1 = split(a:path1, '[/\\]', 1)
+ let p2 = split(a:path2, '[/\\]', 1)
+
let idx = 0
- let minlen = min([len(a:str1), len(a:str2)])
- while (idx < minlen) && (a:str1[idx] ==? a:str2[idx])
+ let minlen = min([len(p1), len(p2)])
+ while (idx < minlen) && (p1[idx] ==? p2[idx])
let idx = idx + 1
endwhile
- return strpart(a:str1, 0, idx)
+ if idx == 0
+ return ''
+ else
+ return join(p1[: idx-1], '/')
+ endif
endfunction "}}}
function! s:find_wiki(path) "{{{
let idx = 0
while idx < len(g:vimwiki_list)
- let path = vimwiki#chomp_slash(expand(VimwikiGet('path', idx)))
- if s:str_common_pfx(path, a:path) == path
+ let path = vimwiki#base#chomp_slash(expand(VimwikiGet('path', idx)))
+ let path = vimwiki#base#path_norm(path)
+ if s:path_common_pfx(path, a:path) == path
return idx
endif
let idx += 1
@@ -53,6 +61,19 @@ function! s:setup_buffer_leave()"{{{
endif
endfunction"}}}
+function! s:setup_filetype() "{{{
+ " Find what wiki current buffer belongs to.
+ let path = expand('%:p:h')
+ let ext = '.'.expand('%:e')
+ let idx = s:find_wiki(path)
+
+ if idx == -1 && g:vimwiki_global_ext == 0
+ return
+ endif
+
+ set filetype=vimwiki
+endfunction "}}}
+
function! s:setup_buffer_enter() "{{{
if exists("b:vimwiki_idx")
let g:vimwiki_current_idx = b:vimwiki_idx
@@ -81,8 +102,16 @@ function! s:setup_buffer_enter() "{{{
let b:vimwiki_idx = g:vimwiki_current_idx
endif
+ " If you have
+ " au GUIEnter * VimwikiIndex
+ " Then change it to
+ " au GUIEnter * nested VimwikiIndex
+ if &filetype == ''
+ set filetype=vimwiki
+ endif
+
" Update existed/non-existed links highlighting.
- call vimwiki#highlight_links()
+ call vimwiki#base#highlight_links()
" Settings foldmethod, foldexpr and foldtext are local to window. Thus in a
" new tab with the same buffer folding is reset to vim defaults. So we
@@ -158,9 +187,9 @@ if !exists("*VimwikiWeblinkHandler") "{{{
for browser in g:vimwiki_browsers
if executable(browser)
if has("win32")
- execute '!start "'.browser.'" ' . a:weblink
+ execute '!start "'.browser.'" "' . a:weblink . '"'
else
- execute '!'.browser.' ' . a:weblink
+ execute '!'.browser.' "' . a:weblink . '"'
endif
return
endif
@@ -178,8 +207,11 @@ let s:vimwiki_defaults.index = 'index'
let s:vimwiki_defaults.ext = '.wiki'
let s:vimwiki_defaults.maxhi = 1
let s:vimwiki_defaults.syntax = 'default'
-let s:vimwiki_defaults.html_header = ''
-let s:vimwiki_defaults.html_footer = ''
+
+let s:vimwiki_defaults.template_path = '~/vimwiki/templates/'
+let s:vimwiki_defaults.template_default = 'default'
+let s:vimwiki_defaults.template_ext = '.html'
+
let s:vimwiki_defaults.nested_syntaxes = {}
let s:vimwiki_defaults.auto_export = 0
" is wiki temporary -- was added to g:vimwiki_list by opening arbitrary wiki
@@ -217,7 +249,7 @@ call s:default('fold_trailing_empty_lines', 0)
call s:default('fold_lists', 0)
call s:default('menu', 'Vimwiki')
call s:default('global_ext', 1)
-call s:default('hl_headers', 1)
+call s:default('hl_headers', 0)
call s:default('hl_cb_checked', 0)
call s:default('camel_case', 1)
call s:default('list_ignore_newline', 1)
@@ -233,6 +265,7 @@ if has("win32")
else
call s:default('browsers',
\ [
+ \ 'chromium-browser',
\ 'opera',
\ 'firefox',
\ 'konqueror',
@@ -245,7 +278,8 @@ call s:default('w32_dir_enc', '')
call s:default('CJK_length', 0)
call s:default('dir_link', '')
call s:default('file_exts', 'pdf,txt,doc,rtf,xls,php,zip,rar,7z,html,gz')
-call s:default('valid_html_tags', 'b,i,s,u,sub,sup,kbd,br,hr')
+call s:default('valid_html_tags', 'b,i,s,u,sub,sup,kbd,br,hr,div,center,strong,em')
+call s:default('user_htmls', '')
call s:default('html_header_numbering', 0)
call s:default('html_header_numbering_sym', '')
@@ -273,9 +307,15 @@ else
let g:vimwiki_rxWikiLink = g:vimwiki_rxWikiLink1.'\|'.g:vimwiki_rxWikiLink2
endif
let g:vimwiki_rxWeblink = '\%("[^"(]\+\((\([^)]\+\))\)\?":\)\?'.
- \'\%(https\?\|ftp\|gopher\|telnet\|file\|notes\|ms-help\):'.
- \'\%(\%(\%(//\)\|\%(\\\\\)\)\+[A-Za-z0-9:#@%/;,$~()_?+=.&\\\-]*\)'.
- \'[().,?]\@<!'
+ \'\%('.
+ \'\%('.
+ \'\%(https\?\|ftp\|gopher\|telnet\|file\|notes\|ms-help\):'.
+ \'\%(\%(//\)\|\%(\\\\\)\)'.
+ \'\)'.
+ \'\|\%(mailto:\)'.
+ \'\)'.
+ \'\+\S\+'.
+ \'[().,?\]]\@<!'
"}}}
" AUTOCOMMANDS for all known wiki extensions {{{
@@ -297,64 +337,71 @@ augroup end
augroup vimwiki
autocmd!
for ext in keys(extensions)
- exe 'autocmd BufEnter *'.ext.' call s:setup_buffer_enter()'
+ exe 'autocmd BufWinEnter *'.ext.' call s:setup_buffer_enter()'
exe 'autocmd BufLeave,BufHidden *'.ext.' call s:setup_buffer_leave()'
- exe 'autocmd BufNewFile,BufRead, *'.ext.' setlocal filetype=vimwiki'
+ exe 'autocmd BufNewFile,BufRead, *'.ext.' call s:setup_filetype()'
" ColorScheme could have or could have not a
" VimwikiHeader1..VimwikiHeader6 highlight groups. We need to refresh
" syntax after colorscheme change.
- exe 'autocmd ColorScheme *'.ext.' call vimwiki#setup_colors()'.
- \ ' | call vimwiki#highlight_links()'
+ exe 'autocmd ColorScheme *'.ext.' syntax enable'.
+ \ ' | call vimwiki#base#highlight_links()'
" Format tables when exit from insert mode. Do not use textwidth to
" autowrap tables.
if g:vimwiki_table_auto_fmt
- exe 'autocmd InsertLeave *'.ext.' call vimwiki_tbl#format(line("."))'
- exe 'autocmd InsertEnter *'.ext.' call vimwiki_tbl#reset_tw(line("."))'
+ exe 'autocmd InsertLeave *'.ext.' call vimwiki#tbl#format(line("."))'
+ exe 'autocmd InsertEnter *'.ext.' call vimwiki#tbl#reset_tw(line("."))'
endif
endfor
augroup END
"}}}
" COMMANDS {{{
-command! VimwikiUISelect call vimwiki#ui_select()
+command! VimwikiUISelect call vimwiki#base#ui_select()
command! -count VimwikiIndex
- \ call vimwiki#goto_index(v:count1)
+ \ call vimwiki#base#goto_index(v:count1)
command! -count VimwikiTabIndex tabedit <bar>
- \ call vimwiki#goto_index(v:count1)
+ \ call vimwiki#base#goto_index(v:count1)
+command! -count VimwikiDiaryIndex
+ \ call vimwiki#diary#goto_index(v:count1)
command! -count VimwikiMakeDiaryNote
- \ call vimwiki_diary#make_note(v:count1)
+ \ call vimwiki#diary#make_note(v:count1)
command! -count VimwikiTabMakeDiaryNote tabedit <bar>
- \ call vimwiki_diary#make_note(v:count1)
+ \ call vimwiki#diary#make_note(v:count1)
"}}}
" MAPPINGS {{{
if !hasmapto('<Plug>VimwikiIndex')
- map <silent><unique> <Leader>ww <Plug>VimwikiIndex
+ nmap <silent><unique> <Leader>ww <Plug>VimwikiIndex
endif
-noremap <unique><script> <Plug>VimwikiIndex :VimwikiIndex<CR>
+nnoremap <unique><script> <Plug>VimwikiIndex :VimwikiIndex<CR>
if !hasmapto('<Plug>VimwikiTabIndex')
- map <silent><unique> <Leader>wt <Plug>VimwikiTabIndex
+ nmap <silent><unique> <Leader>wt <Plug>VimwikiTabIndex
endif
-noremap <unique><script> <Plug>VimwikiTabIndex :VimwikiTabIndex<CR>
+nnoremap <unique><script> <Plug>VimwikiTabIndex :VimwikiTabIndex<CR>
if !hasmapto('<Plug>VimwikiUISelect')
- map <silent><unique> <Leader>ws <Plug>VimwikiUISelect
+ nmap <silent><unique> <Leader>ws <Plug>VimwikiUISelect
+endif
+nnoremap <unique><script> <Plug>VimwikiUISelect :VimwikiUISelect<CR>
+
+if !hasmapto('<Plug>VimwikiDiaryIndex')
+ nmap <silent><unique> <Leader>wi <Plug>VimwikiDiaryIndex
endif
-noremap <unique><script> <Plug>VimwikiUISelect :VimwikiUISelect<CR>
+nnoremap <unique><script> <Plug>VimwikiDiaryIndex :VimwikiDiaryIndex<CR>
if !hasmapto('<Plug>VimwikiMakeDiaryNote')
- map <silent><unique> <Leader>w<Leader>w <Plug>VimwikiMakeDiaryNote
+ nmap <silent><unique> <Leader>w<Leader>w <Plug>VimwikiMakeDiaryNote
endif
-noremap <unique><script> <Plug>VimwikiMakeDiaryNote :VimwikiMakeDiaryNote<CR>
+nnoremap <unique><script> <Plug>VimwikiMakeDiaryNote :VimwikiMakeDiaryNote<CR>
if !hasmapto('<Plug>VimwikiTabMakeDiaryNote')
- map <silent><unique> <Leader>w<Leader>t <Plug>VimwikiTabMakeDiaryNote
+ nmap <silent><unique> <Leader>w<Leader>t <Plug>VimwikiTabMakeDiaryNote
endif
-noremap <unique><script> <Plug>VimwikiTabMakeDiaryNote
+nnoremap <unique><script> <Plug>VimwikiTabMakeDiaryNote
\ :VimwikiTabMakeDiaryNote<CR>
"}}}
@@ -366,9 +413,9 @@ function! s:build_menu(topmenu)
let norm_path = fnamemodify(VimwikiGet('path', idx), ':h:t')
let norm_path = escape(norm_path, '\ \.')
execute 'menu '.a:topmenu.'.Open\ index.'.norm_path.
- \ ' :call vimwiki#goto_index('.(idx + 1).')<CR>'
+ \ ' :call vimwiki#base#goto_index('.(idx + 1).')<CR>'
execute 'menu '.a:topmenu.'.Open/Create\ diary\ note.'.norm_path.
- \ ' :call vimwiki_diary#make_note('.(idx + 1).')<CR>'
+ \ ' :call vimwiki#diary#make_note('.(idx + 1).')<CR>'
let idx += 1
endwhile
endfunction
@@ -390,8 +437,8 @@ endif
" CALENDAR Hook "{{{
if g:vimwiki_use_calendar
- let g:calendar_action = 'vimwiki_diary#calendar_action'
- let g:calendar_sign = 'vimwiki_diary#calendar_sign'
+ let g:calendar_action = 'vimwiki#diary#calendar_action'
+ let g:calendar_sign = 'vimwiki#diary#calendar_sign'
endif
"}}}
diff --git a/syntax/vimwiki.vim b/syntax/vimwiki.vim
@@ -10,7 +10,7 @@ elseif exists("b:current_syntax")
finish
endif
-" Links highlighting is controlled by vimwiki#highlight_links() function.
+" Links highlighting is controlled by vimwiki#base#highlight_links() function.
" It is called from setup_buffer_enter() function in the BufEnter autocommand.
" Load concrete Wiki syntax
@@ -20,6 +20,9 @@ execute 'runtime! syntax/vimwiki_'.VimwikiGet('syntax').'.vim'
if exists("+conceallevel")
syntax conceal on
endif
+
+syntax spell toplevel
+
syn match VimwikiLinkChar contained /\[\[/
syn match VimwikiLinkChar contained /\]\]/
syn match VimwikiLinkChar contained /\[\[[^\[\]\|]\{-}|\ze.\{-}]]/
@@ -62,12 +65,12 @@ execute 'syntax match VimwikiTodo /'. g:vimwiki_rxTodo .'/'
" Tables
-" execute 'syntax match VimwikiTable /'.g:vimwiki_rxTable.'/'
syntax match VimwikiTableRow /^\s*|.\+|\s*$/
\ transparent contains=VimwikiCellSeparator,VimwikiLinkT,
\ VimwikiNoExistsLinkT,VimwikiEmoticons,VimwikiTodo,
\ VimwikiBoldT,VimwikiItalicT,VimwikiBoldItalicT,VimwikiItalicBoldT,
- \ VimwikiDelTextT,VimwikiSuperScriptT,VimwikiSubScriptT,VimwikiCodeT
+ \ VimwikiDelTextT,VimwikiSuperScriptT,VimwikiSubScriptT,VimwikiCodeT,
+ \ @Spell
syntax match VimwikiCellSeparator
\ /\%(|\)\|\%(-\@<=+\-\@=\)\|\%([|+]\@<=-\+\)/ contained
@@ -76,35 +79,36 @@ execute 'syntax match VimwikiList /'.g:vimwiki_rxListBullet.'/'
execute 'syntax match VimwikiList /'.g:vimwiki_rxListNumber.'/'
execute 'syntax match VimwikiList /'.g:vimwiki_rxListDefine.'/'
-execute 'syntax match VimwikiBold /'.g:vimwiki_rxBold.'/ contains=VimwikiBoldChar'
-execute 'syntax match VimwikiBoldT /'.g:vimwiki_rxBold.'/ contained contains=VimwikiBoldCharT'
+execute 'syntax match VimwikiBold /'.g:vimwiki_rxBold.'/ contains=VimwikiBoldChar,@Spell'
+execute 'syntax match VimwikiBoldT /'.g:vimwiki_rxBold.'/ contained contains=VimwikiBoldCharT,@Spell'
-execute 'syntax match VimwikiItalic /'.g:vimwiki_rxItalic.'/ contains=VimwikiItalicChar'
-execute 'syntax match VimwikiItalicT /'.g:vimwiki_rxItalic.'/ contained contains=VimwikiItalicCharT'
+execute 'syntax match VimwikiItalic /'.g:vimwiki_rxItalic.'/ contains=VimwikiItalicChar,@Spell'
+execute 'syntax match VimwikiItalicT /'.g:vimwiki_rxItalic.'/ contained contains=VimwikiItalicCharT,@Spell'
-execute 'syntax match VimwikiBoldItalic /'.g:vimwiki_rxBoldItalic.'/ contains=VimwikiBoldItalicChar,VimwikiItalicBoldChar'
-execute 'syntax match VimwikiBoldItalicT /'.g:vimwiki_rxBoldItalic.'/ contained contains=VimwikiBoldItalicChatT,VimwikiItalicBoldCharT'
+execute 'syntax match VimwikiBoldItalic /'.g:vimwiki_rxBoldItalic.'/ contains=VimwikiBoldItalicChar,VimwikiItalicBoldChar,@Spell'
+execute 'syntax match VimwikiBoldItalicT /'.g:vimwiki_rxBoldItalic.'/ contained contains=VimwikiBoldItalicChatT,VimwikiItalicBoldCharT,@Spell'
-execute 'syntax match VimwikiItalicBold /'.g:vimwiki_rxItalicBold.'/ contains=VimwikiBoldItalicChar,VimwikiItalicBoldChar'
-execute 'syntax match VimwikiItalicBoldT /'.g:vimwiki_rxItalicBold.'/ contained contains=VimwikiBoldItalicCharT,VimsikiItalicBoldCharT'
+execute 'syntax match VimwikiItalicBold /'.g:vimwiki_rxItalicBold.'/ contains=VimwikiBoldItalicChar,VimwikiItalicBoldChar,@Spell'
+execute 'syntax match VimwikiItalicBoldT /'.g:vimwiki_rxItalicBold.'/ contained contains=VimwikiBoldItalicCharT,VimsikiItalicBoldCharT,@Spell'
-execute 'syntax match VimwikiDelText /'.g:vimwiki_rxDelText.'/ contains=VimwikiDelTextChar'
-execute 'syntax match VimwikiDelTextT /'.g:vimwiki_rxDelText.'/ contained contains=VimwikiDelTextChar'
+execute 'syntax match VimwikiDelText /'.g:vimwiki_rxDelText.'/ contains=VimwikiDelTextChar,@Spell'
+execute 'syntax match VimwikiDelTextT /'.g:vimwiki_rxDelText.'/ contained contains=VimwikiDelTextChar,@Spell'
-execute 'syntax match VimwikiSuperScript /'.g:vimwiki_rxSuperScript.'/ contains=VimwikiSuperScriptChar'
-execute 'syntax match VimwikiSuperScriptT /'.g:vimwiki_rxSuperScript.'/ contained contains=VimwikiSuperScriptCharT'
+execute 'syntax match VimwikiSuperScript /'.g:vimwiki_rxSuperScript.'/ contains=VimwikiSuperScriptChar,@Spell'
+execute 'syntax match VimwikiSuperScriptT /'.g:vimwiki_rxSuperScript.'/ contained contains=VimwikiSuperScriptCharT,@Spell'
-execute 'syntax match VimwikiSubScript /'.g:vimwiki_rxSubScript.'/ contains=VimwikiSubScriptChar'
-execute 'syntax match VimwikiSubScriptT /'.g:vimwiki_rxSubScript.'/ contained contains=VimwikiSubScriptCharT'
+execute 'syntax match VimwikiSubScript /'.g:vimwiki_rxSubScript.'/ contains=VimwikiSubScriptChar,@Spell'
+execute 'syntax match VimwikiSubScriptT /'.g:vimwiki_rxSubScript.'/ contained contains=VimwikiSubScriptCharT,@Spell'
execute 'syntax match VimwikiCode /'.g:vimwiki_rxCode.'/ contains=VimwikiCodeChar'
execute 'syntax match VimwikiCodeT /'.g:vimwiki_rxCode.'/ contained contains=VimwikiCodeCharT'
+
" <hr> horizontal rule
execute 'syntax match VimwikiHR /'.g:vimwiki_rxHR.'/'
-execute 'syntax region VimwikiPre start=/'.g:vimwiki_rxPreStart.
- \ '/ end=/'.g:vimwiki_rxPreEnd.'/ contains=VimwikiComment'
+execute 'syntax region VimwikiPre start=/^\s*'.g:vimwiki_rxPreStart.
+ \ '/ end=/^\s*'.g:vimwiki_rxPreEnd.'\s*$/ contains=@Spell'
" List item checkbox
syntax match VimwikiCheckBox /\[.\?\]/
@@ -121,6 +125,7 @@ endif
syntax match VimwikiPlaceholder /^\s*%toc\%(\s.*\)\?$/ contains=VimwikiPlaceholderParam
syntax match VimwikiPlaceholder /^\s*%nohtml\s*$/
syntax match VimwikiPlaceholder /^\s*%title\%(\s.*\)\?$/ contains=VimwikiPlaceholderParam
+syntax match VimwikiPlaceholder /^\s*%template\%(\s.*\)\?$/ contains=VimwikiPlaceholderParam
syntax match VimwikiPlaceholderParam /\s.*/ contained
" html tags
@@ -130,23 +135,44 @@ execute 'syntax match VimwikiBold #\c<b>.\{-}</b># contains=VimwikiHTMLTag'
execute 'syntax match VimwikiItalic #\c<i>.\{-}</i># contains=VimwikiHTMLTag'
execute 'syntax match VimwikiUnderline #\c<u>.\{-}</u># contains=VimwikiHTMLTag'
-syntax region VimwikiComment start='<!--' end='-->'
+execute 'syntax match VimwikiComment /'.g:vimwiki_rxComment.'/ contains=@Spell'
+
+" Header levels, 1-6
+execute 'syntax match VimwikiHeader1 /'.g:vimwiki_rxH1.'/ contains=VimwikiTodo,VimwikiHeaderChar,VimwikiNoExistsLink,VimwikiLink,@Spell'
+execute 'syntax match VimwikiHeader2 /'.g:vimwiki_rxH2.'/ contains=VimwikiTodo,VimwikiHeaderChar,VimwikiNoExistsLink,VimwikiLink,@Spell'
+execute 'syntax match VimwikiHeader3 /'.g:vimwiki_rxH3.'/ contains=VimwikiTodo,VimwikiHeaderChar,VimwikiNoExistsLink,VimwikiLink,@Spell'
+execute 'syntax match VimwikiHeader4 /'.g:vimwiki_rxH4.'/ contains=VimwikiTodo,VimwikiHeaderChar,VimwikiNoExistsLink,VimwikiLink,@Spell'
+execute 'syntax match VimwikiHeader5 /'.g:vimwiki_rxH5.'/ contains=VimwikiTodo,VimwikiHeaderChar,VimwikiNoExistsLink,VimwikiLink,@Spell'
+execute 'syntax match VimwikiHeader6 /'.g:vimwiki_rxH6.'/ contains=VimwikiTodo,VimwikiHeaderChar,VimwikiNoExistsLink,VimwikiLink,@Spell'
+
+" group names "{{{
if g:vimwiki_hl_headers == 0
- execute 'syntax match VimwikiHeader /'.g:vimwiki_rxHeader.'/ contains=VimwikiTodo,VimwikiHeaderChar'
+ hi link VimwikiHeader1 Title
+ hi link VimwikiHeader2 Title
+ hi link VimwikiHeader3 Title
+ hi link VimwikiHeader4 Title
+ hi link VimwikiHeader5 Title
+ hi link VimwikiHeader6 Title
else
- " Header levels, 1-6
- execute 'syntax match VimwikiHeader1 /'.g:vimwiki_rxH1.'/ contains=VimwikiTodo,VimwikiHeaderChar'
- execute 'syntax match VimwikiHeader2 /'.g:vimwiki_rxH2.'/ contains=VimwikiTodo,VimwikiHeaderChar'
- execute 'syntax match VimwikiHeader3 /'.g:vimwiki_rxH3.'/ contains=VimwikiTodo,VimwikiHeaderChar'
- execute 'syntax match VimwikiHeader4 /'.g:vimwiki_rxH4.'/ contains=VimwikiTodo,VimwikiHeaderChar'
- execute 'syntax match VimwikiHeader5 /'.g:vimwiki_rxH5.'/ contains=VimwikiTodo,VimwikiHeaderChar'
- execute 'syntax match VimwikiHeader6 /'.g:vimwiki_rxH6.'/ contains=VimwikiTodo,VimwikiHeaderChar'
+ if &background == 'light'
+ hi def VimwikiHeader1 guibg=bg guifg=#aa5858 gui=bold ctermfg=DarkRed term=bold cterm=bold
+ hi def VimwikiHeader2 guibg=bg guifg=#507030 gui=bold ctermfg=DarkGreen term=bold cterm=bold
+ hi def VimwikiHeader3 guibg=bg guifg=#1030a0 gui=bold ctermfg=DarkBlue term=bold cterm=bold
+ hi def VimwikiHeader4 guibg=bg guifg=#103040 gui=bold ctermfg=Black term=bold cterm=bold
+ hi def VimwikiHeader5 guibg=bg guifg=#505050 gui=bold ctermfg=Black term=bold cterm=bold
+ hi def VimwikiHeader6 guibg=bg guifg=#636363 gui=bold ctermfg=Black term=bold cterm=bold
+ else
+ hi def VimwikiHeader1 guibg=bg guifg=#e08090 gui=bold ctermfg=Red term=bold cterm=bold
+ hi def VimwikiHeader2 guibg=bg guifg=#80e090 gui=bold ctermfg=Green term=bold cterm=bold
+ hi def VimwikiHeader3 guibg=bg guifg=#6090e0 gui=bold ctermfg=Blue term=bold cterm=bold
+ hi def VimwikiHeader4 guibg=bg guifg=#c0c0f0 gui=bold ctermfg=White term=bold cterm=bold
+ hi def VimwikiHeader5 guibg=bg guifg=#e0e0f0 gui=bold ctermfg=White term=bold cterm=bold
+ hi def VimwikiHeader6 guibg=bg guifg=#f0f0f0 gui=bold ctermfg=White term=bold cterm=bold
+ endif
endif
-" group names "{{{
-
-call vimwiki#setup_colors()
+hi def link VimwikiMarkers Normal
hi def VimwikiBold term=bold cterm=bold gui=bold
hi def link VimwikiBoldT VimwikiBold
@@ -164,16 +190,16 @@ hi def VimwikiUnderline gui=underline
hi def link VimwikiCode PreProc
hi def link VimwikiCodeT VimwikiCode
-hi def link VimwikiNoExistsLink Error
-hi def link VimwikiNoExistsLinkT VimwikiNoExistsLink
-
hi def link VimwikiPre PreProc
hi def link VimwikiPreT VimwikiPre
+hi def link VimwikiNoExistsLink SpellBad
+hi def link VimwikiNoExistsLinkT VimwikiNoExistsLink
+
hi def link VimwikiLink Underlined
-hi def link VimwikiLinkT Underlined
+hi def link VimwikiLinkT VimwikiLink
-hi def link VimwikiList Function
+hi def link VimwikiList Identifier
hi def link VimwikiCheckBox VimwikiList
hi def link VimwikiCheckBoxDone Comment
hi def link VimwikiEmoticons Character
@@ -190,33 +216,32 @@ hi def link VimwikiSubScriptT VimwikiSubScript
hi def link VimwikiTodo Todo
hi def link VimwikiComment Comment
-hi def link VimwikiCellSeparator PreProc
-
hi def link VimwikiPlaceholder SpecialKey
hi def link VimwikiPlaceholderParam String
hi def link VimwikiHTMLtag SpecialKey
-hi def link VimwikiBoldChar VimwikiIgnore
-hi def link VimwikiItalicChar VimwikiIgnore
-hi def link VimwikiBoldItalicChar VimwikiIgnore
-hi def link VimwikiItalicBoldChar VimwikiIgnore
-hi def link VimwikiDelTextChar VimwikiIgnore
-hi def link VimwikiSuperScriptChar VimwikiIgnore
-hi def link VimwikiSubScriptChar VimwikiIgnore
-hi def link VimwikiCodeChar VimwikiIgnore
-hi def link VimwikiHeaderChar VimwikiIgnore
+hi def link VimwikiCellSeparator VimwikiMarkers
+hi def link VimwikiBoldChar VimwikiMarkers
+hi def link VimwikiItalicChar VimwikiMarkers
+hi def link VimwikiBoldItalicChar VimwikiMarkers
+hi def link VimwikiItalicBoldChar VimwikiMarkers
+hi def link VimwikiDelTextChar VimwikiMarkers
+hi def link VimwikiSuperScriptChar VimwikiMarkers
+hi def link VimwikiSubScriptChar VimwikiMarkers
+hi def link VimwikiCodeChar VimwikiMarkers
+hi def link VimwikiHeaderChar VimwikiMarkers
hi def link VimwikiLinkChar VimwikiLink
hi def link VimwikiNoLinkChar VimwikiNoExistsLink
-hi def link VimwikiBoldCharT VimwikiIgnore
-hi def link VimwikiItalicCharT VimwikiIgnore
-hi def link VimwikiBoldItalicCharT VimwikiIgnore
-hi def link VimwikiItalicBoldCharT VimwikiIgnore
-hi def link VimwikiDelTextCharT VimwikiIgnore
-hi def link VimwikiSuperScriptCharT VimwikiIgnore
-hi def link VimwikiSubScriptCharT VimwikiIgnore
-hi def link VimwikiCodeCharT VimwikiIgnore
-hi def link VimwikiHeaderCharT VimwikiIgnore
+hi def link VimwikiBoldCharT VimwikiMarkers
+hi def link VimwikiItalicCharT VimwikiMarkers
+hi def link VimwikiBoldItalicCharT VimwikiMarkers
+hi def link VimwikiItalicBoldCharT VimwikiMarkers
+hi def link VimwikiDelTextCharT VimwikiMarkers
+hi def link VimwikiSuperScriptCharT VimwikiMarkers
+hi def link VimwikiSubScriptCharT VimwikiMarkers
+hi def link VimwikiCodeCharT VimwikiMarkers
+hi def link VimwikiHeaderCharT VimwikiMarkers
hi def link VimwikiLinkCharT VimwikiLinkT
hi def link VimwikiNoLinkCharT VimwikiNoExistsLinkT
"}}}
@@ -227,7 +252,7 @@ let b:current_syntax="vimwiki"
let nested = VimwikiGet('nested_syntaxes')
if !empty(nested)
for [hl_syntax, vim_syntax] in items(nested)
- call vimwiki#nested_syntax(vim_syntax,
+ call vimwiki#base#nested_syntax(vim_syntax,
\ '^\s*{{{\%(.*[[:blank:][:punct:]]\)\?'.
\ hl_syntax.'\%([[:blank:][:punct:]].*\)\?',
\ '^\s*}}}', 'VimwikiPre')
diff --git a/syntax/vimwiki_default.vim b/syntax/vimwiki_default.vim
@@ -81,3 +81,5 @@ let g:vimwiki_rxListDefine = '::\(\s\|$\)'
" Preformatted text
let g:vimwiki_rxPreStart = '{{{'
let g:vimwiki_rxPreEnd = '}}}'
+
+let g:vimwiki_rxComment = '^\s*%%.*$'
diff --git a/syntax/vimwiki_media.vim b/syntax/vimwiki_media.vim
@@ -65,3 +65,5 @@ let g:vimwiki_rxListDefine = '^\%(;\|:\)\s'
" Preformatted text
let g:vimwiki_rxPreStart = '<pre>'
let g:vimwiki_rxPreEnd = '<\/pre>'
+
+let g:vimwiki_rxComment = '^\s*%%.*$'
