X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lilypond-mode.el;h=7df2546a5a68b1b29414e071a25d8d1b67d02076;hb=d145acbbd1250d861b3e8559d40c342273b2bb63;hp=e56a32acdda99822c5ded3b68130b4ec65fe5c61;hpb=696e34b7b40cf030bfc45e3e636187b4560bb8d9;p=lilypond.git diff --git a/lilypond-mode.el b/lilypond-mode.el index e56a32acdd..7df2546a5a 100644 --- a/lilypond-mode.el +++ b/lilypond-mode.el @@ -5,7 +5,7 @@ ;;; ;;; (c) 1999--2001 Jan Nieuwenhuizen ;;; -;;; Changed 2001--2002 Heikki Junes +;;; Changed 2001--2003 Heikki Junes ;;; * Add PS-compilation, PS-viewing and MIDI-play (29th Aug 2001) ;;; * Keyboard shortcuts (12th Sep 2001) ;;; * Inserting tags, inspired on sgml-mode (11th Oct 2001) @@ -19,10 +19,15 @@ ;;; Look lilypond-init.el or Documentation/topdocs/INSTALL.texi ;;; for installing instructions. +;;; TODO: +;;; * sensible error if lilypond.words not found. +;;; * XEmacs, broken ? +;;; * parenthesis matching + (require 'easymenu) (require 'compile) -(defconst LilyPond-version "1.7.8" +(defconst LilyPond-version "1.7.12" "`LilyPond-mode' version number.") (defconst LilyPond-help-address "bug-lilypond@gnu.org" @@ -31,6 +36,11 @@ (defvar LilyPond-mode-hook nil "*Hook called by `LilyPond-mode'.") +;; FIXME: find ``\score'' in buffers / make settable? +(defun LilyPond-master-file () + ;; duh + (buffer-file-name)) + (defvar LilyPond-kick-xdvi nil "If true, no simultaneous xdvi's are started, but reload signal is sent.") @@ -62,7 +72,7 @@ Finds file lilypond-words from load-path." "Contains all words: keywords, identifiers, reserved words." (nconc '(("" . 1)) x)) -; creates dictionary if empty +;; creates dictionary if empty (if (eq (length (LilyPond-add-dictionary-word ())) 1) (progn (setq fn (LilyPond-words-filename)) @@ -146,20 +156,48 @@ in LilyPond-include-path." found)) (defun LilyPond-running () - (let ((process (get-process "lilypond"))) - (and process - (eq (process-status process) 'run)))) - -(defun Midi-running () - (let ((process (get-process "midi"))) - (and process - (eq (process-status process) 'run)))) - -(defun LilyPond-kill-job () - "Kill the currently running LilyPond job." + "Check the currently running LilyPond compiling jobs." + (interactive) + (let ((process-names (list "lilypond" "tex" "2dvi" "2ps" "2midi" + "book" "latex")) + (running nil)) + (while (setq process-name (pop process-names)) + (setq process (get-process process-name)) + (if (and process + (eq (process-status process) 'run)) + (push process-name running))) + running)) ; return the running jobs + +(defun LilyPond-midi-running () + "Check the currently running Midi processes." + (interactive) + (let ((process-names (list "midi" "midiall")) + (running nil)) + (while (setq process-name (pop process-names)) + (setq process (get-process process-name)) + (if (and process + (eq (process-status process) 'run)) + (push process-name running))) + running)) ; return the running jobs + +(defun LilyPond-kill-jobs () + "Kill the currently running LilyPond compiling jobs." (interactive) - ;; What bout TeX, Xdvi? - (quit-process (get-process "lilypond") t)) + (let ((process-names (LilyPond-running)) + (killed nil)) + (while (setq process-name (pop process-names)) + (quit-process (get-process process-name) t) + (push process-name killed)) + killed)) ; return the killed jobs + +(defun LilyPond-kill-midi () + "Kill the currently running midi processes." + (let ((process-names (LilyPond-midi-running)) + (killed nil)) + (while (setq process-name (pop process-names)) + (quit-process (get-process process-name) t) + (push process-name killed)) + killed)) ; return the killed jobs ;; URG, should only run LilyPond-compile for LilyPond ;; not for tex,xdvi (ly2dvi?) @@ -223,20 +261,78 @@ in LilyPond-include-path." :group 'LilyPond :type 'string) -(defcustom LilyPond-midi-all-command "timidity -ig" +(defcustom LilyPond-all-midi-command "timidity -ia" "Command used to play MIDI files." :group 'LilyPond :type 'string) +(defun LilyPond-command-current-midi () + "Play midi corresponding to the current document." + (interactive) + (LilyPond-command (LilyPond-command-menu "Midi") 'LilyPond-master-file)) + +(defun LilyPond-command-all-midi () + "Play midi corresponding to the current document." + (interactive) + (LilyPond-command (LilyPond-command-menu "MidiAll") 'LilyPond-master-file)) + +(defun count-rexp (start end rexp) + "Print number of found regular expressions in the region." + (interactive "r") + (save-excursion + (save-restriction + (narrow-to-region start end) + (goto-char (point-min)) + (count-matches rexp)))) + +(defun count-midi-words () + "Check number of midi-scores before the curser." + (interactive) + (count-rexp (point-min) (point-max) "\\\\midi")) + +(defun count-midi-words-backwards () + "Check number of midi-scores before the curser." + (interactive) + (count-rexp (point-min) (point) "\\\\midi")) + +(defun LilyPond-string-current-midi () + "Check the midi file of the following midi-score in the current document." + (interactive) + (let ((fnameprefix (substring (LilyPond-master-file) 0 -3)) ; suppose ".ly" + (allcount (string-to-number (substring (count-midi-words) 0 -12))) + (count (string-to-number (substring (count-midi-words-backwards) 0 -12)))) + (concat fnameprefix + (if (and (> allcount 1) (> count 0)) ; not first score + (if (eq count allcount) ; last score + (concat "-" (number-to-string (+ count -1))) + (concat "-" (number-to-string count)))) + ".midi"))) + +(defun LilyPond-string-all-midi () + "Return the midi files of the current document in ascending order." + (interactive) + (let ((fnameprefix (substring (LilyPond-master-file) 0 -3)) + (allcount (string-to-number (substring (count-midi-words) 0 -12)))) + (concat (if (> allcount 0) ; at least one midi-score + (concat fnameprefix ".midi ")) + (if (> allcount 1) ; more than one midi-score + (concat fnameprefix "-[1-9].midi ")) + (if (> allcount 9) ; etc. + (concat fnameprefix "-[1-9][0-9].midi")) + (if (> allcount 99) ; not first score + (concat fnameprefix "-[1-9][0-9][0-9].midi"))))) + ;; This is the major configuration variable. (defcustom LilyPond-command-alist + ;; Should expand this to include possible keyboard shortcuts which + ;; could then be mapped to define-key and menu. `( ("LilyPond" . ("lilypond %s" . "LaTeX")) ("TeX" . ("tex '\\nonstopmode\\input %t'" . "View")) ("2Dvi" . ("ly2dvi %s" . "View")) - ("2PS" . ("ly2dvi -P %s" . "View")) + ("2PS" . ("ly2dvi -P %s" . "ViewPS")) ("2Midi" . ("lilypond -m %s" . "View")) ("Book" . ("lilypond-book %x" . "LaTeX")) @@ -244,13 +340,16 @@ in LilyPond-include-path." ;; point-n-click (arg: exits upop USR1) ("SmartView" . ("xdvi %d" . "LilyPond")) - + ;; refreshes when kicked USR1 ("View" . (,(concat LilyPond-xdvi-command " %d") . "LilyPond")) - ("ViewPS" . (,(concat LilyPond-gv-command " %p") . "LilyPond")) - ("Midi" . (,(concat LilyPond-midi-command " %m") . "LilyPond")) + ;; The following are refreshed in LilyPond-command: + ;; - current-midi depends on cursor position and + ("Midi" . (,(concat LilyPond-midi-command " " (LilyPond-string-current-midi)) . "LilyPond" )) ; + ;; - all-midi depends on number of midi-score. + ("MidiAll" . (,(concat LilyPond-all-midi-command " " (LilyPond-string-all-midi)) . "LilyPond")) ) "AList of commands to execute on the current document. @@ -326,9 +425,12 @@ Must be the car of an entry in `LilyPond-command-alist'." (LilyPond-check-files (concat name ".tex") (list name) LilyPond-file-extensions) - (if (buffer-modified-p) - (if (y-or-n-p "Save buffer before next command? ") - (LilyPond-save-buffer))) + (if (verify-visited-file-modtime (current-buffer)) + (if (buffer-modified-p) + (if (y-or-n-p "Save buffer before next command? ") + (LilyPond-save-buffer))) + (if (y-or-n-p "The command will be invoked to an already saved buffer. Revert it? ") + (revert-buffer t t))) ;;"LilyPond" LilyPond-command-default)) (t LilyPond-command-default))) @@ -347,12 +449,6 @@ Must be the car of an entry in `LilyPond-command-alist'." answer default)))) - -;; FIXME: find ``\score'' in buffers / make settable? -(defun LilyPond-master-file () - ;; duh - (buffer-file-name)) - (defun LilyPond-command-master () "Run command on the current document." (interactive) @@ -377,6 +473,12 @@ Must be the car of an entry in `LilyPond-command-alist'." (LilyPond-command (LilyPond-command-menu "2PS") 'LilyPond-master-file) ) +(defun LilyPond-command-formatmidi () + "Format the midi output of the current document." + (interactive) + (LilyPond-command (LilyPond-command-menu "2Midi") 'LilyPond-master-file) +) + (defun LilyPond-command-smartview () "View the dvi output of current document." (interactive) @@ -395,68 +497,7 @@ Must be the car of an entry in `LilyPond-command-alist'." (LilyPond-command (LilyPond-command-menu "ViewPS") 'LilyPond-master-file) ) -(defun LilyPond-command-midi () - "Play midi corresponding to the current document." - (interactive) - (LilyPond-command (LilyPond-command-menu "Midi") 'LilyPond-master-file) -) - -(defun count-rexp (start end rexp) - "Print number of found regular expressions in the region." - (interactive "r") - (save-excursion - (save-restriction - (narrow-to-region start end) - (goto-char (point-min)) - (count-matches rexp)))) - -(defun count-midi-words () - "Print number of scores before the curser." - (interactive) - (count-rexp (point-min) (point-max) "\\\\midi")) - -(defun count-midi-words-backwards () - "Print number of scores before the curser." - (interactive) - (count-rexp (point-min) (point) "\\\\midi")) - -(defun LilyPond-command-next-midi () - "Play next midi score of the current document." - (interactive) - (if (Midi-running) - (quit-process (get-process "midi") t) - (LilyPond-compile-file - (let ((fname (LilyPond-master-file)) - (allcount (string-to-number (substring (count-midi-words) 0 -12))) - (count (string-to-number (substring (count-midi-words-backwards) 0 -12)))) - (concat LilyPond-midi-command " " - (substring fname 0 -3) ; suppose ".ly" - (if (and (> allcount 1) (> count 0)) ; not first score - (if (eq count allcount) ; last score - (concat "-" (number-to-string (+ count -1))) - (concat "-" (number-to-string count)))) - ".midi")) - "Midi"))) - -(defun LilyPond-command-all-midi () - "Play next midi score of the current document." - (interactive) - (if (Midi-running) - (quit-process (get-process "midi") t) - (LilyPond-compile-file - (let ((fname (LilyPond-master-file)) - (allcount (string-to-number (substring (count-midi-words) 0 -12)))) - (concat LilyPond-midi-all-command " " - (if (> allcount 0) ; at least one midi-score - (concat (substring fname 0 -3) ".midi ")) - (if (> allcount 1) ; more than one midi-score - (concat (substring fname 0 -3) "-?.midi ")) - (if (> allcount 9) ; etc. - (concat (substring fname 0 -3) "-??.midi")) - (if (> allcount 99) ; not first score - (concat (substring fname 0 -3) "-???.midi")))) - "Midi"))) - +;; FIXME, does not find commend ender (defun LilyPond-un-comment-region (start end level) "Remove up to LEVEL comment characters from each line in the region." (interactive "*r\np") @@ -531,9 +572,12 @@ command." (let ((entry (assoc name LilyPond-command-alist))) (if entry (let ((command (LilyPond-command-expand (cadr entry) - (apply file nil)))) - (if (string-equal name "View") - (let ((buffer-xdvi (get-buffer-create "*view*"))) + (apply file nil))) + (jobs nil) + (job-string "no jobs")) + (if (member name (list "View" "ViewPS")) + ;; is USR1 a right signal for viewps? + (let ((buffer-xdvi (get-buffer-create (concat "*" name "*")))) (if LilyPond-kick-xdvi (let ((process-xdvi (get-buffer-process buffer-xdvi))) (if process-xdvi @@ -541,8 +585,44 @@ command." (LilyPond-shell-process name buffer-xdvi command))) (LilyPond-shell-process name buffer-xdvi command))) (progn + (if (string-equal name "Midi") + (progn + (setq command (concat LilyPond-midi-command " " (LilyPond-string-current-midi))) + (if (LilyPond-kill-midi) + (setq job-string nil)))) ; either stop or start playing + (if (string-equal name "MidiAll") + (progn + (setq command (concat LilyPond-all-midi-command " " (LilyPond-string-all-midi))) + (LilyPond-kill-midi))) ; stop and start playing + (if (and (member name (list "Midi" "MidiAll")) job-string) + (if (file-newer-than-file-p + (LilyPond-master-file) + (concat (substring (LilyPond-master-file) 0 -3) ".midi")) + (if (y-or-n-p "Midi older than source. Reformat midi?") + (progn + (LilyPond-command-formatmidi) + (while (LilyPond-running) + (message "Starts playing midi once it is built.") + (sit-for 0 100)))))) + (if (member name (list "LilyPond" "TeX" "2Midi" "2PS" "2Dvi" + "Book" "LaTeX")) + (if (setq jobs (LilyPond-running)) + (progn + (setq job-string "Process") ; could also suggest compiling after process has ended + (while jobs + (setq job-string (concat job-string " \"" (pop jobs) "\""))) + (setq job-string (concat job-string " is already running; kill it to proceed ")) + (if (y-or-n-p job-string) + (progn + (setq job-string "no jobs") + (LilyPond-kill-jobs) + (while (LilyPond-running) + (sit-for 0 100))) + (setq job-string nil))))) + (setq LilyPond-command-default name) - (LilyPond-compile-file command name))))))) + (if (string-equal job-string "no jobs") + (LilyPond-compile-file command name)))))))) ;; XEmacs stuff ;; Sadly we need this for a macro in Emacs 19. @@ -567,17 +647,20 @@ command." (if LilyPond-mode-map () (setq LilyPond-mode-map (make-sparse-keymap)) + ;; 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) - (define-key LilyPond-mode-map "\C-c\C-k" 'LilyPond-kill-job) + (define-key LilyPond-mode-map "\C-c\C-k" 'LilyPond-kill-jobs) (define-key LilyPond-mode-map "\C-c\C-c" 'LilyPond-command-master) + (define-key LilyPond-mode-map "\C-cm" 'LilyPond-command-formatmidi) (define-key LilyPond-mode-map "\C-c\C-d" 'LilyPond-command-formatdvi) (define-key LilyPond-mode-map "\C-c\C-f" 'LilyPond-command-formatps) (define-key LilyPond-mode-map "\C-c\C-s" 'LilyPond-command-smartview) (define-key LilyPond-mode-map "\C-c\C-v" 'LilyPond-command-view) (define-key LilyPond-mode-map "\C-c\C-p" 'LilyPond-command-viewps) - (define-key LilyPond-mode-map "\C-c\C-m" 'LilyPond-command-next-midi) + (define-key LilyPond-mode-map [(control c) return] 'LilyPond-command-current-midi) + (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) @@ -585,9 +668,9 @@ command." (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 ")" 'LilyPond-electric-close-paren) - (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) ; urgh + (define-key LilyPond-mode-map ">" 'LilyPond-electric-close-paren) ; argh + (define-key LilyPond-mode-map "}" 'LilyPond-electric-close-paren) ; ..rgh (define-key LilyPond-mode-map [S-iso-lefttab] 'LilyPond-autocompletion) (define-key LilyPond-mode-map "\C-c\t" 'LilyPond-info-index-search) ) @@ -630,7 +713,7 @@ command." (make-string (abs octav) (if (> octav 0) ?' ?,)) durat (if (string= durat "") "" (make-string dots ?.))))))) -; (insert (number-to-string x)) ; test numbers for characters + ;; (insert (number-to-string x)) ; test numbers for characters (setq note (cdr (assoc (char-to-string x) dutch-notes))) (cond ((= x 127) (backward-kill-word 1)) ; backspace @@ -697,9 +780,9 @@ command." (let ((pre "") (prelen 0) (ch (char-before (- (point) 0)))) - (while (and ch (or (and (>= ch 65) (<= ch 90)) ; not bolp, A-Z + (while (and ch (or (and (>= ch 65) (<= ch 90)) ; not bolp, A-Z (and (>= ch 97) (<= ch 122)) ; a-z - (= ch 92))) ; \\ + (= ch 92))) ; \\ (setq pre (concat (char-to-string ch) pre)) (setq prelen (+ prelen 1)) (setq ch (char-before (- (point) prelen)))) @@ -711,7 +794,7 @@ command." (let ((post "") (postlen 0) (ch (char-after (+ (point) 0)))) - (while (and ch (or (and (>= ch 65) (<= ch 90)) ; not eolp, A-Z + (while (and ch (or (and (>= ch 65) (<= ch 90)) ; not eolp, A-Z (and (>= ch 97) (<= ch 122)))) ; a-z (setq post (concat post (char-to-string ch))) (setq postlen (+ postlen 1)) @@ -724,7 +807,7 @@ command." (let ((pre (LilyPond-pre-word-search)) (post (LilyPond-post-word-search)) (compsstr "")) - ; insert try-completion and show all-completions + ;; insert try-completion and show all-completions (if (> (length pre) 0) (progn (setq trycomp (try-completion pre (LilyPond-add-dictionary-word ()))) @@ -754,6 +837,7 @@ command." "Launch Info for music-glossary." (interactive) (info "music-glossary")) + (defun LilyPond-internals-info () "Launch Info for lilypond-internals." (interactive) @@ -855,20 +939,24 @@ command." [ "Region" LilyPond-command-select-region :keys "C-c C-r" :style radio :selected (eq LilyPond-command-current 'LilyPond-command-region) ])) -; (let ((file 'LilyPond-command-on-current)) -; (mapcar 'LilyPond-command-menu-entry LilyPond-command-alist)) +;;; (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. '([ "LilyPond" LilyPond-command-lilypond t]) '([ "TeX" (LilyPond-command (LilyPond-command-menu "TeX") 'LilyPond-master-file) ]) '([ "2Dvi" LilyPond-command-formatdvi t]) '([ "2PS" LilyPond-command-formatps t]) - '([ "2Midi" (LilyPond-command (LilyPond-command-menu "2Midi") 'LilyPond-master-file)]) + '([ "2Midi" LilyPond-command-formatmidi t]) '([ "Book" (LilyPond-command (LilyPond-command-menu "Book") 'LilyPond-master-file) ]) '([ "LaTeX" (LilyPond-command (LilyPond-command-menu "LaTeX") 'LilyPond-master-file) ]) + '([ "Kill jobs" LilyPond-kill-jobs t]) + '("-----") '([ "SmartView" LilyPond-command-smartview t]) '([ "View" LilyPond-command-view t]) '([ "ViewPS" LilyPond-command-viewps t]) - '([ "Midi (off)" LilyPond-command-next-midi t]) + '("-----") + '([ "Midi (toggle)" LilyPond-command-current-midi t]) '([ "Midi all" LilyPond-command-all-midi t]) )) @@ -975,7 +1063,7 @@ 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) + (set-syntax-table LilyPond-mode-syntax-table) (setq major-mode 'LilyPond-mode) (setq mode-name "LilyPond") (setq local-abbrev-table LilyPond-mode-abbrev-table) @@ -985,7 +1073,7 @@ LilyPond-xdvi-command\t\tcommand to display dvi files -- bit superfluous" (setq imenu-generic-expression LilyPond-imenu-generic-expression) (imenu-add-to-menubar "Index") - ;; run the mode hook. LilyPond-mode-hook use is deprecated + ;; run the mode hook. LilyPond-mode-hook use is deprecated (run-hooks 'LilyPond-mode-hook)) (defun LilyPond-version ()