[fomus-cvs] CVS update: fomus/backend_mid.lisp fomus/version.lisp

[David Psenicka]

Update of /project/fomus/cvsroot/fomus
In directory common-lisp.net:/tmp/cvs-serv18508

Modified Files:
	backend_mid.lisp version.lisp 
Log Message:
bug fix
Date: Sat Nov 12 03:20:59 2005
Author: dpsenicka

Index: fomus/backend_mid.lisp
diff -u fomus/backend_mid.lisp:1.6 fomus/backend_mid.lisp:1.7
--- fomus/backend_mid.lisp:1.6	Sat Oct 22 22:43:06 2005
+++ fomus/backend_mid.lisp	Sat Nov 12 03:20:58 2005
@@ -419,13 +419,15 @@
 													     ch)
 											       for n in n0 and x from 1
 											       and tr in (force-list (or (event-tiert ev) '(nil)))
+											       and tl in (force-list (or (event-tielt ev) '(nil)))
 											       for bot = t then nil and top = (= x ln)
 											       for i = (find-if (lambda (y) (= (midi-note (cdr y)) n)) ts) ; i = (marks . tiedobj)
 											       unless (getmark ev (list :harmonic :touched n))
-											       if i do (setf (midi-dur* (cdr i)) (- (event-endoff ev) (midi-off (cdr i)))
-													     (car i) (delete-duplicates (nconc (midi-marks ev bot top pmn)
-																	       (car i))
-																	:test #'equal))
+											       if (and i tl)
+											       do (setf (midi-dur* (cdr i)) (- (event-endoff ev) (midi-off (cdr i)))
+													(car i) (delete-duplicates (nconc (midi-marks ev bot top pmn)
+																	  (car i))
+																   :test #'equal))
 											       else collect
 											       (let ((i (cons (midi-marks ev bot top pmn)
 													      (make-instance *cm-midi*
@@ -439,8 +441,7 @@
 												 i) end end)
 											 (list (cons (midi-marks ev t t pmn)
 												     (make-instance *cm-midi* :channel ch :time of :duration du
-														    :keynum nil
-														    :amplitude 0)))))
+														    :keynum nil :amplitude 0)))))
 									  when mi nconc mi))) ; list is (marks . objs)
 							    (lambda (x y) (midi-sort (cdr x) (cdr y))))
 							   for (ms . e) = (first r)


Index: fomus/version.lisp
diff -u fomus/version.lisp:1.17 fomus/version.lisp:1.18
--- fomus/version.lisp:1.17	Fri Nov 11 23:38:17 2005
+++ fomus/version.lisp	Sat Nov 12 03:20:58 2005
@@ -12,7 +12,7 @@
 (declaim (type string +title+)
 	 (type cons +version+ +banner+))
 (defparameter +title+ "FOMUS")
-(defparameter +version+ '(0 1 22))
+(defparameter +version+ '(0 1 23))
 (defparameter +banner+
   `("Lisp music notation formatter"
     "Copyright (c) 2005 David Psenicka, All Rights Reserved"