From e045377bdca82e386c1beded1d40d159699cb919 Mon Sep 17 00:00:00 2001 From: hjunes Date: Sat, 17 May 2003 22:14:11 +0000 Subject: [PATCH] fontlock update for postfix syntax --- ChangeLog | 6 ++++++ lilypond-font-lock.el | 8 ++++---- lilypond.words | 3 +++ 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index acb5e7cffe..73da33145c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2003-05-18 Heikki Junes + + * lilypond-font-lock.el: Add postfix syntax for horizontal groups. + + * lilypond.words: add 3. + 2003-05-17 Han-Wen Nienhuys * scm/define-grobs.scm: uniform naming for definitions and output diff --git a/lilypond-font-lock.el b/lilypond-font-lock.el index 5686ac67d3..7c37655632 100644 --- 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 4403ea8f98..5aa289a61d 100644 --- 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 -- 2.39.5