* VERSION (MY_PATCH_LEVEL): make 1.7.0

[lilypond.git] / scm / drums.scm

diff --git a/scm/drums.scm b/scm/drums.scm
index 3e88da7196fe822a05bf11ad0159285693f6759f..b3151aa99415b01b2e82ce56d67376a169851356 100644 (file)
--- a/scm/drums.scm
+++ b/scm/drums.scm
@@ -37,9 +37,14 @@
        (crashcymbalb     cymcb ,(make-pitch -1 5 0))
        (vibraslap        vibs  ,(make-pitch -1 5 1))
        (ridecymbalb      cymrb ,(make-pitch -1 6 0))
+       (mutehibongo      bohm  ,(make-pitch -1 6 1))
        (hibongo          boh   ,(make-pitch 0 0 0))
+       (openhibongo      boho  ,(make-pitch 0 1 -2))
+       (mutelobongo      bolm  ,(make-pitch -1 6 2))
        (lobongo          bol   ,(make-pitch 0 0 1))
+       (openlobongo      bolo  ,(make-pitch 0 1 -1))
        (mutehiconga      cghm  ,(make-pitch 0 1 0))
+       (muteloconga      cglm  ,(make-pitch 0 2 -2))
        (openhiconga      cgho  ,(make-pitch 0 1 1))
        (hiconga          cgh   ,(make-pitch 0 2 -1))
        (openloconga      cglo  ,(make-pitch 0 1 2))
@@ -89,10 +94,10 @@
        (hihat            cross         #f        ,(make-pitch 0 3 0))
        (highfloortom     default       #f        ,(make-pitch -1 5 0))
        (pedalhihat       cross         #f        ,(make-pitch -1 2 0))
-       (lowtom           default       #f        ,(make-pitch 0 0 0))
+       (lowtom           default       #f        ,(make-pitch -1 6 0))
        (openhihat        cross         "open"    ,(make-pitch 0 3 0))
        (halfopenhihat    xcircle       #f        ,(make-pitch 0 3 0))
-       (lowmidtom        default       #f        ,(make-pitch 0 1 0))
+       (lowmidtom        default       #f        ,(make-pitch 0 0 0))
        (himidtom         default       #f        ,(make-pitch 0 2 0))
        (crashcymbala     xcircle       #f        ,(make-pitch 0 5 0))
        (crashcymbal      xcircle       #f        ,(make-pitch 0 5 0))
@@ -119,7 +124,8 @@
 (define congas `(
        (losidestick      cross         #f        ,(make-pitch -1 6 0))
        (loconga          default       #f        ,(make-pitch -1 6 0))
-       (openloconga      default       ,"open"   ,(make-pitch -1 6 0))
+       (openloconga      default       "open"    ,(make-pitch -1 6 0))
+       (muteloconga      default       "stopped" ,(make-pitch -1 6 0))
        (hisidestick      cross         #f        ,(make-pitch 0 1 0))
        (hiconga          default       #f        ,(make-pitch 0 1 0))
        (openhiconga      default       "open"    ,(make-pitch 0 1 0))
@@ -128,8 +134,14 @@
  ))
 
 (define bongos `(
+       (losidestick      cross         #f        ,(make-pitch -1 6 0))
        (lobongo          default       #f        ,(make-pitch -1 6 0))
+       (openlobongo      default       "open"    ,(make-pitch -1 6 0))
+       (mutelobongo      default       "stopped" ,(make-pitch -1 6 0))
+       (hisidestick      cross         #f        ,(make-pitch 0 1 0))
        (hibongo          default       #f        ,(make-pitch 0 1 0))
+       (openhibongo      default       "open"    ,(make-pitch 0 1 0))
+       (mutehibongo      default       "stopped" ,(make-pitch 0 1 0))
  ))
 
 
@@ -154,7 +166,7 @@
 (define (make-articulation-script x) 
      (let* (  (m (ly-make-music "Articulation_req"))
            )
-     (ly-set-mus-property m 'articulation-type x)
+     (ly-set-mus-property! m 'articulation-type x)
      m
      )
  )
@@ -163,7 +175,7 @@
 (define (add-articulation-script m x)
   (if x
    (if (and x (equal? (ly-music-name m) "Request_chord"))
-     (ly-set-mus-property m 'elements
+     (ly-set-mus-property! m 'elements
        (cons (make-articulation-script x) (ly-get-mus-property m 'elements))
      )
      (let* ( (es (ly-get-mus-property m 'elements))
@@ -180,10 +192,11 @@
 (define (make-head-type-elem t)
    (let* ( (m (ly-make-music "Music"))
          )
-     (ly-set-mus-property m 'iterator-ctor Push_property_iterator::constructor)
-     (ly-set-mus-property m 'symbol 'NoteHead)
-     (ly-set-mus-property m 'grob-property 'style)
-     (ly-set-mus-property m 'grob-value t)
+     (ly-set-mus-property! m 'iterator-ctor Push_property_iterator::constructor)
+     (ly-set-mus-property! m 'symbol 'NoteHead)
+     (ly-set-mus-property! m 'grob-property 'style)
+     (ly-set-mus-property! m 'grob-value t)
+     (ly-set-mus-property! m 'pop-first #t)
      m
    )
  )
@@ -192,17 +205,17 @@
    (let* ( (m (ly-make-music "Context_specced_music"))
            (e (make-head-type-elem t))
          )
-     (ly-set-mus-property m 'element e)
-     (ly-set-mus-property m 'context-type "Thread")
+     (ly-set-mus-property! m 'element e)
+     (ly-set-mus-property! m 'context-type "Thread")
      m
    )
  )
 
 (define (make-thread-context thread-name element)
    (let* ( (m (ly-make-music "Context_specced_music")))
-     (ly-set-mus-property m 'element element)
-     (ly-set-mus-property m 'context-type "Thread")
-     (ly-set-mus-property m 'context-id (symbol->string thread-name))
+     (ly-set-mus-property! m 'element element)
+     (ly-set-mus-property! m 'context-type "Thread")
+     (ly-set-mus-property! m 'context-id (symbol->string thread-name))
      m
    )
  )
@@ -225,7 +238,7 @@
              (seq (make-sequential-music (list ht req-ch)))
              )
          (add-articulation-script req-ch script)
-         (ly-set-mus-property fe 'pitch pitch)
+         (ly-set-mus-property! fe 'pitch pitch)
          (set! req-ch (make-thread-context style seq))
         req-ch
        )
@@ -276,22 +289,22 @@
            (alts (ly-get-mus-property music 'alternatives)))
 
       (if (pair? es)
-       (ly-set-mus-property music 'elements (map (drums->paper kit) es) )
+       (ly-set-mus-property! music 'elements (map (drums->paper kit) es) )
       )
 
       (if (music? alts)
-        (ly-set-mus-property
+        (ly-set-mus-property!
          music 'alternatives
          ((drums->paper kit) alts)))
 
       (if (music? body)
-        (ly-set-mus-property
+        (ly-set-mus-property!
          music 'body
          ((drums->paper kit) body)))
 
       (if (music? e)
         (begin
-          (ly-set-mus-property
+          (ly-set-mus-property!
            music 'element
            ((drums->paper kit) e))
         )