Index: buffer.lisp
===================================================================
RCS file: /project/gsharp/cvsroot/gsharp/buffer.lisp,v
retrieving revision 1.34
diff -u -r1.34 buffer.lisp
--- buffer.lisp	15 Feb 2006 02:54:26 -0000	1.34
+++ buffer.lisp	28 Feb 2006 17:02:34 -0000
@@ -49,15 +49,15 @@
 	   :type (or (integer 2 6) null))))
 
 (defun make-clef (name &key lineno)
-  (declare (type (member :treble :bass :c :percussion) name)
+  (declare (type (member :treble :treble8 :bass :c :percussion) name)
 	   (type (or (integer 2 6) null) lineno))
   (when (null lineno)
     (setf lineno
 	  (ecase name
-	      (:treble 2)
-	      (:bass 6)
-	      (:c 4)
-	      (:percussion 3))))
+            ((:treble :treble8) 2)
+            (:bass 6)
+            (:c 4)
+            (:percussion 3))))
   (make-instance 'clef :name name :lineno lineno))
 
 (defmethod print-gsharp-object :after ((c clef) stream)
Index: drawing.lisp
===================================================================
RCS file: /project/gsharp/cvsroot/gsharp/drawing.lisp,v
retrieving revision 1.63
diff -u -r1.63 drawing.lisp
--- drawing.lisp	26 Feb 2006 22:18:39 -0000	1.63
+++ drawing.lisp	28 Feb 2006 17:02:34 -0000
@@ -42,7 +42,7 @@
 	     :stream pane)
     (let ((yoffset (ecase (name (clef staff))
 		     (:bass (- (lineno (clef staff)) 4))
-		     (:treble (+ (lineno (clef staff)) 2))
+		     ((:treble :treble8) (+ (lineno (clef staff)) 2))
 		     (:c (- (lineno (clef staff)) 1)))))
       (loop for pitch in '(6 2 5 1 4 0 3)
 	    for line in '(0 3 -1 2 -2 1 -3)
@@ -51,7 +51,7 @@
 	    do (score-pane:draw-accidental pane :flat x (+ line yoffset))))
     (let ((yoffset (ecase (name (clef staff))
 		     (:bass (lineno (clef staff)))
-		     (:treble (+ (lineno (clef staff)) 6))
+		     ((:treble :treble8) (+ (lineno (clef staff)) 6))
 		     (:c (+ (lineno (clef staff)) 3)))))
       (loop for pitch in '(3 0 4 1 5 2 6)
 	    for line in '(0 -3 1 -2 -5 -1 -4)
@@ -635,7 +667,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 28))
+			  (bottom-line (- (ecase (name clef) (:treble 32) (:bass 24) (:c 28) (:treble8 25))
 					  (lineno clef)))
 			  (lnote-offset (score-pane:staff-step (- last-note bottom-line))))
 		     (draw-line* pane
Index: gui.lisp
===================================================================
RCS file: /project/gsharp/cvsroot/gsharp/gui.lisp,v
retrieving revision 1.56
diff -u -r1.56 gui.lisp
--- gui.lisp	15 Feb 2006 17:46:52 -0000	1.56
+++ gui.lisp	28 Feb 2006 17:02:34 -0000
@@ -174,7 +176,7 @@
 (defmethod note-position ((note note))
   (let ((clef (clef (staff note))))
     (+ (- (pitch note)
-	  (ecase (name clef) (:treble 32) (:bass 24) (:c 28)))
+	  (ecase (name clef) (:treble 32) (:bass 24) (:c 28) (:treble8 25)))
        (lineno clef))))
 
 (defmethod display-element ((frame gsharp) pane)
@@ -1010,7 +1101,7 @@
 				    (lambda (so-far mode)
 				      (complete-from-possibilities
 				       so-far
-				       '(:treble :bass :c :percussion)
+				       '(:treble :treble8 :bass :c :percussion)
 				       '()
 				       :action mode
 				       :predicate (constantly t)
Index: measure.lisp
===================================================================
RCS file: /project/gsharp/cvsroot/gsharp/measure.lisp,v
retrieving revision 1.27
diff -u -r1.27 measure.lisp
--- measure.lisp	15 Feb 2006 02:44:48 -0000	1.27
+++ measure.lisp	28 Feb 2006 17:02:34 -0000
@@ -120,7 +120,7 @@
 (defmethod note-position ((note note))
   (let ((clef (clef (staff note))))
     (+ (- (pitch note)
-	  (ecase (name clef) (:treble 32) (:bass 24) (:c 28)))
+	  (ecase (name clef) (:treble 32) (:bass 24) (:c 28) (:treble8 25)))
        (lineno clef))))
 
 ;;; given a list of notes, return the one that is at the top
Index: score-pane.lisp
===================================================================
RCS file: /project/gsharp/cvsroot/gsharp/score-pane.lisp,v
retrieving revision 1.21
diff -u -r1.21 score-pane.lisp
--- score-pane.lisp	26 Feb 2006 22:18:39 -0000	1.21
+++ score-pane.lisp	28 Feb 2006 17:02:34 -0000
@@ -249,7 +249,8 @@
 
 (define-pixmap-recording (draw-clef (name))
     (ecase name
-      (:treble +glyph-g-clef+)
+      ;; FIXME
+      ((:treble :treble8) +glyph-g-clef+)
       (:bass +glyph-f-clef+)
       (:c +glyph-c-clef+)))
 
