Update of /project/gsharp/cvsroot/gsharp In directory cl-net:/tmp/cvs-serv10002 Modified Files: cursor.lisp drawing.lisp gui.lisp Log Message: Remove gsharp-buffer:: prefix from key-signature (since it's exported). --- /project/gsharp/cvsroot/gsharp/cursor.lisp 2007/07/27 22:28:05 1.6 +++ /project/gsharp/cvsroot/gsharp/cursor.lisp 2008/11/19 15:45:46 1.7 @@ -166,8 +166,7 @@ (when (> (pos cursor) position) (incf (pos cursor))))) -(defmethod add-element :after - ((keysig gsharp-buffer::key-signature) bar position) +(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) --- /project/gsharp/cvsroot/gsharp/drawing.lisp 2008/02/09 16:58:35 1.85 +++ /project/gsharp/cvsroot/gsharp/drawing.lisp 2008/11/19 15:45:47 1.86 @@ -162,7 +162,7 @@ (score-pane:staff-step 5) (score-pane:staff-step 2))) -(defmethod right-bulge ((keysig gsharp-buffer::key-signature) pane) +(defmethod right-bulge ((keysig key-signature) pane) ;; FIXME: shares much code with DRAW-ELEMENT (KEY-SIGNATURE). (let ((old-keysig (keysig keysig))) (let ((bulge 0)) @@ -697,7 +697,7 @@ (defun draw-beam-group (pane elements) (let ((e (car elements))) - (when (typep e 'gsharp-buffer::key-signature) + (when (typep e 'key-signature) (assert (null (cdr elements))) (return-from draw-beam-group (draw-element pane e (final-absolute-element-xoffset e))))) --- /project/gsharp/cvsroot/gsharp/gui.lisp 2008/02/09 16:58:35 1.94 +++ /project/gsharp/cvsroot/gsharp/gui.lisp 2008/11/19 15:45:47 1.95 @@ -955,7 +955,7 @@ (define-gsharp-command com-insert-keysig () (insert-keysig)) -(defmethod remove-element :before ((keysig gsharp-buffer::key-signature) (bar bar)) +(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)))