vim-pandoc: set the markdown wrapping method
* NEW Enables vim-pandoc formatting module and set it to hard wrap at 79 columns. * Updates the local language dictionaries. Co-Authored-by: Igor Milhit <igor@milhit.ch>server
parent
eefd1e7317
commit
c5d227c527
|
@ -350,6 +350,23 @@ if s:is_win
|
||||||
function! s:is_local_plug(repo)
|
function! s:is_local_plug(repo)
|
||||||
return a:repo =~? '^[a-z]:\|^[%~]'
|
return a:repo =~? '^[a-z]:\|^[%~]'
|
||||||
endfunction
|
endfunction
|
||||||
|
|
||||||
|
" Copied from fzf
|
||||||
|
function! s:wrap_cmds(cmds)
|
||||||
|
return map(['@echo off', 'for /f "tokens=4" %%a in (''chcp'') do set origchcp=%%a', 'chcp 65001 > nul'] +
|
||||||
|
\ (type(a:cmds) == type([]) ? a:cmds : [a:cmds]) +
|
||||||
|
\ ['chcp %origchcp% > nul'], 'v:val."\r"')
|
||||||
|
endfunction
|
||||||
|
|
||||||
|
function! s:batchfile(cmd)
|
||||||
|
let batchfile = tempname().'.bat'
|
||||||
|
call writefile(s:wrap_cmds(a:cmd), batchfile)
|
||||||
|
let cmd = plug#shellescape(batchfile, {'shell': &shell, 'script': 1})
|
||||||
|
if &shell =~# 'powershell\.exe$'
|
||||||
|
let cmd = '& ' . cmd
|
||||||
|
endif
|
||||||
|
return [batchfile, cmd]
|
||||||
|
endfunction
|
||||||
else
|
else
|
||||||
function! s:rtp(spec)
|
function! s:rtp(spec)
|
||||||
return s:dirpath(a:spec.dir . get(a:spec, 'rtp', ''))
|
return s:dirpath(a:spec.dir . get(a:spec, 'rtp', ''))
|
||||||
|
@ -434,8 +451,8 @@ endfunction
|
||||||
|
|
||||||
function! s:dobufread(names)
|
function! s:dobufread(names)
|
||||||
for name in a:names
|
for name in a:names
|
||||||
let path = s:rtp(g:plugs[name]).'/**'
|
let path = s:rtp(g:plugs[name])
|
||||||
for dir in ['ftdetect', 'ftplugin']
|
for dir in ['ftdetect', 'ftplugin', 'after/ftdetect', 'after/ftplugin']
|
||||||
if len(finddir(dir, path))
|
if len(finddir(dir, path))
|
||||||
if exists('#BufRead')
|
if exists('#BufRead')
|
||||||
doautocmd BufRead
|
doautocmd BufRead
|
||||||
|
@ -794,9 +811,7 @@ endfunction
|
||||||
|
|
||||||
function! s:chsh(swap)
|
function! s:chsh(swap)
|
||||||
let prev = [&shell, &shellcmdflag, &shellredir]
|
let prev = [&shell, &shellcmdflag, &shellredir]
|
||||||
if s:is_win
|
if !s:is_win && a:swap
|
||||||
set shell=cmd.exe shellcmdflag=/c shellredir=>%s\ 2>&1
|
|
||||||
elseif a:swap
|
|
||||||
set shell=sh shellredir=>%s\ 2>&1
|
set shell=sh shellredir=>%s\ 2>&1
|
||||||
endif
|
endif
|
||||||
return prev
|
return prev
|
||||||
|
@ -809,9 +824,7 @@ function! s:bang(cmd, ...)
|
||||||
" but it won't work on Windows.
|
" but it won't work on Windows.
|
||||||
let cmd = a:0 ? s:with_cd(a:cmd, a:1) : a:cmd
|
let cmd = a:0 ? s:with_cd(a:cmd, a:1) : a:cmd
|
||||||
if s:is_win
|
if s:is_win
|
||||||
let batchfile = tempname().'.bat'
|
let [batchfile, cmd] = s:batchfile(cmd)
|
||||||
call writefile(["@echo off\r", cmd . "\r"], batchfile)
|
|
||||||
let cmd = batchfile
|
|
||||||
endif
|
endif
|
||||||
let g:_plug_bang = (s:is_win && has('gui_running') ? 'silent ' : '').'!'.escape(cmd, '#!%')
|
let g:_plug_bang = (s:is_win && has('gui_running') ? 'silent ' : '').'!'.escape(cmd, '#!%')
|
||||||
execute "normal! :execute g:_plug_bang\<cr>\<cr>"
|
execute "normal! :execute g:_plug_bang\<cr>\<cr>"
|
||||||
|
@ -1094,7 +1107,7 @@ function! s:update_finish()
|
||||||
elseif has_key(spec, 'tag')
|
elseif has_key(spec, 'tag')
|
||||||
let tag = spec.tag
|
let tag = spec.tag
|
||||||
if tag =~ '\*'
|
if tag =~ '\*'
|
||||||
let tags = s:lines(s:system('git tag --list '.s:shellesc(tag).' --sort -version:refname 2>&1', spec.dir))
|
let tags = s:lines(s:system('git tag --list '.plug#shellescape(tag).' --sort -version:refname 2>&1', spec.dir))
|
||||||
if !v:shell_error && !empty(tags)
|
if !v:shell_error && !empty(tags)
|
||||||
let tag = tags[0]
|
let tag = tags[0]
|
||||||
call s:log4(name, printf('Latest tag for %s -> %s', spec.tag, tag))
|
call s:log4(name, printf('Latest tag for %s -> %s', spec.tag, tag))
|
||||||
|
@ -1151,7 +1164,7 @@ function! s:job_abort()
|
||||||
silent! call job_stop(j.jobid)
|
silent! call job_stop(j.jobid)
|
||||||
endif
|
endif
|
||||||
if j.new
|
if j.new
|
||||||
call s:system('rm -rf ' . s:shellesc(g:plugs[name].dir))
|
call s:system('rm -rf ' . plug#shellescape(g:plugs[name].dir))
|
||||||
endif
|
endif
|
||||||
endfor
|
endfor
|
||||||
let s:jobs = {}
|
let s:jobs = {}
|
||||||
|
@ -1204,15 +1217,10 @@ endfunction
|
||||||
|
|
||||||
function! s:spawn(name, cmd, opts)
|
function! s:spawn(name, cmd, opts)
|
||||||
let job = { 'name': a:name, 'running': 1, 'error': 0, 'lines': [''],
|
let job = { 'name': a:name, 'running': 1, 'error': 0, 'lines': [''],
|
||||||
\ 'batchfile': (s:is_win && (s:nvim || s:vim8)) ? tempname().'.bat' : '',
|
|
||||||
\ 'new': get(a:opts, 'new', 0) }
|
\ 'new': get(a:opts, 'new', 0) }
|
||||||
let s:jobs[a:name] = job
|
let s:jobs[a:name] = job
|
||||||
let cmd = has_key(a:opts, 'dir') ? s:with_cd(a:cmd, a:opts.dir) : a:cmd
|
let cmd = has_key(a:opts, 'dir') ? s:with_cd(a:cmd, a:opts.dir, 0) : a:cmd
|
||||||
if !empty(job.batchfile)
|
let argv = s:is_win ? ['cmd', '/s', '/c', '"'.cmd.'"'] : ['sh', '-c', cmd]
|
||||||
call writefile(["@echo off\r", cmd . "\r"], job.batchfile)
|
|
||||||
let cmd = job.batchfile
|
|
||||||
endif
|
|
||||||
let argv = add(s:is_win ? ['cmd', '/c'] : ['sh', '-c'], cmd)
|
|
||||||
|
|
||||||
if s:nvim
|
if s:nvim
|
||||||
call extend(job, {
|
call extend(job, {
|
||||||
|
@ -1262,9 +1270,6 @@ function! s:reap(name)
|
||||||
call s:log(bullet, a:name, empty(result) ? 'OK' : result)
|
call s:log(bullet, a:name, empty(result) ? 'OK' : result)
|
||||||
call s:bar()
|
call s:bar()
|
||||||
|
|
||||||
if has_key(job, 'batchfile') && !empty(job.batchfile)
|
|
||||||
call delete(job.batchfile)
|
|
||||||
endif
|
|
||||||
call remove(s:jobs, a:name)
|
call remove(s:jobs, a:name)
|
||||||
endfunction
|
endfunction
|
||||||
|
|
||||||
|
@ -1354,8 +1359,8 @@ while 1 " Without TCO, Vim stack is bound to explode
|
||||||
\ printf('git clone %s %s %s %s 2>&1',
|
\ printf('git clone %s %s %s %s 2>&1',
|
||||||
\ has_tag ? '' : s:clone_opt,
|
\ has_tag ? '' : s:clone_opt,
|
||||||
\ prog,
|
\ prog,
|
||||||
\ s:shellesc(spec.uri),
|
\ plug#shellescape(spec.uri, {'script': 0}),
|
||||||
\ s:shellesc(s:trim(spec.dir))), { 'new': 1 })
|
\ plug#shellescape(s:trim(spec.dir), {'script': 0})), { 'new': 1 })
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if !s:jobs[name].running
|
if !s:jobs[name].running
|
||||||
|
@ -1982,17 +1987,23 @@ function! s:update_ruby()
|
||||||
EOF
|
EOF
|
||||||
endfunction
|
endfunction
|
||||||
|
|
||||||
function! s:shellesc_cmd(arg)
|
function! s:shellesc_cmd(arg, script)
|
||||||
let escaped = substitute(a:arg, '[&|<>()@^]', '^&', 'g')
|
let escaped = substitute('"'.a:arg.'"', '[&|<>()@^!"]', '^&', 'g')
|
||||||
let escaped = substitute(escaped, '%', '%%', 'g')
|
return substitute(escaped, '%', (a:script ? '%' : '^') . '&', 'g')
|
||||||
let escaped = substitute(escaped, '"', '\\^&', 'g')
|
|
||||||
let escaped = substitute(escaped, '\(\\\+\)\(\\^\)', '\1\1\2', 'g')
|
|
||||||
return '^"'.substitute(escaped, '\(\\\+\)$', '\1\1', '').'^"'
|
|
||||||
endfunction
|
endfunction
|
||||||
|
|
||||||
function! s:shellesc(arg)
|
function! s:shellesc_ps1(arg)
|
||||||
if &shell =~# 'cmd.exe$'
|
return "'".substitute(escape(a:arg, '\"'), "'", "''", 'g')."'"
|
||||||
return s:shellesc_cmd(a:arg)
|
endfunction
|
||||||
|
|
||||||
|
function! plug#shellescape(arg, ...)
|
||||||
|
let opts = a:0 > 0 && type(a:1) == s:TYPE.dict ? a:1 : {}
|
||||||
|
let shell = get(opts, 'shell', s:is_win ? 'cmd.exe' : 'sh')
|
||||||
|
let script = get(opts, 'script', 1)
|
||||||
|
if shell =~# 'cmd\.exe$'
|
||||||
|
return s:shellesc_cmd(a:arg, script)
|
||||||
|
elseif shell =~# 'powershell\.exe$' || shell =~# 'pwsh$'
|
||||||
|
return s:shellesc_ps1(a:arg)
|
||||||
endif
|
endif
|
||||||
return shellescape(a:arg)
|
return shellescape(a:arg)
|
||||||
endfunction
|
endfunction
|
||||||
|
@ -2026,8 +2037,9 @@ function! s:format_message(bullet, name, message)
|
||||||
endif
|
endif
|
||||||
endfunction
|
endfunction
|
||||||
|
|
||||||
function! s:with_cd(cmd, dir)
|
function! s:with_cd(cmd, dir, ...)
|
||||||
return printf('cd%s %s && %s', s:is_win ? ' /d' : '', s:shellesc(a:dir), a:cmd)
|
let script = a:0 > 0 ? a:1 : 1
|
||||||
|
return printf('cd%s %s && %s', s:is_win ? ' /d' : '', plug#shellescape(a:dir, {'script': script}), a:cmd)
|
||||||
endfunction
|
endfunction
|
||||||
|
|
||||||
function! s:system(cmd, ...)
|
function! s:system(cmd, ...)
|
||||||
|
@ -2035,11 +2047,9 @@ function! s:system(cmd, ...)
|
||||||
let [sh, shellcmdflag, shrd] = s:chsh(1)
|
let [sh, shellcmdflag, shrd] = s:chsh(1)
|
||||||
let cmd = a:0 > 0 ? s:with_cd(a:cmd, a:1) : a:cmd
|
let cmd = a:0 > 0 ? s:with_cd(a:cmd, a:1) : a:cmd
|
||||||
if s:is_win
|
if s:is_win
|
||||||
let batchfile = tempname().'.bat'
|
let [batchfile, cmd] = s:batchfile(cmd)
|
||||||
call writefile(["@echo off\r", cmd . "\r"], batchfile)
|
|
||||||
let cmd = batchfile
|
|
||||||
endif
|
endif
|
||||||
return system(s:is_win ? '('.cmd.')' : cmd)
|
return system(cmd)
|
||||||
finally
|
finally
|
||||||
let [&shell, &shellcmdflag, &shellredir] = [sh, shellcmdflag, shrd]
|
let [&shell, &shellcmdflag, &shellredir] = [sh, shellcmdflag, shrd]
|
||||||
if s:is_win
|
if s:is_win
|
||||||
|
@ -2115,7 +2125,7 @@ endfunction
|
||||||
|
|
||||||
function! s:rm_rf(dir)
|
function! s:rm_rf(dir)
|
||||||
if isdirectory(a:dir)
|
if isdirectory(a:dir)
|
||||||
call s:system((s:is_win ? 'rmdir /S /Q ' : 'rm -rf ') . s:shellesc(a:dir))
|
call s:system((s:is_win ? 'rmdir /S /Q ' : 'rm -rf ') . plug#shellescape(a:dir))
|
||||||
endif
|
endif
|
||||||
endfunction
|
endfunction
|
||||||
|
|
||||||
|
@ -2224,7 +2234,7 @@ function! s:upgrade()
|
||||||
let new = tmp . '/plug.vim'
|
let new = tmp . '/plug.vim'
|
||||||
|
|
||||||
try
|
try
|
||||||
let out = s:system(printf('git clone --depth 1 %s %s', s:shellesc(s:plug_src), s:shellesc(tmp)))
|
let out = s:system(printf('git clone --depth 1 %s %s', plug#shellescape(s:plug_src), plug#shellescape(tmp)))
|
||||||
if v:shell_error
|
if v:shell_error
|
||||||
return s:err('Error upgrading vim-plug: '. out)
|
return s:err('Error upgrading vim-plug: '. out)
|
||||||
endif
|
endif
|
||||||
|
@ -2367,11 +2377,9 @@ function! s:preview_commit()
|
||||||
setlocal previewwindow filetype=git buftype=nofile nobuflisted modifiable
|
setlocal previewwindow filetype=git buftype=nofile nobuflisted modifiable
|
||||||
try
|
try
|
||||||
let [sh, shellcmdflag, shrd] = s:chsh(1)
|
let [sh, shellcmdflag, shrd] = s:chsh(1)
|
||||||
let cmd = 'cd '.s:shellesc(g:plugs[name].dir).' && git show --no-color --pretty=medium '.sha
|
let cmd = 'cd '.plug#shellescape(g:plugs[name].dir).' && git show --no-color --pretty=medium '.sha
|
||||||
if s:is_win
|
if s:is_win
|
||||||
let batchfile = tempname().'.bat'
|
let [batchfile, cmd] = s:batchfile(cmd)
|
||||||
call writefile(["@echo off\r", cmd . "\r"], batchfile)
|
|
||||||
let cmd = batchfile
|
|
||||||
endif
|
endif
|
||||||
execute 'silent %!' cmd
|
execute 'silent %!' cmd
|
||||||
finally
|
finally
|
||||||
|
@ -2420,9 +2428,9 @@ function! s:diff()
|
||||||
call s:append_ul(2, origin ? 'Pending updates:' : 'Last update:')
|
call s:append_ul(2, origin ? 'Pending updates:' : 'Last update:')
|
||||||
for [k, v] in plugs
|
for [k, v] in plugs
|
||||||
let range = origin ? '..origin/'.v.branch : 'HEAD@{1}..'
|
let range = origin ? '..origin/'.v.branch : 'HEAD@{1}..'
|
||||||
let cmd = 'git log --graph --color=never '.join(map(['--pretty=format:%x01%h%x01%d%x01%s%x01%cr', range], 's:shellesc(v:val)'))
|
let cmd = 'git log --graph --color=never '.join(map(['--pretty=format:%x01%h%x01%d%x01%s%x01%cr', range], 'plug#shellescape(v:val)'))
|
||||||
if has_key(v, 'rtp')
|
if has_key(v, 'rtp')
|
||||||
let cmd .= ' -- '.s:shellesc(v.rtp)
|
let cmd .= ' -- '.plug#shellescape(v.rtp)
|
||||||
endif
|
endif
|
||||||
let diff = s:system_chomp(cmd, v.dir)
|
let diff = s:system_chomp(cmd, v.dir)
|
||||||
if !empty(diff)
|
if !empty(diff)
|
||||||
|
|
13
init.vim
13
init.vim
|
@ -37,7 +37,7 @@ set mouse=a " Enable mouse usage (all modes)
|
||||||
|
|
||||||
set linebreak " Line wrap
|
set linebreak " Line wrap
|
||||||
set tw=79 " Lines longer than 79 chars will be wrapped
|
set tw=79 " Lines longer than 79 chars will be wrapped
|
||||||
set colorcolumn=79 " Colors the 79th column
|
set colorcolumn=+1 " Colors the tw+1 column
|
||||||
|
|
||||||
set number " Line numbering
|
set number " Line numbering
|
||||||
set cursorline
|
set cursorline
|
||||||
|
@ -45,13 +45,10 @@ set ruler
|
||||||
set modeline
|
set modeline
|
||||||
|
|
||||||
" Markdown
|
" Markdown
|
||||||
au FileType markdown set wrap
|
autocmd FileType markdown set nocursorline
|
||||||
au FileType markdown set nocursorline
|
|
||||||
au FileType markdown set linebreak
|
|
||||||
au FileType markdown set colorcolumn&
|
|
||||||
|
|
||||||
" Consider `.jsonld` as JSON
|
" Consider `.jsonld` as JSON
|
||||||
autocmd BufNewFile,BufRead *.jsonld setfiletype json
|
autocmd BufNewFile,BufRead *.jsonld set filetype=json
|
||||||
" tabstop to 2 for JSON
|
" tabstop to 2 for JSON
|
||||||
au FileType json set tabstop=2
|
au FileType json set tabstop=2
|
||||||
au FileType json set softtabstop=2
|
au FileType json set softtabstop=2
|
||||||
|
@ -78,6 +75,10 @@ autocmd FileType xml set foldlevel=1
|
||||||
" vim-pandoc
|
" vim-pandoc
|
||||||
" default languages grammar check
|
" default languages grammar check
|
||||||
:let g:pandoc#spell#default_langs = ['fr', 'en']
|
:let g:pandoc#spell#default_langs = ['fr', 'en']
|
||||||
|
" formatting module mode hard wrap
|
||||||
|
:let g:pandoc#formatting#colorcolumn = +1
|
||||||
|
:let g:pandoc#formatting#textwidth = 79
|
||||||
|
:let g:pandoc#formatting#mode = "hA"
|
||||||
|
|
||||||
" set C-l to :nohlsearch
|
" set C-l to :nohlsearch
|
||||||
nnoremap <silent> <C-l> :nohlsearch<CR><C-l>
|
nnoremap <silent> <C-l> :nohlsearch<CR><C-l>
|
||||||
|
|
|
@ -20,3 +20,4 @@ brisolée
|
||||||
ebook
|
ebook
|
||||||
itérativement
|
itérativement
|
||||||
consortial
|
consortial
|
||||||
|
passe-t-il
|
||||||
|
|
Binary file not shown.
Loading…
Reference in New Issue