release: 1.5.27

[lilypond.git] / ly / drumpitch-init.ly

diff --git a/ly/drumpitch-init.ly b/ly/drumpitch-init.ly
index 211246f0817c013bbd1cba98fb4adcc63f001896..c70b18e0fea90c9117b133f98dfb9130334e541b 100644 (file)
--- a/ly/drumpitch-init.ly
+++ b/ly/drumpitch-init.ly
@@ -116,7 +116,7 @@
 #(define timbales `(
        (losidestick      cross         ,#f       ,(make-pitch -1 6 0))
        (lotimbale        default       ,#f       ,(make-pitch -1 6 0))
-       (cowbell          triangle      ,#f       ,(make-pitch 0 0 0))
+       (cowbell          triangle      ,#f       ,(make-pitch 0 2 0))
        (hisidestick      cross         ,#f       ,(make-pitch 0 1 0))
        (hitimbale        default       ,#f       ,(make-pitch 0 1 0))
  ))
@@ -137,20 +137,23 @@
        (hibongo          default       ,#f       ,(make-pitch 0 1 0))
  ))
 
-#(define guiro `(
-       (shortguiro       default       "staccato",(make-pitch 0 0 0))
-       (longguiro        default       "tenuto"  ,(make-pitch 0 0 0))
-       (guiro            default       ,#f       ,(make-pitch 0 0 0))
- ))
 
-#(define triangle `(
+#(define percussion `(
        (opentriangle     cross         "open"    ,(make-pitch 0 0 0))
        (mutetriangle     cross         "stopped" ,(make-pitch 0 0 0))
        (triangle         cross         ,#f       ,(make-pitch 0 0 0))
+       (shortguiro       default       "staccato",(make-pitch 0 0 0))
+       (longguiro        default       "tenuto"  ,(make-pitch 0 0 0))
+       (guiro            default       ,#f       ,(make-pitch 0 0 0))
+       (cowbell          triangle      ,#f       ,(make-pitch 0 0 0))
+       (claves           default       ,#f       ,(make-pitch 0 0 0))
+       (tambourine       default       ,#f       ,(make-pitch 0 0 0))
+       (cabasa           cross         ,#f       ,(make-pitch 0 0 0))
+       (maracas          default       ,#f       ,(make-pitch 0 0 0))
+       (handclap         default       ,#f       ,(make-pitch 0 0 0))
  ))
 
 
-
 \pitchnames
 #(append (map (lambda (x) (cons (car x) (caddr x))) drum-pitch-names)
         (map (lambda (x) (cons (cadr x) (caddr x))) drum-pitch-names)