Update of /project/gsharp/cvsroot/gsharp In directory common-lisp.net:/tmp/cvs-serv14087

Modified Files: buffer.lisp gui.lisp packages.lisp Log Message: Removed MAKE-CLUSTER and MAKE-REST in favor of MAKE-INSTANCE 'CLUSTER and MAKE-INSTANCE 'REST

Date: Mon Oct 31 21:48:17 2005 Author: rstrandh

Index: gsharp/buffer.lisp diff -u gsharp/buffer.lisp:1.16 gsharp/buffer.lisp:1.17 --- gsharp/buffer.lisp:1.16 Mon Oct 31 21:38:49 2005 +++ gsharp/buffer.lisp Mon Oct 31 21:48:17 2005 @@ -282,11 +282,6 @@ (with-slots (stem-direction notes) c (format stream ":stem-direction ~W :notes ~W " stem-direction notes)))

-(defun make-cluster (rbeams lbeams dots notehead stem-direction) - (make-instance 'cluster - :rbeams rbeams :lbeams lbeams :dots dots - :notehead notehead :stem-direction stem-direction)) - (defun read-cluster-v3 (stream char n) (declare (ignore char n)) (apply #'make-instance 'cluster (read-delimited-list #] stream t))) @@ -340,11 +335,6 @@ (defmethod print-object :after ((s rest) stream) (with-slots (staff staff-pos) s (format stream ":staff ~W :staff-pos ~W " staff staff-pos))) - -(defun make-rest (rbeams lbeams dots notehead staff) - (make-instance 'rest - :rbeams rbeams :lbeams lbeams :dots dots - :notehead notehead :staff staff))

(defun read-rest-v3 (stream char n) (declare (ignore char n))

Index: gsharp/gui.lisp diff -u gsharp/gui.lisp:1.32 gsharp/gui.lisp:1.33 --- gsharp/gui.lisp:1.32 Mon Oct 31 21:38:49 2005 +++ gsharp/gui.lisp Mon Oct 31 21:48:17 2005 @@ -564,11 +564,12 @@ (defun insert-cluster () (let* ((state (input-state *application-frame*)) (cursor (cursor *application-frame*)) - (cluster (make-cluster (if (eq (notehead state) :filled) (rbeams state) 0) - (if (eq (notehead state) :filled) (lbeams state) 0) - (dots state) - (notehead state) - (stem-direction state)))) + (cluster (make-instance 'cluster + :rbeams (if (eq (notehead state) :filled) (rbeams state) 0) + :lbeams (if (eq (notehead state) :filled) (lbeams state) 0) + :dots (dots state) + :notehead (notehead state) + :stem-direction (stem-direction state)))) (insert-element cluster cursor) (forward-element cursor) cluster)) @@ -626,11 +627,12 @@ (define-gsharp-command com-insert-rest () (let* ((state (input-state *application-frame*)) (cursor (cursor *application-frame*)) - (rest (make-rest (if (eq (notehead state) :filled) (rbeams state) 0) - (if (eq (notehead state) :filled) (lbeams state) 0) - (dots state) - (notehead state) - (car (staves (layer (cursor *application-frame*))))))) + (rest (make-instance 'rest + :rbeams (if (eq (notehead state) :filled) (rbeams state) 0) + :lbeams (if (eq (notehead state) :filled) (lbeams state) 0) + :dots (dots state) + :notehead (notehead state) + :staff (car (staves (layer (cursor *application-frame*))))))) (insert-element rest cursor) (forward-element cursor) rest))

Index: gsharp/packages.lisp diff -u gsharp/packages.lisp:1.18 gsharp/packages.lisp:1.19 --- gsharp/packages.lisp:1.18 Mon Oct 31 21:38:49 2005 +++ gsharp/packages.lisp Mon Oct 31 21:48:17 2005 @@ -44,8 +44,8 @@ #:note-less #:note-equal #:bar #:notehead #:rbeams #:lbeams #:dots #:element #:melody-element #:notes - #:add-note #:find-note #:remove-note #:cluster #:make-cluster - #:rest #:make-rest #:lyrics-element #:make-lyrics-element + #:add-note #:find-note #:remove-note #:cluster + #:rest #:lyrics-element #:make-lyrics-element #:slice #:elements #:nb-elements #:elementno #:add-element #:remove-element #:bar #:make-bar