put to menu post-syntaxed slur pairs and syntax for \times.

diff --git a/ChangeLog b/ChangeLog
index d754d984042e06495e761533a10d6bc138dc9406..38cc87b28b39f87538bd0403031fe1969f89755a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,10 @@
 
        * lilypond.words: add useful `\context Staff =' and `\context Voice ='.
        
+       * lilypond-mode.el: add menu keywords separately.
+
+       * lilypond.words: post-syntaxed slur pairs and syntax for \times.
+       
 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 399055c94696f546320e1c8a56fd260832313eb4..278afe01cf681763f8a520842aa7128c5fd1eb62 100644 (file)
--- a/lilypond-mode.el
+++ b/lilypond-mode.el
@@ -88,15 +88,26 @@ Finds file lilypond-words from load-path."
        (LilyPond-add-dictionary-word (list copy)))
       (kill-buffer b)))
 
-(defconst LilyPond-menu-keywords nil
-  "Keywords which can be inserted from the menu.")
+(defconst LilyPond-menu-keywords 
+  (let ((wordlist '()) ; add syntax entries to lilypond.words
+       (co (all-completions "" (LilyPond-add-dictionary-word ())))
+       (currword ""))
+    (progn
+      (while (> (length co) 0)
+       (setq currword (car co))
+       (if (string-equal "-" (car (setq co (cdr co))))
+           (progn
+             (add-to-list 'wordlist currword)
+             (while (and (> (length co) 0)
+                         (not (string-equal "-" (car (setq co (cdr co))))))))))
+      wordlist))
+  "Keywords inserted from LilyPond-Insert-menu.")
 
-(defconst LilyPond-keywords 
+(defconst LilyPond-keywords
   (let ((wordlist '("\\score")) ; add \keywords to lilypond.words
        (co (all-completions "" (LilyPond-add-dictionary-word ())))
        (currword ""))
     (progn
-      (setq LilyPond-menu-keywords '())
       (while (> (length co) 0)
        (setq currword (car co))
        (if (> (length currword) 1)
@@ -105,10 +116,8 @@ Finds file lilypond-words from load-path."
                     (string-equal (downcase currword) currword))
                (add-to-list 'wordlist currword)))
        (if (string-equal "-" (car (setq co (cdr co))))
-           (progn
-             (add-to-list 'LilyPond-menu-keywords currword)
-             (while (and (> (length co) 0)
-                         (not (string-equal "-" (car (setq co (cdr co))))))))))
+           (while (and (> (length co) 0)
+                       (not (string-equal "-" (car (setq co (cdr co)))))))))
       wordlist))
   "LilyPond \\keywords")
 

diff --git a/lilypond.words b/lilypond.words
index a3437a05fbb36445e960f5c8e3076dad1dfffa7a..acec2bfd35b9392f32711ca01fb2e98bd11c65e7 100644 (file)
--- a/lilypond.words
+++ b/lilypond.words
@@ -1,3 +1,5 @@
+-\( - _ -\) -
+-\\\( - _ -\\\) -
 \\accent
 \\accentus
 \\accepts
@@ -445,7 +447,7 @@ Thread
 \\tiltup
 \\timb
 \\time
-\\times
+\\times - % { _ } -
 TimeSignature 
 \\tiny
 \\toeters