X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lilypond-mode.el;h=60e4e6ebb1192c25809c427a7527129350ddd05a;hb=1753b1a73742a5b0893037116bb6f2febba277f3;hp=e8a572d6fe8ee08cf95508c1060410c376cf6073;hpb=4226ecf83027c92b0289f75e4071497566452e48;p=lilypond.git

diff --git a/lilypond-mode.el b/lilypond-mode.el
index e8a572d6fe..60e4e6ebb1 100644
--- a/lilypond-mode.el
+++ b/lilypond-mode.el
@@ -10,9 +10,6 @@
 ;;;    * Keyboard shortcuts (12th Sep 2001)
 ;;;    * Inserting tags, inspired on sgml-mode (11th Oct 2001)
 ;;;    * Autocompletion & Info (23rd Nov 2002)
-;;;
-;;; Changed 2002 Carlos Betancourt <carlos.betancourt@chello.be>
-;;;    * Added spanish-note-replacements
 
 ;;; Inspired on auctex
 
@@ -22,7 +19,7 @@
 (require 'easymenu)
 (require 'compile)
 
-(defconst LilyPond-version "1.7.19"
+(defconst LilyPond-version "1.8.0"
   "`LilyPond-mode' version number.")
 
 (defconst LilyPond-help-address "bug-lilypond@gnu.org"
@@ -49,6 +46,10 @@
   '(("\\([a-zA-Z]?:?[^:( \t\n]+\\)[:( \t]+\\([0-9]+\\)[:) \t]" 1 2))
   "Regexp used to match LilyPond errors.  See `compilation-error-regexp-alist'.")
 
+(defvar LilyPond-imenu nil
+  "A flag to tell whether LilyPond-imenu is turned on.")
+(make-variable-buffer-local 'LilyPond-imenu)
+
 (defcustom LilyPond-include-path ".:/tmp"
   "* LilyPond include path."
   :type 'string
@@ -56,16 +57,16 @@
 
 (defun LilyPond-words-filename ()
   "The file containing LilyPond \keywords \Identifiers and ReservedWords.
-Finds file lilypond-words from load-path."
+Finds file lilypond-words.el from load-path."
   (let ((fn nil)
 	(lp load-path)
-	(words-file "lilypond.words"))
+	(words-file "lilypond.words.el"))
     (while (and (> (length lp) 0) (not fn))
       (setq fn (concat (car lp) "/" words-file))
       (if (not (file-readable-p fn)) 
 	  (progn (setq fn nil) (setq lp (cdr lp)))))
     (if (not fn)
-	(progn (message "Warning: `lilypond.words' not found in `load-path'. See `lilypond-init.el'.")
+	(progn (message "Warning: `lilypond.words.el' not found in `load-path'. See `lilypond-init.el'.")
 	       (sit-for 5 0)))
     fn))
 
@@ -87,47 +88,95 @@ Finds file lilypond-words from load-path."
 	(LilyPond-add-dictionary-word (list copy)))
       (kill-buffer b)))
 
-(defconst LilyPond-keywords 
-  (let ((wordlist ())
-	(co (all-completions "" (LilyPond-add-dictionary-word ()))))
+(defvar LilyPond-insert-tag-current ""
+  "The last command selected from the LilyPond-Insert -menu.")
+
+(defconst LilyPond-menu-keywords 
+  (let ((wordlist '())
+	(co (all-completions "" (LilyPond-add-dictionary-word ())))
+	(currword ""))
     (progn
       (while (> (length co) 0)
-	(if (> (length (car co)) 1)
-	    (if (and (string-equal "\\" (substring (car co) 0 1))
-		     (string-equal (downcase (car co)) (car co)))
-		(add-to-list 'wordlist (car co))))
-	(setq co (cdr co)))
-      (if (eq (length wordlist) 0)
-	  (setq wordlist '("\\score"))) ; add \keywords to lilypond.words
+	(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))))))))))
+      (reverse wordlist)))
+  "Keywords inserted from LilyPond-Insert-menu.")
+
+(defconst LilyPond-keywords
+  (let ((wordlist '("\\score"))
+	(co (all-completions "" (LilyPond-add-dictionary-word ())))
+	(currword ""))
+    (progn
+      (while (> (length co) 0)
+	(setq currword (car co))
+	(if (> (length currword) 1)
+	    (if (and (string-equal "\\" (substring currword 0 1))
+	             (progn (string-match "[a-z-]+" currword)
+	    	            (= (match-end 0) (length currword)))
+		     (not (string-equal "\\longa" currword))
+		     (not (string-equal "\\breve" currword))
+		     (not (string-equal "\\maxima" currword))
+		     (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)))))))))
       wordlist))
   "LilyPond \\keywords")
 
 (defconst LilyPond-identifiers 
-  (let ((wordlist ())
+  (let ((wordlist '("\\voiceOne"))
 	(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 co (cdr co)))
-      (if (eq (length wordlist) 0)
-	  (setq wordlist '("\\voiceOne"))) ; add \Identifiers to lilypond.words
+	(setq currword (car co))
+	(if (> (length currword) 1)
+	    (if (and (string-equal "\\" (substring currword 0 1))
+	             (progn (string-match "[a-zA-Z-]+" currword)
+	    	            (= (match-end 0) (length currword)))
+		     (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)))))))))
       wordlist))
   "LilyPond \\Identifiers")
 
-(defconst LilyPond-reserved-words 
-  (let ((wordlist ())
+(defconst LilyPond-Capitalized-Reserved-Words 
+  (let ((wordlist '("Staff"))
 	(co (all-completions "" (LilyPond-add-dictionary-word ()))))
     (progn
       (while (> (length co) 0)
-	(if (> (length (car co)) 0)
-	    (if (not (string-equal "\\" (substring (car co) 0 1)))
-		(add-to-list 'wordlist (car co))))
-	(setq co (cdr co)))
-      (if (eq (length wordlist) 0)
-	  (setq wordlist '("Staff"))) ; add ReservedWords to lilypond.words
+	(setq currword (car co))
+	(if (> (length currword) 0)
+	    (if (and (progn (string-match "[a-zA-Z_]+" currword)
+	    	            (= (match-end 0) (length currword)))
+		     (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)))))))))
+      wordlist))
+  "LilyPond ReservedWords")
+
+(defconst LilyPond-non-capitalized-reserved-words
+  (let ((wordlist '("c"))
+	(co (all-completions "" (LilyPond-add-dictionary-word ()))))
+    (progn
+      (while (> (length co) 0)
+	(setq currword (car co))
+	(if (> (length currword) 0)
+	    (if (and (progn (string-match "[a-z]+" currword)
+	    	            (= (match-end 0) (length currword)))
+		     (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)))))))))
       wordlist))
   "LilyPond ReservedWords")
 
@@ -343,11 +392,11 @@ in LilyPond-include-path."
   ;; Should expand this to include possible keyboard shortcuts which
   ;; could then be mapped to define-key and menu.
   `(
-    ("LilyPond" . ("lilypond %s" . "LaTeX"))
+    ("Raw LilyPond" . ("lilypond-bin %s" . "LaTeX"))
     ("TeX" . ("tex '\\nonstopmode\\input %t'" . "View"))
 
-    ("2Dvi" . ("ly2dvi %s" . "View"))
-    ("2PS" . ("ly2dvi -P %s" . "ViewPS"))
+    ("2Dvi" . ("lilypond %s" . "View"))
+    ("2PS" . ("lilypond -P %s" . "ViewPS"))
     ("2Midi" . ("lilypond -m %s" . "View"))
 
     ("Book" . ("lilypond-book %x" . "LaTeX"))
@@ -513,12 +562,6 @@ Must be the car of an entry in `LilyPond-command-alist'."
   (LilyPond-command (LilyPond-command-menu "ViewPS") 'LilyPond-master-file)
 )
 
-;;; Refer to syntax-table (in lilypond-font-lock.el) for comment characters.
-(defun LilyPond-un-comment-region (start end level)
-  "Remove up to LEVEL comment characters from each line in the region."
-  (interactive "*r\np") 
-  (comment-region start end (- level)))
-
 ;; FIXME, this is broken
 (defun LilyPond-region-file (begin end)
   (let (
@@ -667,7 +710,7 @@ command."
 (if LilyPond-mode-map
     ()
   (setq LilyPond-mode-map (make-sparse-keymap))
-  ;; Put keys to Lilypond-command-alist and fetch them from there somehow.
+  ;; Put keys to LilyPond-command-alist and fetch them from there somehow.
   (define-key LilyPond-mode-map "\C-c\C-l" 'LilyPond-command-lilypond)
   (define-key LilyPond-mode-map "\C-c\C-r" 'LilyPond-command-region)
   (define-key LilyPond-mode-map "\C-c\C-b" 'LilyPond-command-buffer)
@@ -683,11 +726,10 @@ command."
   (define-key LilyPond-mode-map [(control c) (control return)] 'LilyPond-command-all-midi)
   (define-key LilyPond-mode-map "\C-x\C-s" 'LilyPond-save-buffer)
   (define-key LilyPond-mode-map "\C-cf" 'font-lock-fontify-buffer)
-  (define-key LilyPond-mode-map "\C-ci" 'LilyPond-quick-note-insert)
-  (define-key LilyPond-mode-map "\C-cn" 'LilyPond-insert-tag-notes)
-  (define-key LilyPond-mode-map "\C-cs" 'LilyPond-insert-tag-score)
-  (define-key LilyPond-mode-map "\C-c:" 'LilyPond-un-comment-region)
-  (define-key LilyPond-mode-map "\C-c;" 'comment-region)
+  (define-key LilyPond-mode-map "\C-ci" 'LilyPond-insert-tag-current)
+  ;; the following will should be overriden by Lilypond Quick Insert Mode
+  (define-key LilyPond-mode-map "\C-cq" 'LilyPond-quick-insert-mode)
+  (define-key LilyPond-mode-map "\C-c;" 'LilyPond-comment-region)
   (define-key LilyPond-mode-map ")" 'LilyPond-electric-close-paren)
   (define-key LilyPond-mode-map ">" 'LilyPond-electric-close-paren)
   (define-key LilyPond-mode-map "}" 'LilyPond-electric-close-paren)
@@ -700,108 +742,23 @@ command."
 
 ;;; Menu Support
 
-(defun LilyPond-quick-note-insert()
+;;; This mode was originally LilyPond-quick-note-insert by Heikki Junes.
+;;; The original version has been junked since CVS-1.97,
+;;; in order to merge the efforts done by Nicolas Sceaux.
+;;; LilyPond Quick Insert Mode is a major mode, toggled by C-c q.
+(defun LilyPond-quick-insert-mode ()
   "Insert notes with fewer key strokes by using a simple keyboard piano."
   (interactive)
-  (setq dutch-notes
-       '(("k" "a") ("l" "b") ("a" "c") ("s" "d")
-         ("d" "e") ("f" "f") ("j" "g") ("r" "r")))
-  (setq dutch-note-ends '("eses" "es" "" "is" "isis"))
-  (setq dutch-note-replacements '("" ""))
-  (setq finnish-note-replacements
-       '(("eeses" "eses") ("ees" "es") ("aeses" "asas") ("aes" "as") ("b" "h")
-         ("beses" "heses") ("bes" "b") ("bis" "his") ("bisis" "hisis")))
-                             ; add more translations of the note names
-  (setq spanish-note-replacements
-       '(("c" "do") ("d" "re") ("e" "mi") ("f" "fa") ("g" "sol") ("a" "la") ("b
-" "si")
-      ("cis" "dos") ("cisis" "doss") ("ces" "dob") ("ceses" "dobb")
-      ("dis" "res") ("disis" "ress") ("des" "reb") ("deses" "rebb")
-      ("eis" "mis") ("eisis" "miss") ("ees" "mib") ("eeses" "mibb")
-      ("fis" "fas") ("fisis" "fass") ("fes" "fab") ("feses" "fabb")
-      ("gis" "sols") ("gisis" "solss") ("ges" "solb") ("geses" "solbb")
-      ("ais" "las") ("aisis" "lass") ("aes" "lab") ("aeses" "labb")
-      ("bis" "sis") ("bisis" "siss") ("bes" "sib") ("beses" "sibb")))
-  (setq other-keys "()<>~}")
-  (setq accid 0) (setq octav 0) (setq durat "") (setq dots 0)
-
-  (message "Press h for help.") (sit-for 0 750)
-
-  (setq note-replacements dutch-note-replacements)
-  (setq xkey 0) (setq xinitpoint (point))
-  (< xinitpoint (point))
-  (while (not (= xkey 27)) ; esc to quit
-    (message (format " a[]s[]d f[]j[]k[]l r with %4s%-4s%3s%-4s ie ,' 12345678 . 0 (<~>)/}b\\b\\n Esc"
-		     (nth (+ accid 2) dutch-note-ends)
-		     (make-string (abs octav) (if (> octav 0) ?' ?,))
-		     durat
-		     (if (string= durat "") "" (make-string dots ?.))))
-    (setq xkey (read-char-exclusive))
-    (setq x (char-to-string xkey))
-    (setq note (cdr (assoc x dutch-notes)))
-    (cond
-     ((string= x "q") (progn (setq xkey 27))) ; quit
-     ((= xkey 13) (progn (insert "\n") (LilyPond-indent-line))) ; return
-     ((or (= xkey 127)     ; backspace is recognized as a char only in Emacs
-	  (string= x "b")) ; so, we need to define an another char for XEmacs
-      (progn (narrow-to-region xinitpoint (point))
-	     (backward-kill-word 1)
-	     (widen)))
-     ((and (string< x "9") (string< "0" x))
-      (progn (setq durat (int-to-string (expt 2 (- (string-to-int x) 1))))
-             (setq dots 0)))
-     ((string= x " ") (insert " "))
-     ((string= x "/") (progn (insert "\\times ")
-			     (message "Insert a number for the denominator (\"x/\")")
-                             (while (not (and (string< x "9") (string< "0" x)))
-                               (setq x (char-to-string (read-char-exclusive))))
-                             (insert (format "%s/" x)) (setq x "/")
-			     (message "Insert a number for the numerator (\"/y\")")
-                             (while (not (and (string< x "9") (string< "0" x)))
-                               (setq x (char-to-string (read-char-exclusive))))
-                             (insert (format "%s { " x))))
-     ((string= x "0") (progn (setq accid 0) (setq octav 0)
-                             (setq durat "") (setq dots 0)))
-     ((string= x "i") (setq accid (if (= accid 2) 0 (max (+ accid 1) 1))))
-     ((string= x "e") (setq accid (if (= accid -2) 0 (min (+ accid -1) -1))))
-     ((string= x "'") (setq octav (if (= octav 4) 0 (max (+ octav 1) 1))))
-     ((string= x ",") (setq octav (if (= octav -4) 0 (min (+ octav -1) -1))))
-     ((string= x ".") (setq dots (if (= dots 4) 0 (+ dots 1))))
-     ((not (null (member x (split-string other-keys ""))))
-      (insert (format "%s " x)))
-     ((not (null note))
-      (progn
-        (setq note
-              (format "%s%s" (car note) (if (string= "r" (car note)) ""
-                                          (nth (+ accid 2) dutch-note-ends))))
-        (setq notetwo (car (cdr (assoc note note-replacements))))
-        (if (not (null notetwo)) (setq note notetwo))
-        (insert
-         (format "%s%s%s%s "
-                 note
-                 (if (string= "r" note) ""
-                     (make-string (abs octav) (if (> octav 0) ?' ?,)))
-                 durat
-                 (if (string= durat "") "" (make-string dots ?.))))
-        (setq accid 0) (setq octav 0) (setq durat "") (setq dots 0)))
-     ((string= x "t") (progn (setq note-replacements dutch-note-replacements)
-                             (message "Selected Dutch notes")
-                             (sit-for 0 750)))
-     ((string= x "n") (progn (setq note-replacements finnish-note-replacements)
-                             (message "Selected Finnish/Deutsch notes")
-                             (sit-for 0 750)))
-                              ; add more translations of the note names
-     ((string= x "p") (progn (setq note-replacements spanish-note-replacements)
-                             (message "Selected Spanish notes")
-                             (sit-for 0 750)))
-     ((string= x "h")
-      (progn (message "Insert notes with fewer key strokes. For example \"i,5.f\" produces \"fis,32. \".") (sit-for 5 0)
-             (message "Add also \"a ~ a\"-ties, \"a ( ) b\"-slurs and \"< a b >\"-chords.") (sit-for 5 0)
-             (message "There are Du(t)ch, Fin(n)ish/Deutsch (hit 'n') and S(p)anish note names.") (sit-for 5 0)
-             (message "(B)ackspace deletes last note, Ret starts a new indented line and Esc (q)uits.") (sit-for 5 0)
-             (message "Insert note triplets \"\\times 2/3 { a b } \" by typing \"/23ab}\".") (sit-for 5 0)
-             (message "This mode is experimental. Use normal mode to add further details.") (sit-for 5 0)))))
-  (message "Normal editing mode."))
+  (progn 
+    (message "Invoke (C-c q) from keyboard. If you still see this message,") (sit-for 5 0)
+    (message "then you have not installed LilyPond Quick Insert Mode (lyqi).") (sit-for 5 0)
+    (message "Download lyqi from http://nicolas.sceaux.free.fr/lilypond/lyqi.html,") (sit-for 5 0)
+    (message "see installation instructions from lyqi's README -file.") (sit-for 5 0)
+    (message "You need also eieio (Enhanced Integration of Emacs Interpreted Objects).") (sit-for 5 0)
+    (message "Download eieio from http://cedet.sourceforge.net/eieio.shtml,") (sit-for 5 0)
+    (message "see installation instructions from eieio's INSTALL -file.") (sit-for 5 0)
+    (message "")
+    ))    
 
 (defun LilyPond-pre-word-search ()
   "Fetch the alphabetic characters and \\ in front of the cursor."
@@ -880,61 +837,69 @@ command."
     (LilyPond-info)
     (Info-index str)))
 
-(defun LilyPond-insert-string (pre)
-  "Insert text to the buffer."
-  (insert pre)
-  (length pre))
-
-(defun LilyPond-insert-between (text pre post)
-  "Insert text to the buffer if non-empty string is given."
-  (let ((str (read-string text)))
-    (if (string-equal str "")
-	0
-      (progn (setq pre_str_post (concat pre str post))
-	     (insert pre_str_post)
-	     (length pre_str_post)))))
-
-(defun LilyPond-insert-tag-notes ()
-  "LilyPond notes tag."
+(defun LilyPond-insert-tag-current (&optional word)
+  "Set the current tag to be inserted."
   (interactive)
-  (setq begin (if (LilyPond-mark-active)
-		  (mark-marker) (point-marker)))
-  (setq end (point-marker))
-  (goto-char begin)
-  (setq l1 (LilyPond-insert-string "\\notes "))
-  (setq l2 (LilyPond-insert-between "Relative (e.g. c'): " "\\relative " " "))
-  (if (eq l2 0)
-      (setq l2 (LilyPond-insert-between "Transpose (e.g. c c'): " "\\transpose " " ")))
-  (setq l3 (LilyPond-insert-string "{ "))
-  (goto-char (+ end l1 l2 l3))
-  (LilyPond-insert-string " }")
-  (goto-char (+ end l1 l2 l3)))
-
-(defun LilyPond-insert-tag-score ()
-  "LilyPond score tag."
+  (if word
+      (setq LilyPond-insert-tag-current word))
+  (if (memq LilyPond-insert-tag-current LilyPond-menu-keywords)
+      (LilyPond-insert-tag)
+    (message "No tag was selected from LilyPond->Insert tag-menu.")))
+
+(defun LilyPond-insert-tag ()
+  "Insert syntax for given tag. The definitions are in LilyPond-words-filename."
   (interactive)
-  (setq begin (if (LilyPond-mark-active) 
-		  (mark-marker) (point-marker)))
-  (setq end (point-marker))
-  (goto-char begin)
-  (setq l1 (LilyPond-insert-string "\\score {\n    ")) ; keep track of lengths
-  (goto-char (+ end l1))
-  (LilyPond-insert-string "\n    \\paper { }\n")
-  (setq l2 (if (y-or-n-p "Insert \"\\header\" field? ")
-	       (+ (LilyPond-insert-string "    \\header {")
-		  (LilyPond-insert-between "Title: " "\n      title = \"" "\"")
-		  (LilyPond-insert-between "Subtitle: " "\n      subtitle = \"" "\"")
-		  (LilyPond-insert-between "Piece: " "\n      piece = \"" "\"")
-		  (LilyPond-insert-between "Opus: "  "\n      opus = \"" "\"")
-		  (LilyPond-insert-string "\n    }\n"))
-	     0))
-  (setq l3 (if (y-or-n-p "Insert \"\\midi\" field? ")
-	       (+ (LilyPond-insert-string "    \\midi {")
-		  (LilyPond-insert-between "Tempo: " " \\tempo (e.g. 4 = 60)" "")
-		  (LilyPond-insert-string " }\n"))
-	     0))
-  (setq l4 (LilyPond-insert-string "}\n"))
-  (goto-char (+ end l1)))
+  (setq b (find-file-noselect (LilyPond-words-filename) t t))
+  (let ((word LilyPond-insert-tag-current)
+	(found nil)
+	(p nil)
+	(query nil)
+        (m (set-marker (make-marker) 1 (get-buffer b)))
+        (distance (if (LilyPond-mark-active)
+		      (abs (- (mark-marker) (point-marker))) 0))
+       )
+   ;; find the place first
+   (if (LilyPond-mark-active)
+       (goto-char (min (mark-marker) (point-marker))))
+   (while (and (not found) (> (buffer-size b) (marker-position m)))
+    (setq copy (car (copy-alist (list (eval (symbol-name (read m)))))))
+    (if (string-equal word copy) (setq found t)))
+   (if found (insert word))
+   (if (> (buffer-size b) (marker-position m))
+       (setq copy (car (copy-alist (list (eval (symbol-name (read m))))))))
+   (if (not (string-equal "-" copy)) 
+       (setq found nil))
+   (while (and found (> (buffer-size b) (marker-position m)))
+    ;; find next symbol
+    (setq copy (car (copy-alist (list (eval (symbol-name (read m)))))))
+    ;; check whether it is the word, or the word has been found
+    (cond 
+     ((string-equal "-" copy) (setq found nil))
+     ((string-equal "%" copy) (insert " " (read-string "Give Arguments: ")))
+     ((string-equal "_" copy) 
+      (progn 
+       (setq p (point))
+       (goto-char (+ p distance))))
+     ((string-equal "\?" copy) (setq query t))
+     ((string-equal "\!" copy) (setq query nil))
+     ((string-equal "\\n" copy) 
+      (if (not query)
+       (progn (LilyPond-indent-line) (insert "\n") (LilyPond-indent-line))))
+     ((string-equal "{" copy) 
+      (if (not query) 
+	  (progn (insert " { "))))
+     ((string-equal "}" copy)
+      (if (not query)
+       (progn (insert " } ") (setq query nil) )))
+     ((not query)
+      (insert copy))
+     (query
+      (if (y-or-n-p (concat "Proceed with `" copy "'? "))
+       (progn (insert copy) (setq query nil))))
+   ))
+   (if p (goto-char p))
+   (kill-buffer b))
+)
 
 (defun LilyPond-command-menu-entry (entry)
   ;; Return LilyPond-command-alist ENTRY as a menu item.
@@ -967,7 +932,7 @@ command."
 ;;;	  (let ((file 'LilyPond-command-on-current))
 ;;;	    (mapcar 'LilyPond-command-menu-entry LilyPond-command-alist))
 ;;; Some kind of mapping which includes :keys might be more elegant
-;;; Put keys to Lilypond-command-alist and fetch them from there somehow.
+;;; Put keys to LilyPond-command-alist and fetch them from there somehow.
 	  '([ "LilyPond" LilyPond-command-lilypond t])
 	  '([ "TeX" (LilyPond-command (LilyPond-command-menu "TeX") 'LilyPond-master-file) ])
 	  '([ "2Dvi" LilyPond-command-formatdvi t])
@@ -985,21 +950,49 @@ command."
 	  '([ "Midi all" LilyPond-command-all-midi t])
 	  ))
 
+(defun LilyPond-menu-keywords-item (arg)
+  "Make vector for LilyPond-mode-keywords."
+  (vector arg (list 'LilyPond-insert-tag-current arg) :style 'radio :selected (list 'eq 'LilyPond-insert-tag-current arg)))
+
+(defun LilyPond-menu-keywords ()
+  "Make Insert Tag menu. 
+
+The Insert Tag -menu is splitted into parts if it is long enough."
+
+  (let ((li (mapcar 'LilyPond-menu-keywords-item LilyPond-menu-keywords))
+	(w (round (sqrt (length LilyPond-menu-keywords))))
+	(splitted '())
+	(imin 0) imax lw rw)
+    (while (< imin (length LilyPond-menu-keywords))
+      (setq imax (- (min (+ imin w) (length LilyPond-menu-keywords)) 1))
+      (setq lw (nth imin LilyPond-menu-keywords)) 
+      (setq rw (nth imax LilyPond-menu-keywords))
+      (add-to-list 'splitted
+         (let ((l (list (concat (substring lw 0 (min 7 (length lw))) 
+				" ... " 
+				(substring rw 0 (min 7 (length rw)))))))
+	   (while (<= imin imax)
+	     (add-to-list 'l (nth imin li))
+	     (setq imin (1+ imin)))
+	   (reverse l))))
+    (if (> (length LilyPond-menu-keywords) 12) (reverse splitted) li)))
+
 ;;; LilyPond-mode-menu should not be interactive, via "M-x LilyPond-<Tab>"
 (easy-menu-define LilyPond-mode-menu
   LilyPond-mode-map
   "Menu used in LilyPond mode."
   (append '("LilyPond")
-	  '(("Insert"
-	     [ "\\notes..."  LilyPond-insert-tag-notes t]
-	     [ "\\score..."  LilyPond-insert-tag-score t]
-	     ["Quick Notes"  LilyPond-quick-note-insert t]
-	     ["Autocompletion"   LilyPond-autocompletion t]
-	     ))
+	  '(["Add index menu" LilyPond-add-imenu-menu])
+	  (list (cons "Insert tag" 
+                (cons ["Previously selected" LilyPond-insert-tag-current t] 
+                (cons "-----"
+		      (LilyPond-menu-keywords)))))
 	  '(("Miscellaneous"
-	     ["Uncomment Region" LilyPond-un-comment-region t]
-	     ["Comment Region" comment-region t]
+	     ["Autocompletion"   LilyPond-autocompletion t]
+	     ["(Un)comment Region" LilyPond-comment-region t]
 	     ["Refontify buffer" font-lock-fontify-buffer t]
+	     "-----"
+	     ["Quick Insert Mode"  LilyPond-quick-insert-mode :keys "C-c q"]
  	     ))
 	  '(("Info"
 	     ["LilyPond" LilyPond-info t]
@@ -1042,6 +1035,17 @@ command."
 		 (LilyPond-command-region (mark t) (point))))
       (funcall LilyPond-command-current))))
 
+(defun LilyPond-add-imenu-menu ()
+  (interactive)
+  "Add an imenu menu to the menubar."
+  (if (not LilyPond-imenu)
+      (progn
+	(imenu-add-to-menubar "Index")
+	(redraw-frame (selected-frame))
+	(setq LilyPond-imenu t))
+    (message "%s" "LilyPond-imenu already exists.")))
+(put 'LilyPond-add-imenu-menu 'menu-enable '(not LilyPond-imenu))
+
 (defun LilyPond-mode ()
   "Major mode for editing LilyPond music files.
 
@@ -1095,22 +1099,16 @@ LilyPond-xdvi-command\t\tcommand to display dvi files -- bit superfluous"
   (make-local-variable 'indent-line-function)
   (setq indent-line-function 'LilyPond-indent-line)
 
-  (set-syntax-table LilyPond-mode-syntax-table)
+  (LilyPond-mode-set-syntax-table '(?\< ?\> ?\{ ?\}))
   (setq major-mode 'LilyPond-mode)
   (setq mode-name "LilyPond")
   (setq local-abbrev-table LilyPond-mode-abbrev-table)
   (use-local-map LilyPond-mode-map)
 
-  ;; In Emacs blink-...-on-screen needs to be declared.
-  (if (not (string-match "XEmacs\\|Lucid" emacs-version))
-      (progn
-	(make-local-variable 'blink-matching-paren-on-screen)
-	(setq blink-matching-paren-on-screen t)))
-
   ;; In XEmacs imenu was synched up with: FSF 20.4
   (make-local-variable 'imenu-generic-expression)
   (setq imenu-generic-expression LilyPond-imenu-generic-expression)
-  (imenu-add-to-menubar "Index")
+  ;; (imenu-add-to-menubar "Index") ; see LilyPond-add-imenu-menu
 
   ;; In XEmacs one needs to use 'easy-menu-add'.
   (if (string-match "XEmacs\\|Lucid" emacs-version)
@@ -1123,6 +1121,23 @@ LilyPond-xdvi-command\t\tcommand to display dvi files -- bit superfluous"
       (setq zmacs-regions nil)
     (setq mark-even-if-inactive t))
 
+  ;; Context dependent syntax tables in LilyPond-mode
+  (make-local-hook 'post-command-hook) ; XEmacs requires
+  (add-hook 'post-command-hook 'LilyPond-mode-context-set-syntax-table nil t)
+
+  ;; Turn on paren-mode buffer-locally, i.e., in LilyPond-mode
+  (if (string-match "XEmacs\\|Lucid" emacs-version)
+      (progn
+	(make-local-variable 'paren-mode)
+	(paren-set-mode 'paren)
+	(make-local-variable 'blink-matching-paren)
+	(setq blink-matching-paren t)
+	)
+    (progn
+      (make-local-variable 'blink-matching-paren-on-screen)
+      (setq blink-matching-paren-on-screen t)
+     ))
+
   ;; run the mode hook. LilyPond-mode-hook use is deprecated
   (run-hooks 'LilyPond-mode-hook))