patch::: 1.5.4.jcn5

[lilypond.git] / lilypond-mode.el

diff --git a/lilypond-mode.el b/lilypond-mode.el
index ac735918016ab94c5c99f47e80b3ecf93f6f1177..8ea8cf8b7dbb11ba722096c8f3423bf9bf35bf97 100644 (file)
--- a/lilypond-mode.el
+++ b/lilypond-mode.el
@@ -3,17 +3,23 @@
 ;;;
 ;;; source file of the GNU LilyPond music typesetter
 ;;; 
-;;; (c) 1999, 2000 Jan Nieuwenhuizen <janneke@gnu.org>
+;;; (c) 1999--2001 Jan Nieuwenhuizen <janneke@gnu.org>
 
 ;;; Inspired on auctex
 
+;;;
+;;; Add this to your ~/.emacs or ~/.emacs.el
+;;;     (load-library "lilypond-mode.el")
+;;;     (setq auto-mode-alist
+;;;      (append '(("\\.ly$" . LilyPond-mode) auto-mode-alist)))
+;;; 
 
 (load-library "lilypond-font-lock")
 
 (require 'easymenu)
 (require 'compile)
 
-(defconst LilyPond-version "1.3.103"
+(defconst LilyPond-version "1.3.143"
   "`LilyPond-mode' version number.")
 
 (defconst LilyPond-help-address "bug-gnu-music@gnu.org"
@@ -22,6 +28,12 @@
 (defvar LilyPond-mode-hook nil
   "*Hook called by `LilyPond-mode'.")
 
+(defvar LilyPond-kick-xdvi nil
+  "If true, no simultaneous xdvi's are started, but reload signal is sent.")
+
+(defvar LilyPond-command-history nil
+  "Command history list.")
+       
 (defvar LilyPond-regexp-alist
   '(("\\([a-zA-Z]?:?[^:( \t\n]+\\)[:( \t]+\\([0-9]+\\)[:) \t]" 1 2))
   "Regexp used to match LilyPond errors.  See `compilation-error-regexp-alist'.")
@@ -219,7 +231,7 @@ Must be the car of an entry in `LilyPond-command-alist'."
         (answer (or LilyPond-command-force
                     (completing-read
                      (concat "Command: (default " default ") ")
-                     LilyPond-command-alist nil t))))
+                     LilyPond-command-alist nil t nil 'LilyPond-command-history))))
 
     ;; If the answer is "LilyPond" it will not be expanded to "LilyPond"
     (let ((answer (car-safe (assoc answer LilyPond-command-alist))))
@@ -240,6 +252,7 @@ Must be the car of an entry in `LilyPond-command-alist'."
   (LilyPond-command (LilyPond-command-query (LilyPond-master-file))
                    'LilyPond-master-file))
 
+;; FIXME, this is broken
 (defun LilyPond-region-file (begin end)
   (let (
        ;; (dir "/tmp/")
@@ -286,6 +299,16 @@ Must be the car of an entry in `LilyPond-command-alist'."
           file))
       string)))
 
+(defun LilyPond-shell-process (name buffer command)
+  (let ((old (current-buffer)))
+    (switch-to-buffer-other-window buffer)
+    ;; If we empty the buffer don't see messages scroll by.
+    ;; (erase-buffer)
+    
+    (start-process-shell-command name buffer command)
+    (switch-to-buffer-other-window old)))
+  
+
 (defun LilyPond-command (name file)
   "Run command NAME on the file you get by calling FILE.
 
@@ -299,17 +322,17 @@ command."
     (if entry
        (let ((command (LilyPond-command-expand (cadr entry)
                                                (apply file nil))))
-         (let* (
-                (buffer-xdvi (get-buffer "*view*"))
-                (process-xdvi (if buffer-xdvi (get-buffer-process buffer-xdvi) nil)))
-           (if (and process-xdvi
-                    (string-equal name "View"))
-               ;; Don't open new xdvi window, but force redisplay
-               ;; We could make this an option.
-               (signal-process (process-id process-xdvi) 'SIGUSR1)
-             (progn
-               (setq LilyPond-command-default name)
-               (LilyPond-compile-file command name))))))))
+         (if (string-equal name "View")
+             (let ((buffer-xdvi (get-buffer-create "*view*")))
+               (if LilyPond-kick-xdvi
+                 (let ((process-xdvi (get-buffer-process buffer-xdvi)))
+                   (if process-xdvi
+                       (signal-process (process-id process-xdvi) 'SIGUSR1)
+                     (LilyPond-shell-process name buffer-xdvi command)))
+                 (LilyPond-shell-process name buffer-xdvi command)))
+           (progn
+             (setq LilyPond-command-default name)
+             (LilyPond-compile-file command name)))))))
          
 ;; XEmacs stuff
 ;; Sadly we need this for a macro in Emacs 19.
@@ -334,10 +357,10 @@ command."
 (if LilyPond-mode-map
     ()
   (setq LilyPond-mode-map (make-sparse-keymap))
-  (define-key LilyPond-mode-map "\C-c\C-c" 'LilyPond-command-master)
   (define-key LilyPond-mode-map "\C-c\C-r" 'LilyPond-command-region)
   (define-key LilyPond-mode-map "\C-c\C-b" 'LilyPond-command-buffer)
   (define-key LilyPond-mode-map "\C-c\C-k" 'LilyPond-kill-job)
+  (define-key LilyPond-mode-map "\C-c\C-c" 'LilyPond-command-master)
   )
 
 ;;; Menu Support
@@ -402,7 +425,18 @@ command."
     (funcall LilyPond-command-current)))
 
 (defun LilyPond-mode ()
-  "Major mode for editing LilyPond music files."
+  "Major mode for editing LilyPond music files.
+
+This mode knows about LilyPond keywords and line comments, not about
+indentation or block comments.  It features easy compilation, error
+finding and viewing of a LilyPond source buffer or region.
+
+COMMANDS
+\\{LilyPond-mode-map}
+VARIABLES
+
+LilyPond-command-alist\t\talist from name to command
+LilyPond-xdvi-command\t\tcommand to display dvi files -- bit superfluous"
   (interactive)
   ;; set up local variables
   (kill-all-local-variables)
@@ -423,7 +457,7 @@ command."
   (setq comment-start-skip "%{? *")
 
   (make-local-variable 'comment-end)
-  (setq comment-end "\n")
+  (setq comment-end "")
 
   (make-local-variable 'block-comment-start)
   (setq block-comment-start "%{")