gsharp-cvs

gsharp-cvs@common-lisp.net

396 discussions

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

02 Nov '05

Update of /project/gsharp/cvsroot/gsharp/Doc In directory common-lisp.net:/tmp/cvs-serv22023/Doc Modified Files: buffer.tex Log Message: Put back some of the constructor functions. Added more documentation about buffer protocols. Date: Wed Nov 2 06:01:18 2005 Author: rstrandh Index: gsharp/Doc/buffer.tex diff -u gsharp/Doc/buffer.tex:1.5 gsharp/Doc/buffer.tex:1.6 --- gsharp/Doc/buffer.tex:1.5 Mon Oct 31 19:23:47 2005 +++ gsharp/Doc/buffer.tex Wed Nov 2 06:01:18 2005 @@ -39,10 +39,6 @@ \Defclass {clef} -\Definitarg {:name} - -\Definitarg {:lineno} - \Defun {make-clef} {name \optional (lineno \cl{nil})} Create a clef with the name and line numbers given. Line numbers @@ -80,41 +76,24 @@ The protocol class for all staves. -\Definitarg {:name} +\Defclass {fiveline-staff} -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 -initarg is \lispobj{"default staff"}. +This class is a subclass of \lispobj{staff}, and is used to represent an +ordinary five-line staff for displaying notes. \Defgeneric {name} {staff} Return the name of the staff. With \lispobj{setf}, change the name of the staff. -\Defclass {fiveline-staff} - -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 \lispobj{clef}. The clef of a five-line staff indicates where -on the staff notes are to be displayed. - -\Definitarg {:keysig} - -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 -(\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} {\key name clef keysig} -\Defun {make-fiveline-staff} {name \optional (clef \lispobj(make-clef :treble))} +Make a five-line staff with the name, the clef, and the key signature +indicated. The default value of the \lispobj{name} argument is the +string \lispobj{"default staff"}. The default value for the +\lispobj{clef} argument is a newly created treble clef. The default +argument for the key signature is a key signature with no +alterations. \Defgeneric {clef} {fiveline-staff} @@ -131,6 +110,11 @@ This class is a subclass of \lispobj{staff}, and is used to represent a staff for displaying lyrics. +\Defun {make-lyrics-staff} (\key name) + +Make a lyrics staff with the name indicated. The default value of the +\lispobj{name} argument is the string \lispobj{"default staff"}. + %------------------------------------------------------------------- \subsection{External representation} @@ -171,22 +155,101 @@ The protocol class for notes. +\Defun {make-note} (pitch staff \rest args \key head accidentals dots) + +Create a note as indicated. The pitch represents the pitch of the +note without any accidentals, and is an integer between 0 and 127, +where 0 indicates a C in the lowest octave. The staff is an instance +of the class \lispobj{staff} and indicates what staff the note is to +be displayed on. + +The \lispobj{head} argument indicates what kind of note-head is wanted +in the form of one of the keywords \lispobj{:whole}, \lispobj{:half}, +and \lispobj{:filled}, or nil, where nil means that the note-head is +taken from the cluster to which the note belongs. + +The \lispobj{accidentals} argument indicates which, if any, +accidentals the note should have, and is one of the keywords +\lispobj{:natural}, \lispobj{:flat}, \lispobj{:double-flat}, +\lispobj{:sharp}, or \lispobj{:double-sharp}. The default value is +\lispobj{:natural} meaning that this note does not have any +accidentals. + +The \lispobj{dots} argument indicates how many dots follow this note. +It is an integer between 0 and 3 or nil, where nil means that the +number of dots is taken from the cluster to which the note belongs. %------------------------------------------------------------------- \subsection{External representation} A note is printed (by \lispobj{print-object} -\Definitarg{:cluster} +%=================================================================== +\section{The cluster protocol} + +%------------------------------------------------------------------- +\subsection{Description} -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. +A cluster is a roughly the same as a chord, in that it is a collection +of notes that share a stem (unless the note heads are whole note +heads, in which case there is no stem at all). + +%------------------------------------------------------------------- +\subsection{Protocol classes and functions} -\Definitarg{:pitch} +\Defclass{cluster} + +\Defun {make-cluster} {&key (notehead :filled) (lbeams 0) (rbeams 0) + (dots 0) (xoffset 0) notes (stem-direction :auto))} + +Create a cluster. + +The \lispobj{notehead} argument indicates the basic timing unit to be +used for this cluster and is one of the keywords \lispobj{:whole}, +\lispobj{:half}, and \lispobj{:filled}. A value of \lispobj{:whole} +gives a \emph{basic duration} of $1$, a value of \lispobj{:half} gives $1 +\over 2$ and \lispobj{:filled} gives $1 \over 4$. + +The \lispobj{lbeams} argument indicates by how many beams this cluster +ties to the cluster immediately to its left. It must be an integer +between $0$ and $5$ inclusive. + +The \lispobj{rbeams} argument indicates by how many beams this cluster +ties to the cluster immediately to its right. It must be an integer +between $0$ and $5$ inclusive. + +When the \lispobj{notehead} argument is \lispobj{:filled}, the +\emph{basic duration} ($1 \over 4$) is divided by $2^n$ where $n$ is the max +of the values of \lispobj{lbeams} and \lispobj{rbeams}, giving the +\emph{beamed duration} of the cluster. + +The \lispobj{dots} arguments indicates how many dots should follow +notes of this cluster by default. It must be an integer between $0$ +and $3$ inclusive. The number of dots determines how the \emph{final +duration} for the cluster is obtained from its \emph{beamed duration}. +When the value is $0$, the final duration is the same as the beamed +duration. When the value is $1$, the final duration is the beamed +duration multiplied by $3 \over 2$. When the value is $2$, the final +duration is the beamed duration multiplied by $7 \over 4$. When the +value is $3$, the final duration is the beamed duration multiplied by +$15 \over 8$. + +The \lispobj{xoffset} arguments indicates by how much to the right of +its nominal position this cluster should be displayed. The unit is in +\emph{staff-steps}. + +The \lispobj{notes} argument is a list of initial notes for this +cluster. + +The \lispobj{stem-direction} argument indicates the direction to be +used for the stem of this cluster. The value is one of the keywords +\lispobj{:up}, \lispobj{:down} and \lispobj{:auto}, where +\lispobj{:auto} means that the direction is determined by the layout +algorithm. The values \lispobj{:up} and \lispobj{:down} are typically +used when two voices share a staff, and one voice has all the stems up +and the other has all the stems down. + +%------------------------------------------------------------------- +\subsection{External representation} -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/buffer.lisp gsharp/gui.lisp gsharp/packages.lisp
by rstrandh＠common-lisp.net 02 Nov '05

02 Nov '05

Update of /project/gsharp/cvsroot/gsharp In directory common-lisp.net:/tmp/cvs-serv22023 Modified Files: buffer.lisp gui.lisp packages.lisp Log Message: Put back some of the constructor functions. Added more documentation about buffer protocols. Date: Wed Nov 2 06:01:11 2005 Author: rstrandh Index: gsharp/buffer.lisp diff -u gsharp/buffer.lisp:1.20 gsharp/buffer.lisp:1.21 --- gsharp/buffer.lisp:1.20 Tue Nov 1 19:08:02 2005 +++ gsharp/buffer.lisp Wed Nov 2 06:01:10 2005 @@ -38,18 +38,18 @@ (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 +(defun make-clef (name &key lineno) + (declare (type (member :treble :bass :c :percussion) name) + (type (or (integer 2 6) null) lineno)) + (when (null lineno) + (setf lineno + (ecase name (:treble 2) (:bass 6) (:c 4) - (:percussion 3)))))) - + (:percussion 3)))) + (make-instance 'clef :name name :lineno lineno)) + (defmethod print-object :after ((c clef) stream) (format stream ":lineno ~W " (lineno c))) @@ -75,12 +75,14 @@ (defclass fiveline-staff (staff) ((print-character :allocation :class :initform #\=) - (clef :accessor clef :initarg :clef :initform (make-instance 'clef :name :treble)) + (clef :accessor clef :initarg :clef :initform (make-clef :treble)) (keysig :accessor keysig :initarg :keysig - :initform (make-array 7 :initial-element :natural))) - (:default-initargs - :name "default staff")) + :initform (make-array 7 :initial-element :natural)))) +(defun make-fiveline-staff (&rest args &key name clef keysig) + (declare (ignore name clef keysig)) + (apply #'make-instance 'fiveline-staff args)) + (defmethod print-object :after ((s fiveline-staff) stream) (format stream ":clef ~W :keysig ~W " (clef s) (keysig s))) @@ -97,6 +99,10 @@ (defclass lyrics-staff (staff) ((print-character :allocation :class :initform #\L))) +(defun make-lyrics-staff (&rest args &key name) + (declare (ignore name)) + (apply #'make-instance 'lyrics-staff args)) + (defun read-lyrics-staff-v3 (stream char n) (declare (ignore char n)) (apply #'make-instance 'lyrics-staff (read-delimited-list #\] stream t))) @@ -152,15 +158,26 @@ (defclass note (gsharp-object) ((print-character :allocation :class :initform #\N) (cluster :initform nil :initarg :cluster :accessor cluster) - (pitch :initarg :pitch :reader pitch :type (integer 0 128)) - (staff :initarg :staff :reader staff :type (or staff null)) + (pitch :initarg :pitch :reader pitch :type (integer 0 127)) + (staff :initarg :staff :reader staff :type staff) (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)))) + :type (or (integer 0 3) null)))) + +(defun make-note (pitch staff &rest args &key head (accidentals :natural) dots) + (declare (type (integer 0 127) pitch) + (type staff staff) + (type (or (member :whole :half :filled) null) head) + (type (member :natural :flat :double-flat + :sharp :double-sharp) + accidentals) + (type (or (integer 0 3) null) dots) + (ignore head accidentals dots)) + (apply #'make-instance 'note :pitch pitch :staff staff args)) (defmethod print-object :after ((n note) stream) (with-slots (pitch staff head accidentals dots) n @@ -214,10 +231,10 @@ (defclass element (gsharp-object) ((bar :initform nil :initarg :bar :accessor bar) - (notehead :initarg :notehead :accessor notehead) - (rbeams :initarg :rbeams :accessor rbeams) - (lbeams :initarg :lbeams :accessor lbeams) - (dots :initarg :dots :accessor dots) + (notehead :initform :whole :initarg :notehead :accessor notehead) + (rbeams :initform 0 :initarg :rbeams :accessor rbeams) + (lbeams :initform 0 :initarg :lbeams :accessor lbeams) + (dots :initform 0 :initarg :dots :accessor dots) (xoffset :initform 0 :initarg :xoffset :accessor xoffset))) (defmethod print-object :after ((e element) stream) @@ -270,14 +287,26 @@ (defclass cluster (melody-element) ((print-character :allocation :class :initform #\%) (notes :initform '() :initarg :notes :accessor notes) - (stem-direction :initarg :stem-direction :accessor stem-direction) - (stem-length :initform nil :initarg :stem-length :accessor stem-length))) + (stem-direction :initform :auto :initarg :stem-direction :accessor stem-direction))) (defmethod initialize-instance :after ((c cluster) &rest args) (declare (ignore args)) (loop for note in (notes c) do (setf (cluster note) c))) +(defun make-cluster (&rest args + &key (notehead :filled) (lbeams 0) (rbeams 0) (dots 0) + (xoffset 0) notes (stem-direction :auto)) + (declare (type (member :whole :half :filled) notehead) + (type (integer 0 5) lbeams) + (type (integer 0 5) rbeams) + (type (integer 0 3) dots) + (type number xoffset) + (type list notes) + (type (member :up :down :auto) stem-direction) + (ignore notehead lbeams rbeams dots xoffset notes stem-direction)) + (apply #'make-instance 'cluster args)) + (defmethod print-object :after ((c cluster) stream) (with-slots (stem-direction notes) c (format stream ":stem-direction ~W :notes ~W " stem-direction notes))) @@ -332,6 +361,20 @@ (staff :initarg :staff :reader staff) (staff-pos :initarg :staff-pos :initform 4 :reader staff-pos))) +(defun make-rest (staff &rest args + &key (staff-pos 4) (notehead :filled) (lbeams 0) (rbeams 0) + (dots 0) (xoffset 0)) + (declare (type staff staff) + (type integer staff-pos) + (type (member :whole :half :filled) notehead) + (type (integer 0 5) lbeams) + (type (integer 0 5) rbeams) + (type (integer 0 3) dots) + (type number xoffset) + (ignore staff-pos notehead lbeams rbeams dots xoffset)) + (apply #'make-instance 'rest + :staff staff args)) + (defmethod print-object :after ((s rest) stream) (with-slots (staff staff-pos) s (format stream ":staff ~W :staff-pos ~W " staff staff-pos))) @@ -842,7 +885,7 @@ (defclass buffer (gsharp-object) ((print-character :allocation :class :initform #\B) (segments :initform '() :initarg :segments :accessor segments) - (staves :initform (list (make-instance 'fiveline-staff)) + (staves :initform (list (make-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.36 gsharp/gui.lisp:1.37 --- gsharp/gui.lisp:1.36 Tue Nov 1 19:08:02 2005 +++ gsharp/gui.lisp Wed Nov 2 06:01:10 2005 @@ -165,9 +165,8 @@ (lbeams (lbeams cluster)) (dots (dots cluster)) (notes (notes cluster)) - (stem-direction (stem-direction cluster)) - (stem-length (stem-length cluster))) - (declare (ignore stem-direction stem-length notehead lbeams rbeams dots)) + (stem-direction (stem-direction cluster))) + (declare (ignore stem-direction notehead lbeams rbeams dots)) (loop for note in notes do (draw-ellipse* pane xpos (* 15 (note-position note)) 7 0 0 7) (score-pane:draw-accidental pane (accidentals note) @@ -564,12 +563,12 @@ (defun insert-cluster () (let* ((state (input-state *application-frame*)) (cursor (cursor *application-frame*)) - (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)))) + (cluster (make-cluster + :notehead (notehead state) + :lbeams (if (eq (notehead state) :filled) (lbeams state) 0) + :rbeams (if (eq (notehead state) :filled) (rbeams state) 0) + :dots (dots state) + :stem-direction (stem-direction state)))) (insert-element cluster cursor) (forward-element cursor) cluster)) @@ -580,9 +579,7 @@ (defun insert-note (pitch cluster) (let* ((state (input-state *application-frame*)) (staff (car (staves (layer (slice (bar cluster)))))) - (note (make-instance 'note - :pitch pitch - :staff staff + (note (make-note pitch staff :head (notehead state) :accidentals (aref (keysig staff) (mod pitch 7)) :dots (dots state)))) @@ -627,12 +624,11 @@ (define-gsharp-command com-insert-rest () (let* ((state (input-state *application-frame*)) (cursor (cursor *application-frame*)) - (rest (make-instance 'rest + (rest (make-rest (car (staves (layer (cursor *application-frame*)))) :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*))))))) + :notehead (notehead state)))) (insert-element rest cursor) (forward-element cursor) rest)) @@ -735,9 +731,7 @@ (let ((element (cur-element))) (if (typep element 'cluster) (let* ((note (cur-note)) - (new-note (make-instance 'note - :pitch (1- (pitch note)) - :staff (staff note) + (new-note (make-note (1- (pitch note)) (staff note) :head (head note) :accidentals (accidentals note) :dots (dots note)))) @@ -753,10 +747,10 @@ (cursor (cursor *application-frame*))) (backward-element cursor) (delete-element cursor) - (insert-element (make-instance 'rest + (insert-element (make-rest staff + :staff-pos (- staff-pos 2) :notehead notehead :dots dots - :rbeams rbeams :lbeams lbeams - :staff staff :staff-pos (- staff-pos 2)) + :rbeams rbeams :lbeams lbeams) cursor) (forward-element cursor))))) @@ -764,9 +758,7 @@ (let ((element (cur-element))) (if (typep element 'cluster) (let* ((note (cur-note)) - (new-note (make-instance 'note - :pitch (1+ (pitch note)) - :staff (staff note) + (new-note (make-note (1+ (pitch note)) (staff note) :head (head note) :accidentals (accidentals note) :dots (dots note)))) @@ -782,19 +774,17 @@ (cursor (cursor *application-frame*))) (backward-element cursor) (delete-element cursor) - (insert-element (make-instance 'rest + (insert-element (make-rest staff + :staff-pos (+ staff-pos 2) :notehead notehead :dots dots - :rbeams rbeams :lbeams lbeams - :staff staff :staff-pos (+ staff-pos 2)) + :rbeams rbeams :lbeams lbeams) cursor) (forward-element cursor))))) (define-gsharp-command com-sharper () (let* ((cluster (cur-cluster)) (note (cur-note)) - (new-note (make-instance 'note - :pitch (pitch note) - :staff (staff note) + (new-note (make-note (pitch note) (staff note) :head (head note) :accidentals (ecase (accidentals note) (:double-sharp :double-sharp) @@ -810,9 +800,7 @@ (define-gsharp-command com-flatter () (let* ((cluster (cur-cluster)) (note (cur-note)) - (new-note (make-instance 'note - :pitch (pitch note) - :staff (staff note) + (new-note (make-note (pitch note) (staff note) :head (head note) :accidentals (ecase (accidentals note) (:double-sharp :sharp) @@ -925,7 +913,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-instance 'clef :name type :lineno line)))) + (setf (clef staff) (make-clef type :lineno line)))) (define-gsharp-command com-higher () (incf (last-note (input-state *application-frame*)) 7)) @@ -1054,9 +1042,9 @@ (ecase (accept 'staff-type :prompt "Type") (: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-instance 'lyrics-staff :name name))))) + (clef (make-clef clef-name :lineno line))) + (make-fiveline-staff :name name :clef clef))) + (:lyrics (make-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.22 gsharp/packages.lisp:1.23 --- gsharp/packages.lisp:1.22 Tue Nov 1 19:08:02 2005 +++ gsharp/packages.lisp Wed Nov 2 06:01:10 2005 @@ -36,16 +36,18 @@ (defpackage :gsharp-buffer (:use :common-lisp :gsharp-utilities) (:shadow #:rest) - (:export #:clef #:name #:lineno - #:staff #:fiveline-staff - #:lyrics-staff + (:export #:clef #:name #:lineno #:make-clef + #:staff #:fiveline-staff #:make-fiveline-staff + #:lyrics-staff #:make-lyrics-staff #:gsharp-condition - #:pitch #:accidentals #:dots #:note + #:pitch #:accidentals #:dots #:note #:make-note #:note-less #:note-equal #:bar #:notehead #:rbeams #:lbeams #:dots #:element #:melody-element #:notes - #:add-note #:find-note #:remove-note #:cluster - #:rest #:lyrics-element + #:add-note #:find-note #:remove-note + #:cluster #:make-cluster + #:rest #:make-rest + #:lyrics-element #:make-lyrics-element #:slice #:elements #:nb-elements #:elementno #:add-element #:remove-element #:bar #:make-bar @@ -64,7 +66,7 @@ #:rename-staff #:add-staff-to-layer #:remove-staff-from-layer - #:stem-direction #:stem-length #:undotted-duration #:duration + #:stem-direction #: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

1 0

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

01 Nov '05

Update of /project/gsharp/cvsroot/gsharp In directory common-lisp.net:/tmp/cvs-serv8373 Modified Files: buffer.lisp gui.lisp packages.lisp Log Message: Removed MAKE-INITIALIZED-BUFFER Date: Tue Nov 1 19:08:02 2005 Author: rstrandh Index: gsharp/buffer.lisp diff -u gsharp/buffer.lisp:1.19 gsharp/buffer.lisp:1.20 --- gsharp/buffer.lisp:1.19 Tue Nov 1 01:23:26 2005 +++ gsharp/buffer.lisp Tue Nov 1 19:08:02 2005 @@ -852,18 +852,16 @@ (defmethod initialize-instance :after ((b buffer) &rest args) (declare (ignore args)) - (loop for segment in (segments b) - do (setf (buffer segment) b))) + (with-slots (segments) b + (when (null segments) + (add-segment (make-instance 'segment :staff (car (staves b))) b 0)) + (loop for segment in segments + do (setf (buffer segment) b)))) (defmethod print-object :after ((b buffer) stream) (with-slots (staves segments min-width spacing-style right-edge left-offset left-margin) b (format stream ":staves ~W :segments ~W :min-width ~W :spacing-style ~W :right-edge ~W :left-offset ~W :left-margin ~W " staves segments min-width spacing-style right-edge left-offset left-margin))) - -(defun make-initialized-buffer () - (let ((buffer (make-instance 'buffer))) - (add-segment (make-instance 'segment :staff (car (staves buffer))) buffer 0) - buffer)) (defun read-buffer-v3 (stream char n) (declare (ignore char n)) Index: gsharp/gui.lisp diff -u gsharp/gui.lisp:1.35 gsharp/gui.lisp:1.36 --- gsharp/gui.lisp:1.35 Tue Nov 1 01:23:26 2005 +++ gsharp/gui.lisp Tue Nov 1 19:08:02 2005 @@ -218,7 +218,7 @@ ("Quit" :command com-quit))) (define-gsharp-command (com-new-buffer :name t) () - (let* ((buffer (make-initialized-buffer)) + (let* ((buffer (make-instance 'buffer)) (cursor (make-initial-cursor buffer)) (staff (car (staves buffer))) (input-state (make-input-state))) @@ -541,7 +541,7 @@ (defun gsharp (&key new-process (process-name "Gsharp") (width 900) (height 600)) "Start a Gsharp session" - (let* ((buffer (make-initialized-buffer)) + (let* ((buffer (make-instance 'buffer)) (staff (car (staves buffer))) (input-state (make-input-state)) (cursor (make-initial-cursor buffer))) Index: gsharp/packages.lisp diff -u gsharp/packages.lisp:1.21 gsharp/packages.lisp:1.22 --- gsharp/packages.lisp:1.21 Tue Nov 1 01:23:26 2005 +++ gsharp/packages.lisp Tue Nov 1 19:08:02 2005 @@ -55,7 +55,6 @@ #:slice #:segment #:slices #:sliceno #:head #:body #:tail #:make-layer #:buffer - #:make-initialized-buffer #:layers #:nb-layers #:layerno #:add-layer #:remove-layer #:segment #:segments #:nb-segments #:segmentno #:staves

1 0

[gsharp-cvs] CVS update: gsharp/INSTALL
by rstrandh＠common-lisp.net 01 Nov '05

01 Nov '05

Update of /project/gsharp/cvsroot/gsharp In directory common-lisp.net:/tmp/cvs-serv7682 Modified Files: INSTALL Log Message: Added font compilation to INSTALL instructions Date: Tue Nov 1 18:58:26 2005 Author: rstrandh Index: gsharp/INSTALL diff -u gsharp/INSTALL:1.2 gsharp/INSTALL:1.3 --- gsharp/INSTALL:1.2 Tue Nov 1 18:37:01 2005 +++ gsharp/INSTALL Tue Nov 1 18:58:26 2005 @@ -1,3 +1,9 @@ +;;; Compile the fonts + +$ (cd Fonts; make) + +;;; Start the lisp system + ;;; Load the gsharp.asd file or make sure the directory in which it ;;; lives is in the asdf:*central-registry* list of directories

1 0

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

01 Nov '05

Update of /project/gsharp/cvsroot/gsharp/Doc In directory common-lisp.net:/tmp/cvs-serv7647 Modified Files: gsharp.tex Log Message: Updated install instructions to conform to reality. Date: Tue Nov 1 18:56:52 2005 Author: rstrandh Index: gsharp/Doc/gsharp.tex diff -u gsharp/Doc/gsharp.tex:1.4 gsharp/Doc/gsharp.tex:1.5 --- gsharp/Doc/gsharp.tex:1.4 Sat Jul 24 08:41:54 2004 +++ gsharp/Doc/gsharp.tex Tue Nov 1 18:56:51 2005 @@ -105,16 +105,22 @@ we have not decided exactly in what form the releases will be made available to the public. -For now, you have to use CMUCL (perhaps SBCL will work as well, but it -has not been tested) with a core image that contains {\clim} and -MK:DEFSYSTEM. Start {\lisp}, load the file \texttt{system.lisp} into -the running {\lisp} image and then type: +First make the fonts. In the \texttt{Fonts} subdirectory, type +\texttt{make}. -\texttt{(operate-on-system :gsharp :compile)} +For now, you have to use a Lisp system that runs McCLIM comfortably +(SBCL, CMUCL, OpenMCL) with a core image that contains {\clim} and +ASDF. Start {\lisp}, load the file \texttt{gsharp.asd} into +the running {\lisp} image and then type: + +\texttt{(asdf:operate 'asdf:load-op :gsharp)} which will compile and load all the files. To start {\gs} type -\texttt{(gsharp::run-gsharp)} +\texttt{(gsharp::gsharp)} + +Instead of loading the ASDF file manually, you could put it in a +directory that is in the list \texttt{asdf:*central-registry*}. \section{The different editing panes}

1 0

[gsharp-cvs] CVS update: gsharp/INSTALL
by rstrandh＠common-lisp.net 01 Nov '05

01 Nov '05

Update of /project/gsharp/cvsroot/gsharp In directory common-lisp.net:/tmp/cvs-serv6921 Modified Files: INSTALL Log Message: Updated INSTALL instructions Date: Tue Nov 1 18:37:01 2005 Author: rstrandh Index: gsharp/INSTALL diff -u gsharp/INSTALL:1.1.1.1 gsharp/INSTALL:1.2 --- gsharp/INSTALL:1.1.1.1 Mon Feb 16 16:46:05 2004 +++ gsharp/INSTALL Tue Nov 1 18:37:01 2005 @@ -1,12 +1,13 @@ -;;; Load the system definition file +;;; Load the gsharp.asd file or make sure the directory in which it +;;; lives is in the asdf:*central-registry* list of directories -(load "system.lisp") +(load "gsharp.asd") ;;; Compile and load the system -(operate-on-system :gsharp :compile) -(operate-on-system :gsharp :load) +(asdf:operate 'asdf:load-op :gsharp) ;;; Run Gsharp -(gsharp::run-gsharp) +(gsharp::gsharp) +

1 0

[gsharp-cvs] CVS update: gsharp/gsharp.asd gsharp/system.lisp
by rstrandh＠common-lisp.net 01 Nov '05

01 Nov '05

Update of /project/gsharp/cvsroot/gsharp In directory common-lisp.net:/tmp/cvs-serv5400 Added Files: gsharp.asd Removed Files: system.lisp Log Message: Replacing system.lisp with gsharp.asd Date: Tue Nov 1 18:19:52 2005 Author: rstrandh

1 0

[gsharp-cvs] CVS update: gsharp/esa.lisp
by crhodes＠common-lisp.net 01 Nov '05

01 Nov '05

Update of /project/gsharp/cvsroot/gsharp In directory common-lisp.net:/tmp/cvs-serv5196 Modified Files: esa.lisp Log Message: Make menus work. Basically copy the body of McCLIM's READ-FRAME-COMMAND :AROUND method into the ESA toplevel Date: Tue Nov 1 10:50:16 2005 Author: crhodes Index: gsharp/esa.lisp diff -u gsharp/esa.lisp:1.7 gsharp/esa.lisp:1.8 --- gsharp/esa.lisp:1.7 Sat Oct 29 00:16:37 2005 +++ gsharp/esa.lisp Tue Nov 1 10:50:16 2005 @@ -212,7 +212,7 @@ (defun process-gestures-or-command (frame command-table) (with-input-context - (`(command :command-table ,(command-table (car (windows frame))))) + (`(or menu-item (command :command-table ,(command-table (car (windows frame)))))) (object) (let ((gestures '())) (multiple-value-bind (numarg numargp) @@ -234,7 +234,18 @@ (execute-frame-command frame command) (return))) (t nil)))))) - (t + (menu-item + (let ((command (command-menu-item-value object))) + (unless (listp command) + (setq command (list command))) + (when (and (typep (frame-standard-input frame) 'interactor-pane) + (member *unsupplied-argument-marker* command :test #'eq)) + (setq command + (command-line-read-remaining-arguments-for-partial-command + (frame-command-table frame) (frame-standard-input frame) + command 0))) + (execute-frame-command frame command))) + (command (execute-frame-command frame object)))) (defmethod redisplay-frame-panes :around ((frame esa-frame-mixin) &key force-p)

1 0

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

01 Nov '05

Update of /project/gsharp/cvsroot/gsharp In directory common-lisp.net:/tmp/cvs-serv29573 Modified Files: buffer.lisp gui.lisp packages.lisp Log Message: Removed the function MAKE-INITIALIZED-SEGMENT Date: Tue Nov 1 01:23:27 2005 Author: rstrandh Index: gsharp/buffer.lisp diff -u gsharp/buffer.lisp:1.18 gsharp/buffer.lisp:1.19 --- gsharp/buffer.lisp:1.18 Mon Oct 31 22:16:03 2005 +++ gsharp/buffer.lisp Tue Nov 1 01:23:26 2005 @@ -745,19 +745,18 @@ (buffer :initform nil :initarg :buffer :accessor buffer) (layers :initform '() :initarg :layers :accessor layers))) -(defmethod initialize-instance :after ((s segment) &rest args) +(defmethod initialize-instance :after ((s segment) &rest args &key staff) (declare (ignore args)) - (loop for layer in (layers s) - do (setf (segment layer) s))) + (with-slots (layers) s + (when (null layers) + (assert (not (null staff))) + (push (make-layer "Default layer" staff) layers)) + (loop for layer in layers + do (setf (segment layer) s)))) (defmethod print-object :after ((s segment) stream) (format stream ":layers ~W " (layers s))) -(defun make-initialized-segment (staff) - (let ((segment (make-instance 'segment))) - (add-layer (make-layer "Default layer" staff) segment) - segment)) - (defun read-segment-v3 (stream char n) (declare (ignore char n)) (apply #'make-instance 'segment (read-delimited-list #\] stream t))) @@ -861,12 +860,9 @@ (format stream ":staves ~W :segments ~W :min-width ~W :spacing-style ~W :right-edge ~W :left-offset ~W :left-margin ~W " staves segments min-width spacing-style right-edge left-offset left-margin))) -(defun make-empty-buffer () - (make-instance 'buffer)) - (defun make-initialized-buffer () - (let ((buffer (make-empty-buffer))) - (add-segment (make-initialized-segment (car (staves buffer))) buffer 0) + (let ((buffer (make-instance 'buffer))) + (add-segment (make-instance 'segment :staff (car (staves buffer))) buffer 0) buffer)) (defun read-buffer-v3 (stream char n) @@ -911,7 +907,7 @@ (setf segments (delete segment segments :test #'eq)) ;; make sure there is one segment left (unless segments - (add-segment (make-initialized-segment (car (staves buffer))) buffer 0))) + (add-segment (make-instance 'segment :staff (car (staves buffer))) buffer 0))) (setf buffer nil))) (define-condition staff-already-in-buffer (gsharp-condition) () Index: gsharp/gui.lisp diff -u gsharp/gui.lisp:1.34 gsharp/gui.lisp:1.35 --- gsharp/gui.lisp:1.34 Mon Oct 31 22:16:04 2005 +++ gsharp/gui.lisp Tue Nov 1 01:23:26 2005 @@ -367,13 +367,13 @@ (define-gsharp-command (com-insert-segment-before :name t) () (let ((cursor (cursor *application-frame*))) - (insert-segment-before (make-initialized-segment (car (staves (buffer *application-frame*)))) + (insert-segment-before (make-instance 'segment :staff (car (staves (buffer *application-frame*)))) cursor) (backward-segment cursor))) (define-gsharp-command (com-insert-segment-after :name t) () (let ((cursor (cursor *application-frame*))) - (insert-segment-after (make-initialized-segment (car (staves (buffer *application-frame*)))) + (insert-segment-after (make-instance 'segment :staff (car (staves (buffer *application-frame*)))) cursor) (forward-segment cursor))) Index: gsharp/packages.lisp diff -u gsharp/packages.lisp:1.20 gsharp/packages.lisp:1.21 --- gsharp/packages.lisp:1.20 Mon Oct 31 22:16:04 2005 +++ gsharp/packages.lisp Tue Nov 1 01:23:26 2005 @@ -55,10 +55,9 @@ #:slice #:segment #:slices #:sliceno #:head #:body #:tail #:make-layer #:buffer - #:make-empty-buffer #:make-initialized-buffer + #:make-initialized-buffer #:layers #:nb-layers #:layerno #:add-layer #:remove-layer #: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-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

← Newer
1
...
26
27
28
29
30
31
32
...
40
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

gsharp-cvs