October 2005 - gsharp-cvs@common-lisp.net

[gsharp-cvs] CVS update: gsharp/buffer.lisp gsharp/gui.lisp gsharp/packages.lisp
by rstrandh＠common-lisp.net 31 Oct '05

31 Oct '05

Update of /project/gsharp/cvsroot/gsharp In directory common-lisp.net:/tmp/cvs-serv15881 Modified Files: buffer.lisp gui.lisp packages.lisp Log Message: Removed make-lyrics-element and make-empty-segment Date: Mon Oct 31 22:16:04 2005 Author: rstrandh Index: gsharp/buffer.lisp diff -u gsharp/buffer.lisp:1.17 gsharp/buffer.lisp:1.18 --- gsharp/buffer.lisp:1.17 Mon Oct 31 21:48:17 2005 +++ gsharp/buffer.lisp Mon Oct 31 22:16:03 2005 @@ -363,11 +363,6 @@ (setf text (make-array length :adjustable t :element-type 'fixnum :fill-pointer length :initial-contents text)))))) -(defun make-lyrics-element (rbeams lbeams dots notehead staff) - (make-instance 'lyrics-element - :rbeams rbeams :lbeams lbeams :dots dots - :notehead notehead :staff staff)) - (defmethod print-object :after ((elem lyrics-element) stream) (with-slots (staff text) elem (format stream ":staff ~W :text ~W " staff text))) @@ -462,9 +457,6 @@ (defclass melody-bar (bar) ((print-character :allocation :class :initform #\|))) -(defun make-melody-bar () - (make-instance 'melody-bar)) - (defun read-melody-bar-v3 (stream char n) (declare (ignore char n)) (apply #'make-instance 'melody-bar (read-delimited-list #\] stream t))) @@ -476,9 +468,6 @@ (defclass lyrics-bar (bar) ((print-character :allocation :class :initform #\C))) -(defun make-lyrics-bar () - (make-instance 'lyrics-bar)) - (defun read-lyrics-bar-v3 (stream char n) (declare (ignore char n)) (apply #'make-instance 'lyrics-bar (read-delimited-list #\] stream t))) @@ -522,9 +511,6 @@ (defmethod print-object :after ((s slice) stream) (format stream ":bars ~W " (bars s))) -(defun make-empty-slice () - (make-instance 'slice)) - (defun read-slice-v3 (stream char n) (declare (ignore char n)) (apply #'make-instance 'slice (read-delimited-list #\] stream t))) @@ -633,7 +619,7 @@ (defmethod make-layer (name (initial-staff fiveline-staff)) (flet ((make-initialized-slice () - (let ((slice (make-empty-slice))) + (let ((slice (make-instance 'slice))) (add-bar (make-instance 'melody-bar) slice 0) slice))) (let* ((head (make-initialized-slice)) @@ -662,7 +648,7 @@ (defmethod make-layer (name (initial-staff lyrics-staff)) (flet ((make-initialized-slice () - (let ((slice (make-empty-slice))) + (let ((slice (make-instance 'slice))) (add-bar (make-instance 'lyrics-bar) slice 0) slice))) (let* ((head (make-initialized-slice)) @@ -767,11 +753,8 @@ (defmethod print-object :after ((s segment) stream) (format stream ":layers ~W " (layers s))) -(defun make-empty-segment () - (make-instance 'segment)) - (defun make-initialized-segment (staff) - (let ((segment (make-empty-segment))) + (let ((segment (make-instance 'segment))) (add-layer (make-layer "Default layer" staff) segment) segment)) Index: gsharp/gui.lisp diff -u gsharp/gui.lisp:1.33 gsharp/gui.lisp:1.34 --- gsharp/gui.lisp:1.33 Mon Oct 31 21:48:17 2005 +++ gsharp/gui.lisp Mon Oct 31 22:16:04 2005 @@ -1130,12 +1130,12 @@ (defun insert-lyrics-element () (let* ((state (input-state *application-frame*)) (cursor (cursor *application-frame*)) - (element (make-lyrics-element - (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*))))))) + (element (make-instance 'lyrics-element + :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 element cursor) (forward-element cursor) element)) Index: gsharp/packages.lisp diff -u gsharp/packages.lisp:1.19 gsharp/packages.lisp:1.20 --- gsharp/packages.lisp:1.19 Mon Oct 31 21:48:17 2005 +++ gsharp/packages.lisp Mon Oct 31 22:16:04 2005 @@ -45,7 +45,7 @@ #:notehead #:rbeams #:lbeams #:dots #:element #:melody-element #:notes #:add-note #:find-note #:remove-note #:cluster - #:rest #:lyrics-element #:make-lyrics-element + #:rest #:lyrics-element #:slice #:elements #:nb-elements #:elementno #:add-element #:remove-element #:bar #:make-bar @@ -58,7 +58,7 @@ #:make-empty-buffer #:make-initialized-buffer #:layers #:nb-layers #:layerno #:add-layer #:remove-layer #:segment - #:make-empty-segment #:make-initialized-segment + #:make-initialized-segment #:segments #:nb-segments #:segmentno #:staves #:find-staff #:add-segment #:remove-segment #:add-staff-before-staff #:add-staff-after-staff

1 0

[gsharp-cvs] CVS update: gsharp/buffer.lisp gsharp/gui.lisp gsharp/packages.lisp
by rstrandh＠common-lisp.net 31 Oct '05

31 Oct '05

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

1 0

[gsharp-cvs] CVS update: gsharp/buffer.lisp gsharp/gui.lisp gsharp/packages.lisp
by rstrandh＠common-lisp.net 31 Oct '05

31 Oct '05

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

1 0

[gsharp-cvs] CVS update: gsharp/buffer.lisp gsharp/gui.lisp gsharp/packages.lisp
by rstrandh＠common-lisp.net 31 Oct '05

31 Oct '05

Update of /project/gsharp/cvsroot/gsharp In directory common-lisp.net:/tmp/cvs-serv11680 Modified Files: buffer.lisp gui.lisp packages.lisp Log Message: Removed the function MAKE-FIVELINE-STAFF in favor of MAKE-INSTANCE 'FIVELINE-STAFF. Date: Mon Oct 31 21:16:54 2005 Author: rstrandh Index: gsharp/buffer.lisp diff -u gsharp/buffer.lisp:1.14 gsharp/buffer.lisp:1.15 --- gsharp/buffer.lisp:1.14 Mon Oct 31 20:55:30 2005 +++ gsharp/buffer.lisp Mon Oct 31 21:16:51 2005 @@ -75,16 +75,15 @@ (defclass fiveline-staff (staff) ((print-character :allocation :class :initform #\=) - (clef :accessor clef :initarg :clef :initform nil) + (clef :accessor clef :initarg :clef :initform (make-instance 'clef :name :treble)) (keysig :accessor keysig :initarg :keysig - :initform (make-array 7 :initial-element :natural)))) + :initform (make-array 7 :initial-element :natural))) + (:default-initargs + :name "default staff")) (defmethod print-object :after ((s fiveline-staff) stream) (format stream ":clef ~W :keysig ~W " (clef s) (keysig s))) -(defun make-fiveline-staff (name &optional (clef (make-instance 'clef :name :treble))) - (make-instance 'fiveline-staff :name name :clef clef)) - (defun read-fiveline-staff-v3 (stream char n) (declare (ignore char n)) (apply #'make-instance 'fiveline-staff (read-delimited-list #\] stream t))) @@ -874,7 +873,7 @@ (defclass buffer (gsharp-object) ((print-character :allocation :class :initform #\B) (segments :initform '() :initarg :segments :accessor segments) - (staves :initform (list (make-fiveline-staff "default staff")) + (staves :initform (list (make-instance 'fiveline-staff)) :initarg :staves :accessor staves) (min-width :initform *default-min-width* :initarg :min-width :accessor min-width) (spacing-style :initform *default-spacing-style* :initarg :spacing-style :accessor spacing-style) Index: gsharp/gui.lisp diff -u gsharp/gui.lisp:1.30 gsharp/gui.lisp:1.31 --- gsharp/gui.lisp:1.30 Mon Oct 31 20:55:30 2005 +++ gsharp/gui.lisp Mon Oct 31 21:16:51 2005 @@ -1050,9 +1050,10 @@ (defun acquire-new-staff () (let ((name (acquire-unique-staff-name "Name of new staff"))) (ecase (accept 'staff-type :prompt "Type") - (:fiveline (let ((clef (accept 'clef-type :prompt "Clef type of new staff")) - (line (accept 'integer :prompt "Line of clef"))) - (make-fiveline-staff name (make-instance 'clef :name clef :lineno line)))) + (:fiveline (let* ((clef-name (accept 'clef-type :prompt "Clef type of new staff")) + (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))))) (define-gsharp-command (com-insert-staff-before :name t) () Index: gsharp/packages.lisp diff -u gsharp/packages.lisp:1.16 gsharp/packages.lisp:1.17 --- gsharp/packages.lisp:1.16 Mon Oct 31 20:55:30 2005 +++ gsharp/packages.lisp Mon Oct 31 21:16:51 2005 @@ -37,7 +37,7 @@ (:use :common-lisp :gsharp-utilities) (:shadow #:rest) (:export #:clef #:name #:lineno - #:staff #:fiveline-staff #:make-fiveline-staff + #:staff #:fiveline-staff #:lyrics-staff #:make-lyrics-staff #:gsharp-condition #:pitch #:accidentals #:dots #:note

1 0

[gsharp-cvs] CVS update: gsharp/buffer.lisp gsharp/gui.lisp gsharp/packages.lisp
by rstrandh＠common-lisp.net 31 Oct '05

31 Oct '05

Update of /project/gsharp/cvsroot/gsharp In directory common-lisp.net:/tmp/cvs-serv9736 Modified Files: buffer.lisp gui.lisp packages.lisp Log Message: Removed MAKE-CLEF in favor of MAKE-INSTANCE 'CLEF Date: Mon Oct 31 20:55:30 2005 Author: rstrandh Index: gsharp/buffer.lisp diff -u gsharp/buffer.lisp:1.13 gsharp/buffer.lisp:1.14 --- gsharp/buffer.lisp:1.13 Mon Oct 31 20:01:16 2005 +++ gsharp/buffer.lisp Mon Oct 31 20:55:30 2005 @@ -35,23 +35,24 @@ (defclass clef (gsharp-object name-mixin) ((print-character :allocation :class :initform #\K) - (lineno :reader lineno :initarg :lineno :initform nil))) + (lineno :reader lineno :initarg :lineno + :type (or (integer 2 6) null)))) +(defmethod initialize-instance :after ((c clef) &rest args) + (declare (ignore args)) + (with-slots (lineno name) c + (check-type name (member :treble :bass :c :percussion)) + (unless (slot-boundp c 'lineno) + (setf lineno + (ecase name + (:treble 2) + (:bass 6) + (:c 4) + (:percussion 3)))))) + (defmethod print-object :after ((c clef) stream) (format stream ":lineno ~W " (lineno c))) -(defun make-clef (name &optional lineno) - (declare (type (member :treble :bass :c :percussion) name) - (type (or (integer 2 6) null) lineno)) - (make-instance 'clef - :name name - :lineno (or lineno - (ecase name - (:treble 2) - (:bass 6) - (:c 4) - (:percussion 3))))) - (defun read-clef-v3 (stream char n) (declare (ignore char n)) (apply #'make-instance 'clef (read-delimited-list #\] stream t))) @@ -81,7 +82,7 @@ (defmethod print-object :after ((s fiveline-staff) stream) (format stream ":clef ~W :keysig ~W " (clef s) (keysig s))) -(defun make-fiveline-staff (name &optional (clef (make-clef :treble))) +(defun make-fiveline-staff (name &optional (clef (make-instance 'clef :name :treble))) (make-instance 'fiveline-staff :name name :clef clef)) (defun read-fiveline-staff-v3 (stream char n) Index: gsharp/gui.lisp diff -u gsharp/gui.lisp:1.29 gsharp/gui.lisp:1.30 --- gsharp/gui.lisp:1.29 Mon Oct 31 19:24:39 2005 +++ gsharp/gui.lisp Mon Oct 31 20:55:30 2005 @@ -923,7 +923,7 @@ (let ((staff (accept 'score-pane:fiveline-staff :prompt "Set clef of staff")) (type (accept 'clef-type :prompt "Type of clef")) (line (accept 'integer :prompt "Line of clef"))) - (setf (clef staff) (make-clef type line)))) + (setf (clef staff) (make-instance 'clef :name type :lineno line)))) (define-gsharp-command com-higher () (incf (last-note (input-state *application-frame*)) 7)) @@ -1052,7 +1052,7 @@ (ecase (accept 'staff-type :prompt "Type") (:fiveline (let ((clef (accept 'clef-type :prompt "Clef type of new staff")) (line (accept 'integer :prompt "Line of clef"))) - (make-fiveline-staff name (make-clef clef line)))) + (make-fiveline-staff name (make-instance 'clef :name clef :lineno line)))) (:lyrics (make-lyrics-staff name))))) (define-gsharp-command (com-insert-staff-before :name t) () Index: gsharp/packages.lisp diff -u gsharp/packages.lisp:1.15 gsharp/packages.lisp:1.16 --- gsharp/packages.lisp:1.15 Mon Oct 31 19:24:39 2005 +++ gsharp/packages.lisp Mon Oct 31 20:55:30 2005 @@ -36,7 +36,7 @@ (defpackage :gsharp-buffer (:use :common-lisp :gsharp-utilities) (:shadow #:rest) - (:export #:clef #:make-clef #:name #:lineno + (:export #:clef #:name #:lineno #:staff #:fiveline-staff #:make-fiveline-staff #:lyrics-staff #:make-lyrics-staff #:gsharp-condition

1 0

[gsharp-cvs] CVS update: gsharp/buffer.lisp
by rstrandh＠common-lisp.net 31 Oct '05

31 Oct '05

Update of /project/gsharp/cvsroot/gsharp In directory common-lisp.net:/tmp/cvs-serv6122 Modified Files: buffer.lisp Log Message: put back the lost type information, this time in the class definition Date: Mon Oct 31 20:01:16 2005 Author: rstrandh Index: gsharp/buffer.lisp diff -u gsharp/buffer.lisp:1.12 gsharp/buffer.lisp:1.13 --- gsharp/buffer.lisp:1.12 Mon Oct 31 19:24:39 2005 +++ gsharp/buffer.lisp Mon Oct 31 20:01:16 2005 @@ -155,11 +155,15 @@ (defclass note (gsharp-object) ((print-character :allocation :class :initform #\N) (cluster :initform nil :initarg :cluster :accessor cluster) - (pitch :initarg :pitch :reader pitch) - (staff :initarg :staff :reader staff) - (head :initform nil :initarg :head :reader head) - (accidentals :initform :natural :initarg :accidentals :reader accidentals) - (dots :initform nil :initarg :dots :reader dots))) + (pitch :initarg :pitch :reader pitch :type (integer 0 128)) + (staff :initarg :staff :reader staff :type (or staff null)) + (head :initform nil :initarg :head :reader head + :type (or (member :whole :half :filled) null)) + (accidentals :initform :natural :initarg :accidentals :reader accidentals + :type (member :natural :flat :double-flat + :sharp :double-sharp)) + (dots :initform nil :initarg :dots :reader dots + :type (or integer null)))) (defmethod print-object :after ((n note) stream) (with-slots (pitch staff head accidentals dots) n

1 0

[gsharp-cvs] CVS update: gsharp/buffer.lisp gsharp/gui.lisp gsharp/packages.lisp
by rstrandh＠common-lisp.net 31 Oct '05

31 Oct '05

Update of /project/gsharp/cvsroot/gsharp In directory common-lisp.net:/tmp/cvs-serv3417 Modified Files: buffer.lisp gui.lisp packages.lisp Log Message: Removed the function MAKE-NOTE in favor of MAKE-INSTANCE 'NOTE Date: Mon Oct 31 19:24:39 2005 Author: rstrandh Index: gsharp/buffer.lisp diff -u gsharp/buffer.lisp:1.11 gsharp/buffer.lisp:1.12 --- gsharp/buffer.lisp:1.11 Mon Oct 31 03:16:27 2005 +++ gsharp/buffer.lisp Mon Oct 31 19:24:39 2005 @@ -132,29 +132,12 @@ ;;; currently does not belong to any cluster. (defgeneric cluster (note)) -(defclass note (gsharp-object) - ((print-character :allocation :class :initform #\N) - (cluster :initform nil :initarg :cluster :accessor cluster) - (pitch :initarg :pitch :reader pitch) - (staff :initarg :staff :reader staff) - (head :initarg :head :reader head) - (accidentals :initarg :accidentals :reader accidentals) - (dots :initarg :dots :reader dots))) - -(defmethod print-object :after ((n note) stream) - (with-slots (pitch staff head accidentals dots) n - (format stream - ":pitch ~W :staff ~W :head ~W :accidentals ~W :dots ~W " - pitch staff head accidentals dots))) - -;;; Make a note with the pitch and staff given. -;;; ;;; The pitch is a number from 0 to 128 ;;; ;;; The staff is a staff object. ;;; ;;; Head can be :whole, :half, :filled, or nil. A value of nil means -;;; that the note head is determined by that of the cluster to which the +;;; that the notehead is determined by that of the cluster to which the ;;; note belongs. ;;; ;;; Accidentals can be :natural :flat :double-flat :sharp or :double-sharp. @@ -163,22 +146,27 @@ ;;; display style. ;;; ;;; The number of dots can be an integer or nil, meaning that the number -;;; of dots is taken from the cluster. +;;; of dots is taken from the cluster. The default value is nil. ;;; ;;; The actual duration of the note is computed from the note head, the ;;; number of beams of the cluster to which the note belongs, and the ;;; number of dots in the usual way. -(defun make-note (pitch &optional staff - (head nil) (accidentals :natural) (dots nil)) - (declare (type (integer 0 128) pitch) - (type (or staff null) staff) - (type (or (member :whole :half :filled) null) head) - (type (member :natural :flat :double-flat :sharp :double-sharp) accidentals) - (type (or integer null) dots)) - (make-instance 'note - :pitch pitch :staff staff - :head head :accidentals accidentals :dots dots)) - + +(defclass note (gsharp-object) + ((print-character :allocation :class :initform #\N) + (cluster :initform nil :initarg :cluster :accessor cluster) + (pitch :initarg :pitch :reader pitch) + (staff :initarg :staff :reader staff) + (head :initform nil :initarg :head :reader head) + (accidentals :initform :natural :initarg :accidentals :reader accidentals) + (dots :initform nil :initarg :dots :reader dots))) + +(defmethod print-object :after ((n note) stream) + (with-slots (pitch staff head accidentals dots) n + (format stream + ":pitch ~W :staff ~W :head ~W :accidentals ~W :dots ~W " + pitch staff head accidentals dots))) + (defun read-note-v3 (stream char n) (declare (ignore char n)) (apply #'make-instance 'note (read-delimited-list #\] stream t))) Index: gsharp/gui.lisp diff -u gsharp/gui.lisp:1.28 gsharp/gui.lisp:1.29 --- gsharp/gui.lisp:1.28 Mon Oct 31 02:49:47 2005 +++ gsharp/gui.lisp Mon Oct 31 19:24:39 2005 @@ -579,11 +579,12 @@ (defun insert-note (pitch cluster) (let* ((state (input-state *application-frame*)) (staff (car (staves (layer (slice (bar cluster)))))) - (note (make-note pitch - staff - (notehead state) - (aref (keysig staff) (mod pitch 7)) - (dots state)))) + (note (make-instance 'note + :pitch pitch + :staff staff + :head (notehead state) + :accidentals (aref (keysig staff) (mod pitch 7)) + :dots (dots state)))) (setf *current-cluster* cluster *current-note* note) (add-note cluster note))) @@ -732,11 +733,12 @@ (let ((element (cur-element))) (if (typep element 'cluster) (let* ((note (cur-note)) - (new-note (make-note (1- (pitch note)) - (staff note) - (head note) - (accidentals note) - (dots note)))) + (new-note (make-instance 'note + :pitch (1- (pitch note)) + :staff (staff note) + :head (head note) + :accidentals (accidentals note) + :dots (dots note)))) (remove-note note) (add-note element new-note) (setf *current-note* new-note)) @@ -760,11 +762,12 @@ (let ((element (cur-element))) (if (typep element 'cluster) (let* ((note (cur-note)) - (new-note (make-note (1+ (pitch note)) - (staff note) - (head note) - (accidentals note) - (dots note)))) + (new-note (make-instance 'note + :pitch (1+ (pitch note)) + :staff (staff note) + :head (head note) + :accidentals (accidentals note) + :dots (dots note)))) (remove-note note) (add-note element new-note) (setf *current-note* new-note)) @@ -787,16 +790,17 @@ (define-gsharp-command com-sharper () (let* ((cluster (cur-cluster)) (note (cur-note)) - (new-note (make-note (pitch note) - (staff note) - (head note) - (ecase (accidentals note) - (:double-sharp :double-sharp) - (:sharp :double-sharp) - (:natural :sharp) - (:flat :natural) - (:double-flat :flat)) - (dots note)))) + (new-note (make-instance 'note + :pitch (pitch note) + :staff (staff note) + :head (head note) + :accidentals (ecase (accidentals note) + (:double-sharp :double-sharp) + (:sharp :double-sharp) + (:natural :sharp) + (:flat :natural) + (:double-flat :flat)) + :dots (dots note)))) (remove-note note) (add-note cluster new-note) (setf *current-note* new-note))) @@ -804,16 +808,17 @@ (define-gsharp-command com-flatter () (let* ((cluster (cur-cluster)) (note (cur-note)) - (new-note (make-note (pitch note) - (staff note) - (head note) - (ecase (accidentals note) - (:double-sharp :sharp) - (:sharp :natural) - (:natural :flat) - (:flat :double-flat) - (:double-flat :double-flat)) - (dots note)))) + (new-note (make-instance 'note + :pitch (pitch note) + :staff (staff note) + :head (head note) + :accidentals (ecase (accidentals note) + (:double-sharp :sharp) + (:sharp :natural) + (:natural :flat) + (:flat :double-flat) + (:double-flat :double-flat)) + :dots (dots note)))) (remove-note note) (add-note cluster new-note) (setf *current-note* new-note))) Index: gsharp/packages.lisp diff -u gsharp/packages.lisp:1.14 gsharp/packages.lisp:1.15 --- gsharp/packages.lisp:1.14 Mon Oct 31 03:16:27 2005 +++ gsharp/packages.lisp Mon Oct 31 19:24:39 2005 @@ -41,7 +41,7 @@ #:lyrics-staff #:make-lyrics-staff #:gsharp-condition #:pitch #:accidentals #:dots #:note - #:make-note #:note-less #:note-equal #:bar + #:note-less #:note-equal #:bar #:notehead #:rbeams #:lbeams #:dots #:element #:melody-element #:notes #:add-note #:find-note #:remove-note #:cluster #:make-cluster

1 0

[gsharp-cvs] CVS update: gsharp/Doc/buffer.tex
by rstrandh＠common-lisp.net 31 Oct '05

31 Oct '05

Update of /project/gsharp/cvsroot/gsharp/Doc In directory common-lisp.net:/tmp/cvs-serv3392 Modified Files: buffer.tex Log Message: Improvements to the documentation of buffer protocols. Date: Mon Oct 31 19:23:47 2005 Author: rstrandh Index: gsharp/Doc/buffer.tex diff -u gsharp/Doc/buffer.tex:1.4 gsharp/Doc/buffer.tex:1.5 --- gsharp/Doc/buffer.tex:1.4 Mon Oct 31 15:42:34 2005 +++ gsharp/Doc/buffer.tex Mon Oct 31 19:23:47 2005 @@ -67,11 +67,6 @@ The reader accepts this syntax, except that the slots can come in any arbitrary order. -In version 2 of the external representation, a clef was written like -this : - -\texttt{[K \textit{name} \textit{lineno} ]} - %=================================================================== \section{The staff protocol} @@ -100,13 +95,13 @@ \Defclass {fiveline-staff} -This class is a subclass of \texttt{staff} and is used to represent an +This class is a subclass of \lispobj{staff}, and is used to represent an ordinary five-line staff for displaying notes. \Definitarg {:clef} This value must always be supplied, and must be an instance of the -class \texttt{clef}. The clef of a five-line staff indicates where +class \lispobj{clef}. The clef of a five-line staff indicates where on the staff notes are to be displayed. \Definitarg {:keysig} @@ -114,12 +109,12 @@ This initarg is used to represent the key signature of the staff. The value is a vector with seven elements, where each element corresponds to a note of the scale (C, D, E, F, G, A, B), and is a keyword -(\texttt{:natural}, \texttt{:sharp}, or \texttt{:flat}) indicating +(\lispobj{:natural}, \lispobj{:sharp}, or \lispobj{:flat}) indicating whether staff positions corresponding to that note of the scale should be altered. The default value for this initarg is a vector with seven elements, each begin the object \lispobj{:natural}. -\Defun {make-fiveline-staff} {name \optional (clef \texttt(make-clef :treble))} +\Defun {make-fiveline-staff} {name \optional (clef \lispobj(make-clef :treble))} \Defgeneric {clef} {fiveline-staff} @@ -131,6 +126,11 @@ Return the key signature of the staff. With \lispobj{setf}, change the key signature of the staff. +\Defclass {lyrics-staff} + +This class is a subclass of \lispobj{staff}, and is used to represent a +staff for displaying lyrics. + %------------------------------------------------------------------- \subsection{External representation} @@ -142,10 +142,10 @@ The reader accepts this syntax, except that the slots can come in any arbitrary order. -In version 2 of the external representation, a staff was written like -this : +A lyrics staff is printed (by \lispobj{print-object}) like this in +version 3 of the external representation: -\texttt{[= \textit{clef} \textit{keysig} ]} +\texttt{[L :name \textit{name} ]} %=================================================================== \section{The keysig protocol} @@ -154,3 +154,39 @@ keysig would be a read-only object. %=================================================================== +\section{The note protocol} + +%------------------------------------------------------------------- +\subsection{Description} + +Notes are immutable objects. For that reason, if you want to change +some characteristics of a note in a cluster, you have to delete the +note from the cluster and create one with the characteristics you +would like. + +%------------------------------------------------------------------- +\subsection{Protocol classes and functions} + +\Defclass{note} + +The protocol class for notes. + + +%------------------------------------------------------------------- +\subsection{External representation} + +A note is printed (by \lispobj{print-object} + +\Definitarg{:cluster} + +This initarg determines the cluster to which the note belongs. The +default value for this initarg is \lispobj{nil} indicating that the +note currently does not belong to any cluster. + +\Definitarg{:pitch} + +This initarg is mandatory, and determines the pitch of the note. +A pitch is indicated as an integer between 0 and 127, where 0 means a +C in the lowest octave possible. + +\Definitarg{:staff} \ No newline at end of file

1 0

[gsharp-cvs] CVS update: gsharp/Doc/Makefile gsharp/Doc/buffer.tex gsharp/Doc/tex-dependencies
by crhodes＠common-lisp.net 31 Oct '05

31 Oct '05

Update of /project/gsharp/cvsroot/gsharp/Doc In directory common-lisp.net:/tmp/cvs-serv19226 Modified Files: Makefile buffer.tex tex-dependencies Log Message: Documentation build fixes Date: Mon Oct 31 15:42:34 2005 Author: crhodes Index: gsharp/Doc/Makefile diff -u gsharp/Doc/Makefile:1.2 gsharp/Doc/Makefile:1.3 --- gsharp/Doc/Makefile:1.2 Tue Feb 24 06:30:47 2004 +++ gsharp/Doc/Makefile Mon Oct 31 15:42:34 2005 @@ -1,8 +1,8 @@ NAME=gsharp -TEXFILES=$(NAME).tex $(shell tex-dependencies $(NAME).tex) -PSTEX_T=$(shell strip-dependence inputfig $(TEXFILES)) -VERBATIM=$(shell strip-dependence verbatimtabinput $(TEXFILES)) +TEXFILES=$(NAME).tex $(shell ./tex-dependencies $(NAME).tex) +PSTEX_T=$(shell ./strip-dependence inputfig $(TEXFILES)) +VERBATIM=$(shell ./strip-dependence verbatimtabinput $(TEXFILES)) PSTEX=$(subst .pstex_t,.pstex,$(PSTEX_T)) all : $(NAME).ps Index: gsharp/Doc/buffer.tex diff -u gsharp/Doc/buffer.tex:1.3 gsharp/Doc/buffer.tex:1.4 --- gsharp/Doc/buffer.tex:1.3 Mon Oct 31 02:39:23 2005 +++ gsharp/Doc/buffer.tex Mon Oct 31 15:42:34 2005 @@ -90,7 +90,7 @@ This initarg indicates the name of the staff to be used. The name of a staff must be unique and usually has some relationship to the instruments(s) displayed on it. Examples of staff names would be -``1st violin'', ``soprano & alto'', etc. The default value for this +``1st violin'', ``soprano \& alto'', etc. The default value for this initarg is \lispobj{"default staff"}. \Defgeneric {name} {staff} Index: gsharp/Doc/tex-dependencies diff -u gsharp/Doc/tex-dependencies:1.1.1.1 gsharp/Doc/tex-dependencies:1.2 --- gsharp/Doc/tex-dependencies:1.1.1.1 Mon Feb 16 16:46:31 2004 +++ gsharp/Doc/tex-dependencies Mon Oct 31 15:42:34 2005 @@ -1,10 +1,10 @@ #!/bin/sh #set -x -TEXFILES=$(strip-dependence inputtex $1) +TEXFILES=$(./strip-dependence inputtex $1) echo -n $TEXFILES for i in $TEXFILES do - echo -n $(tex-dependencies $i) + echo -n $(./tex-dependencies $i) done echo

1 0

[gsharp-cvs] CVS update: gsharp/buffer.lisp gsharp/measure.lisp gsharp/packages.lisp gsharp/play.lisp
by rstrandh＠common-lisp.net 31 Oct '05

31 Oct '05

Update of /project/gsharp/cvsroot/gsharp In directory common-lisp.net:/tmp/cvs-serv30200 Modified Files: buffer.lisp measure.lisp packages.lisp play.lisp Log Message: Got rid of ELEMENT-DURATION in favor of just DURATION by converting a :before method to an :around method. Date: Mon Oct 31 03:16:27 2005 Author: rstrandh Index: gsharp/buffer.lisp diff -u gsharp/buffer.lisp:1.10 gsharp/buffer.lisp:1.11 --- gsharp/buffer.lisp:1.10 Mon Oct 31 02:41:13 2005 +++ gsharp/buffer.lisp Mon Oct 31 03:16:27 2005 @@ -244,7 +244,7 @@ (:filled (/ (expt 2 (+ 2 (max (rbeams element) (lbeams element)))))))) -(defmethod element-duration ((element element)) +(defmethod duration ((element element)) (let ((duration (undotted-duration element))) (do ((dot-duration (/ duration 2) (/ dot-duration 2)) (nb-dots (dots element) (1- nb-dots))) Index: gsharp/measure.lisp diff -u gsharp/measure.lisp:1.3 gsharp/measure.lisp:1.4 --- gsharp/measure.lisp:1.3 Fri Jul 23 18:51:16 2004 +++ gsharp/measure.lisp Mon Oct 31 03:16:27 2005 @@ -21,16 +21,17 @@ ;;; a `duration' slot that contains the duration of the element. ;;; It also makes sure that whenever the duration of an element ;;; is being asked for, the new value is computed should any -;;; modification to the element have taken placed in the meantime. +;;; modification to the element have taken place in the meantime. (defrclass relement element - ((duration :initform nil :reader duration))) + ((duration :initform nil))) -(defmethod duration :before ((element relement)) +(defmethod duration :around ((element relement)) (with-slots (duration) element (when (or (modified-p element) (null duration)) - (setf duration (element-duration element)) - (setf (modified-p element) nil)))) + (setf duration (call-next-method)) + (setf (modified-p element) nil)) + duration)) (defmethod mark-modified ((element relement)) (setf (modified-p element) t) Index: gsharp/packages.lisp diff -u gsharp/packages.lisp:1.13 gsharp/packages.lisp:1.14 --- gsharp/packages.lisp:1.13 Mon Oct 31 02:49:47 2005 +++ gsharp/packages.lisp Mon Oct 31 03:16:27 2005 @@ -66,7 +66,7 @@ #:rename-staff #:add-staff-to-layer #:remove-staff-from-layer - #:stem-direction #:stem-length #:undotted-duration #:element-duration + #:stem-direction #:stem-length #:undotted-duration #:duration #:clef #:keysig #:staff-pos #:xoffset #:read-everything #:save-buffer-to-stream #:line-width #:min-width #:spacing-style #:right-edge #:left-offset #:left-margin #:text #:append-char #:erase-char @@ -91,7 +91,7 @@ (:use :common-lisp :gsharp-numbering :gsharp-buffer :gsharp-utilities :obseq) (:shadowing-import-from :gsharp-numbering #:number) (:shadowing-import-from :gsharp-buffer #:rest) - (:export #:mark-modified #:modified-p #:duration #:measure + (:export #:mark-modified #:modified-p #:measure #:measure-min-dist #:measure-coeff #:measure-start-times #:measure-bar-pos #:measure-seg-pos #:measure-bars #:measures #:nb-measures #:measureno Index: gsharp/play.lisp diff -u gsharp/play.lisp:1.1 gsharp/play.lisp:1.2 --- gsharp/play.lisp:1.1 Mon Oct 31 02:41:13 2005 +++ gsharp/play.lisp Mon Oct 31 03:16:27 2005 @@ -10,7 +10,7 @@ (let ((durations (mapcar (lambda (slice) (mapcar (lambda (bar) (reduce #'+ (elements bar) - :key #'element-duration)) + :key #'duration)) (bars slice))) slices))) (loop while durations @@ -27,7 +27,7 @@ (notes element)) (mapcar (lambda (note) (make-instance 'note-off-message - :time (+ time (* 128 (element-duration element))) + :time (+ time (* 128 (duration element))) :status (+ #x80 channel) :key (midi-pitch note) :velocity 100)) (notes element))))) @@ -35,7 +35,7 @@ (defun events-from-bar (bar time channel) (mapcan (lambda (element) (prog1 (events-from-element element time channel) - (incf time (* 128 (element-duration element))))) + (incf time (* 128 (duration element))))) (elements bar))) (defun track-from-slice (slice channel durations)

1 0