y0rune/vimwiki
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #711 from gpanders/dev

Browse Source 
Allow forcing VimwikiAll2HTML with !
This commit is contained in:
Rane Brown 2019-05-22 06:37:58 -06:00 committed by GitHub
commit 70a4852f3c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
autoload/vimwiki/html.vim
View File

@ -1611,7 +1611,7 @@ function! vimwiki#html#Wiki2HTML(path_html, wikifile)
endfunction endfunction
function! vimwiki#html#WikiAll2HTML(path_html) function! vimwiki#html#WikiAll2HTML(path_html, force)
if !s:syntax_supported() && !s:use_custom_wiki2html() if !s:syntax_supported() && !s:use_custom_wiki2html()
echomsg 'Vimwiki Error: Conversion to HTML is not supported for this syntax' echomsg 'Vimwiki Error: Conversion to HTML is not supported for this syntax'
return return
@ -1653,7 +1653,7 @@ function! vimwiki#html#WikiAll2HTML(path_html)
call vimwiki#vars#set_bufferlocal('subdir', subdir) call vimwiki#vars#set_bufferlocal('subdir', subdir)
call vimwiki#vars#set_bufferlocal('invsubdir', vimwiki#base#invsubdir(subdir)) call vimwiki#vars#set_bufferlocal('invsubdir', vimwiki#base#invsubdir(subdir))
if !s:is_html_uptodate(wikifile) if a:force || !s:is_html_uptodate(wikifile)
echomsg 'Vimwiki: Processing '.wikifile echomsg 'Vimwiki: Processing '.wikifile
call s:convert_file(path_html, wikifile) call s:convert_file(path_html, wikifile)

7
doc/vimwiki.txt
View File

@ -822,10 +822,14 @@ Vimwiki file.
*:Vimwiki2HTMLBrowse* *:Vimwiki2HTMLBrowse*
Convert current wiki page to HTML and open it in the webbrowser. Convert current wiki page to HTML and open it in the webbrowser.
*:VimwikiAll2HTML* *:VimwikiAll2HTML[!]*
Convert all wiki pages to HTML. Convert all wiki pages to HTML.
Default CSS file (style.css) is created if there is no one. Default CSS file (style.css) is created if there is no one.
By default, only converts wiki pages which have not already been
converted or have been modified since their last conversion. With !,
convert all pages, regardless of whether or not they are out-of-date.
*:VimwikiToggleListItem* *:VimwikiToggleListItem*
Toggle checkbox of a list item on/off. Toggle checkbox of a list item on/off.
See |vimwiki-todo-lists|. See |vimwiki-todo-lists|.
@ -3452,6 +3456,7 @@ https://github.com/vimwiki-backup/vimwiki/issues.
2.5 (in progress)~ 2.5 (in progress)~
New:~ New:~
* PR #711: Allow forcing VimwikiAll2HTML with !
* PR #702: Make remapping documentation more accessible to newer vim users * PR #702: Make remapping documentation more accessible to newer vim users
* PR #673: Add :VimwikiGoto key mapping. * PR #673: Add :VimwikiGoto key mapping.
* PR #689: Allow |vimwiki-option-diary_rel_path| to be an empty string. * PR #689: Allow |vimwiki-option-diary_rel_path| to be an empty string.

4
ftplugin/vimwiki.vim
View File

@ -234,8 +234,8 @@ command! -buffer Vimwiki2HTMLBrowse
\ call vimwiki#base#system_open_link(vimwiki#html#Wiki2HTML( \ call vimwiki#base#system_open_link(vimwiki#html#Wiki2HTML(
\ expand(vimwiki#vars#get_wikilocal('path_html')), \ expand(vimwiki#vars#get_wikilocal('path_html')),
\ expand('%'))) \ expand('%')))
command! -buffer VimwikiAll2HTML command! -buffer -bang VimwikiAll2HTML
\ call vimwiki#html#WikiAll2HTML(expand(vimwiki#vars#get_wikilocal('path_html'))) \ call vimwiki#html#WikiAll2HTML(expand(vimwiki#vars#get_wikilocal('path_html')), <bang>0)
command! -buffer VimwikiTOC call vimwiki#base#table_of_contents(1) command! -buffer VimwikiTOC call vimwiki#base#table_of_contents(1)