Update of /project/gsharp/cvsroot/gsharp In directory cl-net:/tmp/cvs-serv15490
Modified Files: cursor.lisp drawing.lisp gui.lisp packages.lisp Log Message: Export make-key-signature, key-signatures from gsharp-buffer
--- /project/gsharp/cvsroot/gsharp/cursor.lisp 2008/11/19 15:45:46 1.7 +++ /project/gsharp/cvsroot/gsharp/cursor.lisp 2008/11/19 16:05:13 1.8 @@ -168,8 +168,8 @@
(defmethod add-element :after ((keysig key-signature) bar position) (let ((staff (staff keysig))) - (setf (gsharp-buffer::key-signatures staff) - (merge 'list (list keysig) (gsharp-buffer::key-signatures staff) + (setf (key-signatures staff) + (merge 'list (list keysig) (key-signatures staff) (lambda (x y) (gsharp::starts-before-p x (bar y) y))))))
(defmethod remove-element :before ((element element) (bar cbar)) --- /project/gsharp/cvsroot/gsharp/drawing.lisp 2008/11/19 15:45:47 1.86 +++ /project/gsharp/cvsroot/gsharp/drawing.lisp 2008/11/19 16:05:13 1.87 @@ -33,7 +33,7 @@ (format stream "[lyrics staff ~a]" (name object)))
(defun key-signature-for-staff (staff measures) - (let ((key-signatures (gsharp-buffer::key-signatures staff)) + (let ((key-signatures (key-signatures staff)) (barno (gsharp-numbering:number (car (measure-bars (car measures)))))) (or (and key-signatures (find barno key-signatures :from-end t :test #'> --- /project/gsharp/cvsroot/gsharp/gui.lisp 2008/11/19 15:45:47 1.95 +++ /project/gsharp/cvsroot/gsharp/gui.lisp 2008/11/19 16:05:13 1.96 @@ -942,9 +942,9 @@ (cursor (current-cursor)) (staff (car (staves (layer cursor)))) (keysig (if (keysig cursor) - (gsharp-buffer::make-key-signature + (make-key-signature staff :alterations (copy-seq (alterations (keysig cursor)))) - (gsharp-buffer::make-key-signature staff)))) + (make-key-signature staff)))) ;; FIXME: should only invalidate elements temporally after the ;; cursor. (gsharp-measure::invalidate-everything-using-staff (current-buffer) staff) @@ -957,8 +957,8 @@
(defmethod remove-element :before ((keysig key-signature) (bar bar)) (let ((staff (staff keysig))) - (setf (gsharp-buffer::key-signatures staff) - (remove keysig (gsharp-buffer::key-signatures staff))) + (setf (key-signatures staff) + (remove keysig (key-signatures staff))) (gsharp-measure::invalidate-everything-using-staff (current-buffer) staff)))
;;; FIXME: this isn't quite right (argh) for the case of two @@ -1005,14 +1005,14 @@ ;; in. (assert (eq cursor (current-cursor))) (let* ((staff (car (staves (layer cursor)))) - (key-signatures (gsharp-buffer::key-signatures staff)) + (key-signatures (key-signatures staff)) (bar (bar cursor)) (element-or-nil (cursor-element cursor))) (%keysig staff key-signatures bar element-or-nil)))
(defmethod keysig ((note note)) (let* ((staff (staff note)) - (key-signatures (gsharp-buffer::key-signatures staff)) + (key-signatures (key-signatures staff)) (bar (bar (cluster note))) (element-or-nil (cluster note))) (%keysig staff key-signatures bar element-or-nil))) @@ -1024,7 +1024,7 @@
(defmethod keysig ((element element)) (let* ((staff (staff element)) - (key-signatures (gsharp-buffer::key-signatures staff)) + (key-signatures (key-signatures staff)) (bar (bar element))) (%keysig staff key-signatures bar element)))
--- /project/gsharp/cvsroot/gsharp/packages.lisp 2008/02/09 16:58:35 1.66 +++ /project/gsharp/cvsroot/gsharp/packages.lisp 2008/11/19 16:05:13 1.67 @@ -55,6 +55,7 @@ (:shadow #:rest) (:export #:clef #:name #:lineno #:make-clef #:staff #:fiveline-staff #:make-fiveline-staff + #:key-signatures #:lyrics-staff #:make-lyrics-staff #:gsharp-condition #:pitch #:accidentals #:dots #:note #:make-note @@ -90,7 +91,8 @@ #:clef #:f-position #:b-position #:bottom-line #:keysig #:staff-pos #:xoffset #:read-everything #:read-buffer-from-stream - #:key-signature #:alterations #:more-sharps #:more-flats + #:key-signature #:make-key-signature + #:alterations #:more-sharps #:more-flats #:line-width #:lines-per-page #:min-width #:spacing-style #:right-edge #:left-offset #:left-margin #:text #:append-char #:erase-char