;;;
;;; 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-file "lilypond-font-lock.el")
+(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 "help-gnu-music@gnu.org"
+(defconst LilyPond-help-address "bug-gnu-music@gnu.org"
"Address accepting submission of bug reports.")
(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'.")
;; Should check whether in command-alist?
-(defvar LilyPond-command-default "LilyPond")
+(defcustom LilyPond-command-default "LilyPond"
+ "Default command. Must identify a member of LilyPond-command-alist."
+
+ :group 'LilyPond
+ :type 'string)
;;;(make-variable-buffer-local 'LilyPond-command-last)
(defvar LilyPond-command-current 'LilyPond-command-master)
;; variable instead of quering the user.
(defvar LilyPond-command-force nil)
+(defcustom LilyPond-xdvi-command "xdvik"
+ "Command used to display DVI files."
+
+ :group 'LilyPond
+ :type 'string)
;; This is the major configuration variable.
(defcustom LilyPond-command-alist
- '(
+ `(
("LilyPond" . ("lilypond %s" . "TeX"))
("TeX" . ("tex '\\nonstopmode\\input %t'" . "View"))
-
+
+ ("2Dvi" . ("ly2dvi %s" . "View"))
+
+ ("Book" . ("lilypond-book %x" . "LaTeX"))
+ ("LaTeX" . ("latex '\\nonstopmode\\input %l'" . "View"))
+
;; point-n-click (arg: exits upop USR1)
("SmartView" . ("xdvi %d" . "LilyPond"))
;; refreshes when kicked USR1
- ("View" . ("xdvik %d" . "LilyPond"))
+ ("View" . (,(concat LilyPond-xdvi-command " %d") . "LilyPond"))
)
"AList of commands to execute on the current document.
LilyPond-expand-list.
"
:group 'LilyPond
- :type '(repeat (group (string :tag "Name")
+ :type '(repeat (cons :tag "Command Item"
+ (string :tag "Key")
+ (cons :tag "How"
(string :tag "Command")
- (choice :tag "How"
- :value LilyPond-run-command
- (function-item LilyPond-run-command)
- (function-item LilyPond-run-LilyPond)
- (function :tag "Other"))
- (boolean :tag "Prompt")
- (sexp :format "End\n"))))
+ (string :tag "Next Key")))))
;; drop this?
(defcustom LilyPond-file-extensions '(".ly" ".sly" ".fly")
("%t" . ".tex")
("%d" . ".dvi")
("%p" . ".ps")
+ ("%l" . ".latex")
+ ("%x" . ".tely")
)
"Alist of expansion strings for LilyPond command names."
:group 'LilyPond
- :type '(repeat (group (string :tag "Key")
- (sexp :tag "Expander")
- (repeat :inline t
- :tag "Arguments"
- (sexp :format "%v")))))
+ :type '(repeat (cons :tag "Alist item"
+ (string :tag "Symbol")
+ (string :tag "Expansion"))))
(defcustom LilyPond-command-Show "View"
"*The default command to show (view or print) a LilyPond file.
-Must be the car of an entry in LilyPond-command-alist."
+Must be the car of an entry in `LilyPond-command-alist'."
:group 'LilyPond
:type 'string)
(make-variable-buffer-local 'LilyPond-command-Show)
(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))))
(LilyPond-command (LilyPond-command-query (LilyPond-master-file))
'LilyPond-master-file))
+;; FIXME, this is broken
(defun LilyPond-region-file (begin end)
(let (
;; (dir "/tmp/")
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.
(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.
(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
(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)
(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 "%{")
(interactive)
(message "Using `LilyPond-mode' version %s" LilyPond-version))
-(provide 'LilyPond-mode)
-;;; LilyPond-mode.el ends here
+(provide 'lilypond-mode)
+;;; lilypond-mode.el ends here
projects / lilypond.git / blobdiff