Merge branch 'master' of carldsorensen@git.sv.gnu.org:/srv/git/lilypond

[lilypond.git] / vim / lilypond-syntax.vim

diff --git a/vim/lilypond-syntax.vim b/vim/lilypond-syntax.vim
index 7874f6eeb2c75d7f55fbfddf2091b0d188555771..7d0a6d89e797ddf3b26f36034c18dcd2d9f4fdf2 100644 (file)
--- a/vim/lilypond-syntax.vim
+++ b/vim/lilypond-syntax.vim
@@ -6,7 +6,7 @@
 " 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