Update of /project/fomus/cvsroot/fomus In directory common-lisp.net:/tmp/cvs-serv21177 Modified Files: backends.lisp data.lisp misc.lisp Log Message: bug fix Date: Wed Aug 31 16:35:15 2005 Author: dpsenicka Index: fomus/backends.lisp diff -u fomus/backends.lisp:1.8 fomus/backends.lisp:1.9 --- fomus/backends.lisp:1.8 Sun Aug 28 23:31:27 2005 +++ fomus/backends.lisp Wed Aug 31 16:35:15 2005 @@ -29,7 +29,7 @@ (fresh-line f))) (defun split-preproc-backends (pts) - (loop for x of-type (or symbol cons) in (force-list2some *backend*) + (loop for x in (force-list2some *backend*) do (case (first (force-list x)) (:lilypond (split-preproc-lilypond pts))))) Index: fomus/data.lisp diff -u fomus/data.lisp:1.18 fomus/data.lisp:1.19 --- fomus/data.lisp:1.18 Wed Aug 31 16:07:10 2005 +++ fomus/data.lisp Wed Aug 31 16:35:15 2005 @@ -342,7 +342,7 @@ (make-instr :violin :clefs :treble :8uplegls '(5 2) :minp 55 :maxp 103 :midiprgch-im '(40 110) :midiprgch-ex 40) (make-instr :viola :clefs '(:treble :alto) :8uplegls '(5 2) :minp 48 :maxp 93 :midiprgch-im 41 :midiprgch-ex 41) - (make-instr :violoncello :clefs '(:bass :tenor :treble) :minp 36 :maxp 84 :midiprgch-im 42 :midiprgch-ex 42) + (make-instr :cello :clefs '(:bass :tenor :treble) :minp 36 :maxp 84 :midiprgch-im 42 :midiprgch-ex 42) (make-instr :contrabass :clefs '(:bass :tenor) :tpose -12 :minp 28 :maxp 67 :midiprgch-im 43 :midiprgch-ex 43)))) (eval-when (:compile-toplevel :load-toplevel :execute) Index: fomus/misc.lisp diff -u fomus/misc.lisp:1.8 fomus/misc.lisp:1.9 --- fomus/misc.lisp:1.8 Sun Aug 28 23:31:27 2005 +++ fomus/misc.lisp Wed Aug 31 16:35:15 2005 @@ -57,11 +57,11 @@ (if (listp list) (copy-list list) (list list))) (defun force-list2some (list) (let ((x (force-list list))) - (if (or (null x) (some #'listp x)) x + (if (or (null x) (some #'consp x)) x (list x)))) (defun force-list2all (list) (let ((x (force-list list))) - (if (or (null x) (every #'listp x)) x + (if (or (null x) (every #'consp x)) x (list x)))) (defmacro cons-list (objs places)