From 33ca2b62e075b2ac686feb09ff6f9751335ab48b Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Mon, 15 Apr 2002 08:10:11 +0000 Subject: [PATCH] *** empty log message *** --- ChangeLog | 5 +++++ VERSION | 2 +- lilypond-font-lock.el | 14 +++++++------- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4c78e3bdff..632e7941b1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2002-04-14 Heikki Junes + + * lilypond-font-lock.el: Handle scheme-slurs up to seventh level. + Minor fixes. + 2002-04-15 Han-Wen * mf/feta-din-code.mf: dynamic z sign. diff --git a/VERSION b/VERSION index 3fbe9057cd..eb2d42c0f5 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=5 PATCH_LEVEL=52 -MY_PATCH_LEVEL=hjj1 +MY_PATCH_LEVEL=hjj2 # use the above to send patches: MY_PATCH_LEVEL is always empty for a diff --git a/lilypond-font-lock.el b/lilypond-font-lock.el index 45f2e47b03..d0fd636772 100644 --- a/lilypond-font-lock.el +++ b/lilypond-font-lock.el @@ -40,7 +40,7 @@ "\\(command\\)?spanrequest" "consists\\(end\\)?" "context" "contrabasso" "\\(de\\)?cr" "default" "denies" "different" "dirs" "down\\(bow\\|prall\\)?" "duration" "\\(dynamic\\|text\\)?script" -"eccentric" "eg" "embeddedps" "elementdescriptions" +"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" "header" "\\(h\\|v\\)size" "in\\(clude\\|versions\\|visible\\)?" @@ -126,8 +126,8 @@ (cons (concat "\\(" rwregex "\\)") 'font-lock-variable-name-face) ;; highlight note names; separate notes from (other than ')'-type) brackets - '("\\([sR]\\(128\\|64\\|32\\|16\\|8\\|4\\|2\\|1\\)?[ ]*[*][0-9]+\\)"1 font-lock-type-face) - '("[ <\{[~()\t\\\|]\\(\\(\\(\\(do\\|re\\|mi\\|fa\\|sol\\|la\\|si\\)\\(bb?\\|dd?\\|ss?\\)?\\)\\|\\([a-hsrR]\\(flat\\(flat\\)?\\|sharp\\(sharp\\)?\\|ff?\\|ss?\\|is\\(siss\\|s\\|is\\)?\\|es\\(sess\\|s\\|es\\)?\\)?\\)\\|\\(as\\(as\\|es\\)?\\)\\|\\(es\\(es\\)?\\)\\|\\(bb\\)\\)[,']*[?!]?\\(128\\|64\\|32\\|16\\|8\\|4\\|2\\|1\\)?[.]*\\)" 1 font-lock-type-face) + '("\\([sR]\\(128\\|64\\|32\\|16\\|8\\|4\\|2\\|1\\)?[.]*[ \t]*[*][ \t]*[0-9]+\\)"1 font-lock-type-face) + '("[ <\{[~(!)\t\\\|]\\(\\(\\(\\(do\\|re\\|mi\\|fa\\|sol\\|la\\|si\\)\\(bb?\\|dd?\\|ss?\\)?\\)\\|\\([a-hsrR]\\(flat\\(flat\\)?\\|sharp\\(sharp\\)?\\|ff?\\|ss?\\|is\\(siss\\|s\\|is\\)?\\|es\\(sess\\|s\\|es\\)?\\)?\\)\\|\\(as\\(as\\|es\\)?\\)\\|\\(es\\(es\\)?\\)\\|\\(bb\\)\\)[,']*[?!]?\\(128\\|64\\|32\\|16\\|8\\|4\\|2\\|1\\)?[.]*\\)" 1 font-lock-type-face) ;; highlight identifiers (cons (concat "\\([_^-]?\\(" iregex "\\)\\)+\\($\\|[] \t(~{}>\\\\_-()^]\\)") '(0 font-lock-function-name-face t)) @@ -147,11 +147,11 @@ ;; ties ~, slurs \( () \), hairpins \<, \>, end-of-hairpin \!, '("\\(\\\\[()]\\|[(~)]\\)" 0 font-lock-builtin-face t) -;; highlight scheme; Urgh. should count '(':s, then continue up to last ')' - '("[_^-]?#\\(#[ft]\\|['`](lines[^)]*))\\|['`][a-zA-Z-:]+\\|['`]?([^)]*)\\|-?[0-9.]+\\|\"[^\"]*\"\\)" 0 font-lock-string-face t) +;; highlight scheme: handle slurs up to seventh level + '("[_^-]?#\\(#[ft]\\|-?[0-9.]+\\|\"[^\"]*\"\\|['`]?[a-zA-Z-:]+\\|['`]?([^()]*\\(([^()]*\\(([^()]*\\(([^()]*\\(([^()]*\\(([^()]*\\(([^)]*)[^()]*\\)*)[^()]*\\)*)[^()]*\\)*)[^()]*\\)*)[^()]*\\)*)[^()]*\\)*[^)]*)\\)" 0 font-lock-string-face t) -;; highlight strings - '("[_^-]?\"[^\"]*\"" 0 font-lock-string-face t) +;; highlight strings: urgh. should hangle strings in strings, i.e., \\\" + '("\\([_^-]?\"[^\"]*\"\\)" 0 font-lock-string-face t) ;; highlight (block) comments; urgh. block comments should be updatable '("\\(%\\({[^%]*%\\(}\\|\\([^}][^%]*%\\)+}\\)\\|.*\\)\\)" 0 font-lock-comment-face t) -- 2.39.5