From ddf7e5e0ff4d16e6b8c0019e04e7a3b0d7ae59c7 Mon Sep 17 00:00:00 2001 From: Greg Anders Date: Mon, 20 May 2019 08:22:15 -0600 Subject: [PATCH 1/3] Allow forcing VimwikiAll2HTML with ! --- autoload/vimwiki/html.vim | 4 ++-- ftplugin/vimwiki.vim | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/autoload/vimwiki/html.vim b/autoload/vimwiki/html.vim index 409e5b0..fca30db 100644 --- a/autoload/vimwiki/html.vim +++ b/autoload/vimwiki/html.vim @@ -1611,7 +1611,7 @@ function! vimwiki#html#Wiki2HTML(path_html, wikifile) endfunction -function! vimwiki#html#WikiAll2HTML(path_html) +function! vimwiki#html#WikiAll2HTML(path_html, force) if !s:syntax_supported() && !s:use_custom_wiki2html() echomsg 'Vimwiki Error: Conversion to HTML is not supported for this syntax' return @@ -1653,7 +1653,7 @@ function! vimwiki#html#WikiAll2HTML(path_html) call vimwiki#vars#set_bufferlocal('subdir', 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 call s:convert_file(path_html, wikifile) diff --git a/ftplugin/vimwiki.vim b/ftplugin/vimwiki.vim index a450a63..619e762 100644 --- a/ftplugin/vimwiki.vim +++ b/ftplugin/vimwiki.vim @@ -234,8 +234,8 @@ command! -buffer Vimwiki2HTMLBrowse \ call vimwiki#base#system_open_link(vimwiki#html#Wiki2HTML( \ expand(vimwiki#vars#get_wikilocal('path_html')), \ expand('%'))) -command! -buffer VimwikiAll2HTML - \ call vimwiki#html#WikiAll2HTML(expand(vimwiki#vars#get_wikilocal('path_html'))) +command! -buffer -bang VimwikiAll2HTML + \ call vimwiki#html#WikiAll2HTML(expand(vimwiki#vars#get_wikilocal('path_html')), 0) command! -buffer VimwikiTOC call vimwiki#base#table_of_contents(1) From 12df0bddb2b20a5a48955e34b8d95f40952748f6 Mon Sep 17 00:00:00 2001 From: Greg Anders Date: Mon, 20 May 2019 08:29:12 -0600 Subject: [PATCH 2/3] Update documentation --- doc/vimwiki.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/doc/vimwiki.txt b/doc/vimwiki.txt index 6f8d6d4..7dd0083 100644 --- a/doc/vimwiki.txt +++ b/doc/vimwiki.txt @@ -822,10 +822,14 @@ Vimwiki file. *:Vimwiki2HTMLBrowse* Convert current wiki page to HTML and open it in the webbrowser. -*:VimwikiAll2HTML* +*:VimwikiAll2HTML[!]* Convert all wiki pages to HTML. 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* Toggle checkbox of a list item on/off. See |vimwiki-todo-lists|. From 8bfdf54d10a36c744a22cc202db3455af5b56bd3 Mon Sep 17 00:00:00 2001 From: Greg Anders Date: Wed, 22 May 2019 06:28:03 -0600 Subject: [PATCH 3/3] Update changelog --- doc/vimwiki.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/vimwiki.txt b/doc/vimwiki.txt index 7dd0083..a4f0712 100644 --- a/doc/vimwiki.txt +++ b/doc/vimwiki.txt @@ -3456,6 +3456,7 @@ https://github.com/vimwiki-backup/vimwiki/issues. 2.5 (in progress)~ New:~ + * PR #711: Allow forcing VimwikiAll2HTML with ! * PR #702: Make remapping documentation more accessible to newer vim users * PR #673: Add :VimwikiGoto key mapping. * PR #689: Allow |vimwiki-option-diary_rel_path| to be an empty string.