fontlock update for postfix syntax

diff --git a/ChangeLog b/ChangeLog
index acb5e7cffe50b4801c34a0dd22ca32b4c31215d1..73da33145c7669626f993c6adfb274f032a6ef69 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-05-18  Heikki Junes  <hjunes@cc.hut.fi>
+
+       * lilypond-font-lock.el: Add postfix syntax for horizontal groups.
+
+       * lilypond.words: add 3.
+
 2003-05-17  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
        * scm/define-grobs.scm: uniform naming for definitions and output

diff --git a/lilypond-font-lock.el b/lilypond-font-lock.el
index 5686ac67d373a770b4a1b76a86248130a94a7829..7c376556325bdc795134db088f06a107b0bfb8ff 100644 (file)
--- a/lilypond-font-lock.el
+++ b/lilypond-font-lock.el
@@ -85,21 +85,21 @@
 ;            Multiple lines may need refontifying (C-c f).
       '("\\(\\\\lyrics[^{<]*\\)\\({[^}]*\\|<[^>]*\\)" 2 font-lock-string-face t)
 
-;; "on top", ... horizontal grouping:
+;; "on top", ... horizontal grouping, also as postfix syntax '-*':
 ;;               - brackets '{[]}'
 ;;               - ties '~'
 ;;               - ligatures \[, \]
-      '("\\([][~}{]\\|\\\\[][]\\)" 0 font-lock-warning-face t)
+      '("\\(-?[][~}{]\\|\\\\[][]\\)" 0 font-lock-warning-face t)
 
 ;; "on top", ... vertical grouping:
 ;;               - '<>'-chord brackets with '\\'-voice sep., not marcato '->'
 ;;               - '<< a b >>8' -chords
       '("\\(\\(-.\\)+\\|[^-^_]\\)\\([<>]+\\(\\(128\\|6?4\\|3?2\\|16?\\|8\\|\\\\\\(breve\\|longa\\)\\)[.]*\\([ \t]*[*][ \t]*[0-9]+\\(/[1-9][0-9]*\\)?\\)?\\)?\\|\\\\\\\\\\)" 3 font-lock-function-name-face t)
 
-;; "on top", ... expressional grouping:
+;; "on top", ... expressional grouping, also as postfix syntax '-*':
 ;;               - slurs ( ), \( \), [-^_][()]
 ;;               - hairpins \<, \>, \! 
-      '("\\(\\\\[(<!>)]\\|[-^_]?[()]\\)" 0 font-lock-builtin-face t)
+      '("\\(-?\\\\[(<!>)]\\|[-^_]?[()]\\)" 0 font-lock-builtin-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 4403ea8f981cfe4622bcc89918d98e824aa0c4b9..5aa289a61d7b57f58f68160aff9be8ec27f855cc 100644 (file)
--- a/lilypond.words
+++ b/lilypond.words
@@ -74,6 +74,7 @@ Cluster
 \\default
 \\defaultAccidentals
 \\denies
+\\description
 \\different
 \\dirs
 \\dorian
@@ -389,6 +390,7 @@ StaffSymbol
 \\staffTwo
 \\start
 \\startCluster
+\\startGroup
 \\startTextSpan
 Stem
 \\stemBoth
@@ -397,6 +399,7 @@ Stem
 \\stemUp
 \\stop
 \\stopCluster
+\\stopGroup
 \\stopped
 \\stopTextSpan
 \\stpaper