[fomus-cvs] CVS update: fomus/TODO fomus/fomus.asd fomus/staves.lisp fomus/test.lisp fomus/version.lisp

[David Psenicka]

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

Modified Files:
	TODO fomus.asd staves.lisp test.lisp version.lisp 
Log Message:
bug fixes
Date: Tue Sep 13 23:39:14 2005
Author: dpsenicka

Index: fomus/TODO
diff -u fomus/TODO:1.19 fomus/TODO:1.20
--- fomus/TODO:1.19	Wed Aug 31 23:17:59 2005
+++ fomus/TODO	Tue Sep 13 23:39:14 2005
@@ -2,7 +2,8 @@
 
 Immediate:
 
-    Testing and bug fixes
+    Bugs:
+      Quantizing nested tuplets--occasional hangups
     Splitting chords across staves (LilyPond)
     STAFF, CLEF and other marks for overriding FOMUS's decisions
     MusicXML backend
@@ -12,7 +13,7 @@
       most often used settings
       easy, indexed examples of all features
     Tuplet bracket setting
-    Marks affecting all voices
+    Marks affecting all voices (distinguishing them for purposes of MIDI playback, etc.)
     Aesthetic tweaks:
       avoid staff changes when notes move in other direction
       re-evaluate initial clef decision in measure 1


Index: fomus/fomus.asd
diff -u fomus/fomus.asd:1.11 fomus/fomus.asd:1.12
--- fomus/fomus.asd:1.11	Sat Sep  3 21:57:14 2005
+++ fomus/fomus.asd	Tue Sep 13 23:39:14 2005
@@ -4,7 +4,7 @@
 (asdf:defsystem "fomus"
   
   :description "Lisp music notation formatter"
-  :version "0.1.15"
+  :version "0.1.16"
   :author "David Psenicka"
   :licence "LLGPL"
 


Index: fomus/staves.lisp
diff -u fomus/staves.lisp:1.9 fomus/staves.lisp:1.10
--- fomus/staves.lisp:1.9	Tue Aug 30 00:28:03 2005
+++ fomus/staves.lisp	Tue Sep 13 23:39:14 2005
@@ -122,12 +122,17 @@
 									  (push e li)
 									  (if (eq c0 (clefs-getclef nil li s)) ; goes back to original clef
 									      (return)
-									      (if (or (or (null *clef-force-clef-change-dist*)
+									      (if (or (and *clef-force-clef-change-dist*
 											  (> (- oo o) *clef-force-clef-change-dist*)) ; going too far
 										      (eq c (clefs-getclef c0 li s))) ; finally supported by necessary change
 										  (return t)
 										  (setf li (list e)))))	; necessary to change
-								      (setf oo (event-off e) gg (event-grace e) li (list e))))))
+								      (setf oo (event-off e) gg (event-grace e) li (list e)))
+								  finally
+								  (return (unless (or (null li) (eq c0 (clefs-getclef nil li s))) ; goes back to original clef
+									    (or (and *clef-force-clef-change-dist*
+										     (> (- oo o) *clef-force-clef-change-dist*)) ; going too far
+										(eq c (clefs-getclef c0 li s))))))))
 					       (setf (svref cs s) c ve (cons (let ((x (copy-event (first ve))))
 									       (addmark x (list :clef c)) x)
 									     (rest ve)))


Index: fomus/test.lisp
diff -u fomus/test.lisp:1.13 fomus/test.lisp:1.14
--- fomus/test.lisp:1.13	Sat Sep  3 21:57:14 2005
+++ fomus/test.lisp	Tue Sep 13 23:39:14 2005
@@ -11,7 +11,7 @@
  (list
   (make-part
    :name "Piano"
-   :instr :piano
+   :instr '(:piano :staves 1)
    :events
    (loop
     for off from 0 to 10 by 1/2


Index: fomus/version.lisp
diff -u fomus/version.lisp:1.10 fomus/version.lisp:1.11
--- fomus/version.lisp:1.10	Sat Sep  3 21:57:14 2005
+++ fomus/version.lisp	Tue Sep 13 23:39:14 2005
@@ -12,7 +12,7 @@
 (declaim (type string +title+)
 	 (type cons +version+ +banner+))
 (defparameter +title+ "FOMUS")
-(defparameter +version+ '(0 1 15))
+(defparameter +version+ '(0 1 16))
 (defparameter +banner+
   `("Lisp music notation formatter"
     "Copyright (c) 2005 David Psenicka, All Rights Reserved"