Allow to specify additional chars for lists

This commit is contained in:
Michael F. Schönitzer
2017-09-16 16:30:22 +02:00
parent 976cbbcd23
commit 41e653718e
3 changed files with 18 additions and 6 deletions

View File

@ -1455,7 +1455,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

@ -1509,11 +1509,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)
@ -1529,8 +1533,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),