Update runtime files
diff --git a/runtime/ftplugin/mp.vim b/runtime/ftplugin/mp.vim
index 3a0a3d0..bc5116e 100644
--- a/runtime/ftplugin/mp.vim
+++ b/runtime/ftplugin/mp.vim
@@ -1,82 +1,91 @@
-" Vim filetype plugin file
-" Language: MetaPost
-" Maintainer: Nicola Vitacolonna <nvitacolonna@gmail.com>
-" Former Maintainers: Nikolai Weibull <now@bitwi.se>
-" Latest Revision: 2016 Oct 2
+vim9script
+
+# Vim filetype plugin file
+# Language: MetaPost
+# Maintainer: Nicola Vitacolonna <nvitacolonna@gmail.com>
+# Former Maintainers: Nikolai Weibull <now@bitwi.se>
+# Latest Revision: 2022 Aug 12
if exists("b:did_ftplugin")
finish
endif
-let b:did_ftplugin = 1
-let s:cpo_save = &cpo
-set cpo&vim
+b:did_ftplugin = 1
+b:undo_ftplugin = "setl com< cms< fo< sua< inc< def< ofu<"
-let b:undo_ftplugin = "setl com< cms< fo< sua< inc< def< ofu<"
- \ . "| unlet! b:match_ignorecase b:match_words b:match_skip"
-
-setlocal comments=:% commentstring=%\ %s formatoptions-=t formatoptions+=cjroql2
-setlocal suffixesadd=.mp,.mpiv
-let &l:include = '\<\%(input\|loadmodule\)\>' " loadmodule is in MetaFun
-let &l:define = '\<\%(let\|newinternal\|interim\|def\|vardef\)\>\|\<\%(primary\|secondary\|tertiary\)def\>\s*[^ .]\+'
+setlocal comments=:%
+setlocal commentstring=%\ %s
+setlocal formatoptions+=cjroql2
+setlocal formatoptions-=t
setlocal omnifunc=syntaxcomplete#Complete
-let g:omni_syntax_group_include_mp = 'mf\w\+,mp\w\+'
-let g:omni_syntax_group_exclude_mp = 'mfTodoComment'
+setlocal suffixesadd=.mp,.mpiv,.mpvi,.mpxl
-if exists(":FixBeginfigs") != 2
- command -nargs=0 FixBeginfigs call s:fix_beginfigs()
+&l:include = '\<\%(input\|loadmodule\)\>' # loadmodule is from MetaFun
+&l:define = '\<\%(let\|newinternal\|interim\|def\|vardef\)\>\|\<\%(primary\|secondary\|tertiary\)def\>\s*[^ .]\+'
- function! s:fix_beginfigs()
- let i = 1
- g/^beginfig(\d*);$/s//\='beginfig('.i.');'/ | let i = i + 1
- endfunction
+g:omni_syntax_group_include_mp = 'mf\w\+,mp\w\+,metafun\w\+'
+g:omni_syntax_group_exclude_mp = 'mfTodoComment'
+
+var fignum: number
+
+def FixBeginfigs()
+ fignum = 1
+ g/^\s*beginfig(\d*)\s*;\(\s*%.*\)\=$/s/^.\{-};/\='beginfig(' .. fignum .. ');'/ | ++fignum
+enddef
+
+command! -buffer -nargs=0 -bar FixBeginfigs FixBeginfigs()
+
+if exists("g:loaded_matchit") && !exists("b:match_words")
+ b:match_ignorecase = 0
+ b:match_skip = 'synIDattr(synID(line("."), col("."), 1), "name") =~# "^mf\\%(Comment\\|String\\|\\)$\\|^mpTeXinsert$"'
+ b:match_words = '\<if\>:\<else\%[if]\>:\<fi\>,'
+ .. '\<for\%(\|suffixes\|ever\)\>:\<exit\%(if\|unless\)\>:\<endfor\>,'
+ .. '\<\%(\|var\|primary\|secondary\|tertiary\)def\>:\<enddef\>,'
+ .. '\<begin\(\a\+\)\>:end\1,'
+ .. '\<beginlogochar\>:\<endchar\>'
+ b:undo_ftplugin ..= "| unlet! b:match_ignorecase b:match_words b:match_skip"
endif
-let s:mp_regex = {
- \ 'beginsection' : '^\s*\%(\%(\|var\|primary\|secondary\|tertiary\)def\|begin\%(fig\|char\|logochar\|glyph\|graph\)\)\>',
- \ 'endsection' : '^\s*\%(enddef\|end\%(fig\|char\|glyph\|graph\)\)\>',
- \ 'beginblock' : '^\s*\%(begingroup\|if\|for\%(\|suffixes\|ever\)\)\>',
- \ 'endblock' : '^\s*\%(endgroup\|fi\|endfor\)\>'
- \ }
+if !get(g:, 'no_mp_maps', 0) && !get(g:, 'no_plugin_maps', 0)
+ const mp_regex = {
+ 'beginsection': '^\s*\%(\%(\|var\|primary\|secondary\|tertiary\)def\|begin\%(fig\|char\|logochar\|glyph\|graph\)\)\>',
+ 'endsection': '^\s*\%(enddef\|end\%(fig\|char\|glyph\|graph\)\)\>',
+ 'beginblock': '^\s*\%(begingroup\|if\|for\%(\|suffixes\|ever\)\)\>',
+ 'endblock': '^\s*\%(endgroup\|fi\|endfor\)\>'}
-function! s:move_around(count, what, flags, visual)
- if a:visual
- exe "normal! gv"
- endif
- call search(s:mp_regex[a:what], a:flags.'s') " 's' sets previous context mark
- call map(range(2, a:count), 'search(s:mp_regex[a:what], a:flags)')
-endfunction
+ def MoveAround(count: number, what: string, flags: string)
+ search(mp_regex[what], flags .. 's') # 's' sets previous context mark
+ var i = 2
+ while i <= count
+ search(mp_regex[what], flags)
+ i += 1
+ endwhile
+ enddef
+ # Macros to move around
+ nnoremap <silent><buffer> [[ <scriptcmd>MoveAround(v:count1, "beginsection", "bW")<cr>
+ vnoremap <silent><buffer> [[ <scriptcmd>MoveAround(v:count1, "beginsection", "bW")<cr>
+ nnoremap <silent><buffer> ]] <scriptcmd>MoveAround(v:count1, "beginsection", "W") <cr>
+ vnoremap <silent><buffer> ]] <scriptcmd>MoveAround(v:count1, "beginsection", "W") <cr>
+ nnoremap <silent><buffer> [] <scriptcmd>MoveAround(v:count1, "endsection", "bW")<cr>
+ vnoremap <silent><buffer> [] <scriptcmd>MoveAround(v:count1, "endsection", "bW")<cr>
+ nnoremap <silent><buffer> ][ <scriptcmd>MoveAround(v:count1, "endsection", "W") <cr>
+ vnoremap <silent><buffer> ][ <scriptcmd>MoveAround(v:count1, "endsection", "W") <cr>
+ nnoremap <silent><buffer> [{ <scriptcmd>MoveAround(v:count1, "beginblock", "bW")<cr>
+ vnoremap <silent><buffer> [{ <scriptcmd>MoveAround(v:count1, "beginblock", "bW")<cr>
+ nnoremap <silent><buffer> ]} <scriptcmd>MoveAround(v:count1, "endblock", "W") <cr>
+ vnoremap <silent><buffer> ]} <scriptcmd>MoveAround(v:count1, "endblock", "W") <cr>
-" Move around macros.
-nnoremap <silent><buffer> [[ :<C-U>call <SID>move_around(v:count1, "beginsection", "bW", v:false) <CR>
-vnoremap <silent><buffer> [[ :<C-U>call <SID>move_around(v:count1, "beginsection", "bW", v:true) <CR>
-nnoremap <silent><buffer> ]] :<C-U>call <SID>move_around(v:count1, "beginsection", "W", v:false) <CR>
-vnoremap <silent><buffer> ]] :<C-U>call <SID>move_around(v:count1, "beginsection", "W", v:true) <CR>
-nnoremap <silent><buffer> [] :<C-U>call <SID>move_around(v:count1, "endsection", "bW", v:false) <CR>
-vnoremap <silent><buffer> [] :<C-U>call <SID>move_around(v:count1, "endsection", "bW", v:true) <CR>
-nnoremap <silent><buffer> ][ :<C-U>call <SID>move_around(v:count1, "endsection", "W", v:false) <CR>
-vnoremap <silent><buffer> ][ :<C-U>call <SID>move_around(v:count1, "endsection", "W", v:true) <CR>
-nnoremap <silent><buffer> [{ :<C-U>call <SID>move_around(v:count1, "beginblock", "bW", v:false) <CR>
-vnoremap <silent><buffer> [{ :<C-U>call <SID>move_around(v:count1, "beginblock", "bW", v:true) <CR>
-nnoremap <silent><buffer> ]} :<C-U>call <SID>move_around(v:count1, "endblock", "W", v:false) <CR>
-vnoremap <silent><buffer> ]} :<C-U>call <SID>move_around(v:count1, "endblock", "W", v:true) <CR>
-
-if exists("loaded_matchit")
- let b:match_ignorecase = 0
- let b:match_words =
- \ '\<if\>:\<else\%[if]\>:\<fi\>,' .
- \ '\<for\%(\|suffixes\|ever\)\>:\<exit\%(if\|unless\)\>:\<endfor\>,' .
- \ '\<\%(\|var\|primary\|secondary\|tertiary\)def\>:\<enddef\>,' .
- \ '\<beginfig\>:\<endfig\>,' .
- \ '\<begingroup\>:\<endgroup\>,' .
- \ '\<begin\%(logo\)\?char\>:\<endchar\>,' .
- \ '\<beginglyph\>:\<endglyph\>,' .
- \ '\<begingraph\>:\<endgraph\>'
- " Ignore comments and strings
- let b:match_skip = 'synIDattr(synID(line("."), col("."), 1), "name")
- \ =~# "^mf\\%(Comment\\|String\\|\\)$\\|^mpTeXinsert$"'
+ for mapping in ["[[", "]]", "[]", "][", "[{", "]}"]
+ b:undo_ftplugin ..= printf(" | silent! execute 'nunmap <buffer> %s'", mapping)
+ b:undo_ftplugin ..= printf(" | silent! execute 'vunmap <buffer> %s'", mapping)
+ endfor
endif
-let &cpo = s:cpo_save
-unlet s:cpo_save
+if (has('gui_win32') || has('gui_gtk')) && !exists('b:browsefilter')
+ b:browsefilter = "MetaPost Source Files (*.mp)\t*.mp\n"
+ .. "All Files (*.*)\t*.*\n"
+ b:undo_ftplugin ..= ' | unlet! b:browsefilter'
+endif
+
+# vim: sw=2 fdm=marker