diff --git a/vimwiki_0_6.vba b/vimwiki_0_6_1.vba similarity index 71% rename from vimwiki_0_6.vba rename to vimwiki_0_6_1.vba index ca81f97..faa5a33 100644 --- a/vimwiki_0_6.vba +++ b/vimwiki_0_6_1.vba @@ -1,15 +1,663 @@ " Vimball Archiver by Charles E. Campbell, Jr., Ph.D. UseVimball finish -autoload/vimwiki.vim [[[1 -959 +autoload\vimwiki_html.vim [[[1 +645 " VimWiki plugin file " Language: Wiki " Author: Maxim Kim (habamax at gmail dot com) " Home: http://code.google.com/p/vimwiki/ " Filenames: *.wiki -" Last Change: 04.02.2009 12:30 -" Version: 0.6 +" Last Change: 2009-02-08 01:28 +" Version: 0.6.1 + +if exists("g:loaded_vimwiki_html_auto") || &cp + finish +endif +let g:loaded_vimwiki_html_auto = 1 + +"" I do not want to redefine these functions. Really. I do not want them to be +"" global too. +function! s:msg(message) "{{{ + echohl WarningMsg + echomsg 'vimwiki: '.a:message + echohl None +endfunction "}}} + +function! s:get_file_name_only(filename) "{{{ + let word = substitute(a:filename, '\'.g:vimwiki_ext, "", "g") + let word = substitute(word, '.*[/\\]', "", "g") + return word +endfunction "}}} + +function! s:syntax_supported() " {{{ + return g:vimwiki_syntax == "default" +endfunction " }}} + +function! s:create_default_CSS(path) " {{{ + if glob(a:path.'style.css') == "" + let lines = ['body { margin: 1em 5em 1em 5em; font-size: 120%; line-height: 1.5;}'] + call add(lines, 'p, ul, ol {margin: 0.3em auto;}') + call add(lines, '.todo {font-weight: bold; text-decoration: underline; color: #FF0000; }') + call add(lines, '.strike {text-decoration: line-through; }') + call add(lines, 'h1 {font-size: 2.0em;}') + call add(lines, 'h2 {font-size: 1.4em;}') + call add(lines, 'h3 {font-size: 1.0em;}') + call add(lines, 'h4 {font-size: 0.8em;}') + call add(lines, 'h5 {font-size: 0.7em;}') + call add(lines, 'h6 {font-size: 0.6em;}') + call add(lines, 'h1 { border-bottom: 1px solid #3366cc; text-align: left; padding: 0em 1em 0.3em 0em; }') + call add(lines, 'h3 { background: #e5ecf9; border-top: 1px solid #3366cc; padding: 0.1em 0.3em 0.1em 0.5em; }') + call add(lines, 'ul { margin-left: 2em; padding-left: 0.5em; }') + call add(lines, 'pre { border-left: 0.2em solid #ccc; margin-left: 2em; padding-left: 0.5em; }') + call add(lines, 'td { border: 1px solid #ccc; padding: 0.3em; }') + call add(lines, 'hr { border: none; border-top: 1px solid #ccc; }') + + call writefile(lines, a:path.'style.css') + echomsg "Default style.css is created." + endif +endfunction "}}} + +function! s:is_web_link(lnk) "{{{ + if a:lnk =~ '^\(http://\|www.\|ftp://\)' + 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:get_html_header(title, charset) "{{{ + let lines=[] + + " globals are bad, but... + if g:vimwiki_html_header != "" + try + let lines = readfile(g:vimwiki_html_header) + call map(lines, 'substitute(v:val, "%title%", "'. a:title .'", "g")') + return lines + catch /E484/ + call s:msg("Header template ". g:vimwiki_html_header. " does not exist!") + endtry + endif + + " if no g:vimwiki_html_header set up or error while reading template + " file -- use default header. + call add(lines, "") + call add(lines, '') + call add(lines, '
') + call add(lines, '') + call add(lines, '")
+ let processed = 1
+ elseif code && a:line =~ '^}}}\s*$'
+ " elseif code && a:line =~ g:vimwiki_rxPreEnd
+ let code = 0
+ call add(lines, "
")
+ let processed = 1
+ elseif code
+ let processed = 1
+ call add(lines, a:line)
+ endif
+ return [processed, lines, code]
+endfunction "}}}
+
+function! s:process_tag_pre(line, pre) "{{{
+ let lines = []
+ let pre = a:pre
+ let processed = 0
+ if a:line =~ '^\s\+[^[:blank:]*#]'
+ if !pre
+ call add(lines, "") + let pre = 1 + endif + let processed = 1 + call add(lines, a:line) + elseif pre && a:line =~ '^\s*$' + let processed = 1 + call add(lines, a:line) + elseif pre + call add(lines, "") + let pre = 0 + endif + return [processed, lines, pre] +endfunction "}}} + +function! s:process_tag_list(line, lists) "{{{ + let lines = [] + let lstSym = '' + let lstTagOpen = '' + let lstTagClose = '' + let lstRegExp = '' + let processed = 0 + if a:line =~ '^\s\+\*' + let lstSym = '*' + let lstTagOpen = '
'.a:line.'
') + return [1, lines] + endif + return [0, lines] +endfunction "}}} + +function! s:process_tag_h(line) "{{{ + let line = a:line + let processed = 0 + if a:line =~ g:vimwiki_rxH6 + let line = '".line." | ") + endif + endwhile + call add(lines, "
'', ''
'')')
+ " TODO: change make_tag function: delete cSym parameter -- count of symbols
+ " to strip from 2 sides of tag. Add 2 new instead -- OpenWikiTag length
+ " and CloseWikiTag length as for preformatted text there could be {{{,}}} and ,. + call map(lines, 's:make_tag(v:val, g:vimwiki_rxPreStart.''.\+''.g:vimwiki_rxPreEnd, ''
'', ''
'', 3)')
+ call extend(ldest, lines)
+ endif
+
+ "" table
+ if !processed
+ let [processed, lines, table] = s:process_tag_table(line, table)
+ call map(lines, 's:make_tag(v:val, ''\[\[.\{-}\]\]'', '''', '''', 2, ''s:make_internal_link'')')
+ call map(lines, 's:make_tag(v:val, ''\[.\{-}\]'', '''', '''', 1, ''s:make_external_link'')')
+ call map(lines, 's:make_tag(v:val, g:vimwiki_rxWeblink, '''', '''', 0, ''s:make_barebone_link'')')
+ call map(lines, 's:make_tag(v:val, g:vimwiki_rxWikiWord, '''', '''', 0, ''s:make_wikiword_link'')')
+ call map(lines, 's:make_tag(v:val, g:vimwiki_rxItalic, '''', '''')')
+ call map(lines, 's:make_tag(v:val, g:vimwiki_rxBold, '''', '''')')
+ call map(lines, 's:make_tag(v:val, g:vimwiki_rxTodo, '''', '''', 0)')
+ call map(lines, 's:make_tag(v:val, g:vimwiki_rxDelText, '''', '''', 2)')
+ call map(lines, 's:make_tag(v:val, g:vimwiki_rxSuperScript, '''', '''', 1)')
+ call map(lines, 's:make_tag(v:val, g:vimwiki_rxSubScript, '''', '''', 2)')
+ call map(lines, 's:make_tag(v:val, g:vimwiki_rxCode, '''', ''
'')')
+ call map(lines, 's:make_tag(v:val, g:vimwiki_rxPreStart.''.\+''.g:vimwiki_rxPreEnd, '''', ''
'', 3)')
+ call extend(ldest, lines)
+ endif
+
+ if !processed
+ let [processed, line] = s:process_tag_h(line)
+ if processed
+ call s:close_tag_list(lists, ldest)
+ let table = s:close_tag_table(table, ldest)
+ let code = s:close_tag_code(code, ldest)
+ call add(ldest, line)
+ endif
+ endif
+
+ if !processed
+ let [processed, line] = s:process_tag_hr(line)
+ if processed
+ call s:close_tag_list(lists, ldest)
+ let table = s:close_tag_table(table, ldest)
+ let code = s:close_tag_code(code, ldest)
+ call add(ldest, line)
+ endif
+ endif
+
+ "" P
+ if !processed
+ let line = s:make_tag(line, '\[\[.\{-}\]\]', '', '', 2, 's:make_internal_link')
+ let line = s:make_tag(line, '\[.\{-}\]', '', '', 1, 's:make_external_link')
+ let line = s:make_tag(line, g:vimwiki_rxWeblink, '', '', 0, 's:make_barebone_link')
+ let line = s:make_tag(line, g:vimwiki_rxWikiWord, '', '', 0, 's:make_wikiword_link')
+ let line = s:make_tag(line, g:vimwiki_rxItalic, '', '')
+ let line = s:make_tag(line, g:vimwiki_rxBold, '', '')
+ let line = s:make_tag(line, g:vimwiki_rxTodo, '', '', 0)
+ let line = s:make_tag(line, g:vimwiki_rxDelText, '', '', 2)
+ let line = s:make_tag(line, g:vimwiki_rxSuperScript, '', '', 1)
+ let line = s:make_tag(line, g:vimwiki_rxSubScript, '', '', 2)
+ let line = s:make_tag(line, g:vimwiki_rxCode, '', '
')
+ let line = s:make_tag(line, g:vimwiki_rxPreStart.'.\+'.g:vimwiki_rxPreEnd, '', '
', 3)
+ let [processed, lines] = s:process_tag_p(line)
+ if processed && pre
+ let pre = s:close_tag_pre(pre, ldest)
+ endif
+ if processed && code
+ let code = s:close_tag_code(code, ldest)
+ endif
+ if processed && table
+ let table = s:close_tag_table(table, ldest)
+ endif
+ call extend(ldest, lines)
+ endif
+
+ "" add the rest
+ if !processed
+ call add(ldest, line)
+ endif
+ endfor
+
+ "" process end of file
+ "" close opened tags if any
+ call s:close_tag_pre(pre, ldest)
+ call s:close_tag_code(code, ldest)
+ call s:close_tag_list(lists, ldest)
+ call s:close_tag_table(table, ldest)
+
+
+ call extend(ldest, s:get_html_footer())
+
+ "" make html file.
+ "" TODO: add html headings, css, etc.
+ let wwFileNameOnly = s:get_file_name_only(a:wikifile)
+ call writefile(ldest, a:path.wwFileNameOnly.'.html')
+endfunction "}}}
+
+function! vimwiki_html#WikiAll2HTML(path) "{{{
+ if !s:syntax_supported()
+ call s:msg('Wiki2Html: Only vimwiki_default syntax supported!!!')
+ return
+ endif
+
+ if !isdirectory(a:path)
+ call s:msg('Please create '.a:path.' directory first!')
+ return
+ endif
+
+ let setting_more = &more
+ setlocal nomore
+
+ let wikifiles = split(glob(g:vimwiki_home.'*'.g:vimwiki_ext), '\n')
+ for wikifile in wikifiles
+ echomsg 'Processing '.wikifile
+ call vimwiki_html#Wiki2HTML(a:path, wikifile)
+ endfor
+ call s:create_default_CSS(g:vimwiki_home_html)
+ echomsg 'Done!'
+
+ let &more = setting_more
+endfunction "}}}
+autoload\vimwiki.vim [[[1
+343
+" VimWiki plugin file
+" Language: Wiki
+" Author: Maxim Kim (habamax at gmail dot com)
+" Home: http://code.google.com/p/vimwiki/
+" Filenames: *.wiki
+" Last Change: 2009-02-08 01:37
+" Version: 0.6.1
+
if exists("g:loaded_vimwiki_auto") || &cp
finish
endif
@@ -17,15 +665,13 @@ let g:loaded_vimwiki_auto = 1
let s:wiki_badsymbols = '[<>|?*/\:"]'
-"" vimwiki functions {{{2
-""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
function! s:msg(message) "{{{
echohl WarningMsg
echomsg 'vimwiki: '.a:message
echohl None
endfunction "}}}
-function! s:getFileNameOnly(filename) "{{{
+function! s:get_file_name_only(filename) "{{{
let word = substitute(a:filename, '\'.g:vimwiki_ext, "", "g")
let word = substitute(word, '.*[/\\]', "", "g")
return word
@@ -99,7 +745,7 @@ function! s:WikiIsLinkToNonWikiFile(word) "{{{
return 0
endfunction "}}}
-"" WikiWord history helper functions {{{
+" WikiWord history helper functions {{{
" history is [['WikiWord.wiki', 11], ['AnotherWikiWord', 3] ... etc]
" where numbers are column positions we should return to when coming back.
function! s:GetHistoryWord(historyItem)
@@ -347,623 +993,8 @@ function! vimwiki#WikiRenameWord() "{{{
echomsg wwtorename." is renamed to ".newWord
endfunction "}}}
-
-" Functions 2}}}
-
-"" vimwiki html functions {{{2
-""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-function! s:WikiCreateDefaultCSS(path) " {{{
- if glob(a:path.'style.css') == ""
- let lines = ['body { margin: 1em 5em 1em 5em; font-size: 120%; line-height: 1.5;}']
- call add(lines, 'p, ul, ol {margin: 0.3em auto;}')
- call add(lines, '.todo {font-weight: bold; text-decoration: underline; color: #FF0000; }')
- call add(lines, '.strike {text-decoration: line-through; }')
- call add(lines, 'h1 {font-size: 2.0em;}')
- call add(lines, 'h2 {font-size: 1.4em;}')
- call add(lines, 'h3 {font-size: 1.0em;}')
- call add(lines, 'h4 {font-size: 0.8em;}')
- call add(lines, 'h5 {font-size: 0.7em;}')
- call add(lines, 'h6 {font-size: 0.6em;}')
- call add(lines, 'h1 { border-bottom: 1px solid #3366cc; text-align: left; padding: 0em 1em 0.3em 0em; }')
- call add(lines, 'h3 { background: #e5ecf9; border-top: 1px solid #3366cc; padding: 0.1em 0.3em 0.1em 0.5em; }')
- call add(lines, 'ul { margin-left: 2em; padding-left: 0.5em; }')
- call add(lines, 'pre { border-left: 0.2em solid #ccc; margin-left: 2em; padding-left: 0.5em; }')
- call add(lines, 'td { border: 1px solid #ccc; padding: 0.3em; }')
- call add(lines, 'hr { border: none; border-top: 1px solid #ccc; }')
-
- call writefile(lines, a:path.'style.css')
- echomsg "Default style.css is created."
- endif
-endfunction "}}}
-
-function! s:syntax_supported()
- return g:vimwiki_syntax == "default"
-endfunction
-
-function! vimwiki#WikiAll2HTML(path) "{{{
- if !s:syntax_supported()
- call s:msg('Wiki2Html: Only vimwiki_default syntax supported!!!')
- return
- endif
-
- if !isdirectory(a:path)
- call s:msg('Please create '.a:path.' directory first!')
- return
- endif
-
- let setting_more = &more
- setlocal nomore
-
- let wikifiles = split(glob(g:vimwiki_home.'*'.g:vimwiki_ext), '\n')
- for wikifile in wikifiles
- echomsg 'Processing '.wikifile
- call vimwiki#Wiki2HTML(a:path, wikifile)
- endfor
- call s:WikiCreateDefaultCSS(g:vimwiki_home_html)
- echomsg 'Done!'
-
- let &more = setting_more
-endfunction "}}}
-
-function! vimwiki#Wiki2HTML(path, wikifile) "{{{
- if !s:syntax_supported()
- call s:msg('Wiki2Html: Only vimwiki_default syntax supported!!!')
- return
- endif
-
- if !isdirectory(a:path)
- call s:msg('Please create '.a:path.' directory first!')
- return
- endif
-
- "" helper funcs
- function! s:isWebLink(lnk) "{{{
- if a:lnk =~ '^\(http://\|www.\|ftp://\)'
- return 1
- endif
- return 0
- endfunction "}}}
- function! s:isImgLink(lnk) "{{{
- if a:lnk =~ '.\(png\|jpg\|gif\|jpeg\)$'
- return 1
- endif
- return 0
- endfunction "}}}
-
- function! s:HTMLHeader(title, charset) "{{{
- let lines=[]
-
- " globals are bad, but...
- if g:vimwiki_html_header != ""
- try
- let lines = readfile(g:vimwiki_html_header)
- call map(lines, 'substitute(v:val, "%title%", "'. a:title .'", "g")')
- return lines
- catch /E484/
- call s:msg("Header template ". g:vimwiki_html_header. " does not exist!")
- endtry
- endif
-
- " if no g:vimwiki_html_header set up or error while reading template
- " file -- use default header.
- call add(lines, "")
- call add(lines, '')
- call add(lines, '')
- call add(lines, '')
- call add(lines, '")
- let processed = 1
- elseif code && a:line =~ '^}}}\s*$'
- " elseif code && a:line =~ g:vimwiki_rxPreEnd
- let code = 0
- call add(lines, "
")
- let processed = 1
- elseif code
- let processed = 1
- call add(lines, a:line)
- endif
- return [processed, lines, code]
- endfunction "}}}
-
- function! s:processPre(line, pre) "{{{
- let lines = []
- let pre = a:pre
- let processed = 0
- if a:line =~ '^\s\+[^[:blank:]*#]'
- if !pre
- call add(lines, "") - let pre = 1 - endif - let processed = 1 - call add(lines, a:line) - elseif pre && a:line =~ '^\s*$' - let processed = 1 - call add(lines, a:line) - elseif pre - call add(lines, "") - let pre = 0 - endif - return [processed, lines, pre] - endfunction "}}} - - function! s:processList(line, lists) "{{{ - let lines = [] - let lstSym = '' - let lstTagOpen = '' - let lstTagClose = '' - let lstRegExp = '' - let processed = 0 - if a:line =~ '^\s\+\*' - let lstSym = '*' - let lstTagOpen = '
'.a:line.'
') - return [1, lines] - endif - return [0, lines] - endfunction "}}} - - function! s:processHeading(line) "{{{ - let line = a:line - let processed = 0 - if a:line =~ g:vimwiki_rxH6 - let line = '".line." | ") - endif - endwhile - call add(lines, "
'', ''
'')')
- " TODO: change MakeTag function: delete cSym parameter -- count of symbols
- " to strip from 2 sides of tag. Add 2 new instead -- OpenWikiTag length
- " and CloseWikiTag length as for preformatted text there could be {{{,}}} and ,. - call map(lines, 's:MakeTag(v:val, g:vimwiki_rxPreStart.''.\+''.g:vimwiki_rxPreEnd, ''
'', ''
'', 3)')
- call extend(ldest, lines)
- endif
-
- "" table
- if !processed
- let [processed, lines, table] = s:processTable(line, table)
- call map(lines, 's:MakeTag(v:val, ''\[\[.\{-}\]\]'', '''', '''', 2, ''s:MakeInternalLink'')')
- call map(lines, 's:MakeTag(v:val, ''\[.\{-}\]'', '''', '''', 1, ''s:MakeExternalLink'')')
- call map(lines, 's:MakeTag(v:val, g:vimwiki_rxWeblink, '''', '''', 0, ''s:MakeBareBoneLink'')')
- call map(lines, 's:MakeTag(v:val, g:vimwiki_rxWikiWord, '''', '''', 0, ''s:MakeWikiWordLink'')')
- call map(lines, 's:MakeTag(v:val, g:vimwiki_rxItalic, '''', '''')')
- call map(lines, 's:MakeTag(v:val, g:vimwiki_rxBold, '''', '''')')
- call map(lines, 's:MakeTag(v:val, g:vimwiki_rxTodo, '''', '''', 0)')
- call map(lines, 's:MakeTag(v:val, g:vimwiki_rxDelText, '''', '''', 2)')
- call map(lines, 's:MakeTag(v:val, g:vimwiki_rxSuperScript, '''', '''', 1)')
- call map(lines, 's:MakeTag(v:val, g:vimwiki_rxSubScript, '''', '''', 2)')
- call map(lines, 's:MakeTag(v:val, g:vimwiki_rxCode, '''', ''
'')')
- call map(lines, 's:MakeTag(v:val, g:vimwiki_rxPreStart.''.\+''.g:vimwiki_rxPreEnd, '''', ''
'', 3)')
- call extend(ldest, lines)
- endif
-
- if !processed
- let [processed, line] = s:processHeading(line)
- if processed
- call s:closeList(lists, ldest)
- let table = s:closeTable(table, ldest)
- let code = s:closeCode(code, ldest)
- call add(ldest, line)
- endif
- endif
-
- if !processed
- let [processed, line] = s:processHR(line)
- if processed
- call s:closeList(lists, ldest)
- let table = s:closeTable(table, ldest)
- let code = s:closeCode(code, ldest)
- call add(ldest, line)
- endif
- endif
-
- "" P
- if !processed
- let line = s:MakeTag(line, '\[\[.\{-}\]\]', '', '', 2, 's:MakeInternalLink')
- let line = s:MakeTag(line, '\[.\{-}\]', '', '', 1, 's:MakeExternalLink')
- let line = s:MakeTag(line, g:vimwiki_rxWeblink, '', '', 0, 's:MakeBareBoneLink')
- let line = s:MakeTag(line, g:vimwiki_rxWikiWord, '', '', 0, 's:MakeWikiWordLink')
- let line = s:MakeTag(line, g:vimwiki_rxItalic, '', '')
- let line = s:MakeTag(line, g:vimwiki_rxBold, '', '')
- let line = s:MakeTag(line, g:vimwiki_rxTodo, '', '', 0)
- let line = s:MakeTag(line, g:vimwiki_rxDelText, '', '', 2)
- let line = s:MakeTag(line, g:vimwiki_rxSuperScript, '', '', 1)
- let line = s:MakeTag(line, g:vimwiki_rxSubScript, '', '', 2)
- let line = s:MakeTag(line, g:vimwiki_rxCode, '', '
')
- let line = s:MakeTag(line, g:vimwiki_rxPreStart.'.\+'.g:vimwiki_rxPreEnd, '', '
', 3)
- let [processed, lines] = s:processP(line)
- if processed && pre
- let pre = s:closePre(pre, ldest)
- endif
- if processed && code
- let code = s:closeCode(code, ldest)
- endif
- if processed && table
- let table = s:closeTable(table, ldest)
- endif
- call extend(ldest, lines)
- endif
-
- "" add the rest
- if !processed
- call add(ldest, line)
- endif
- endfor
-
- "" process end of file
- "" close opened tags if any
- call s:closePre(pre, ldest)
- call s:closeCode(code, ldest)
- call s:closeList(lists, ldest)
- call s:closeTable(table, ldest)
-
-
- call extend(ldest, s:HTMLFooter())
-
- "" make html file.
- "" TODO: add html headings, css, etc.
- let wwFileNameOnly = s:getFileNameOnly(a:wikifile)
- call writefile(ldest, a:path.wwFileNameOnly.'.html')
-endfunction "}}}
-
-" 2}}}
-doc/vimwiki.txt [[[1
-645
+doc\vimwiki.txt [[[1
+651
*vimwiki.txt* A Personal Wiki for Vim
__ __ ______ __ __ ______ __ __ ______ ~
@@ -977,7 +1008,7 @@ doc/vimwiki.txt [[[1
Let the help begins ...~
- Version: 0.6 ~
+ Version: 0.6.1 ~
==============================================================================
CONTENTS *vimwiki-contents*
@@ -1497,6 +1528,12 @@ Vim plugins website: http://www.Vim.org/scripts/script.php?script_id=2226
==============================================================================
9. Changelog *vimwiki-changelog*
+0.6.1
+ * [fix] [blablabla bla] shouldn't be converted to a link.
+ * [fix] Remove extra annoing empty strings from PRE tag made from
+ whitespaces in HTML export.
+ * [fix] Moved functions related to HTML converting to new autoload module
+ to increase a bit vimwiki startup time.
0.6
* [new] Header and footer templates. See|g:vimwiki_html_header| and
|g:vimwiki_html_footer|.
@@ -1609,15 +1646,16 @@ it's free enough to suit your needs.
vim:tw=78:ts=8:ft=help:fdm=marker:
-ftplugin/vimwiki.vim [[[1
-97
+ftplugin\vimwiki.vim [[[1
+98
" Vim filetype plugin file
" Language: Wiki
" Author: Maxim Kim (habamax at gmail dot com)
" Home: http://code.google.com/p/vimwiki/
" Filenames: *.wiki
-" Last Change: 29.01.2009 22:43
-" Version: 0.6
+" Last Change: 2009-02-08 12:41
+" Version: 0.6.1
+
if exists("b:did_ftplugin")
finish
endif
@@ -1652,8 +1690,8 @@ setlocal fdm=syntax
setlocal commentstring=
"" commands {{{2
-command! -buffer Vimwiki2HTML call vimwiki#Wiki2HTML(expand(g:vimwiki_home_html), expand('%'))
-command! -buffer VimwikiAll2HTML call vimwiki#WikiAll2HTML(expand(g:vimwiki_home_html))
+command! -buffer Vimwiki2HTML call vimwiki_html#Wiki2HTML(expand(g:vimwiki_home_html), expand('%'))
+command! -buffer VimwikiAll2HTML call vimwiki_html#WikiAll2HTML(expand(g:vimwiki_home_html))
command! -buffer VimwikiNextWord call vimwiki#WikiNextWord()
command! -buffer VimwikiPrevWord call vimwiki#WikiPrevWord()
@@ -1708,15 +1746,15 @@ if g:vimwiki_smartCR==1
noremap