*** empty log message ***

[lilypond.git] / scm / clef.scm

diff --git a/scm/clef.scm b/scm/clef.scm
index 5634abe905adc9a6f254fb2fa9ff552daac8adde..b7171de8d52904a4558e8739b0b15febb66f7639 100644 (file)
--- a/scm/clef.scm
+++ b/scm/clef.scm
@@ -63,7 +63,7 @@
     ("petrucci_f" . ("clefs-petrucci_f" 2 0))
     ("petrucci_g" . ("clefs-petrucci_g" -2 0))))
 
-;; "an alist mapping GLYPHNAME to the position of the central C for
+;; "an alist mapping GLYPHNAME to the position of the middle C for
 ;; that symbol"
 (define c0-pitch-alist
   '(("clefs-G" . -4)
@@ -93,7 +93,7 @@
 (define-public (make-clef-set clef-name)
   "Generate the clef setting commands for a clef with name CL."
   (define (make-prop-set props)
-    (let ((m (make-music-by-name 'PropertySet)))
+    (let ((m (make-music 'PropertySet)))
       (map (lambda (x) (set! (ly:music-property m (car x)) (cdr x))) props)
       m))
   (let ((e '())
@@ -110,18 +110,18 @@
     (if (pair? e)
        (let* ((musics (map make-prop-set  
                            `(((symbol . clefGlyph) (value . ,(cadr e)))
-                             ((symbol . centralCPosition)
+                             ((symbol . middleCPosition)
                               (value . ,(+ oct
                                            (caddr e)
                                            (cdr (assoc (cadr e) c0-pitch-alist)))))
                              ((symbol . clefPosition) (value . ,(caddr e)))
                              ((symbol . clefOctavation) (value . ,(- oct))))))
-              (seq (make-music-by-name 'SequentialMusic))
-              (csp (make-music-by-name 'ContextSpeccedMusic)))
-         (set! (ly:music-property seq 'elements) musics)
+              (seq (make-music 'SequentialMusic
+                               'elements musics))
+              (csp (make-music 'ContextSpeccedMusic)))
          (context-spec-music seq 'Staff))
        (begin
-         (ly:warn (format "Unknown clef type `~a'
-See scm/lily.scm for supported clefs" clef-name))
-         (make-music-by-name 'Music)))))
+         (ly:warn "Unknown clef type `~a'
+See scm/lily.scm for supported clefs" clef-name)
+         (make-music 'Music)))))