[gsharp-cvs] CVS update: gsharp/drawing.lisp gsharp/gui.lisp gsharp/measure.lisp

[Christophe Rhodes]

Update of /project/gsharp/cvsroot/gsharp
In directory common-lisp.net:/tmp/cvs-serv7778

Modified Files:
	drawing.lisp gui.lisp measure.lisp 
Log Message:
Make the C clef have the right octave.

(FIXME: why are there two identical NOTE-POSITION methods?)

Date: Tue Jan  3 15:25:46 2006
Author: crhodes

Index: gsharp/drawing.lisp
diff -u gsharp/drawing.lisp:1.54 gsharp/drawing.lisp:1.55
--- gsharp/drawing.lisp:1.54	Tue Jan  3 15:19:05 2006
+++ gsharp/drawing.lisp	Tue Jan  3 15:25:46 2006
@@ -683,7 +683,7 @@
 		    (yoffset (- (gsharp-drawing::staff-yoffset staff))))
 	       (if (typep staff 'fiveline-staff)
 		   (let* ((clef (clef staff))
-			  (bottom-line (- (ecase (name clef) (:treble 32) (:bass 24) (:c 35))
+			  (bottom-line (- (ecase (name clef) (:treble 32) (:bass 24) (:c 28))
 					  (lineno clef)))
 			  (lnote-offset (score-pane:staff-step (- last-note bottom-line))))
 		     (draw-line* pane


Index: gsharp/gui.lisp
diff -u gsharp/gui.lisp:1.49 gsharp/gui.lisp:1.50
--- gsharp/gui.lisp:1.49	Tue Jan  3 04:10:14 2006
+++ gsharp/gui.lisp	Tue Jan  3 15:25:46 2006
@@ -131,7 +131,7 @@
 (defmethod note-position ((note note))
   (let ((clef (clef (staff note))))
     (+ (- (pitch note)
-	  (ecase (name clef) (:treble 32) (:bass 24) (:c 35)))
+	  (ecase (name clef) (:treble 32) (:bass 24) (:c 28)))
        (lineno clef))))
 
 (defmethod display-element ((frame gsharp) pane)


Index: gsharp/measure.lisp
diff -u gsharp/measure.lisp:1.20 gsharp/measure.lisp:1.21
--- gsharp/measure.lisp:1.20	Wed Dec  7 04:38:27 2005
+++ gsharp/measure.lisp	Tue Jan  3 15:25:46 2006
@@ -85,7 +85,7 @@
 (defmethod note-position ((note note))
   (let ((clef (clef (staff note))))
     (+ (- (pitch note)
-	  (ecase (name clef) (:treble 32) (:bass 24) (:c 35)))
+	  (ecase (name clef) (:treble 32) (:bass 24) (:c 28)))
        (lineno clef))))
 
 ;;; given a list of notes, return the one that is at the top