From: Heikki Junes <heikki.junes@hut.fi>
Date: Sat, 25 Jan 2003 10:36:11 +0000 (+0000)
Subject: fontify multiple stanza in lyrics.
X-Git-Tag: release/1.7.13~27
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=f7d6ae4656629295c0f7eb6f8c388cfeecd569b4;p=lilypond.git

fontify multiple stanza in lyrics.
---

diff --git a/ChangeLog b/ChangeLog
index 36a30cbcf7..03270af953 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-25  Heikki Junes  <hjunes@cc.hut.fi>
+
+	* lilypond-font-lock.el: lyrics-mode update for multiple stanza.	
+	* lilypond.words: add one.
+
 2003-01-23  Heikki Junes  <hjunes@cc.hut.fi>
 
 	* lilypond-font-lock.el: Fontify post-notated slurs [-^_][()].
diff --git a/lilypond-font-lock.el b/lilypond-font-lock.el
index 44df90828c..f8518df97c 100644
--- a/lilypond-font-lock.el
+++ b/lilypond-font-lock.el
@@ -11,7 +11,7 @@
 ;;         1992-1994 Tim Peters
 ;; Created:       Feb 1992
 ;; Version:       1.7.12
-;; Last Modified: 13DEC2003
+;; Last Modified: 26DEC2003
 ;; Keywords: lilypond languages music notation
 
 ;; This software is provided as-is, without express or implied
@@ -46,10 +46,10 @@
 ;; ... (v) the right and the left side of '='-marks.
 ;; ... (v) reserved words, e.g., FiguredBass.
 ;; ... (t) notes and rests
+;; "on top", ... (s) lyrics-mode
 ;; "on top", ... (w) horizontal grouping
 ;; "on top", ... (f) vertical grouping
 ;; "on top", ... (b) expressional grouping
-;; "on top", ... (s) lyrics-mode
 ;; "on top", ... (s) (multiline-)scheme; urgh. one should count the slurs
 ;; "on top", ... (s) strings
 ;; "on top", ... (c) (multiline-)comments
@@ -80,6 +80,11 @@
 ;; ... note or rest (with an accidental), e.g., b,? -- allows cis\longaX
       '("\\(^\\|[ <\{[/~(!)\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]\\)" 2 font-lock-type-face)
 
+;; "on top", ... lyrics-mode: fontify everything between '<'...'>' or '{'...'}'
+;            URGH, does not know anything about inner brackets.
+;            Multiple lines may need refontifying (C-c f).
+      '("\\(\\\\lyrics[^{<]*\\)\\({[^}]*\\|<[^>]*\\)" 2 font-lock-string-face t)
+
 ;; "on top", ... horizontal grouping:
 ;;               - brackets '{[]}'
 ;;               - ties '~'
@@ -95,9 +100,6 @@
 ;;               - 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)
 
diff --git a/lilypond.words b/lilypond.words
index 0ee03cd652..eaaefd18c5 100644
--- a/lilypond.words
+++ b/lilypond.words
@@ -251,6 +251,7 @@ percent
 \\Piano
 \\pianoAccidentals
 \\pianoCautionaries
+PianoPedalBracket
 PianoStaff
 \\PianoStaff
 \\PianoStaffContext