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

[gsharp-cvs] CVS update: gsharp/score-pane.lisp
by rstrandh＠common-lisp.net 07 Nov '05

07 Nov '05

Update of /project/gsharp/cvsroot/gsharp In directory common-lisp.net:/tmp/cvs-serv18103 Modified Files: score-pane.lisp Log Message: Added comments as I re-learn what various functions do and are supposed to do. Date: Mon Nov 7 19:51:41 2005 Author: rstrandh Index: gsharp/score-pane.lisp diff -u gsharp/score-pane.lisp:1.14 gsharp/score-pane.lisp:1.15 --- gsharp/score-pane.lisp:1.14 Fri Oct 28 19:19:50 2005 +++ gsharp/score-pane.lisp Mon Nov 7 19:51:41 2005 @@ -18,12 +18,19 @@ (defparameter *font* nil) (defparameter *fonts* (make-array 100 :initial-element nil)) +;;; Map integer levels of white, represented by the number of white pixels in +;;; a 4x4 pixel grid, to CLIM inks. (defparameter *gray-levels* (loop with result = (make-array '(17)) for i from 0 to 16 do (setf (aref result i) (make-gray-color (/ i 16))) finally (return result))) +;;; Given a pane and a matrix representing a glyph in a font, return a server-side +;;; pixmap that corresponds to that matrix for that pane. Create pixmaps +;;; on demand to avoid initial delays and too many pixmaps in the server. +;;; The elements of the matrix are integers from 0 to 16 inclusive, representing how +;;; many pixels are white in a 4x4 grid. (defun pane-pixmap (pane matrix) (or (gethash matrix (pane-pixmaps pane)) (let* ((dimensions (array-dimensions matrix)) @@ -138,9 +145,23 @@ ;;; ;;; drawing functions +;;; A staff step is half of the distance between two staff lines. +;;; Given a staff-step value, determine the corresponding number of +;;; pixels in the current font. The sign of the value returned is +;;; the same as that of the argument. (defun staff-step (n) (* n (/ (staff-line-distance *font*) 2))) +;;; Given a pane, a glyph number, an x position (measured in pixels) +;;; and a y position (measured in staff steps), draw the glyph +;;; at the position in the pane. +;;; The font is organized so that the normal glyph is immediately +;;; followed by a light version of the glyph. Hence, we add 1 +;;; to the glyph number if a light version is desired. +;;; It appears that the resulting y-coordinate (in pixels) has the +;;; same sign as the staff-step argument, which suggests that this +;;; function must be called with a negated staff-step. It might be +;;; better to have this function do the negation. (defun draw-antialiased-glyph (pane glyph-no x staff-step) (let* ((extra (if *light-glyph* 1 0)) (matrix (glyph *font* (+ glyph-no extra))) @@ -152,6 +173,14 @@ (y1 (+ (staff-step staff-step) dy))) (draw-pixmap* pane pixmap x1 y1))))) +;;; Given a pane, an x position (measured in pixels) a y position +;;; (measured in staff steps), a glyph to draw a the bottom of the stack +;;; a glyph to draw at the top of the stack, a glyph to draws in the middle +;;; of the stack, and the number of elements of the stack, draw the stack +;;; by first drawing the lower glyph, then the intermediate glyphs, and +;;; finally the upper glyph. +;;; It appears that this function increases the staff step in each iteration, +;;; which seems incomptible with the way draw-antialiased-glyph appears to work. (defun draw-stack (pane glyph-lower glyph-upper glyph-two x staff-step how-many) (draw-antialiased-glyph pane glyph-lower x staff-step) (loop for ss from staff-step by 2 @@ -159,14 +188,20 @@ (draw-antialiased-glyph pane glyph-two x ss)) (draw-antialiased-glyph pane glyph-upper x (+ staff-step (* 2 (1- how-many))))) +;;; Draw a stack of whole-note noteheads +;;; This function is currently not used. (defun draw-whole-stack (pane x staff-step how-many) (draw-stack pane +glyph-whole-lower+ +glyph-whole-upper+ +glyph-whole-two+ x staff-step how-many)) +;;; draw a stack of half-note noteheads +;;; This function is currently not used. (defun draw-half-stack (pane x staff-step how-many) (draw-stack pane +glyph-half-lower+ +glyph-half-upper+ +glyph-half-two+ x staff-step how-many)) +;;; draw a stack of filled noteheads. +;;; This function is currently not used. (defun draw-filled-stack (pane x staff-step how-many) (draw-stack pane +glyph-filled-lower+ +glyph-filled-upper+ +glyph-filled-two+ x staff-step how-many))

1 0

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

07 Nov '05

Update of /project/gsharp/cvsroot/gsharp In directory common-lisp.net:/tmp/cvs-serv25048 Modified Files: gui.lisp numbering.lisp packages.lisp Log Message: remove the numbering stuff in favor of just calling POSITION each time. We are likely going to change the representation of sequences from lists to something more elaborate anyway (where it matters), so the numbering will not be relevant in the future. Date: Mon Nov 7 06:23:58 2005 Author: rstrandh Index: gsharp/gui.lisp diff -u gsharp/gui.lisp:1.38 gsharp/gui.lisp:1.39 --- gsharp/gui.lisp:1.38 Wed Nov 2 20:28:09 2005 +++ gsharp/gui.lisp Mon Nov 7 06:23:57 2005 @@ -317,7 +317,6 @@ (setf (buffer *application-frame*) buffer (input-state *application-frame*) input-state (cursor *application-frame*) cursor) - (number-all (buffer *application-frame*)) (select-layer cursor (car (layers (segment (cursor *application-frame*))))))) (define-gsharp-command (com-save-buffer-as :name t) () Index: gsharp/numbering.lisp diff -u gsharp/numbering.lisp:1.5 gsharp/numbering.lisp:1.6 --- gsharp/numbering.lisp:1.5 Thu Nov 3 04:40:13 2005 +++ gsharp/numbering.lisp Mon Nov 7 06:23:57 2005 @@ -1,123 +1,20 @@ (in-package :gsharp-numbering) -(defmacro defnclass (name base slots) - `(progn - (define-added-mixin ,name ,() ,base - ((number :accessor number) - ,@slots)))) +(defmethod number ((element element)) + (position element (elements (bar element)))) -(defun number-elements (list) - (loop for elem in list - and i from 0 - do (setf (number elem) i))) +(defmethod number ((bar bar)) + (position bar (bars (slice bar)))) -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;;; -;;; Element +(defmethod number ((slice slice)) + (let ((layer (layer slice))) + (cond ((eq slice (head layer)) 0) + ((eq slice (body layer)) 1) + ((eq slice (tail layer)) 2)))) -(defnclass nelement element - ()) +(defmethod number ((layer layer)) + (position layer (layers (segment layer)))) -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;;; -;;; Bar +(defmethod number ((segment segment)) + (position segment (segments (buffer segment)))) -(defnclass nbar bar - ()) - -(defmethod add-element :after ((element nelement) (bar bar) position) - (declare (ignore position)) - (number-elements (elements bar))) - -(defmethod remove-element :around ((element nelement)) - (let ((bar (bar element))) - (call-next-method) - (number-elements (elements bar)))) - -(defmethod number-all ((bar bar)) - (number-elements (elements bar))) - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;;; -;;; Slice - -(defnclass nslice slice - ()) - -(defmethod add-bar :after ((bar nbar) (slice slice) position) - (declare (ignore position)) - (number-elements (bars slice))) - -(defmethod remove-bar :around ((bar nbar)) - (let ((slice (slice bar))) - (call-next-method) - (number-elements (bars slice)))) - -(defmethod number-all ((slice slice)) - (number-elements (bars slice)) - (mapc #'number-all (bars slice))) - -(defmethod initialize-instance :after ((slice nslice) &rest args) - (declare (ignore args)) - (number-elements (bars slice))) - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;;; -;;; Layer - -(defnclass nlayer layer - ()) - -(defmethod initialize-instance :after ((layer nlayer) &rest args) - (declare (ignore args)) - (setf (number (head layer)) 0 - (number (body layer)) 1 - (number (tail layer)) 2)) - -(defmethod number-all ((layer layer)) - (number-all (head layer)) - (number-all (body layer)) - (number-all (tail layer))) - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;;; -;;; Segment - -(defnclass nsegment segment - ()) - -(defmethod add-layer :after ((layer nlayer) (segment segment)) - (number-elements (layers segment))) - -(defmethod remove-layer :around ((layer nlayer)) - (let ((segment (segment layer))) - (call-next-method) - (number-elements (layers segment)))) - -(defmethod number-all ((segment segment)) - (number-elements (layers segment)) - (mapc #'number-all (layers segment))) - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;;; -;;; Buffer - -(defnclass nbuffer buffer - ()) - -(defmethod initialize-instance :after ((buffer nbuffer) &rest args) - (declare (ignore args)) - (number-elements (segments buffer))) - -(defmethod add-segment :after ((segment nsegment) (buffer buffer) position) - (declare (ignore position)) - (number-elements (segments buffer))) - -(defmethod remove-segment :around ((segment nsegment)) - (let ((buffer (buffer segment))) - (call-next-method) - (number-elements (segments buffer)))) - -(defmethod number-all ((buffer buffer)) - (number-elements (segments buffer)) - (mapc #'number-all (segments buffer))) Index: gsharp/packages.lisp diff -u gsharp/packages.lisp:1.24 gsharp/packages.lisp:1.25 --- gsharp/packages.lisp:1.24 Wed Nov 2 20:28:09 2005 +++ gsharp/packages.lisp Mon Nov 7 06:23:57 2005 @@ -77,7 +77,7 @@ (:use :gsharp-utilities :gsharp-buffer :clim-lisp) (:shadowing-import-from :gsharp-buffer #:rest) (:shadow #:number) - (:export #:number #:number-all)) + (:export #:number)) (defpackage :obseq (:use :common-lisp)

1 0

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

03 Nov '05

Update of /project/gsharp/cvsroot/gsharp In directory common-lisp.net:/tmp/cvs-serv8429 Modified Files: esa.lisp Log Message: Sync esa with climacs. Date: Thu Nov 3 15:59:23 2005 Author: crhodes Index: gsharp/esa.lisp diff -u gsharp/esa.lisp:1.8 gsharp/esa.lisp:1.9 --- gsharp/esa.lisp:1.8 Tue Nov 1 10:50:16 2005 +++ gsharp/esa.lisp Thu Nov 3 15:59:23 2005 @@ -212,8 +212,11 @@ (defun process-gestures-or-command (frame command-table) (with-input-context - (`(or menu-item (command :command-table ,(command-table (car (windows frame)))))) + ('menu-item) (object) + (with-input-context + (`(command :command-table ,(command-table (car (windows frame))))) + (object) (let ((gestures '())) (multiple-value-bind (numarg numargp) (read-numeric-argument :stream *standard-input*) @@ -234,19 +237,19 @@ (execute-frame-command frame command) (return))) (t nil)))))) - (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)))) + (execute-frame-command frame object))) + (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))))) (defmethod redisplay-frame-panes :around ((frame esa-frame-mixin) &key force-p) (declare (ignore force-p)) @@ -278,7 +281,12 @@ do (restart-case (progn (handler-case - (process-gestures-or-command frame (command-table (car (windows frame)))) + (progn + ;; for presentation-to-command-translators, + ;; which are searched for in + ;; (frame-command-table *application-frame*) + (setf (frame-command-table frame) (command-table (car (windows frame)))) + (process-gestures-or-command frame (command-table (car (windows frame))))) (abort-gesture () (display-message "Quit"))) (redisplay-frame-panes frame)) (return-to-esa () nil))))))

1 0

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

03 Nov '05

Update of /project/gsharp/cvsroot/gsharp/Doc In directory common-lisp.net:/tmp/cvs-serv24392/Doc Modified Files: buffer.tex Log Message: More constructors added. Date: Thu Nov 3 04:40:15 2005 Author: rstrandh Index: gsharp/Doc/buffer.tex diff -u gsharp/Doc/buffer.tex:1.7 gsharp/Doc/buffer.tex:1.8 --- gsharp/Doc/buffer.tex:1.7 Wed Nov 2 06:52:29 2005 +++ gsharp/Doc/buffer.tex Thu Nov 3 04:40:15 2005 @@ -249,6 +249,54 @@ used when two voices share a staff, and one voice has all the stems up and the other has all the stems down. +\Defun {make-rest} {staff \key (staff-pos 4) (notehead :filled) (lbeams 0) (rbeams 0) + (dots 0) (xoffset 0)} + +\Defun {make-lyrics-element} {staff \key (notehead :filled) (lbeams 0) (rbeams 0) + (dots 0) (xoffset 0)} + +%------------------------------------------------------------------- +\subsection{External representation} + + +%=================================================================== +\section{The bar protocol} + +%------------------------------------------------------------------- +\subsection{Description} + + +%------------------------------------------------------------------- +\subsection{Protocol classes and functions} + +\Defclass{bar} + +\Defclass{melody-bar} + +\Defun {make-melody-bar} {\key elements} + +\Defclass{lyrics-bar} + +\Defun {make-lyrics-bar} {\key elements} + +%------------------------------------------------------------------- +\subsection{External representation} + + +%=================================================================== +\section{The slice protocol} + +%------------------------------------------------------------------- +\subsection{Description} + + +%------------------------------------------------------------------- +\subsection{Protocol classes and functions} + +\Defclass{slice} + +\Defun {make-slice} {\key bars} + %------------------------------------------------------------------- \subsection{External representation}

1 0

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

03 Nov '05

Update of /project/gsharp/cvsroot/gsharp In directory common-lisp.net:/tmp/cvs-serv24392 Modified Files: buffer.lisp numbering.lisp Log Message: More constructors added. Date: Thu Nov 3 04:40:14 2005 Author: rstrandh Index: gsharp/buffer.lisp diff -u gsharp/buffer.lisp:1.22 gsharp/buffer.lisp:1.23 --- gsharp/buffer.lisp:1.22 Wed Nov 2 20:28:08 2005 +++ gsharp/buffer.lisp Thu Nov 3 04:40:13 2005 @@ -513,8 +513,10 @@ (defclass melody-bar (bar) ((print-character :allocation :class :initform #\|))) -(defun make-melody-bar () - (make-instance 'melody-bar)) +(defun make-melody-bar (&rest args &key elements) + (declare (type list elements) + (ignore elements)) + (apply #'make-instance 'melody-bar args)) (defun read-melody-bar-v3 (stream char n) (declare (ignore char n)) @@ -527,8 +529,10 @@ (defclass lyrics-bar (bar) ((print-character :allocation :class :initform #\C))) -(defun make-lyrics-bar () - (make-instance 'lyrics-bar)) +(defun make-lyrics-bar (&rest args &key elements) + (declare (type list elements) + (ignore elements)) + (apply #'make-instance 'lyrics-bar args)) (defun read-lyrics-bar-v3 (stream char n) (declare (ignore char n)) @@ -570,6 +574,11 @@ (loop for bar in (bars s) do (setf (slice bar) s))) +(defun make-slice (&rest args &key bars) + (declare (type list bars) + (ignore bars)) + (apply #'make-instance 'slice args)) + (defmethod print-object :after ((s slice) stream) (format stream ":bars ~W " (bars s))) @@ -681,9 +690,7 @@ (defmethod make-layer (name (initial-staff fiveline-staff)) (flet ((make-initialized-slice () - (let ((slice (make-instance 'slice))) - (add-bar (make-melody-bar) slice 0) - slice))) + (make-slice :bars (list (make-melody-bar))))) (let* ((head (make-initialized-slice)) (body (make-initialized-slice)) (tail (make-initialized-slice)) @@ -710,9 +717,7 @@ (defmethod make-layer (name (initial-staff lyrics-staff)) (flet ((make-initialized-slice () - (let ((slice (make-instance 'slice))) - (add-bar (make-lyrics-bar) slice 0) - slice))) + (make-slice :bars (list (make-lyrics-bar))))) (let* ((head (make-initialized-slice)) (body (make-initialized-slice)) (tail (make-initialized-slice)) Index: gsharp/numbering.lisp diff -u gsharp/numbering.lisp:1.4 gsharp/numbering.lisp:1.5 --- gsharp/numbering.lisp:1.4 Sun Aug 15 17:49:41 2004 +++ gsharp/numbering.lisp Thu Nov 3 04:40:13 2005 @@ -57,6 +57,10 @@ (number-elements (bars slice)) (mapc #'number-all (bars slice))) +(defmethod initialize-instance :after ((slice nslice) &rest args) + (declare (ignore args)) + (number-elements (bars slice))) + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; ;;; Layer

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-serv19750 Modified Files: buffer.lisp gui.lisp packages.lisp Log Message: Put back some more constructors. Two things need to be fixed ultimately: * Clefs should not be named objects. Instead, the exact type should probably be identified by subclassing * There is not compelling reason for bars to be subclassed. The distinction between melody and lyrics (and percussion, ultimately) is enough to enforce at the level of the layer. Date: Wed Nov 2 20:28:09 2005 Author: rstrandh Index: gsharp/buffer.lisp diff -u gsharp/buffer.lisp:1.21 gsharp/buffer.lisp:1.22 --- gsharp/buffer.lisp:1.21 Wed Nov 2 06:01:10 2005 +++ gsharp/buffer.lisp Wed Nov 2 20:28:08 2005 @@ -406,6 +406,19 @@ (setf text (make-array length :adjustable t :element-type 'fixnum :fill-pointer length :initial-contents text)))))) +(defun make-lyrics-element (staff &rest args + &key (notehead :filled) (lbeams 0) (rbeams 0) + (dots 0) (xoffset 0)) + (declare (type staff staff) + (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 notehead lbeams rbeams dots xoffset)) + (apply #'make-instance 'lyrics-element + :staff staff args)) + (defmethod print-object :after ((elem lyrics-element) stream) (with-slots (staff text) elem (format stream ":staff ~W :text ~W " staff text))) @@ -500,6 +513,9 @@ (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))) @@ -511,6 +527,9 @@ (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))) @@ -594,7 +613,7 @@ (setf bars (delete bar bars :test #'eq)) (unless bars ;; make sure there is one bar left - (add-bar (make-instance 'melody-bar) slice 0))) + (add-bar (make-melody-bar) slice 0))) (setf slice nil))) (defmethod remove-bar ((bar lyrics-bar)) @@ -604,7 +623,7 @@ (setf bars (delete bar bars :test #'eq)) (unless bars ;; make sure there is one bar left - (add-bar (make-instance 'lyrics-bar) slice 0))) + (add-bar (make-lyrics-bar) slice 0))) (setf slice nil))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -663,7 +682,7 @@ (defmethod make-layer (name (initial-staff fiveline-staff)) (flet ((make-initialized-slice () (let ((slice (make-instance 'slice))) - (add-bar (make-instance 'melody-bar) slice 0) + (add-bar (make-melody-bar) slice 0) slice))) (let* ((head (make-initialized-slice)) (body (make-initialized-slice)) @@ -692,7 +711,7 @@ (defmethod make-layer (name (initial-staff lyrics-staff)) (flet ((make-initialized-slice () (let ((slice (make-instance 'slice))) - (add-bar (make-instance 'lyrics-bar) slice 0) + (add-bar (make-lyrics-bar) slice 0) slice))) (let* ((head (make-initialized-slice)) (body (make-initialized-slice)) Index: gsharp/gui.lisp diff -u gsharp/gui.lisp:1.37 gsharp/gui.lisp:1.38 --- gsharp/gui.lisp:1.37 Wed Nov 2 06:01:10 2005 +++ gsharp/gui.lisp Wed Nov 2 20:28:09 2005 @@ -1118,12 +1118,11 @@ (defun insert-lyrics-element () (let* ((state (input-state *application-frame*)) (cursor (cursor *application-frame*)) - (element (make-instance 'lyrics-element + (element (make-lyrics-element (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 element cursor) (forward-element cursor) element)) Index: gsharp/packages.lisp diff -u gsharp/packages.lisp:1.23 gsharp/packages.lisp:1.24 --- gsharp/packages.lisp:1.23 Wed Nov 2 06:01:10 2005 +++ gsharp/packages.lisp Wed Nov 2 20:28:09 2005 @@ -51,7 +51,8 @@ #:slice #:elements #:nb-elements #:elementno #:add-element #:remove-element #:bar #:make-bar - #:melody-bar #:lyrics-bar + #:melody-bar #:make-melody-bar + #:lyrics-bar #:make-lyrics-bar #:layer #:lyrics-layer #:melody-layer #:bars #:nb-bars #:barno #:add-bar #:remove-bar #:slice

1 0

[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-serv26451 Modified Files: buffer.tex Log Message: Fixed a minor problem preventing compilation Date: Wed Nov 2 06:52:29 2005 Author: rstrandh Index: gsharp/Doc/buffer.tex diff -u gsharp/Doc/buffer.tex:1.6 gsharp/Doc/buffer.tex:1.7 --- gsharp/Doc/buffer.tex:1.6 Wed Nov 2 06:01:18 2005 +++ gsharp/Doc/buffer.tex Wed Nov 2 06:52:29 2005 @@ -199,7 +199,7 @@ \Defclass{cluster} -\Defun {make-cluster} {&key (notehead :filled) (lbeams 0) (rbeams 0) +\Defun {make-cluster} {\key (notehead :filled) (lbeams 0) (rbeams 0) (dots 0) (xoffset 0) notes (stem-direction :auto))} Create a cluster.

1 0

[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