[fomus-cvs] CVS fomus

[dpsenicka]

Update of /project/fomus/cvsroot/fomus
In directory common-lisp:/tmp/cvs-serv25447

Modified Files:
	backend_ly.lisp backend_xml.lisp misc.lisp version.lisp 
Log Message:
bugs/musicxml

--- /project/fomus/cvsroot/fomus/backend_ly.lisp	2006/01/31 08:19:57	1.25
+++ /project/fomus/cvsroot/fomus/backend_ly.lisp	2006/02/01 23:59:06	1.26
@@ -17,14 +17,14 @@
   (defparameter +lilypond-exe+
     (or #+darwin (find-exe "lilypond.sh")
 	#+mswindows (find-exe "lilypond.exe")
-	#-(or darwin mswindows) (find-exe "lilypond") 
+	#-mswindows (find-exe "lilypond") 
 	#+darwin "lilypond.sh"
 	#+mswindows "lilypond.exe"
-	#-(or darwin mswindows) "lilypond"))
+	#-mswindows "lilypond"))
   (defparameter +lilypond-view-exe+ #-mswindows +ghostview-exe+ #+mswindows +acroread-exe+))
 
-(defparameter +lilypond-opts+ #-mswindows '("--ps") #+mswindows '("--pdf"))
-(defparameter +lilypond-out-ext+ #-mswindows "ps" #+mswindows "pdf")
+(defparameter +lilypond-opts+ #-(or darwin mswindows) '("--ps") #+(or darwin mswindows) '("--pdf"))
+(defparameter +lilypond-out-ext+ #-(or darwin mswindows) "ps" #+(or darwin mswindows) "pdf")
 (defparameter +lilypond-view-opts+ #-darwin nil #+darwin '("/Applications/Preview.app"))
 
 (defun view-lilypond (filename options view)
--- /project/fomus/cvsroot/fomus/backend_xml.lisp	2006/01/31 08:19:57	1.6
+++ /project/fomus/cvsroot/fomus/backend_xml.lisp	2006/02/01 23:59:06	1.7
@@ -187,11 +187,11 @@
 							  `("direction" ("placement" ,(if (eq (third x) :up) "above" "below"))
 							    ("direction-type" nil
 							     ("wedge" (("type" "stop") ("number" ,(remnum (cons (second x) (event-voice* e)) wlvl))))))))
-				     nconc (when fi (loop for x in (getmarks e :end8up-) collect
+				     nconc (when fi (loop for xxx in (getmarks e :end8up-) collect
 							  `("direction" nil
 							    ("direction-type" nil
 							     ("octave-shift" (("type" "stop") ("number" ,(remnum (event-staff e) olvl))))))))
-				     nconc (when fi (loop for x in (getmarks e :end8down-) collect
+				     nconc (when fi (loop for xxx in (getmarks e :end8down-) collect
 							  `("direction" nil
 							    ("direction-type" nil
 							     ("octave-shift" (("type" "stop") ("number" ,(remnum (event-staff e) olvl)))))))) 
@@ -209,11 +209,11 @@
 							    ("direction-type" nil
 							     ("wedge" (("type" "crescendo") ("number" ,(getnum (cons (second x) (event-voice* e)) wlvl)))))
 							    ,@(when (> ns 1) `(("staff" nil ,(event-staff e)))))))
-				     nconc (when fi (loop for x in (getmarks e :start8up-) collect
+				     nconc (when fi (loop for xxx in (getmarks e :start8up-) collect
 							  `("direction" nil
 							    ("direction-type" nil
 							     ("octave-shift" (("type" "up") ("number" ,(getnum (event-staff e) olvl))))))))				     
-				     nconc (when fi (loop for x in (getmarks e :start8down-) collect
+				     nconc (when fi (loop for xxx in (getmarks e :start8down-) collect
 							  `("direction" nil
 							    ("direction-type" nil
 							     ("octave-shift" (("type" "down") ("number" ,(getnum (event-staff e) olvl))))))))
@@ -223,7 +223,7 @@
 							  collect
 							  `("direction" ("placement" ,(if (eq (third x) :up) "above" "below"))
 							    ("direction-type" nil
-							     ("dashes" (("type" "start") ("number" ,(remnum (cons (second x) (event-voice* e)) tlvl))))))))
+							     ("dashes" (("type" "start") ("number" ,(getnum (cons (second x) (event-voice* e)) tlvl))))))))
 				     nconc (when fi (loop for (m . i) in +xml-words+ when (getmark e m) collect
 							  (cons i m) into re
 							  finally (when re (return (loop for i in
@@ -237,12 +237,12 @@
 											    ("words" ,+xml-textnotestyle+ ,i))
 											   ,@(when (> ns 1) `(("staff" nil ,(event-staff e))))))))))
 				     nconc (when fi (loop for x in (nconc (getmarks e :text) (getmarks e :textdyn) (getmarks e :textnote) (getmarks e :texttempo)) collect
-							  `("direction" ("placement" ,(ecase (third x) (:up "above") (:down "below")))
+							  `("direction" ("placement" ,(ecase (second x) (:up "above") (:down "below")))
 							    ("direction-type" nil
 							     ("words" ,(ecase (first x)
 									      (:text +xml-textstyle+) (:textdyn +xml-dyntextstyle+)
 									      (:textnote +xml-textnotestyle+) (:texttempo +xml-texttempostyle+))
-							      ,(fourth x))))))
+							      ,(third x))))))
 				     collect `("note" nil
 					       ,@(when (event-grace e) `(("grace" ("slash" ,(if (< (event-grace e) 0) "yes" "no")))))
 					       ,@(unless fi `(("chord" nil)))
--- /project/fomus/cvsroot/fomus/misc.lisp	2006/01/31 08:19:57	1.15
+++ /project/fomus/cvsroot/fomus/misc.lisp	2006/02/01 23:59:06	1.16
@@ -83,11 +83,11 @@
 (defun find-exe (filename)
   (namestring*
    (or #+darwin (probe-file (change-filename filename :dir "/Applications"))
-       #+darwin (find-if (lambda (x) (probe-file x)) (mapcar (lambda (x) (change-filename filename :dir (namestring x))) (directory "/Applications/*.app")))
+       #+darwin (find-if (lambda (x) (probe-file x)) (mapcar (lambda (x) (change-filename filename :dir (namestring x))) (directory "/Applications/*.app" #+openmcl :directories #+openmcl t)))
        #+darwin (probe-file (change-filename filename :dir "/sw/bin"))
-       #+mswindows (find-if (lambda (x) (probe-file x)) (mapcar (lambda (x) (change-filename filename :dir (namestring x))) (directory "\\Program Files\\*")))
-       #+mswindows (find-if (lambda (x) (probe-file x)) (mapcar (lambda (x) (change-filename filename :dir (namestring x))) (directory "\\Program Files\\*\\*")))
-       #+mswindows (find-if (lambda (x) (probe-file x)) (mapcar (lambda (x) (change-filename filename :dir (namestring x))) (directory "\\Program Files\\*\\*\\*")))
+       #+mswindows (find-if (lambda (x) (probe-file x)) (mapcar (lambda (x) (change-filename filename :dir (namestring x))) (directory "\\Program Files\\*" #+openmcl :directories #+openmcl t)))
+       #+mswindows (find-if (lambda (x) (probe-file x)) (mapcar (lambda (x) (change-filename filename :dir (namestring x))) (directory "\\Program Files\\*\\*" #+openmcl :directories #+openmcl t)))
+       #+mswindows (find-if (lambda (x) (probe-file x)) (mapcar (lambda (x) (change-filename filename :dir (namestring x))) (directory "\\Program Files\\*\\*\\*" #+openmcl :directories #+openmcl t)))
        #+mswindows (probe-file (change-filename filename :dir "\\cygwin\\usr\\local\\bin"))
        #+mswindows (probe-file (change-filename filename :dir "\\cygwin\\usr\\bin"))
        #+mswindows (probe-file (change-filename filename :dir "\\cygwin\\bin"))
--- /project/fomus/cvsroot/fomus/version.lisp	2006/01/31 08:19:57	1.27
+++ /project/fomus/cvsroot/fomus/version.lisp	2006/02/01 23:59:06	1.28
@@ -12,7 +12,7 @@
 (declaim (type string +title+)
 	 (type cons +version+ +banner+))
 (defparameter +title+ "FOMUS")
-(defparameter +version+ '(0 1 32))
+(defparameter +version+ '(0 1 33))
 (defparameter +banner+
   `("Lisp music notation formatter"
     "Copyright (c) 2005, 2006 David Psenicka, All Rights Reserved"