From 3756c6258baf4b089df870ae2c7112915bb09df5 Mon Sep 17 00:00:00 2001 From: EinfachToll Date: Fri, 16 Feb 2018 21:42:32 +0100 Subject: [PATCH] Cherry-pick the changes from dev -- part4 --- autoload/vimwiki/html.vim | 3 ++- doc/vimwiki.txt | 17 ++++++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/autoload/vimwiki/html.vim b/autoload/vimwiki/html.vim index 43b90cb..075ab1f 100644 --- a/autoload/vimwiki/html.vim +++ b/autoload/vimwiki/html.vim @@ -1394,7 +1394,8 @@ function! vimwiki#html#CustomWiki2HTML(path, wikifile, force) "{{{ \ (len(vimwiki#vars#get_wikilocal('template_path')) > 1 ? shellescape(expand(vimwiki#vars#get_wikilocal('template_path'))) : '-'). ' '. \ (len(vimwiki#vars#get_wikilocal('template_default')) > 0 ? vimwiki#vars#get_wikilocal('template_default') : '-'). ' '. \ (len(vimwiki#vars#get_wikilocal('template_ext')) > 0 ? vimwiki#vars#get_wikilocal('template_ext') : '-'). ' '. - \ (len(vimwiki#vars#get_bufferlocal('subdir')) > 0 ? shellescape(s:root_path(vimwiki#vars#get_bufferlocal('subdir'))) : '-')) + \ (len(vimwiki#vars#get_bufferlocal('subdir')) > 0 ? shellescape(s:root_path(vimwiki#vars#get_bufferlocal('subdir'))) : '-'). ' '. + \ (len(vimwiki#vars#get_global('custom_wiki2html_args')) > 0 ? vimwiki#vars#get_global('custom_wiki2html_args') : '-')) endfunction " }}} function! s:convert_file(path_html, wikifile) "{{{ diff --git a/doc/vimwiki.txt b/doc/vimwiki.txt index 551d2e8..2cc2c4e 100644 --- a/doc/vimwiki.txt +++ b/doc/vimwiki.txt @@ -2157,8 +2157,12 @@ The following arguments, in this order, are passed to the script: 10. root_path : a count of ../ for pages buried in subdirs For example, if you have wikilink [[dir1/dir2/dir3/my page in a subdir]] then this argument is '../../../'. +11. custom_args : custom arguments that will be passed to the conversion + (can be defined in g:vimwiki_list as 'custom_wiki2html_args' parameter, + see |vimwiki-option-custom_wiki2html_args|) + script. -Options 7-10 are experimental and may change in the future. If any of these +Options 7-11 are experimental and may change in the future. If any of these parameters is empty, a hyphen "-" is passed to the script in its place. For an example and further instructions, refer to the following script: @@ -2171,6 +2175,17 @@ be located at https://github.com/vimwiki-backup/vimwiki/issues/384 To use the internal wiki2html converter, use an empty string (the default). +vimwiki-option-custom_wiki2html_args +----------------------------------------------------------------------------- +Key Default value~ +custom_wiki2html_args '' + +Description +If a custom script is called with |vimwiki-option-custom_wiki2html|, additional +parameters can be passed by setting them using 'custom_wiki2html_args' in +|g:vimwiki_list|. + + *vimwiki-option-list_margin* ------------------------------------------------------------------------------ Key Default value~