From f88877376732804ad9ed3adcccfb83302c21bd0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20F=2E=20Sch=C3=B6nitzer?= Date: Sat, 15 Jul 2017 23:35:48 +0200 Subject: [PATCH 1/7] New feature reject a item form todo-list Based on patches of davidlmontgomery. --- autoload/vimwiki/lst.vim | 56 +++++++++++++++++++++++++++++++++++-- ftplugin/vimwiki.vim | 1 + plugin/vimwiki.vim | 1 + syntax/vimwiki_default.vim | 2 +- syntax/vimwiki_markdown.vim | 2 +- syntax/vimwiki_media.vim | 2 +- 6 files changed, 59 insertions(+), 5 deletions(-) diff --git a/autoload/vimwiki/lst.vim b/autoload/vimwiki/lst.vim index adaee22..a94373c 100644 --- a/autoload/vimwiki/lst.vim +++ b/autoload/vimwiki/lst.vim @@ -693,6 +693,9 @@ function! s:get_rate(item) "{{{ return -1 endif let state = a:item.cb + if state == g:vimwiki_listsym_rejected + return -1 + endif let n=len(g:vimwiki_listsyms_list) return index(g:vimwiki_listsyms_list, state) * 100/(n-1) endfunction "}}} @@ -735,6 +738,8 @@ function! s:rate_to_state(rate) "{{{ let state = g:vimwiki_listsyms_list[n-1] elseif a:rate == 0 let state = g:vimwiki_listsyms_list[0] + elseif a:rate == -1 + let state = g:vimwiki_listsym_rejected else let index = float2nr(ceil(a:rate/100.0*(n-2))) let state = g:vimwiki_listsyms_list[index] @@ -759,8 +764,11 @@ function! s:update_state(item) "{{{ break endif if child_item.cb != '' - let count_children_with_cb += 1 - let sum_children_rate += s:get_rate(child_item) + let rate = s:get_rate(child_item) + if rate != -1 + let count_children_with_cb += 1 + let sum_children_rate += rate + endif endif let child_item = s:get_next_child_item(a:item, child_item) endwhile @@ -909,6 +917,46 @@ function! vimwiki#lst#toggle_cb(from_line, to_line) "{{{ endfunction "}}} +"Toggles checkbox between [ ] and [-] or creates one +"in the lines of the given range +function! vimwiki#lst#toggle_rejected_cb(from_line, to_line) "{{{ + let from_item = s:get_corresponding_item(a:from_line) + if from_item.type == 0 + return + endif + + if from_item.cb == '' + + "if from_line has no CB, make a CB in every selected line + let parent_items_of_lines = [] + for cur_ln in range(from_item.lnum, a:to_line) + let cur_item = s:get_item(cur_ln) + let success = s:create_cb(cur_item) + + if success + let cur_parent_item = s:get_parent(cur_item) + if index(parent_items_of_lines, cur_parent_item) == -1 + call insert(parent_items_of_lines, cur_parent_item) + endif + endif + endfor + + for parent_item in parent_items_of_lines + call s:update_state(parent_item) + endfor + + else + + "if from_line has CB, toggle it and set all siblings to the same new state + let rate_first_line = s:get_rate(from_item) + let new_rate = rate_first_line == -1 ? 0 : -1 + + call s:change_cb(a:from_line, a:to_line, new_rate) + + endif + +endfunction "}}} + function! vimwiki#lst#remove_cb(first_line, last_line) "{{{ let first_item = s:get_corresponding_item(a:first_line) let last_item = s:get_corresponding_item(a:last_line) @@ -1549,6 +1597,10 @@ function! vimwiki#lst#setup_marker_infos() "{{{ "the user can set the listsyms as string, but vimwiki needs a list let g:vimwiki_listsyms_list = split(g:vimwiki_listsyms, '\zs') + + if match(g:vimwiki_listsyms, g:vimwiki_listsym_rejected) != -1 + echomsg "Warning: g:vimwiki_listsyms and g:vimwiki_listsym_rejected overlap" + endif endfunction "}}} function! vimwiki#lst#TO_list_item(inner, visual) "{{{ diff --git a/ftplugin/vimwiki.vim b/ftplugin/vimwiki.vim index a2d6d3e..f2ad61f 100644 --- a/ftplugin/vimwiki.vim +++ b/ftplugin/vimwiki.vim @@ -295,6 +295,7 @@ command! -buffer -range -nargs=1 VimwikiChangeSymbolTo call vimwiki#lst#change_m command! -buffer -range -nargs=1 VimwikiListChangeSymbolI call vimwiki#lst#change_marker(, , , 'i') command! -buffer -nargs=1 VimwikiChangeSymbolInListTo call vimwiki#lst#change_marker_in_list() command! -buffer -range VimwikiToggleListItem call vimwiki#lst#toggle_cb(, ) +command! -buffer -range VimwikiToggleListItemRejected call vimwiki#lst#toggle_rejected_cb(, ) command! -buffer -range VimwikiIncrementListItem call vimwiki#lst#increment_cb(, ) command! -buffer -range VimwikiDecrementListItem call vimwiki#lst#decrement_cb(, ) command! -buffer -range -nargs=+ VimwikiListChangeLvl call vimwiki#lst#change_level(, , ) diff --git a/plugin/vimwiki.vim b/plugin/vimwiki.vim index e31c734..c7c90a4 100644 --- a/plugin/vimwiki.vim +++ b/plugin/vimwiki.vim @@ -373,6 +373,7 @@ call s:default('hl_cb_checked', 0) call s:default('list_ignore_newline', 1) call s:default('text_ignore_newline', 1) call s:default('listsyms', ' .oOX') +call s:default('listsym_rejected', '-') call s:default('use_calendar', 1) call s:default('table_mappings', 1) call s:default('table_auto_fmt', 1) diff --git a/syntax/vimwiki_default.vim b/syntax/vimwiki_default.vim index a90ea20..173c54a 100644 --- a/syntax/vimwiki_default.vim +++ b/syntax/vimwiki_default.vim @@ -79,7 +79,7 @@ let g:vimwiki_rxListDefine = '::\(\s\|$\)' call vimwiki#lst#setup_marker_infos() 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.g:vimwiki_listsym_rejected.']\)\]\s\)\?' let g:vimwiki_rxListItemAndChildren = '^\(\s*\)\%('.g:vimwiki_rxListBullet.'\|'.g:vimwiki_rxListNumber.'\)\s\+\['.g:vimwiki_listsyms_list[-1].'\]\s.*\%(\n\%(\1\s.*\|^$\)\)*' " Preformatted text diff --git a/syntax/vimwiki_markdown.vim b/syntax/vimwiki_markdown.vim index 3ae9da0..647cad9 100644 --- a/syntax/vimwiki_markdown.vim +++ b/syntax/vimwiki_markdown.vim @@ -76,7 +76,7 @@ let g:vimwiki_rxListDefine = '::\%(\s\|$\)' call vimwiki#lst#setup_marker_infos() 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.g:vimwiki_listsym_rejected.']\)\]\s\)\?' let g:vimwiki_rxListItemAndChildren = '^\(\s*\)\%('.g:vimwiki_rxListBullet.'\|'.g:vimwiki_rxListNumber.'\)\s\+\['.g:vimwiki_listsyms_list[-1].'\]\s.*\%(\n\%(\1\s.*\|^$\)\)*' " Preformatted text diff --git a/syntax/vimwiki_media.vim b/syntax/vimwiki_media.vim index a6f8e4a..814d934 100644 --- a/syntax/vimwiki_media.vim +++ b/syntax/vimwiki_media.vim @@ -57,7 +57,7 @@ let g:vimwiki_rxListDefine = '^\%(;\|:\)\s' call vimwiki#lst#setup_marker_infos() 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.g:vimwiki_listsym_rejected.']\)\]\s\)\?' let g:vimwiki_rxListItemAndChildren = '^\('.g:vimwiki_rxListBullet.'\)\s\+\['.g:vimwiki_listsyms_list[-1].'\]\s.*\%(\n\%(\1\%('.g:vimwiki_rxListBullet.'\).*\|^$\|\s.*\)\)*' " Preformatted text From 6b9df766bb9c677894172539f52010dbf4f98566 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20F=2E=20Sch=C3=B6nitzer?= Date: Sat, 5 Aug 2017 14:50:58 +0200 Subject: [PATCH 2/7] Remove duplicated code --- autoload/vimwiki/lst.vim | 112 +++++++++++++++------------------------ 1 file changed, 42 insertions(+), 70 deletions(-) diff --git a/autoload/vimwiki/lst.vim b/autoload/vimwiki/lst.vim index a94373c..f73fad3 100644 --- a/autoload/vimwiki/lst.vim +++ b/autoload/vimwiki/lst.vim @@ -843,6 +843,46 @@ function! s:change_cb(from_line, to_line, new_rate) "{{{ endfunction "}}} +"Toggles checkbox between two states in the lines of the given range, +"creates chceckboxes if there aren't any. +function! s:toggle_create_cb(from_line, to_line, state1, state2) "{{{ + let from_item = s:get_corresponding_item(a:from_line) + if from_item.type == 0 + return + endif + + if from_item.cb == '' + + "if from_line has no CB, make a CB in every selected line + let parent_items_of_lines = [] + for cur_ln in range(from_item.lnum, a:to_line) + let cur_item = s:get_item(cur_ln) + let success = s:create_cb(cur_item) + + if success + let cur_parent_item = s:get_parent(cur_item) + if index(parent_items_of_lines, cur_parent_item) == -1 + call insert(parent_items_of_lines, cur_parent_item) + endif + endif + endfor + + for parent_item in parent_items_of_lines + call s:update_state(parent_item) + endfor + + else + + "if from_line has CB, toggle it and set all siblings to the same new state + let rate_first_line = s:get_rate(from_item) + let new_rate = rate_first_line == a:state1 ? a:state2 : a:state1 + + call s:change_cb(a:from_line, a:to_line, new_rate) + + endif + +endfunction "}}} + "Decrement checkbox between [ ] and [X] "in the lines of the given range function! vimwiki#lst#decrement_cb(from_line, to_line) "{{{ @@ -880,81 +920,13 @@ endfunction "}}} "Toggles checkbox between [ ] and [X] or creates one "in the lines of the given range function! vimwiki#lst#toggle_cb(from_line, to_line) "{{{ - let from_item = s:get_corresponding_item(a:from_line) - if from_item.type == 0 - return - endif - - if from_item.cb == '' - - "if from_line has no CB, make a CB in every selected line - let parent_items_of_lines = [] - for cur_ln in range(from_item.lnum, a:to_line) - let cur_item = s:get_item(cur_ln) - let success = s:create_cb(cur_item) - - if success - let cur_parent_item = s:get_parent(cur_item) - if index(parent_items_of_lines, cur_parent_item) == -1 - call insert(parent_items_of_lines, cur_parent_item) - endif - endif - endfor - - for parent_item in parent_items_of_lines - call s:update_state(parent_item) - endfor - - else - - "if from_line has CB, toggle it and set all siblings to the same new state - let rate_first_line = s:get_rate(from_item) - let new_rate = rate_first_line == 100 ? 0 : 100 - - call s:change_cb(a:from_line, a:to_line, new_rate) - - endif - + return s:toggle_create_cb(a:from_line, a:to_line, 100, 0) endfunction "}}} "Toggles checkbox between [ ] and [-] or creates one "in the lines of the given range function! vimwiki#lst#toggle_rejected_cb(from_line, to_line) "{{{ - let from_item = s:get_corresponding_item(a:from_line) - if from_item.type == 0 - return - endif - - if from_item.cb == '' - - "if from_line has no CB, make a CB in every selected line - let parent_items_of_lines = [] - for cur_ln in range(from_item.lnum, a:to_line) - let cur_item = s:get_item(cur_ln) - let success = s:create_cb(cur_item) - - if success - let cur_parent_item = s:get_parent(cur_item) - if index(parent_items_of_lines, cur_parent_item) == -1 - call insert(parent_items_of_lines, cur_parent_item) - endif - endif - endfor - - for parent_item in parent_items_of_lines - call s:update_state(parent_item) - endfor - - else - - "if from_line has CB, toggle it and set all siblings to the same new state - let rate_first_line = s:get_rate(from_item) - let new_rate = rate_first_line == -1 ? 0 : -1 - - call s:change_cb(a:from_line, a:to_line, new_rate) - - endif - + return s:toggle_create_cb(a:from_line, a:to_line, -1, 0) endfunction "}}} function! vimwiki#lst#remove_cb(first_line, last_line) "{{{ From f917b01998d59e7b168e193a9fdb9a1b7dafebc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20F=2E=20Sch=C3=B6nitzer?= Date: Sat, 5 Aug 2017 00:20:37 +0200 Subject: [PATCH 3/7] Html-export: Add support of rejected Todo-listentry --- autoload/vimwiki/html.vim | 2 ++ autoload/vimwiki/style.css | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/autoload/vimwiki/html.vim b/autoload/vimwiki/html.vim index 0d52271..88f186b 100644 --- a/autoload/vimwiki/html.vim +++ b/autoload/vimwiki/html.vim @@ -876,6 +876,8 @@ function! s:process_tag_list(line, lists) "{{{ let n = len(g:vimwiki_listsyms_list) if completion == 0 let st_tag = '
  • ' + elseif completion == -1 && chk[1] == g:vimwiki_listsym_rejected + let st_tag = '
  • ' elseif completion > 0 && completion < n let completion = float2nr(round(completion / (n-1.0) * 3.0 + 0.5 )) let st_tag = '
  • ' diff --git a/autoload/vimwiki/style.css b/autoload/vimwiki/style.css index da2518c..431d15b 100644 --- a/autoload/vimwiki/style.css +++ b/autoload/vimwiki/style.css @@ -27,6 +27,13 @@ del {text-decoration: line-through; color: #777777;} .tag {background-color: #eeeeee; font-family: monospace; padding: 2px;} /* classes for items of todo lists */ +.rejected { + /* list-style: none; */ + background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPCAMAAAAMCGV4AAAACXBIWXMAAADFAAAAxQEdzbqoAAAAB3RJTUUH4QgEFhAtuWgv9wAAAPZQTFRFmpqam5iYnJaWnJeXnpSUn5OTopCQpoqKpouLp4iIqIiIrYCAt3V1vW1tv2xsmZmZmpeXnpKS/x4e/x8f/yAg/yIi/yQk/yUl/yYm/ygo/ykp/yws/zAw/zIy/zMz/zQ0/zU1/zY2/zw8/0BA/0ZG/0pK/1FR/1JS/1NT/1RU/1VV/1ZW/1dX/1pa/15e/19f/2Zm/2lp/21t/25u/3R0/3p6/4CA/4GB/4SE/4iI/46O/4+P/52d/6am/6ur/66u/7Oz/7S0/7e3/87O/9fX/9zc/93d/+Dg/+vr/+3t/+/v//Dw//Ly//X1//f3//n5//z8////gzaKowAAAA90Uk5T/Pz8/Pz8/Pz8/Pz8/f39ppQKWQAAAAFiS0dEEnu8bAAAAACuSURBVAhbPY9ZF4FQFEZPSKbIMmWep4gMGTKLkIv6/3/GPbfF97b3w17rA0kQOPgvAeHW6uJ6+5h7HqLdwowgOzejXRXBdx6UdSru216xuOMBHHNU0clTzeSUA6EhF8V8kqroluMiU6HKcuf4phGPr1o2q9kYZWwNq1qfRRmTaXpqsyjj17KkWCxKBUBgXWueHIyiAIg18gsse4KHkLF5IKIY10WQgv7fOy4ST34BRiopZ8WLNrgAAAAASUVORK5CYII=); + background-repeat: no-repeat; + background-position: 0 .2em; + padding-left: 1.5em; +} .done0 { /* list-style: none; */ background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPCAYAAAA71pVKAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAAxQAAAMUBHc26qAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAA7SURBVCiR7dMxEgAgCANBI3yVRzF5KxNbW6wsuH7LQ2YKQK1mkswBVERYF5Os3UV3gwd/jF2SkXy66gAZkxS6BniubAAAAABJRU5ErkJggg==); From 013603930679ec801249371e7a55db2a9abbb995 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20F=2E=20Sch=C3=B6nitzer?= Date: Sat, 5 Aug 2017 02:12:41 +0200 Subject: [PATCH 4/7] Documented VimwikiToggleListItemRejected --- doc/vimwiki.txt | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/doc/vimwiki.txt b/doc/vimwiki.txt index bc8db38..883c06c 100644 --- a/doc/vimwiki.txt +++ b/doc/vimwiki.txt @@ -656,6 +656,10 @@ Vimwiki file. Toggle checkbox of a list item on/off. See |vimwiki-todo-lists|. +*:VimwikiToggleListItemRejected* + Toggle checkbox of a list item disabled/off. + See |vimwiki-todo-lists|. + *:VimwikiListChangeLevel* CMD Change the nesting level, or symbol, for a single-line list item. CMD may be ">>" or "<<" to change the indentation of the item, or @@ -1621,6 +1625,10 @@ Use gl (see |vimwiki_gl|) to remove a single checkbox and gL (see |vimwiki_gL|) to remove all checkboxes of the list the cursor is in. +You can mark an item as rejected ("won't do") with +|:VimwikiToggleListItemRejected.| It will not influence the status of it's +parents. + ============================================================================== 9. Tables *vimwiki-tables* @@ -2345,6 +2353,19 @@ You can set it to some more fancy symbols like this: let g:vimwiki_listsyms = '✗○◐●✓' +------------------------------------------------------------------------------ +*g:vimwiki_listsym_rejected* + +Character that is used to show that an item of a todo list will not be done. +Default value is '-'. + +The character used here may not be part of g:vimwiki_listsyms. + +You can set it to some more fancy symbols like this: +> + let g:vimwiki_listsym_rejected = '✗' + + ------------------------------------------------------------------------------ *g:vimwiki_use_mouse* From 413b9ca04fe079a0eb3e93173755e2b020fff92f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20F=2E=20Sch=C3=B6nitzer?= Date: Sat, 5 Aug 2017 17:32:15 +0200 Subject: [PATCH 5/7] Add default keybinding glx for toggling disabled --- doc/vimwiki.txt | 9 ++++++++- ftplugin/vimwiki.vim | 4 ++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/doc/vimwiki.txt b/doc/vimwiki.txt index 883c06c..80ef89e 100644 --- a/doc/vimwiki.txt +++ b/doc/vimwiki.txt @@ -455,6 +455,13 @@ gLI Change the symbol of the current list to To remap: > noremap glo :VimwikiChangeSymbolTo I) noremap glO :VimwikiChangeSymbolInListTo I) +< + *vimwiki_glx* +glx Toggle checkbox of a list item disabled/off. + Maps to |:VimwikiToggleListItemRejected|. + See |vimwiki-todo-lists|. + To remap: > + :map tx VimwikiToggleListItemRejected < *vimwiki_gqq* *vimwiki_gww* gqq Format table. If you made some changes to a table @@ -1626,7 +1633,7 @@ gL (see |vimwiki_gL|) to remove all checkboxes of the list the cursor is in. You can mark an item as rejected ("won't do") with -|:VimwikiToggleListItemRejected.| It will not influence the status of it's +|vimwiki_glx|. A rejected item will not influence the status of it's parents. diff --git a/ftplugin/vimwiki.vim b/ftplugin/vimwiki.vim index f2ad61f..e8a18e4 100644 --- a/ftplugin/vimwiki.vim +++ b/ftplugin/vimwiki.vim @@ -443,6 +443,10 @@ if !hasmapto('VimwikiToggleListItem') vmap VimwikiToggleListItem endif endif +if !hasmapto('VimwikiToggleListItemRejected') + nmap glx VimwikiToggleListItemRejected + vmap glx VimwikiToggleListItemRejected +endif nnoremap