X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=vim%2Flilypond-syntax.vim;h=c8322f697e4808e3ed673bc3e7af782ea624dd06;hb=90e4d7057f3857da049dfda3d130017d4719bd6b;hp=7d0a6d89e797ddf3b26f36034c18dcd2d9f4fdf2;hpb=37ca1f80bf5401accd17056938f4f7b2c147ddb2;p=lilypond.git

diff --git a/vim/lilypond-syntax.vim b/vim/lilypond-syntax.vim
index 7d0a6d89e7..c8322f697e 100644
--- a/vim/lilypond-syntax.vim
+++ b/vim/lilypond-syntax.vim
@@ -1,9 +1,7 @@
 " LilyPond syntax file
 " Language:	LilyPond
 " Maintainer:	Heikki Junes <hjunes@cc.hut.fi>
-" Created:      Oct 17, 2002
-" Last Change:	Sep 23, 2003
-" Version:	6.1-1
+" Last Change:	2010 Jul 26
 "
 " Installed As:	vim/syntax/lilypond.vim
 " Uses Generated File:	vim/syntax/lilypond-words.vim
@@ -33,7 +31,7 @@ setlocal mps+=<:>
 " Case matters
 syn case match
 
-syn cluster lilyMatchGroup	contains=lilyMatcher,lilyString,lilyComment,lilyStatement,lilyNumber,lilyEquation,lilySlur,lilySpecial,lilyNote,lilyKeyword,lilyArticulation,lilyReservedWord
+syn cluster lilyMatchGroup	contains=lilyMatcher,lilyString,lilyComment,lilyStatement,lilyNumber,lilySlur,lilySpecial,lilyNote,lilyKeyword,lilyArticulation,lilyReservedWord,lilyScheme
 
 syn region lilyMatcher	matchgroup=Delimiter start="{" skip="\\\\\|\\[<>]"	end="}"	contains=@lilyMatchGroup fold
 syn region lilyMatcher	matchgroup=Delimiter start="\["		end="]"	contains=@lilyMatchGroup fold
@@ -44,7 +42,6 @@ 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	"\\[<!>\\]"
@@ -52,6 +49,11 @@ syn match lilySpecial	"\\[<!>\\]"
 " c--\mf c^^\mf c__\mf
 syn match lilyArticulation	"[-_^][-_^+|>.]"
 
+" Include Scheme syntax highlighting, where appropriate
+syn include @embeddedScheme syntax/scheme.vim
+unlet b:current_syntax
+syn region lilyScheme matchgroup=Delimiter start="#['`]\?(" matchgroup=Delimiter end=")" contains=@embeddedScheme
+
 " Rest of syntax highlighting rules start here
 "
 " " Define the default highlighting.
@@ -81,3 +83,5 @@ if version >= 508 || !exists("did_lily_syn_inits")
 
   delcommand HiLink
 endif
+
+let b:current_syntax = "lilypond"