allow non-alpha characters only in menu keywords.

diff --git a/ChangeLog b/ChangeLog
index f6c82621df4d96701453f7a6d56b19beb63f1faf..d754d984042e06495e761533a10d6bc138dc9406 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,10 @@
        * lilypond.words: give syntax definitions (LilyPond-insert-tag) for 
        \notes, \relative, \score, \simultaneous, \transpose.
 
+       * lilypond-mode.el: allow non-alpha characters only in menu keywords.
+
+       * lilypond.words: add useful `\context Staff =' and `\context Voice ='.
+       
 2003-08-01  Mats Bengtsson  <mats.bengtsson@s3.kth.se>
 
        * Documentation/topdocs/INSTALL.texi (Top): Documentation of the

diff --git a/lilypond-mode.el b/lilypond-mode.el
index c783787cfafdd0cc8424393b65d364593113701c..399055c94696f546320e1c8a56fd260832313eb4 100644 (file)
--- a/lilypond-mode.el
+++ b/lilypond-mode.el
@@ -101,6 +101,7 @@ Finds file lilypond-words from load-path."
        (setq currword (car co))
        (if (> (length currword) 1)
            (if (and (string-equal "\\" (substring currword 0 1))
+                    (not (string-match "[^a-zA-Z]" (substring currword 1)))
                     (string-equal (downcase currword) currword))
                (add-to-list 'wordlist currword)))
        (if (string-equal "-" (car (setq co (cdr co))))
@@ -116,10 +117,12 @@ Finds file lilypond-words from load-path."
        (co (all-completions "" (LilyPond-add-dictionary-word ()))))
     (progn
       (while (> (length co) 0)
-       (if (> (length (car co)) 1)
-           (if (and (string-equal "\\" (substring (car co) 0 1))
-                    (not (string-equal (downcase (car co)) (car co))))
-               (add-to-list 'wordlist (car co))))
+       (setq currword (car co))
+       (if (> (length currword) 1)
+           (if (and (string-equal "\\" (substring currword 0 1))
+                    (not (string-match "[^a-zA-Z]" (substring currword 1)))
+                    (not (string-equal (downcase currword) currword)))
+               (add-to-list 'wordlist currword)))
        (if (string-equal "-" (car (setq co (cdr co))))
            (while (and (> (length co) 0)
                        (not (string-equal "-" (car (setq co (cdr co)))))))))
@@ -131,9 +134,10 @@ Finds file lilypond-words from load-path."
        (co (all-completions "" (LilyPond-add-dictionary-word ()))))
     (progn
       (while (> (length co) 0)
-       (if (> (length (car co)) 0)
-           (if (not (string-match "[^a-zA-Z]" (car co)))
-               (add-to-list 'wordlist (car co))))
+       (setq currword (car co))
+       (if (> (length currword) 0)
+           (if (not (string-match "[^a-zA-Z]" currword))
+               (add-to-list 'wordlist currword)))
        (if (string-equal "-" (car (setq co (cdr co))))
            (while (and (> (length co) 0)
                        (not (string-equal "-" (car (setq co (cdr co)))))))))

diff --git a/lilypond.words b/lilypond.words
index 29ec256142d96f96ce0ba8df037b066ecc9207cb..a3437a05fbb36445e960f5c8e3076dad1dfffa7a 100644 (file)
--- a/lilypond.words
+++ b/lilypond.words
@@ -66,6 +66,8 @@ Cluster
 \\consists
 \\consistsend
 \\context
+\\context\ Staff\ = - % { _ } -
+\\context\ Voice\ = - % { _ } -
 \\contrabasso
 \\cr
 \\cresc