Juergens patch.

[lilypond.git] / scm / clef.scm

diff --git a/scm/clef.scm b/scm/clef.scm
index a6f11bd692de919ac1db0597d8756ee0f032e350..997ef4c05cfb3c3c07fcc5bcd409fcf4b9693888 100644 (file)
--- a/scm/clef.scm
+++ b/scm/clef.scm
@@ -39,22 +39,23 @@
          ("hufnagel_fa1" . ("clefs-hufnagel_fa" -1 0))
          ("hufnagel_fa2" . ("clefs-hufnagel_fa" 1 0))
          ("hufnagel_do_fa" . ("clefs-hufnagel_do_fa" 4 0))
-         ("mensural1_c1" . ("clefs-mensural1_c" -4 0))
-         ("mensural1_c2" . ("clefs-mensural1_c" -2 0))
-         ("mensural1_c3" . ("clefs-mensural1_c" 0 0))
-         ("mensural1_c4" . ("clefs-mensural1_c" 2 0))
-         ("mensural2_c1" . ("clefs-mensural2_c" -4 0))
-         ("mensural2_c2" . ("clefs-mensural2_c" -2 0))
-         ("mensural2_c3" . ("clefs-mensural2_c" 0 0))
-         ("mensural2_c4" . ("clefs-mensural2_c" 2 0))
-         ("mensural2_c5" . ("clefs-mensural2_c" 4 0))
-         ("mensural3_c1" . ("clefs-mensural3_c" -2 0))
-         ("mensural3_c2" . ("clefs-mensural3_c" 0 0))
-         ("mensural3_c3" . ("clefs-mensural3_c" 2 0))
-         ("mensural3_c4" . ("clefs-mensural3_c" 4 0))
-         ("mensural1_f" . ("clefs-mensural1_f" 2 0))
-         ("mensural2_f" . ("clefs-mensural2_f" 2 0))
+         ("mensural_c1" . ("clefs-mensural_c" -2 0))
+         ("mensural_c2" . ("clefs-mensural_c" 0 0))
+         ("mensural_c3" . ("clefs-mensural_c" 2 0))
+         ("mensural_c4" . ("clefs-mensural_c" 4 0))
+         ("mensural_f" . ("clefs-mensural_f" 2 0))
          ("mensural_g" . ("clefs-mensural_g" -2 0))
+         ("neo_mensural_c1" . ("clefs-neo_mensural_c" -4 0))
+         ("neo_mensural_c2" . ("clefs-neo_mensural_c" -2 0))
+         ("neo_mensural_c3" . ("clefs-neo_mensural_c" 0 0))
+         ("neo_mensural_c4" . ("clefs-neo_mensural_c" 2 0))
+         ("petrucci_c1" . ("clefs-petrucci_c1" -4 0))
+         ("petrucci_c2" . ("clefs-petrucci_c2" -2 0))
+         ("petrucci_c3" . ("clefs-petrucci_c3" 0 0))
+         ("petrucci_c4" . ("clefs-petrucci_c4" 2 0))
+         ("petrucci_c5" . ("clefs-petrucci_c5" 4 0))
+         ("petrucci_f" . ("clefs-petrucci_f" 2 0))
+         ("petrucci_g" . ("clefs-petrucci_g" -2 0))
        )
 )
 
@@ -65,6 +66,7 @@
     ("clefs-C" . 0)
     ("clefs-F" . 4)
     ("clefs-percussion" . 0)
+    ("clefs-tab" . 0 )
     ("clefs-vaticana_do" . 0)
     ("clefs-vaticana_fa" . 4)
     ("clefs-medicaea_do" . 0)
@@ -72,15 +74,32 @@
     ("clefs-hufnagel_do" . 0)
     ("clefs-hufnagel_fa" . 4)
     ("clefs-hufnagel_do_fa" . 0)
-    ("clefs-mensural1_c" . 0)
-    ("clefs-mensural2_c" . 0)
-    ("clefs-mensural3_c" . 0)
-    ("clefs-mensural1_f" . 4)
-    ("clefs-mensural2_f" . 4)
-    ("clefs-mensural_g" . -4))
+    ("clefs-mensural_c" . 0)
+    ("clefs-mensural_f" . 4)
+    ("clefs-mensural_g" . -4)
+    ("clefs-neo_mensural_c" . 0)
+    ("clefs-petrucci_c1" . 0)
+    ("clefs-petrucci_c2" . 0)
+    ("clefs-petrucci_c3" . 0)
+    ("clefs-petrucci_c4" . 0)
+    ("clefs-petrucci_c5" . 0)
+    ("clefs-petrucci_f" . 4)
+    ("clefs-petrucci_g" . -4)
   )
+)
+
+(define-public (make-clef-set cl)
+  "Generate the clef setting commands for a clef with name CL."
+  (define (make-prop-set props)
+    (let*
+       (
+        (m (make-music-by-name 'PropertySet))
+        )
 
-(define (clef-name-to-properties cl)
+      (map (lambda (x) (ly:set-mus-property! m (car x) (cdr x))) props)
+      m
+    ))
+    
   (let ((e '())
        (c0 0)
        (oct 0)
@@ -98,29 +117,39 @@
 
 
     (set! e  (assoc cl supported-clefs))
-
+    
     (if (pair? e)
-       `(((symbol . clefGlyph)
-          (iterator-ctor . ,Property_iterator::constructor)
-          (value . ,(cadr e))
-          )
+       (let* 
+           (
+            (musics (map make-prop-set  
          
-         ((symbol . centralCPosition)
-          (iterator-ctor . ,Property_iterator::constructor)
-          (value . ,(+ oct (caddr e) (cdr  (assoc  (cadr e) c0-pitch-alist))))
-          )
-         ((symbol . clefPosition)
-          (iterator-ctor . ,Property_iterator::constructor)
-          (value . ,(caddr e))
-          )
-         ((symbol . clefOctavation)
-                (iterator-ctor . ,Property_iterator::constructor)
-                (value . ,(- oct))
-              )
+                         `(((symbol . clefGlyph)
+                            (value . ,(cadr e))
+                            )
+                           ((symbol . centralCPosition)
+                            (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))
+            )
+
+         (ly:set-mus-property! seq 'elements musics)
+         (ly:set-mus-property! csp 'element seq)
+         (ly:set-mus-property! csp 'context-type "Staff")
+
+         csp
          )
        (begin
-         (ly-warn (string-append "Unknown clef type `" cl "'\nSee scm/lily.scm for supported clefs"))
-         '())
+         (ly:warn (format "Unknown clef type `~a'
+See scm/lily.scm for supported clefs" cl))
+         (make-music-by-name 'Music)
+         
+       )
     )))
-
-