X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fparser-clef.scm;h=ede242b4aa9cb29056bb61198b960745563ee75b;hb=70cc70f3a6183472b93fc4c2b4c60cc0375b6d64;hp=0095d29e81c08a652a0dbccadf225c6ae8976ccb;hpb=7eaeba29769613cb105e71ac40a71746d1601d90;p=lilypond.git

diff --git a/scm/parser-clef.scm b/scm/parser-clef.scm
index 0095d29e81..ede242b4aa 100644
--- a/scm/parser-clef.scm
+++ b/scm/parser-clef.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;; source file of the GNU LilyPond music typesetter
 ;;;;
-;;;; (c) 2004--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; (c) 2004--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 
 ;; (name . (glyph clef-position octavation))
@@ -33,6 +33,7 @@
     ("vaticana-do2" . ("clefs.vaticana.do" 1 0))
     ("vaticana-do3" . ("clefs.vaticana.do" 3 0))
     ("vaticana-fa1" . ("clefs.vaticana.fa" -1 0))
+
     ("vaticana-fa2" . ("clefs.vaticana.fa" 1 0))
     ("medicaea-do1" . ("clefs.medicaea.do" -1 0))
     ("medicaea-do2" . ("clefs.medicaea.do" 1 0))
@@ -112,18 +113,22 @@
     (if (pair? e)
 	(let* ((musics (map make-prop-set
 			    `(((symbol . clefGlyph) (value . ,(cadr e)))
-			      ((symbol . middleCPosition)
+			      ((symbol . middleCClefPosition)
 			       (value . ,(+ oct
 					    (caddr e)
 					    (cdr (assoc (cadr e) c0-pitch-alist)))))
 			      ((symbol . clefPosition) (value . ,(caddr e)))
 			      ((symbol . clefOctavation) (value . ,(- oct))))))
+	       (recalc-mid-C (make-music 'ApplyContext))
 	       (seq (make-music 'SequentialMusic
-				'elements musics))
+				'elements (append musics (list recalc-mid-C))))
 	       (csp (make-music 'ContextSpeccedMusic)))
+	  (set! (ly:music-property recalc-mid-C 'procedure) ly:set-middle-C!)
 	  (context-spec-music seq 'Staff))
 	(begin
 	  (ly:warning (_ "unknown clef type `~a'") clef-name)
-	  (ly:warning (_ "see scm/clef.scm for supported clefs"))
+	  (ly:warning (_ "supported clefs: ~a")
+		      (string-join
+		       (sort (map car supported-clefs) string<?)))
 	  (make-music 'Music)))))