* GNUmakefile.in: config.h message fix.

[lilypond.git] / lilypond-font-lock.el

diff --git a/lilypond-font-lock.el b/lilypond-font-lock.el
index 308d3faaf98aaba3725064740e2d49904b722328..8d34f5ded395b2f5fa3534fdee53e2a46fc7b7ee 100644 (file)
--- a/lilypond-font-lock.el
+++ b/lilypond-font-lock.el
@@ -39,7 +39,7 @@
 "clipping" "[cm]m" "coda" "complex" 
 "\\(command\\)?spanrequest" "consists\\(end\\)?"
 "context" "contrabasso" "\\(de\\)?cr" "default" "denies" "different" "dirs"
-"down\\(bow\\|prall\\)?" "duration" "\\(dynamic\\|text\\)?script"
+"down\\(bow\\|prall\\)?" "duration" "\\(text\\)?script"
 "eccentric" "eg" "embeddedps" "elementdescriptions" "\\(end\\)?cresc"
 "ex\\(treme\\)?" "fermata" "f+" "figures" "font" "flageolet" "fp" "fragment" 
 "s?fz" "gliss\\(ando\\)?" "gg" "gmsus" "grace" "gr\\(and\\)?staff"
@@ -60,7 +60,7 @@
 "simultaneous" "singlepart" "skip" "small" "\\(smart\\)?transpose"
 "s[pf]+" "staccat\\(issim\\)?o" "staff\\(height\\|space\\)" "start" 
 "stop\\(ped\\)?"
-"st\\(paper\\|score\\)" "stuff" "stylesheet" "su" "tab" "tempo" "tenuto" 
+"st\\(paper\\|score\\)" "stuff" "su" "tab" "tempo" "tenuto" 
 "thenotes" "thrd" "threevoice" "thumb" "tilt\\(down\\|up\\)" 
 "timb" "times?" "tiny" "toeters" "touch" "translator" 
 "trill" "type" "t\\(wo\\(voice\\(steminvert\\)?\\)?\\)?" 
@@ -89,7 +89,7 @@
 "\\(archi\\|bassi\\|legni\\|ottoni\\|timpani\\|viole\\|violini\\)\\(Group\\)" ; *Group
 "melisma\\(End\\)?" "staff\\(One\\|Two\\)?" "rests\\(II\\)?" "specialKey"
 "noBreak" "paperTwentysix" "endHorizScript" "FontBody" "text(I)+"
-"\\(modern\\|forget\\)Accidentals" ; *Accidentals
+"\\(modern\\|forget\\)Accidental" ; *Accidentals
 "noResetKey" "modern\\(Voice\\)?Cautionaries" "unaCorda" "treCorde"
 
                       ))
@@ -97,7 +97,7 @@
   (reservedwords '(
 
 ;; Other words which look nicer when colored
-"Accidentals" "autoBeamSettings" "BarLine" "Beam"
+"Accidental" "autoBeamSettings" "BarLine" "Beam"
 "ChordName\\([s]?\\|s.[a-zA-Z]*\\)" "Dots" "DynamicText"
 "FiguredBass" "Hairpin" "\\(\\(Inner\\)?Choir\\|Grand\\|Piano\\|Tab\\)Staff"
 "Slur" "Stem" "SpacingSpanner" "System\\(StartDelimiter\\)?"
@@ -153,7 +153,7 @@
       (cons (concat "\\(" rwregex "\\)") 'font-lock-variable-name-face)
 
 ;; ... notes and rests, accidentals and duration (multiplied), e.g., b,?16.*3/4
-      '("\\(^\\|[ <\{[~(!)\t\\\|]\\)\\(\\(\\(\\(\\(do\\|re\\|[ms]i\\|[fl]a\\|sol\\)\\(bb?\\|dd?\\|ss?\\)?\\)\\|\\([a-h]\\(flat\\(flat\\)?\\|sharp\\(sharp\\)?\\|ff?\\|ss?\\|is\\(siss\\|s\\|is\\)?\\|es\\(sess\\|s\\|es\\)?\\)?\\)\\|\\(as\\(as\\|es\\)?\\)\\|\\(es\\(es\\)?\\)\\|\\(bb\\)\\)[,']*[?!]?\\|[srR]\\)\\([ \t]*\\(128\\|6?4\\|3?2\\|16?\\|8\\|\\\\breve\\)[.]*\\([ \t]*[*][ \t]*[0-9]+\\(/[1-9]+\\)?\\)?\\)?\\)" 2 font-lock-type-face)
+      '("\\(^\\|[ <\{[~(!)\t\\\|]\\)\\(\\(\\(\\(bb\\|as[ae]s\\|eses\\|\\(do\\|re\\|[ms]i\\|[fl]a\\|sol\\)\\(bb?\\|dd?\\|ss?\\)?\\)\\|\\([a-h]\\(\\(flat\\)+\\|\\(sharp\\)+\\|is\\(siss\\|i?s\\)?\\|es\\(sess\\|e?s\\)?\\|ff?\\|ss?\\)?\\)\\)[,']*[?!]?\\|[srR]\\)\\([ \t]*\\(128\\|6?4\\|3?2\\|16?\\|8\\|\\\\breve\\)[.]*\\([ \t]*[*][ \t]*[0-9]+\\(/[1-9][0-9]*\\)?\\)?\\)?\\)" 2 font-lock-type-face)
 
 ;; "on top", ... '{[]}'-brackets
       '("\\([][}{]\\)" 0 font-lock-warning-face t)
@@ -195,19 +195,19 @@
                        (car x) (cdr x) LilyPond-mode-syntax-table)))
          '(( ?\( . "." ) ( ?\) . "." ) 
            ( ?\[ . "(]" ) ( ?\] . ")[" ) ;; all the other paren characters are now handled by          
-           ( ?\{  .  ".2b" )             ;; lily-specific indenting/matching code in lilypond-indent.el 
-           ( ?\}  .  ".4b" )              
+           ( ?\{  .  ". 2b" )             ;; lily-specific indenting/matching code in lilypond-indent.el 
+           ( ?\}  .  ". 4b" )              
            ( ?\< . "." )( ?\> . ".") 
-           ( ?\$ . "." ) ( ?\% . "." ) ( ?\& . "." )
+           ( ?\$ . "." ) ( ?\& . "." )
            ( ?\* . "." ) ( ?\+ . "." )
            ( ?\/ . "." )  ( ?\= . "." )
            ( ?\| . "." ) (?\\ . "\\" )
-           ( ?\- . "." ) ( ?\_ . "." ) ( ?\^ . "." )
-           ( ?\' . "w")        
-           ( ?\" . "\"" )
-           ( ?\%  .  ". 1b3b" )
-           ( ?\n . ">")
-           ( ?\r . ">")
+           ( ?\- . "." ) ( ?\_ . "." ) ( ?\^ . "." ) ; accent positioners: puctuation characters
+           ( ?\' . "w") ( ?\, . "w") ; transposing octaves, parts of words (notes)
+           ( ?\" . "\"" ) ; string quote characters 
+           ( ?\%  .  "< 1b3b" ) ; (block-)comment starter (or ender)
+           ( ?\n . ">") ; newline: comment ender
+           ( ?\r . ">") ; formfeed: comment ender
            ))
   )