[gsharp-cvs] CVS update: gsharp/buffer.lisp gsharp/gui.lisp

[Christophe Rhodes]

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

Modified Files:
	buffer.lisp gui.lisp 
Log Message:
rescue MAKE-LAYER: make the gui.lisp command call it with a list of one 
staff, and make the constructor functions &allow-other-keys.  (Possibly 
the &a-o-k should instead be just an additional keyword argument NAME).

Date: Thu Nov 10 18:37:16 2005
Author: crhodes

Index: gsharp/buffer.lisp
diff -u gsharp/buffer.lisp:1.24 gsharp/buffer.lisp:1.25
--- gsharp/buffer.lisp:1.24	Mon Nov  7 21:00:52 2005
+++ gsharp/buffer.lisp	Thu Nov 10 18:36:36 2005
@@ -700,9 +700,9 @@
     (format stream ":staves ~W :head ~W :body ~W :tail ~W "
 	    staves head body tail)))
 
-(defgeneric make-layer-for-staff (staff &rest args &key staves head body tail))
+(defgeneric make-layer-for-staff (staff &rest args &key staves head body tail &allow-other-keys))
 
-(defun make-layer (staves &rest args &key head body tail)
+(defun make-layer (staves &rest args &key head body tail &allow-other-keys)
   (declare (type list staves)
 	   (type (or slice null) head body tail)
 	   (ignore head body tail))
@@ -721,7 +721,7 @@
   #'read-melody-layer-v3
   *gsharp-readtable-v3*)
 
-(defmethod make-layer-for-staff ((staff fiveline-staff) &rest args &key staves head body tail)
+(defmethod make-layer-for-staff ((staff fiveline-staff) &rest args &key staves head body tail &allow-other-keys)
   (declare (ignore staves head body tail))
   (apply #'make-instance 'melody-layer args))
 
@@ -738,7 +738,7 @@
   #'read-lyrics-layer-v3
   *gsharp-readtable-v3*)
 
-(defmethod make-layer-for-staff ((staff lyrics-staff) &rest args &key staves head body tail)
+(defmethod make-layer-for-staff ((staff lyrics-staff) &rest args &key staves head body tail &allow-other-keys)
   (declare (ignore staves head body tail))
   (apply #'make-instance 'lyrics-layer args))
 


Index: gsharp/gui.lisp
diff -u gsharp/gui.lisp:1.40 gsharp/gui.lisp:1.41
--- gsharp/gui.lisp:1.40	Mon Nov  7 21:00:52 2005
+++ gsharp/gui.lisp	Thu Nov 10 18:37:16 2005
@@ -441,7 +441,7 @@
 (define-gsharp-command (com-add-layer :name t) ()
   (let* ((name (acquire-unique-layer-name "Name of new layer"))
 	 (staff (accept 'score-pane:staff :prompt "Initial staff of new layer"))
-	 (new-layer (make-layer staff :name name)))
+	 (new-layer (make-layer (list staff) :name name)))
     (add-layer new-layer (segment (cursor *application-frame*)))
     (select-layer (cursor *application-frame*) new-layer)))