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

Remove nonascii bullet symbol because of encoding probs

Browse Source
This commit is contained in:
EinfachToll 2014-07-30 21:26:07 +02:00
parent a099a2cf3c
commit 77bc1b709b
4 changed files with 23 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
autoload/vimwiki/html.vim
View File

@ -1391,7 +1391,7 @@ function! vimwiki#html#Wiki2HTML(path_html, wikifile) "{{{
endif endif
" prepare regexps for lists " prepare regexps for lists
let s:bullets = '[*•-]' let s:bullets = '[*-]'
let s:numbers = let s:numbers =
\'\C\%(#\|\d\+)\|\d\+\.\|[ivxlcdm]\+)\|[IVXLCDM]\+)\|\l\{1,2})\|\u\{1,2})\)' \'\C\%(#\|\d\+)\|\d\+\.\|[ivxlcdm]\+)\|[IVXLCDM]\+)\|\l\{1,2})\|\u\{1,2})\)'

31
doc/vimwiki.txt
View File

@ -380,14 +380,6 @@ gL- Change the symbol of the current list to -.
To remap: > To remap: >
noremap glo :VimwikiChangeSymbolTo -<CR> noremap glo :VimwikiChangeSymbolTo -<CR>
noremap glO :VimwikiChangeSymbolInListTo -<CR> noremap glO :VimwikiChangeSymbolInListTo -<CR>
<
*vimwiki_gl.* *vimwiki_gL.*
gl. Make a list item out of normal line or change the symbol
of the current item to •.
gL. Change the symbol of the current list to •.
To remap: >
noremap glo :VimwikiChangeSymbolTo •<CR>
noremap glO :VimwikiChangeSymbolInListTo •<CR>
< <
*vimwiki_gl1* *vimwiki_gL1* *vimwiki_gl1* *vimwiki_gL1*
gl1 Make a list item out of normal line or change the symbol gl1 Make a list item out of normal line or change the symbol
@ -516,13 +508,13 @@ INSERT MODE *vimwiki-list-mappings*
< <
*vimwiki_i_<C-L>_<C-J>* *vimwiki_i_<C-L>_<C-J>*
<C-L><C-J> Change the symbol of the current list item to the next <C-L><C-J> Change the symbol of the current list item to the next
available. From - to • to 1. to * to I) to a). available. From - to 1. to * to I) to a).
To remap: > To remap: >
:imap <C-A> <Plug>VimwikiListNextSymbol :imap <C-A> <Plug>VimwikiListNextSymbol
< <
*vimwiki_i_<C-L>_<C-K>* *vimwiki_i_<C-L>_<C-K>*
<C-L><C-K> Change the symbol of the current list item to the prev <C-L><C-K> Change the symbol of the current list item to the prev
available. From - to a) to I) to * to 1. to •. available. From - to a) to I) to * to 1.
To remap: > To remap: >
:imap <C-S> <Plug>VimwikiListPrevSymbol :imap <C-S> <Plug>VimwikiListPrevSymbol
< <
@ -860,9 +852,6 @@ two lines.
Unordered lists: > Unordered lists: >
- Bulleted list item 1 - Bulleted list item 1
- Bulleted list item 2 - Bulleted list item 2
or: >
• Bulleted list item 1
• Bulleted list item 2
or: > or: >
* Bulleted list item 1 * Bulleted list item 1
* Bulleted list item 2 * Bulleted list item 2
@ -903,8 +892,8 @@ You can nest and mix the various types: >
- Bulleted list item 2 - Bulleted list item 2
a) Numbered list sub item 1 a) Numbered list sub item 1
b) more ... b) more ...
• and more ... * and more ...
• ... * ...
c) Numbered list sub item 3 c) Numbered list sub item 3
1. Numbered list sub sub item 1 1. Numbered list sub sub item 1
2. Numbered list sub sub item 2 2. Numbered list sub sub item 2
@ -1391,7 +1380,6 @@ For default syntax, the following types are available: >
- hyphen - hyphen
* asterisk * asterisk
# hash # hash
• dot, use gl. to create it
1. number with period 1. number with period
1) number with parenthesis 1) number with parenthesis
a) lower-case letter with parenthesis a) lower-case letter with parenthesis
@ -1424,9 +1412,8 @@ 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 it cannot distinguish which is which (at least if the types are both upper
case or both lower case). case or both lower case).
See |vimwiki_glstar|, |vimwiki_gl#| |vimwiki_gl-|, |vimwiki_gl.|, See |vimwiki_glstar|, |vimwiki_gl#| |vimwiki_gl-|, |vimwiki_gl-|,
|vimwiki_gl-|, |vimwiki_gl1|, |vimwiki_gla|, |vimwiki_glA|, |vimwiki_gli|, |vimwiki_gl1|, |vimwiki_gla|, |vimwiki_glA|, |vimwiki_gli|, |vimwiki_glI|
|vimwiki_glI|
Use glr and gLr, if the numbers of a numbered list are mixed up. See Use glr and gLr, if the numbers of a numbered list are mixed up. See
@ -2031,9 +2018,9 @@ Width of left-hand margin for lists. When negative, the current |shiftwidth|
is used. This affects the appearance of the generated links (see is used. This affects the appearance of the generated links (see
|:VimwikiGenerateLinks|), the Table of contents (|vimwiki-toc|) and the |:VimwikiGenerateLinks|), the Table of contents (|vimwiki-toc|) and the
behavior of the list manipulation commands |:VimwikiListChangeLevel| and the behavior of the list manipulation commands |:VimwikiListChangeLevel| and the
local mappings |vimwiki_glstar|, |vimwiki_gl#| |vimwiki_gl-|, |vimwiki_gl.|, local mappings |vimwiki_glstar|, |vimwiki_gl#| |vimwiki_gl-|, |vimwiki_gl-|,
|vimwiki_gl-|, |vimwiki_gl1|, |vimwiki_gla|, |vimwiki_glA|, |vimwiki_gli|, |vimwiki_gl1|, |vimwiki_gla|, |vimwiki_glA|, |vimwiki_gli|, |vimwiki_glI| and
|vimwiki_glI| and |vimwiki_i_<C-L>_<C-M>|. |vimwiki_i_<C-L>_<C-M>|.
Note: if you use MediaWiki syntax, you probably would like to set this option Note: if you use MediaWiki syntax, you probably would like to set this option
to 0, because every indented line is considered verbatim text. to 0, because every indented line is considered verbatim text.

24
ftplugin/vimwiki.vim
View File

@ -562,23 +562,21 @@ endif
noremap <silent><script><buffer> noremap <silent><script><buffer>
\ <Plug>VimwikiRemoveCBInList :VimwikiRemoveCBInList<CR> \ <Plug>VimwikiRemoveCBInList :VimwikiRemoveCBInList<CR>
for s:k in keys(g:vimwiki_bullet_types) for s:char in keys(g:vimwiki_bullet_types)
let s:char = (s:k == '•' ? '.' : s:k) if !hasmapto(':VimwikiChangeSymbolTo '.s:char.'<CR>')
exe 'noremap <silent><buffer> gl'.s:char.' :VimwikiChangeSymbolTo '.s:char.'<CR>'
if !hasmapto(':VimwikiChangeSymbolTo '.s:k.'<CR>')
exe 'noremap <silent><buffer> gl'.s:char.' :VimwikiChangeSymbolTo '.s:k.'<CR>'
endif endif
if !hasmapto(':VimwikiChangeSymbolInListTo '.s:k.'<CR>') if !hasmapto(':VimwikiChangeSymbolInListTo '.s:char.'<CR>')
exe 'noremap <silent><buffer> gL'.s:char.' :VimwikiChangeSymbolInListTo '.s:k.'<CR>' exe 'noremap <silent><buffer> gL'.s:char.' :VimwikiChangeSymbolInListTo '.s:char.'<CR>'
endif endif
endfor endfor
for s:k in g:vimwiki_number_types
if !hasmapto(':VimwikiChangeSymbolTo '.s:k.'<CR>') for s:typ in g:vimwiki_number_types
exe 'noremap <silent><buffer> gl'.s:k[0].' :VimwikiChangeSymbolTo '.s:k.'<CR>' if !hasmapto(':VimwikiChangeSymbolTo '.s:typ.'<CR>')
exe 'noremap <silent><buffer> gl'.s:typ[0].' :VimwikiChangeSymbolTo '.s:typ.'<CR>'
endif endif
if !hasmapto(':VimwikiChangeSymbolInListTo '.s:k.'<CR>') if !hasmapto(':VimwikiChangeSymbolInListTo '.s:typ.'<CR>')
exe 'noremap <silent><buffer> gL'.s:k[0].' :VimwikiChangeSymbolInListTo '.s:k.'<CR>' exe 'noremap <silent><buffer> gL'.s:typ[0].' :VimwikiChangeSymbolInListTo '.s:typ.'<CR>'
endif endif
endfor endfor

4
syntax/vimwiki_default.vim
View File

@ -74,11 +74,11 @@ let g:vimwiki_rxTableSep = '|'
" Lists " Lists
"1 means multiple bullets, like * ** *** "1 means multiple bullets, like * ** ***
let g:vimwiki_bullet_types = { '-':0, '*':0, '#':0 , '•':0 } let g:vimwiki_bullet_types = { '-':0, '*':0, '#':0 }
let g:vimwiki_number_types = ['1)', '1.', 'i)', 'I)', 'a)', 'A)'] let g:vimwiki_number_types = ['1)', '1.', 'i)', 'I)', 'a)', 'A)']
"this should contain at least one element "this should contain at least one element
"it is used for i_<C-L><C-J> among other things "it is used for i_<C-L><C-J> among other things
let g:vimwiki_list_markers = ['-', '•', '1.', '*', 'I)', 'a)'] let g:vimwiki_list_markers = ['-', '1.', '*', 'I)', 'a)']
let g:vimwiki_rxListDefine = '::\(\s\|$\)' let g:vimwiki_rxListDefine = '::\(\s\|$\)'
call vimwiki#lst#setup_marker_infos() call vimwiki#lst#setup_marker_infos()