Merge branch 'dev' of https://github.com/vimwiki/vimwiki into dev
This commit is contained in:
commit
ed7230707d
@ -860,7 +860,11 @@ function! s:process_tag_list(line, lists) "{{{
|
|||||||
let chk = matchlist(a:line, a:rx_list)
|
let chk = matchlist(a:line, a:rx_list)
|
||||||
if !empty(chk) && len(chk[1]) > 0
|
if !empty(chk) && len(chk[1]) > 0
|
||||||
let completion = index(g:vimwiki_listsyms_list, chk[1])
|
let completion = index(g:vimwiki_listsyms_list, chk[1])
|
||||||
if completion >= 0 && completion <=4
|
let n = len(g:vimwiki_listsyms_list)
|
||||||
|
if completion == 0
|
||||||
|
let st_tag = '<li class="done0">'
|
||||||
|
elseif completion > 0 && completion < n
|
||||||
|
let completion = float2nr(round(completion / (n-1.0) * 3.0 + 0.5 ))
|
||||||
let st_tag = '<li class="done'.completion.'">'
|
let st_tag = '<li class="done'.completion.'">'
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
@ -979,7 +983,11 @@ function! s:process_tag_para(line, para) "{{{
|
|||||||
let para = 1
|
let para = 1
|
||||||
endif
|
endif
|
||||||
let processed = 1
|
let processed = 1
|
||||||
|
if g:vimwiki_text_ignore_newline == 1
|
||||||
call add(lines, a:line)
|
call add(lines, a:line)
|
||||||
|
else
|
||||||
|
call add(lines, a:line."<br />")
|
||||||
|
endif
|
||||||
elseif para && a:line =~# '^\s*$'
|
elseif para && a:line =~# '^\s*$'
|
||||||
call add(lines, "</p>")
|
call add(lines, "</p>")
|
||||||
let para = 0
|
let para = 0
|
||||||
|
@ -693,7 +693,8 @@ function! s:get_rate(item) "{{{
|
|||||||
return -1
|
return -1
|
||||||
endif
|
endif
|
||||||
let state = a:item.cb
|
let state = a:item.cb
|
||||||
return index(g:vimwiki_listsyms_list, state) * 25
|
let n=len(g:vimwiki_listsyms_list)
|
||||||
|
return index(g:vimwiki_listsyms_list, state) * 100/(n-1)
|
||||||
endfunction "}}}
|
endfunction "}}}
|
||||||
|
|
||||||
"Set state of the list item to [ ] or [o] or whatever
|
"Set state of the list item to [ ] or [o] or whatever
|
||||||
@ -729,16 +730,14 @@ endfunction "}}}
|
|||||||
"Returns: the appropriate symbol for a given percent rate
|
"Returns: the appropriate symbol for a given percent rate
|
||||||
function! s:rate_to_state(rate) "{{{
|
function! s:rate_to_state(rate) "{{{
|
||||||
let state = ''
|
let state = ''
|
||||||
|
let n=len(g:vimwiki_listsyms_list)
|
||||||
if a:rate == 100
|
if a:rate == 100
|
||||||
let state = g:vimwiki_listsyms_list[4]
|
let state = g:vimwiki_listsyms_list[n-1]
|
||||||
elseif a:rate == 0
|
elseif a:rate == 0
|
||||||
let state = g:vimwiki_listsyms_list[0]
|
let state = g:vimwiki_listsyms_list[0]
|
||||||
elseif a:rate >= 67
|
|
||||||
let state = g:vimwiki_listsyms_list[3]
|
|
||||||
elseif a:rate >= 34
|
|
||||||
let state = g:vimwiki_listsyms_list[2]
|
|
||||||
else
|
else
|
||||||
let state = g:vimwiki_listsyms_list[1]
|
let index = float2nr(ceil(a:rate/100.0*(n-2)))
|
||||||
|
let state = g:vimwiki_listsyms_list[index]
|
||||||
endif
|
endif
|
||||||
return state
|
return state
|
||||||
endfunction "}}}
|
endfunction "}}}
|
||||||
|
@ -2255,11 +2255,11 @@ Default: 'Vimwiki'
|
|||||||
------------------------------------------------------------------------------
|
------------------------------------------------------------------------------
|
||||||
*g:vimwiki_listsyms*
|
*g:vimwiki_listsyms*
|
||||||
|
|
||||||
String of 5 symbols to show the progression of todo list items.
|
String of at least two symbols to show the progression of todo list items.
|
||||||
Default value is ' .oOX'.
|
Default value is ' .oOX'.
|
||||||
|
|
||||||
The first char is for 0% done items.
|
The first char is for 0% done items.
|
||||||
The fifth is for 100% done items.
|
The last is for 100% done items.
|
||||||
|
|
||||||
You can set it to some more fancy symbols like this:
|
You can set it to some more fancy symbols like this:
|
||||||
>
|
>
|
||||||
@ -2312,6 +2312,19 @@ Value Description~
|
|||||||
Default: 1
|
Default: 1
|
||||||
|
|
||||||
|
|
||||||
|
------------------------------------------------------------------------------
|
||||||
|
*g:vimwiki_text_ignore_newline*
|
||||||
|
|
||||||
|
This is HTML related.
|
||||||
|
Convert newlines to <br />s in text.
|
||||||
|
|
||||||
|
Value Description~
|
||||||
|
0 Newlines in text are converted to <br />s.
|
||||||
|
1 Ignore newlines.
|
||||||
|
|
||||||
|
Default: 1
|
||||||
|
|
||||||
|
|
||||||
------------------------------------------------------------------------------
|
------------------------------------------------------------------------------
|
||||||
*g:vimwiki_use_calendar*
|
*g:vimwiki_use_calendar*
|
||||||
|
|
||||||
|
@ -369,6 +369,7 @@ call s:default('ext2syntax', {}) " syntax map keyed on extension
|
|||||||
call s:default('hl_headers', 0)
|
call s:default('hl_headers', 0)
|
||||||
call s:default('hl_cb_checked', 0)
|
call s:default('hl_cb_checked', 0)
|
||||||
call s:default('list_ignore_newline', 1)
|
call s:default('list_ignore_newline', 1)
|
||||||
|
call s:default('text_ignore_newline', 1)
|
||||||
call s:default('listsyms', ' .oOX')
|
call s:default('listsyms', ' .oOX')
|
||||||
call s:default('use_calendar', 1)
|
call s:default('use_calendar', 1)
|
||||||
call s:default('table_mappings', 1)
|
call s:default('table_mappings', 1)
|
||||||
|
@ -413,7 +413,7 @@ execute 'syntax match VimwikiList /'.g:vimwiki_rxListDefine.'/'
|
|||||||
execute 'syntax match VimwikiListTodo /'.g:vimwiki_rxListItem.'/'
|
execute 'syntax match VimwikiListTodo /'.g:vimwiki_rxListItem.'/'
|
||||||
|
|
||||||
if g:vimwiki_hl_cb_checked == 1
|
if g:vimwiki_hl_cb_checked == 1
|
||||||
execute 'syntax match VimwikiCheckBoxDone /'.g:vimwiki_rxListItemWithoutCB.'\s*\['.g:vimwiki_listsyms_list[4].'\]\s.*$/ '.
|
execute 'syntax match VimwikiCheckBoxDone /'.g:vimwiki_rxListItemWithoutCB.'\s*\['.g:vimwiki_listsyms_list[-1].'\]\s.*$/ '.
|
||||||
\ 'contains=VimwikiNoExistsLink,VimwikiLink,@Spell'
|
\ 'contains=VimwikiNoExistsLink,VimwikiLink,@Spell'
|
||||||
elseif g:vimwiki_hl_cb_checked == 2
|
elseif g:vimwiki_hl_cb_checked == 2
|
||||||
execute 'syntax match VimwikiCheckBoxDone /'.g:vimwiki_rxListItemAndChildren.'/ contains=VimwikiNoExistsLink,VimwikiLink,@Spell'
|
execute 'syntax match VimwikiCheckBoxDone /'.g:vimwiki_rxListItemAndChildren.'/ contains=VimwikiNoExistsLink,VimwikiLink,@Spell'
|
||||||
|
@ -80,7 +80,7 @@ call vimwiki#lst#setup_marker_infos()
|
|||||||
|
|
||||||
let g:vimwiki_rxListItemWithoutCB = '^\s*\%(\('.g:vimwiki_rxListBullet.'\)\|\('.g:vimwiki_rxListNumber.'\)\)\s'
|
let g:vimwiki_rxListItemWithoutCB = '^\s*\%(\('.g:vimwiki_rxListBullet.'\)\|\('.g:vimwiki_rxListNumber.'\)\)\s'
|
||||||
let g:vimwiki_rxListItem = g:vimwiki_rxListItemWithoutCB . '\+\%(\[\(['.g:vimwiki_listsyms.']\)\]\s\)\?'
|
let g:vimwiki_rxListItem = g:vimwiki_rxListItemWithoutCB . '\+\%(\[\(['.g:vimwiki_listsyms.']\)\]\s\)\?'
|
||||||
let g:vimwiki_rxListItemAndChildren = '^\(\s*\)\%('.g:vimwiki_rxListBullet.'\|'.g:vimwiki_rxListNumber.'\)\s\+\['.g:vimwiki_listsyms_list[4].'\]\s.*\%(\n\%(\1\s.*\|^$\)\)*'
|
let g:vimwiki_rxListItemAndChildren = '^\(\s*\)\%('.g:vimwiki_rxListBullet.'\|'.g:vimwiki_rxListNumber.'\)\s\+\['.g:vimwiki_listsyms_list[-1].'\]\s.*\%(\n\%(\1\s.*\|^$\)\)*'
|
||||||
|
|
||||||
" Preformatted text
|
" Preformatted text
|
||||||
let g:vimwiki_rxPreStart = '{{{'
|
let g:vimwiki_rxPreStart = '{{{'
|
||||||
|
@ -77,7 +77,7 @@ call vimwiki#lst#setup_marker_infos()
|
|||||||
|
|
||||||
let g:vimwiki_rxListItemWithoutCB = '^\s*\%(\('.g:vimwiki_rxListBullet.'\)\|\('.g:vimwiki_rxListNumber.'\)\)\s'
|
let g:vimwiki_rxListItemWithoutCB = '^\s*\%(\('.g:vimwiki_rxListBullet.'\)\|\('.g:vimwiki_rxListNumber.'\)\)\s'
|
||||||
let g:vimwiki_rxListItem = g:vimwiki_rxListItemWithoutCB . '\+\%(\[\(['.g:vimwiki_listsyms.']\)\]\s\)\?'
|
let g:vimwiki_rxListItem = g:vimwiki_rxListItemWithoutCB . '\+\%(\[\(['.g:vimwiki_listsyms.']\)\]\s\)\?'
|
||||||
let g:vimwiki_rxListItemAndChildren = '^\(\s*\)\%('.g:vimwiki_rxListBullet.'\|'.g:vimwiki_rxListNumber.'\)\s\+\['.g:vimwiki_listsyms_list[4].'\]\s.*\%(\n\%(\1\s.*\|^$\)\)*'
|
let g:vimwiki_rxListItemAndChildren = '^\(\s*\)\%('.g:vimwiki_rxListBullet.'\|'.g:vimwiki_rxListNumber.'\)\s\+\['.g:vimwiki_listsyms_list[-1].'\]\s.*\%(\n\%(\1\s.*\|^$\)\)*'
|
||||||
|
|
||||||
" Preformatted text
|
" Preformatted text
|
||||||
let g:vimwiki_rxPreStart = '```'
|
let g:vimwiki_rxPreStart = '```'
|
||||||
|
@ -58,7 +58,7 @@ call vimwiki#lst#setup_marker_infos()
|
|||||||
|
|
||||||
let g:vimwiki_rxListItemWithoutCB = '^\s*\%(\('.g:vimwiki_rxListBullet.'\)\|\('.g:vimwiki_rxListNumber.'\)\)\s'
|
let g:vimwiki_rxListItemWithoutCB = '^\s*\%(\('.g:vimwiki_rxListBullet.'\)\|\('.g:vimwiki_rxListNumber.'\)\)\s'
|
||||||
let g:vimwiki_rxListItem = g:vimwiki_rxListItemWithoutCB . '\+\%(\[\(['.g:vimwiki_listsyms.']\)\]\s\)\?'
|
let g:vimwiki_rxListItem = g:vimwiki_rxListItemWithoutCB . '\+\%(\[\(['.g:vimwiki_listsyms.']\)\]\s\)\?'
|
||||||
let g:vimwiki_rxListItemAndChildren = '^\('.g:vimwiki_rxListBullet.'\)\s\+\['.g:vimwiki_listsyms_list[4].'\]\s.*\%(\n\%(\1\%('.g:vimwiki_rxListBullet.'\).*\|^$\|\s.*\)\)*'
|
let g:vimwiki_rxListItemAndChildren = '^\('.g:vimwiki_rxListBullet.'\)\s\+\['.g:vimwiki_listsyms_list[-1].'\]\s.*\%(\n\%(\1\%('.g:vimwiki_rxListBullet.'\).*\|^$\|\s.*\)\)*'
|
||||||
|
|
||||||
" Preformatted text
|
" Preformatted text
|
||||||
let g:vimwiki_rxPreStart = '<pre>'
|
let g:vimwiki_rxPreStart = '<pre>'
|
||||||
|
Loading…
Reference in New Issue
Block a user