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

Cherry-pick the changes from dev -- part4

Browse Source
This commit is contained in:
EinfachToll 2018-02-16 21:42:32 +01:00
parent 73bda6b9ab
commit 3756c6258b
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
autoload/vimwiki/html.vim
View File

@ -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_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_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_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 " }}} endfunction " }}}
function! s:convert_file(path_html, wikifile) "{{{ function! s:convert_file(path_html, wikifile) "{{{

17
doc/vimwiki.txt
View File

@ -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 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]] For example, if you have wikilink [[dir1/dir2/dir3/my page in a subdir]]
then this argument is '../../../'. 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. parameters is empty, a hyphen "-" is passed to the script in its place.
For an example and further instructions, refer to the following script: 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). 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* *vimwiki-option-list_margin*
------------------------------------------------------------------------------ ------------------------------------------------------------------------------
Key Default value~ Key Default value~