Update of /project/gsharp/cvsroot/gsharp In directory clnet:/tmp/cvs-serv10205

Modified Files: cursor.lisp drawing.lisp measure.lisp packages.lisp sdl.lisp utilities.lisp Log Message: Gave the stealth mixin code the right name.

Removed unused variable to remove a compiler warning.

--- /project/gsharp/cvsroot/gsharp/cursor.lisp 2007/07/05 21:13:03 1.4 +++ /project/gsharp/cvsroot/gsharp/cursor.lisp 2007/07/18 07:51:54 1.5 @@ -2,7 +2,7 @@

(defmacro defcclass (name base slots) `(progn - (define-added-mixin ,name () ,base + (define-stealth-mixin ,name () ,base ((cursors :initform '() :accessor cursors) ,@slots))))

--- /project/gsharp/cvsroot/gsharp/drawing.lisp 2007/07/05 21:13:03 1.77 +++ /project/gsharp/cvsroot/gsharp/drawing.lisp 2007/07/18 07:51:54 1.78 @@ -8,16 +8,16 @@ (final-absolute-measure-xoffset :accessor final-absolute-measure-xoffset) (final-width :accessor final-width)))

-(define-added-mixin dbar (x-y-width-mixin) bar +(define-stealth-mixin dbar (x-y-width-mixin) bar ())

-(define-added-mixin dmeasure (x-y-width-mixin) measure +(define-stealth-mixin dmeasure (x-y-width-mixin) measure (;; an elasticity function that describes how the space right after ;; the initial barline of the measure behaves as a function of the ;; force that is applied to it. (prefix-elasticity-function :accessor prefix-elasticity-function)))

-(define-added-mixin dstaff () staff +(define-stealth-mixin dstaff () staff ((yoffset :initform 0 :accessor staff-yoffset)))

(define-presentation-method present @@ -549,10 +549,10 @@ (incf yy (+ 20 (* 70 (length staves)))))))) buffer)))))

-(define-added-mixin xelement () element +(define-stealth-mixin xelement () element ((final-absolute-xoffset :accessor final-absolute-element-xoffset)))

-(define-added-mixin velement () melody-element +(define-stealth-mixin velement () melody-element (;; the position, in staff steps, of the end of the stem ;; that is not attached to a note, independent of the ;; staff on which it is located @@ -567,7 +567,7 @@ ;; the element (bot-note-staff-yoffset :accessor bot-note-staff-yoffset)))

-(define-added-mixin welement () lyrics-element +(define-stealth-mixin welement () lyrics-element ())

;;; Compute and store several important pieces of information @@ -992,6 +992,7 @@ ;;; Key signature element

(defmethod draw-element (pane (keysig key-signature) &optional flags) + (declare (ignore flags)) (let ((staff (staff keysig)) (old-keysig (keysig keysig)) (x (final-absolute-element-xoffset keysig))) --- /project/gsharp/cvsroot/gsharp/measure.lisp 2007/07/05 21:13:03 1.34 +++ /project/gsharp/cvsroot/gsharp/measure.lisp 2007/07/18 07:51:54 1.35 @@ -2,7 +2,7 @@

(defmacro defrclass (name base slots) `(progn - (define-added-mixin ,name () ,base + (define-stealth-mixin ,name () ,base ((modified-p :initform t :accessor modified-p) ,@slots))))

@@ -24,7 +24,7 @@ ;;; ;;; Staff

-(define-added-mixin rstaff () staff +(define-stealth-mixin rstaff () staff ((rank :accessor staff-rank)))

(defun invalidate-slice-using-staff (slice staff) @@ -160,7 +160,7 @@ ;;; ;;; Cluster

-(define-added-mixin rcluster () cluster +(define-stealth-mixin rcluster () cluster ((final-stem-direction :accessor final-stem-direction) ;; the position, in staff steps, of the top note in the element. (top-note-pos :accessor top-note-pos) @@ -729,7 +729,7 @@ ;;; ;;; Buffer

-(define-added-mixin rbuffer (obseq) buffer +(define-stealth-mixin rbuffer (obseq) buffer ((modified-p :initform t :accessor modified-p)))

;;; Given a buffer, a position of a segment in the sequence of --- /project/gsharp/cvsroot/gsharp/packages.lisp 2007/06/18 15:18:17 1.60 +++ /project/gsharp/cvsroot/gsharp/packages.lisp 2007/07/18 07:51:54 1.61 @@ -1,7 +1,7 @@ (defpackage :gsharp-utilities (:shadow built-in-class) (:use :clim-lisp :clim-mop) - (:export #:ninsert-element #:define-added-mixin + (:export #:ninsert-element #:define-stealth-mixin #:unicode-to-char #:char-to-unicode))

(defpackage :mf --- /project/gsharp/cvsroot/gsharp/sdl.lisp 2007/06/21 11:14:27 1.32 +++ /project/gsharp/cvsroot/gsharp/sdl.lisp 2007/07/18 07:51:54 1.33 @@ -1046,7 +1046,6 @@ (thickpart (mf (complex xleft yleft) -- (complex xright yright))) ;; Determine the y coordinate of the previous path at the ;; cross point of the thin part. Use congruent triangles. - (ythin (/ (* (- xright edge-distance) yright) xright)) (height (* height-multiplier sld)) ;; The path for the thin part symmetric around (0, 0) (thinpart (mf (complex 0 (* 0.5 height)) -- (complex 0 (* -0.5 height))))) @@ -1581,3 +1580,4 @@ (defmethod compute-design ((font font) (shape (eql :beam-up-lower))) (climi::close-path (mf #c(0 0) -- (complex 16 0) -- (complex 0 -1) -- #c(0 0)))) + --- /project/gsharp/cvsroot/gsharp/utilities.lisp 2004/07/23 16:51:16 1.2 +++ /project/gsharp/cvsroot/gsharp/utilities.lisp 2007/07/18 07:51:54 1.3 @@ -22,8 +22,8 @@ (defmacro class-stealth-mixins (class) `(gethash ,class *stealth-mixins*))

-(defmacro define-added-mixin (name super-classes victim-class - &rest for-defclass) +(defmacro define-stealth-mixin (name super-classes victim-class + &rest for-defclass) "Like DEFCLASS but adds the newly defined class to the super classes of 'victim-class'." `(progn @@ -45,7 +45,7 @@ ;; When one wants to [re]define the victim class the new mixin ;; should be present too. We do this by 'patching' ensure-class: (defmethod clim-mop:ensure-class-using-class :around - ((name (eql ',victim-class)) class ;AMOP has these swaped ... + (class (name (eql ',victim-class)) &rest arguments &key (direct-superclasses nil direct-superclasses-p) &allow-other-keys) @@ -55,7 +55,7 @@ (dolist (k (class-stealth-mixins name)) (pushnew k direct-superclasses :test #'class-equalp)) - (apply #'call-next-method name class + (apply #'call-next-method class name :direct-superclasses direct-superclasses arguments)) (t