X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=vim%2Flilypond-syntax.vim;h=c749fd9aa09f8a3afdd17bce141c84362c867761;hb=891840d4b25b71e9caac50174077d6461bb5cc7f;hp=7874f6eeb2c75d7f55fbfddf2091b0d188555771;hpb=e3c9620c20174bd54c523a9bd892bb4666efc400;p=lilypond.git

diff --git a/vim/lilypond-syntax.vim b/vim/lilypond-syntax.vim
index 7874f6eeb2..c749fd9aa0 100644
--- a/vim/lilypond-syntax.vim
+++ b/vim/lilypond-syntax.vim
@@ -2,11 +2,11 @@
 " Language:	LilyPond
 " Maintainer:	Heikki Junes <hjunes@cc.hut.fi>
 " Created:      Oct 17, 2002
-" Last Change:	Sep 23, 2003
+" Last Change:	Aug 30, 2009
 " Version:	6.1-1
 "
 " Installed As:	vim/syntax/lilypond.vim
-" Uses Generated File:	vim/syntax/lilypond.words.vim
+" Uses Generated File:	vim/syntax/lilypond-words.vim
 "
 " For version 5.x: Clear all syntax items
 " For version 6.x: Quit when a syntax file was already loaded
@@ -19,9 +19,9 @@ endif
 " Read the LilyPond syntax match groups: 
 "   lilyKeyword, lilyReservedWord, lilyNote
 if version < 600
-  so <sfile>:p:h/lilypond.words.vim
+  so <sfile>:p:h/lilypond-words.vim
 else
-  runtime! syntax/lilypond.words.vim
+  runtime! syntax/lilypond-words.vim
   if exists("b:current_syntax")
     unlet b:current_syntax
   endif
@@ -33,7 +33,7 @@ setlocal mps+=<:>
 " Case matters
 syn case match
 
-syn cluster lilyMatchGroup	contains=lilyMatcher,lilyString,lilyComment,lilyStatement,lilyNumber,lilyEquation,lilySlur,lilySpecial,lilyNote,lilyKeyword,lilyReservedWord
+syn cluster lilyMatchGroup	contains=lilyMatcher,lilyString,lilyComment,lilyStatement,lilyNumber,lilyEquation,lilySlur,lilySpecial,lilyNote,lilyKeyword,lilyArticulation,lilyReservedWord
 
 syn region lilyMatcher	matchgroup=Delimiter start="{" skip="\\\\\|\\[<>]"	end="}"	contains=@lilyMatchGroup fold
 syn region lilyMatcher	matchgroup=Delimiter start="\["		end="]"	contains=@lilyMatchGroup fold
@@ -48,6 +48,9 @@ syn match lilyEquation	"\(#['`]\)\?\(\a*[-]\)*\a*\s*=\s*\(#[#'`]\?\)\?\a*"
 syn match lilySlur	"[(~)]"
 syn match lilySlur	"\\[()]"
 syn match lilySpecial	"\\[<!>\\]"
+" avoid highlighting the extra character in situations like
+" c--\mf c^^\mf c__\mf
+syn match lilyArticulation	"[-_^][-_^+|>.]"
 
 " Rest of syntax highlighting rules start here
 "
@@ -68,6 +71,7 @@ if version >= 508 || !exists("did_lily_syn_inits")
   HiLink lilyComment	Comment
  
   HiLink lilyNote	Identifier
+  HiLink lilyArticulation	PreProc
   HiLink lilyKeyword	Keyword
   HiLink lilyReservedWord	Type
 
@@ -77,3 +81,5 @@ if version >= 508 || !exists("did_lily_syn_inits")
 
   delcommand HiLink
 endif
+
+let b:current_syntax = "lilypond"