Merge pull request #3 from Nudin/individualli

Allow to specify additional chars for lists
This commit is contained in:
Michael F. Schönitzer
2017-09-16 17:09:41 +02:00
committed by GitHub
3 changed files with 18 additions and 6 deletions

View File

@ -1457,7 +1457,11 @@ function! s:convert_file(path_html, wikifile) "{{{
endif
" prepare regexps for lists
let s:bullets = '[*-]'
if exists("g:vimwiki_additional_bullet_types")
let s:bullets = '[*-'. join(keys(g:vimwiki_additional_bullet_types), '') . ']'
else
let s:bullets = '[*-]'
endif
let s:numbers =
\'\C\%(#\|\d\+)\|\d\+\.\|[ivxlcdm]\+)\|[IVXLCDM]\+)\|\l\{1,2})\|\u\{1,2})\)'

View File

@ -1529,11 +1529,15 @@ endfunction "}}}
endif
endfunction "}}}
"handle keys }}}
"handle keys }}}
"misc stuff {{{
function! vimwiki#lst#setup_marker_infos() "{{{
let l:bullet_types=g:vimwiki_bullet_types
if exists("g:vimwiki_additional_bullet_types")
call extend(l:bullet_types, g:vimwiki_additional_bullet_types)
function! vimwiki#lst#setup_marker_infos() "{{{
let s:rx_bullet_chars = '['.join(keys(g:vimwiki_bullet_types), '').']\+'
endif
let s:rx_bullet_chars = '['.join(keys(l:bullet_types), '').']\+'
let s:multiple_bullet_chars = []
for i in keys(l:bullet_types)
@ -1549,8 +1553,8 @@ function! vimwiki#lst#setup_marker_infos() "{{{
let s:number_divisors .= vimwiki#u#escape(i[1])
endfor
let s:char_to_rx = {'1': '\d\+', 'i': '[ivxlcdm]\+', 'I': '[IVXLCDM]\+',
\ 'a': '\l\{1,2}', 'A': '\u\{1,2}'}
let s:char_to_rx = {'1': '\d\+', 'i': '[ivxlcdm]\+', 'I': '[IVXLCDM]\+',
\ 'a': '\l\{1,2}', 'A': '\u\{1,2}'}
"create regexp for bulleted list items
let g:vimwiki_rxListBullet = join( map(keys(l:bullet_types),

View File

@ -1563,6 +1563,10 @@ after a list using letters or vice versa, Vimwiki will get confused because
it cannot distinguish which is which (at least if the types are both upper
case or both lower case).
You can add additional list-types in your vimrc by setting the variable
let g:vimwiki_additional_bullet_types = { "→": 0}
Corresponding mapings will not be set.
See |vimwiki_glstar|, |vimwiki_gl#| |vimwiki_gl-|, |vimwiki_gl-|,
|vimwiki_gl1|, |vimwiki_gla|, |vimwiki_glA|, |vimwiki_gli|, |vimwiki_glI|