From: Heikki Junes Date: Sun, 29 Feb 2004 23:04:02 +0000 (+0000) Subject: * vim/: X-Git-Tag: release/2.1.29~40 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=f0a1bb61c55aca660afd899dc3bcebbeef020ffa;p=lilypond.git * vim/: * vim/syntax: * vim/ftplugin: new directories. * vim/filetype.vim: new file. * lilypond.vim: remove files (see next). * vim/syntax/lilypond.vim: new, renamed file (see prev). * vimrc: remove file (see next). * vim/ftplugin/lilypond.vim: new, renamed file (see prev). --- diff --git a/ChangeLog b/ChangeLog index 1442e0fd09..253dfb2728 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,18 @@ * vimrc: add menu in console and shortcut for it. + * vim/: + * vim/syntax: + * vim/ftplugin: new directories. + + * vim/filetype.vim: new file. + + * lilypond.vim: remove files (see next). + * vim/syntax/lilypond.vim: new, renamed file (see prev). + + * vimrc: remove file (see next). + * vim/ftplugin/lilypond.vim: new, renamed file (see prev). + 2004-02-29 Jan Nieuwenhuizen * stepmake/aclocal.m4: Store computed version in variable. diff --git a/lilypond.vim b/lilypond.vim deleted file mode 100644 index 717730cbc6..0000000000 --- a/lilypond.vim +++ /dev/null @@ -1,78 +0,0 @@ -" Vim syntax file -" Language: LilyPond -" Maintainer: Heikki Junes -" Created: Oct 17, 2002 -" Last Change: Sep 23, 2003 -" Version: 6.1-1 -" Latest: -" http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lilypond.vim - -" For version 5.x: Clear all syntax items -" For version 6.x: Quit when a syntax file was already loaded -if version < 600 - syntax clear -elseif exists("b:current_syntax") - finish -endif - -" Read the LilyPond syntax match groups: -" lilyKeyword, lilyReservedWord, lilyNote -if version < 600 - so :p:h/lilypond.words.vim -else - runtime! syntax/lilypond.words.vim - if exists("b:current_syntax") - unlet b:current_syntax - endif -endif - -" Match also parethesis of angle type -set mps+=<:> - -" Case matters -syn case match - -syn cluster lilyMatchGroup contains=lilyMatcher,lilyString,lilyComment,lilyStatement,lilyNumber,lilyEquation,lilySlur,lilySpecial,lilyNote,lilyKeyword,lilyReservedWord - -syn region lilyMatcher matchgroup=Delimiter start="{" skip="\\\\\|\\[<>]" end="}" contains=@lilyMatchGroup fold -syn region lilyMatcher matchgroup=Delimiter start="\[" end="]" contains=@lilyMatchGroup fold -syn region lilyMatcher matchgroup=Delimiter start="<" skip="\\\\\|\\[{<>}]" end=">" contains=@lilyMatchGroup fold - -syn region lilyString start=/"/ end=/"/ skip=/\\"/ -syn region lilyComment start="%{" skip="%$" end="%}" -syn region lilyComment start="%\([^{]\|$\)" end="$" - -syn match lilyNumber "[-_^.]\?\d\+[.]\?" -syn match lilyEquation "\(#['`]\)\?\(\a*[-]\)*\a*\s*=\s*\(#[#'`]\?\)\?\a*" -syn match lilySlur "[(~)]" -syn match lilySlur "\\[()]" -syn match lilySpecial "\\[\\]" - -" Rest of syntax highlighting rules start here -" -" " Define the default highlighting. -" " For version 5.7 and earlier: only when not done already -" " For version 5.8 and later: only when an item doesn't have highlighting yet -if version >= 508 || !exists("did_lily_syn_inits") - if version < 508 - let did_lily_syn_inits = 1 - command -nargs=+ HiLink hi link - else - command -nargs=+ HiLink hi def link - endif - - HiLink Delimiter Identifier - - HiLink lilyString String - HiLink lilyComment Comment - - HiLink lilyNote Identifier - HiLink lilyKeyword Keyword - HiLink lilyReservedWord Type - - HiLink lilyNumber Constant - HiLink lilySpecial Special - HiLink lilySlur ModeMsg - - delcommand HiLink -endif diff --git a/vim/ftplugin/lilypond.vim b/vim/ftplugin/lilypond.vim new file mode 100644 index 0000000000..4d917bbc67 --- /dev/null +++ b/vim/ftplugin/lilypond.vim @@ -0,0 +1,54 @@ +:version 6.1 +set autoindent +set shiftwidth=2 +" +" some handy key mappings +" +" save and go to previous buffer +map :w:bp +" +" save and go to next buffer +map :w:bn +" +" save & make and play midi +map :w:se makeprg=lilypond\ -m\ %<:make:!timidity %<.midi +" +" save & make dvi, midi, ps +map :w:se makeprg=lilypond\ %<:make +" +" view ps +map :!gv -watch %<.ps & +" +" view dvi +map :!xdvi %<.dvi & +" +" prev error +map :cp +" +" next error +map :cn +" +" make +map :w:se makeprg=make\ -k:make +" +" menu +:source $VIMRUNTIME/menu.vim +:set wildmenu +:set cpo-=< +:set wcm= +:map :emenu +" +" comment region +map :g!/%.*/normal 0i% +" +" remove comments in region +map :g/%.*/normal 0x +" +" Completions in Insert/Replace-mode with +set dictionary-=~/.vim/lilypond.words.el dictionary+=~/.vim/lilypond.words.el +set complete-=k complete+=k +" errorformat for lily (with columns) and gcc +" (how to see multiple-line error messages?) +" +se errorformat=%f:%l:%c:\ %m,%f:%l:\ %m,In\ file\ included\ from\ %f:%l:,\^I\^Ifrom\ %f:%l%m + diff --git a/vim/syntax/lilypond.vim b/vim/syntax/lilypond.vim new file mode 100644 index 0000000000..717730cbc6 --- /dev/null +++ b/vim/syntax/lilypond.vim @@ -0,0 +1,78 @@ +" Vim syntax file +" Language: LilyPond +" Maintainer: Heikki Junes +" Created: Oct 17, 2002 +" Last Change: Sep 23, 2003 +" Version: 6.1-1 +" Latest: +" http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lilypond.vim + +" For version 5.x: Clear all syntax items +" For version 6.x: Quit when a syntax file was already loaded +if version < 600 + syntax clear +elseif exists("b:current_syntax") + finish +endif + +" Read the LilyPond syntax match groups: +" lilyKeyword, lilyReservedWord, lilyNote +if version < 600 + so :p:h/lilypond.words.vim +else + runtime! syntax/lilypond.words.vim + if exists("b:current_syntax") + unlet b:current_syntax + endif +endif + +" Match also parethesis of angle type +set mps+=<:> + +" Case matters +syn case match + +syn cluster lilyMatchGroup contains=lilyMatcher,lilyString,lilyComment,lilyStatement,lilyNumber,lilyEquation,lilySlur,lilySpecial,lilyNote,lilyKeyword,lilyReservedWord + +syn region lilyMatcher matchgroup=Delimiter start="{" skip="\\\\\|\\[<>]" end="}" contains=@lilyMatchGroup fold +syn region lilyMatcher matchgroup=Delimiter start="\[" end="]" contains=@lilyMatchGroup fold +syn region lilyMatcher matchgroup=Delimiter start="<" skip="\\\\\|\\[{<>}]" end=">" contains=@lilyMatchGroup fold + +syn region lilyString start=/"/ end=/"/ skip=/\\"/ +syn region lilyComment start="%{" skip="%$" end="%}" +syn region lilyComment start="%\([^{]\|$\)" end="$" + +syn match lilyNumber "[-_^.]\?\d\+[.]\?" +syn match lilyEquation "\(#['`]\)\?\(\a*[-]\)*\a*\s*=\s*\(#[#'`]\?\)\?\a*" +syn match lilySlur "[(~)]" +syn match lilySlur "\\[()]" +syn match lilySpecial "\\[\\]" + +" Rest of syntax highlighting rules start here +" +" " Define the default highlighting. +" " For version 5.7 and earlier: only when not done already +" " For version 5.8 and later: only when an item doesn't have highlighting yet +if version >= 508 || !exists("did_lily_syn_inits") + if version < 508 + let did_lily_syn_inits = 1 + command -nargs=+ HiLink hi link + else + command -nargs=+ HiLink hi def link + endif + + HiLink Delimiter Identifier + + HiLink lilyString String + HiLink lilyComment Comment + + HiLink lilyNote Identifier + HiLink lilyKeyword Keyword + HiLink lilyReservedWord Type + + HiLink lilyNumber Constant + HiLink lilySpecial Special + HiLink lilySlur ModeMsg + + delcommand HiLink +endif diff --git a/vimrc b/vimrc deleted file mode 100644 index 4d917bbc67..0000000000 --- a/vimrc +++ /dev/null @@ -1,54 +0,0 @@ -:version 6.1 -set autoindent -set shiftwidth=2 -" -" some handy key mappings -" -" save and go to previous buffer -map :w:bp -" -" save and go to next buffer -map :w:bn -" -" save & make and play midi -map :w:se makeprg=lilypond\ -m\ %<:make:!timidity %<.midi -" -" save & make dvi, midi, ps -map :w:se makeprg=lilypond\ %<:make -" -" view ps -map :!gv -watch %<.ps & -" -" view dvi -map :!xdvi %<.dvi & -" -" prev error -map :cp -" -" next error -map :cn -" -" make -map :w:se makeprg=make\ -k:make -" -" menu -:source $VIMRUNTIME/menu.vim -:set wildmenu -:set cpo-=< -:set wcm= -:map :emenu -" -" comment region -map :g!/%.*/normal 0i% -" -" remove comments in region -map :g/%.*/normal 0x -" -" Completions in Insert/Replace-mode with -set dictionary-=~/.vim/lilypond.words.el dictionary+=~/.vim/lilypond.words.el -set complete-=k complete+=k -" errorformat for lily (with columns) and gcc -" (how to see multiple-line error messages?) -" -se errorformat=%f:%l:%c:\ %m,%f:%l:\ %m,In\ file\ included\ from\ %f:%l:,\^I\^Ifrom\ %f:%l%m -