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

Modified Files: data.lisp fomus.asd test.lisp util.lisp version.lisp Log Message: bug fixes Date: Fri Sep 2 07:56:46 2005 Author: dpsenicka

Index: fomus/data.lisp diff -u fomus/data.lisp:1.21 fomus/data.lisp:1.22 --- fomus/data.lisp:1.21 Wed Aug 31 23:17:59 2005 +++ fomus/data.lisp Fri Sep 2 07:56:45 2005 @@ -391,7 +391,7 @@ else if (= (instr-staves e) 2) collect (list :grandstaff sy) into k else if (find sy '(:soprano :mezzo-soprano :contralto :tenor :tenor-8dn :baritone :bass)) collect sy into v else if (find sy '(:soprano-choir :alto-choir :tenor-choir :bass-choir)) collect sy into c - else collect (cons (list :group sy) (/ (+ (instr-minp e) (instr-maxp e)) 2)) into i + else collect (cons (list :group sy) (instr-minp e)) into i finally (return (nconc (mapcar #'car (sort i #'> :key #'cdr)) p (list (cons :choirgroup v)) (list (cons :choirgroup c)) k))))))

Index: fomus/fomus.asd diff -u fomus/fomus.asd:1.9 fomus/fomus.asd:1.10 --- fomus/fomus.asd:1.9 Wed Aug 31 23:17:59 2005 +++ fomus/fomus.asd Fri Sep 2 07:56:45 2005 @@ -4,7 +4,7 @@ (asdf:defsystem "fomus"

:description "Lisp music notation formatter" - :version "0.1.13" + :version "0.1.14" :author "David Psenicka" :licence "LLGPL"

Index: fomus/test.lisp diff -u fomus/test.lisp:1.11 fomus/test.lisp:1.12 --- fomus/test.lisp:1.11 Wed Aug 31 23:18:00 2005 +++ fomus/test.lisp Fri Sep 2 07:56:45 2005 @@ -866,4 +866,3 @@ ;; Grace note rests ;; Mark Spanners ;; Compound meter -;; Auto Time Signatures \ No newline at end of file

Index: fomus/util.lisp diff -u fomus/util.lisp:1.16 fomus/util.lisp:1.17 --- fomus/util.lisp:1.16 Wed Aug 31 23:18:00 2005 +++ fomus/util.lisp Fri Sep 2 07:56:45 2005 @@ -462,8 +462,8 @@ do (mapc (lambda (x) (declare (type symbol x)) (rmmark e x)) +marks-last-rest+) do (loop for sp in (list +marks-spanner-voices+ +marks-spanner-staves+) do (loop for (startsym contsym endsym) of-type (symbol symbol symbol) in sp - do (loop for (xxx n) in (getmarks e startsym) do (rmmark e (list contsym n))) - do (loop for (xxx n) in (getmarks e endsym) do (rmmark e (list contsym n))))))) + do (loop for n in (getmarks e startsym) do (rmmark e (list contsym (second (force-list n))))) + do (loop for n in (getmarks e endsym) do (rmmark e (list contsym (second (force-list n))))))))) (print-dot)))

;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -569,7 +569,7 @@ si) when (> and mx) do (setf mx and) do (funcall fun p at o and) ; part, timesig, o1, o2 - finally (return (cons and at))))) + finally (return (when and (cons and at)))))) (loop with dts = (make-timesigex* *default-timesig*) for p in parts and (lo . at) in (loop @@ -596,7 +596,8 @@ (>= (- (timesig-off e2) (timesig-off e1)) (or *min-auto-timesig-dur* 0))) collect e1) z)) - do (setf at (ut ts p (when nx (timesig-off nx)) (car at))) ; (print-dot) + do (let ((x (ut ts p (when nx (timesig-off nx)) (car at)))) + (when x (setf at x))) ; (print-dot) finally (return at))) do (ut at p mx lo) #|(print-dot)|#))))

Index: fomus/version.lisp diff -u fomus/version.lisp:1.8 fomus/version.lisp:1.9 --- fomus/version.lisp:1.8 Wed Aug 31 23:18:00 2005 +++ fomus/version.lisp Fri Sep 2 07:56:45 2005 @@ -12,7 +12,7 @@ (declaim (type string +title+) (type cons +version+ +banner+)) (defparameter +title+ "FOMUS") -(defparameter +version+ '(0 1 13)) +(defparameter +version+ '(0 1 14)) (defparameter +banner+ `("Lisp music notation formatter" "Copyright (c) 2005 David Psenicka, All Rights Reserved"