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

[Robert Strandh]

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

Modified Files:
	buffer.lisp gui.lisp packages.lisp 
Log Message:
Removed the function MAKE-LYRICS-STAFF in favor of 
MAKE-INSTANCE 'LYRICS-STAFF

Date: Mon Oct 31 21:38:49 2005
Author: rstrandh

Index: gsharp/buffer.lisp
diff -u gsharp/buffer.lisp:1.15 gsharp/buffer.lisp:1.16
--- gsharp/buffer.lisp:1.15	Mon Oct 31 21:16:51 2005
+++ gsharp/buffer.lisp	Mon Oct 31 21:38:49 2005
@@ -97,9 +97,6 @@
 (defclass lyrics-staff (staff)
   ((print-character :allocation :class :initform #\L)))
 
-(defun make-lyrics-staff (name)
-  (make-instance 'lyrics-staff :name name))
-
 (defun read-lyrics-staff-v3 (stream char n)
   (declare (ignore char n))
   (apply #'make-instance 'lyrics-staff (read-delimited-list #\] stream t)))


Index: gsharp/gui.lisp
diff -u gsharp/gui.lisp:1.31 gsharp/gui.lisp:1.32
--- gsharp/gui.lisp:1.31	Mon Oct 31 21:16:51 2005
+++ gsharp/gui.lisp	Mon Oct 31 21:38:49 2005
@@ -1054,7 +1054,7 @@
 			(line (accept 'integer :prompt "Line of clef"))
 			(clef (make-instance 'clef :name clef-name :lineno line)))
 		   (make-instance 'fiveline-staff :name name :clef clef)))
-      (:lyrics (make-lyrics-staff name)))))
+      (:lyrics (make-instance 'lyrics-staff :name name)))))
 
 (define-gsharp-command (com-insert-staff-before :name t) ()
   (add-staff-before-staff (accept 'score-pane:staff :prompt "Insert staff before staff")


Index: gsharp/packages.lisp
diff -u gsharp/packages.lisp:1.17 gsharp/packages.lisp:1.18
--- gsharp/packages.lisp:1.17	Mon Oct 31 21:16:51 2005
+++ gsharp/packages.lisp	Mon Oct 31 21:38:49 2005
@@ -38,7 +38,7 @@
   (:shadow #:rest)
   (:export #:clef #:name #:lineno
 	   #:staff #:fiveline-staff
-	   #:lyrics-staff #:make-lyrics-staff
+	   #:lyrics-staff
 	   #:gsharp-condition
 	   #:pitch #:accidentals #:dots #:note
 	   #:note-less #:note-equal #:bar