Update of /project/gsharp/cvsroot/gsharp In directory common-lisp:/tmp/cvs-serv24231

Modified Files: drawing.lisp Log Message: Fixed a bug so that the explicit x-offset of an element is again taken into account.

Removed a function that is no longer used.

--- /project/gsharp/cvsroot/gsharp/drawing.lisp 2006/02/06 04:17:19 1.58 +++ /project/gsharp/cvsroot/gsharp/drawing.lisp 2006/02/07 03:02:31 1.59 @@ -297,7 +297,8 @@ then (+ xx (max (smallest-gap timeline) (* force (elasticity timeline)))) do (loop for element in (elements timeline) - do (setf (final-absolute-element-xoffset element) xx))) + do (setf (final-absolute-element-xoffset element) + (+ xx (score-pane:staff-step (xoffset element)))))) (loop for bar in (measure-bars measure) do (compute-bar-coordinates bar x y (size-at-force (elasticity-function measure) force))))

@@ -457,16 +458,6 @@ (+ top-note-pos length) (- bot-note-pos length)))))

-(defun compute-element-x-positions (bar x time-alist) - (let ((start-time 0)) - (mapc (lambda (element) - (setf (final-absolute-element-xoffset element) - (round (+ x - (score-pane:staff-step (xoffset element)) - (cdr (assoc start-time time-alist))))) - (incf start-time (duration element))) - (elements bar)))) - ;;; the dominating note among a bunch of notes is the ;;; one that is closest to the beam, i.e. the one ;;; the one that is closest to the end of the stem that