[gsharp-cvs] CVS gsharp

rstrandh rstrandh at common-lisp.net
Mon Feb 6 04:17:19 UTC 2006


Update of /project/gsharp/cvsroot/gsharp
In directory common-lisp:/tmp/cvs-serv4809

Modified Files:
	drawing.lisp 
Log Message:
Fixed a bug that made Gsharp crash in left-bulge and right-bulge for
empty clusters. 



--- /project/gsharp/cvsroot/gsharp/drawing.lisp	2006/01/25 00:50:56	1.57
+++ /project/gsharp/cvsroot/gsharp/drawing.lisp	2006/02/06 04:17:19	1.58
@@ -135,7 +135,8 @@
   (+ (max (- (loop for note in (notes element)
 		   when (final-accidental note)
 		   minimize (final-relative-accidental-xoffset note)))
-	  (if (and (eq (final-stem-direction element) :down)
+	  (if (and (non-empty-cluster-p element)
+		   (eq (final-stem-direction element) :down)
 		   (element-has-suspended-notes element))
 	      (score-pane:staff-step 3)
 	      (score-pane:staff-step 0)))
@@ -149,7 +150,8 @@
      (/ (text-size pane (map 'string 'code-char (text element))) 2)))
 
 (defmethod right-bulge ((element cluster) pane)
-  (if (and (eq (final-stem-direction element) :up)
+  (if (and (non-empty-cluster-p element)
+	   (eq (final-stem-direction element) :up)
 	   (element-has-suspended-notes element))
       (score-pane:staff-step 5)
       (score-pane:staff-step 2)))




More information about the Gsharp-cvs mailing list