fontify lyrics

diff --git a/ChangeLog b/ChangeLog
index 994cc90b05c598b12686cc6ef7fcd5895505cf89..8f7915c3ed74c8dee6c14153daf992ce7642e173 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
 
        * lilypond-mode.el: add shortcut for 2midi
 
+       * lilypond-font-lock.el: fontify lyrics
+
 2002-12-10  Rune Zedeler  <rz@daimi.au.dk>
 
        * scm/drums.scm : use 1.7.x names.

diff --git a/lilypond-font-lock.el b/lilypond-font-lock.el
index 6970c8f9c450c883e50ad54b5367b7311772c861..f4cf55dd53e1b89d397aabe16327233f8e6786fa 100644 (file)
--- a/lilypond-font-lock.el
+++ b/lilypond-font-lock.el
@@ -10,8 +10,8 @@
 ;; Author: 1995-1996 Barry A. Warsaw
 ;;         1992-1994 Tim Peters
 ;; Created:       Feb 1992
-;; Version:       1.7.8
-;; Last Modified: 23NOV2002
+;; Version:       1.7.9
+;; Last Modified: 12DEC2002
 ;; Keywords: lilypond languages music notation
 
 ;; This software is provided as-is, without express or implied
@@ -25,7 +25,7 @@
 ;;
 
 ;; TODO:
-;;   - handle lexer modes (\header, \melodic, \lyric) etc.
+;;   - handle lexer modes (\header, \melodic) etc.
 
 (defconst LilyPond-font-lock-keywords
   (let* ((kwregex (mapconcat (lambda (x) (concat "\\" x))  LilyPond-keywords "\\|"))
@@ -87,6 +87,9 @@
 ;; "on top", ... ties ~, slurs \( () \), hairpins \<, \>, \! 
       '("\\(\\\\[(<!>)]\\|[(~)]\\)" 0 font-lock-builtin-face t)
 
+;; "on top", ... lyrics-mode: fontify everything between '{' and '}'
+      '("\\(\\\\lyrics[^{]*{\\)\\([^}]*\\)" 2 font-lock-string-face t)
+
 ;; "on top", ... (multiline-)scheme: try find slurs up to 7th
       '("[_^-]?#\\(#[ft]\\|-?[0-9.]+\\|\"[^\"]*\"\\|['`]?[a-zA-Z-:]+\\|['`]?([^()]*\\(([^()]*\\(([^()]*\\(([^()]*\\(([^()]*\\(([^()]*\\(([^)]*)[^()]*\\)*)[^()]*\\)*)[^()]*\\)*)[^()]*\\)*)[^()]*\\)*)[^()]*\\)*[^)]*)\\)" 0 font-lock-string-face t)