X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fdrumpitch-init.ly;h=05d15436443406204b9e8f16b9a30f8de494e131;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=c70b18e0fea90c9117b133f98dfb9130334e541b;hpb=8dbb0048c1ac59125562d5adc1c68512eab8541b;p=lilypond.git

diff --git a/ly/drumpitch-init.ly b/ly/drumpitch-init.ly
index c70b18e0fe..05d1543644 100644
--- a/ly/drumpitch-init.ly
+++ b/ly/drumpitch-init.ly
@@ -1,163 +1,353 @@
-% GM drum pitches.
-% I use different accidentals to distinguish drums at the same GM pitch.
-% Always accidental 0 (white keys) or 1 (black keys) to get the "correct" gm name.
-% i.e. fis, for closed highat  ges, for highat.
-
-% 2001/03/25 Rune Zedeler <rune@zedeler.dk>
-
-
-%% TODO: don't pollute global namespace in this way . 
-
-
-#(define drum-pitch-names `(
-	(acousticbassdrum bda	,(make-pitch -3 6 0 ))
-	(bassdrum	  bd	,(make-pitch -2 0 0 ))
-	(hisidestick	  ssh	,(make-pitch -3 6 2))
-	(sidestick	  ss	,(make-pitch -2 0 1))
-	(losidestick	  ssl	,(make-pitch -2 1 -1))
-	(acousticsnare	  sna	,(make-pitch -2 1 0))
-	(snare		  sn	,(make-pitch -2 2 -2))
-	(handclap	  hc	,(make-pitch -2 1 1))
-	(electricsnare	  sne	,(make-pitch -2 2 0))
-	(lowfloortom	  tomfl	,(make-pitch -2 3 0))
-	(closedhihat	  hhc	,(make-pitch -2 3 1))
-	(hihat		  hh	,(make-pitch -2 4 -1))
-	(highfloortom	  tomfh	,(make-pitch -2 4 0))
-	(pedalhihat	  hhp	,(make-pitch -2 4 1))
-	(lowtom		  toml	,(make-pitch -2 5 0))
-	(openhihat	  hho	,(make-pitch -2 5 1))
-	(halfopenhihat	  hhho	,(make-pitch -2 5 1))
-	(lowmidtom	  tomml	,(make-pitch -2 6 0))
-	(himidtom	  tommh	,(make-pitch -1 0 0))
-	(crashcymbala	  cymca	,(make-pitch -1 0 1))
-	(crashcymbal	  cymc	,(make-pitch -1 1 -1))
-	(hightom	  tomh	,(make-pitch -1 1 0))
-	(ridecymbala	  cymra	,(make-pitch -1 1 1))
-	(ridecymbal	  cymr	,(make-pitch -1 2 -1))
-	(chinesecymbal	  cymch	,(make-pitch -1 2 0))
-	(ridebell	  rb	,(make-pitch -1 3 0))
-	(tambourine	  tamb	,(make-pitch -1 3 1))
-	(splashcymbal	  cyms	,(make-pitch -1 4 0))
-	(cowbell	  cb	,(make-pitch -1 4 1))
-	(crashcymbalb	  cymcb	,(make-pitch -1 5 0))
-	(vibraslap	  vibs	,(make-pitch -1 5 1))
-	(ridecymbalb	  cymrb	,(make-pitch -1 6 0))
-	(hibongo	  boh	,(make-pitch 0 0 0))
-	(lobongo	  bol	,(make-pitch 0 0 1))
-	(mutehiconga	  cghm	,(make-pitch 0 1 0))
-	(openhiconga	  cgho	,(make-pitch 0 1 1))
-	(hiconga	  cgh	,(make-pitch 0 2 -1))
-	(openloconga      cglo  ,(make-pitch 0 1 2))
-	(loconga	  cgl	,(make-pitch 0 2 0))
-	(hitimbale	  timh	,(make-pitch 0 3 0))
-	(lotimbale	  timl	,(make-pitch 0 3 1))
-	(hiagogo	  agh	,(make-pitch 0 4 0))
-	(loagogo	  agl	,(make-pitch 0 4 1))
-	(cabasa		  cab	,(make-pitch 0 5 0))
-	(maracas	  mar	,(make-pitch 0 5 1))
-	(shortwhistle	  whs	,(make-pitch 0 6 0))
-	(longwhistle	  whl	,(make-pitch 1 0 0))
-	(shortguiro	  guis	,(make-pitch 1 0 1))
-	(longguiro	  guil	,(make-pitch 1 1 0))
-	(guiro		  gui	,(make-pitch 1 0 2))
-	(claves		  cl	,(make-pitch 1 1 1))
-	(hiwoodblock	  wbh	,(make-pitch 1 2 0))
-	(lowoodblock	  wbl	,(make-pitch 1 3 0))
-	(mutecuica	  cuim	,(make-pitch 1 3 1))
-	(opencuica	  cuio	,(make-pitch 1 4 0))
-	(mutetriangle	  trim	,(make-pitch 1 4 1))
-	(triangle	  tri	,(make-pitch 1 4 2))
-	(opentriangle	  trio	,(make-pitch 1 5 0))
-	;; "transposing" pitches:
-	(oneup		  ua	,(make-pitch 0 1 0))
-	(twoup		  ub	,(make-pitch 0 2 0))
-	(threeup	  uc	,(make-pitch 0 3 0))
-	(fourup		  ud	,(make-pitch 0 4 0))
-	(fiveup		  ue	,(make-pitch 0 5 0))
-	(onedown	  da	,(make-pitch -1 6 0))
-	(twodown	  db	,(make-pitch -1 5 0))
-	(threedown	  dc	,(make-pitch -1 4 0))
-	(fourdown	  dd	,(make-pitch -1 3 0))
-	(fivedown	  de	,(make-pitch -1 2 0))
-))
-
-#(define drums `(
-	(acousticbassdrum default 	,#f	  ,(make-pitch -1 4 0))
-	(bassdrum	  default 	,#f	  ,(make-pitch -1 4 0))
-	(sidestick	  cross		,#f	  ,(make-pitch 0 1 0))
-	(acousticsnare	  default 	,#f	  ,(make-pitch 0 1 0))
-	(snare		  default 	,#f	  ,(make-pitch 0 1 0))
-	(handclap	  triangle	,#f	  ,(make-pitch 0 1 0))
-	(electricsnare	  default 	,#f	  ,(make-pitch 0 1 0))
-	(lowfloortom	  default 	,#f	  ,(make-pitch -1 3 0))
-	(closedhihat	  cross		"stopped" ,(make-pitch 0 3 0))
-	(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))
-	(openhihat	  cross		"open"	  ,(make-pitch 0 3 0))
-	(halfopenhihat	  xcircle	,#f	  ,(make-pitch 0 3 0))
-	(lowmidtom	  default 	,#f	  ,(make-pitch 0 1 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))
-	(hightom	  default 	,#f	  ,(make-pitch 0 4 0))
-	(ridecymbala	  cross		,#f	  ,(make-pitch 0 5 0))
-	(ridecymbal	  cross		,#f	  ,(make-pitch 0 5 0))
-	(chinesecymbal	  mensural 	,#f	  ,(make-pitch 0 5 0))
-	(ridebell	  default	,#f	  ,(make-pitch 0 5 0))
-	(splashcymbal	  diamond 	,#f	  ,(make-pitch 0 5 0))
-	(cowbell	  triangle	,#f	  ,(make-pitch 0 5 0))
-	(crashcymbalb	  cross		,#f	  ,(make-pitch 0 5 0))
-	(vibraslap	  diamond 	,#f	  ,(make-pitch 0 4 0))
-	(ridecymbalb	  cross		,#f	  ,(make-pitch 0 5 0))
- ))
-
-#(define timbales `(
-	(losidestick	  cross		,#f	  ,(make-pitch -1 6 0))
-	(lotimbale	  default	,#f	  ,(make-pitch -1 6 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))
- ))
-
-#(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))
-	(hisidestick	  cross		,#f	  ,(make-pitch 0 1 0))
-	(hiconga	  default	,#f	  ,(make-pitch 0 1 0))
-	(openhiconga      default       "open"    ,(make-pitch 0 1 0))
-        (mutehiconga      default       "stopped" ,(make-pitch 0 1 0))
-  
- ))
-
-#(define bongos `(
-	(lobongo	  default	,#f	  ,(make-pitch -1 6 0))
-	(hibongo	  default	,#f	  ,(make-pitch 0 1 0))
- ))
-
-
-#(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)
+
+\version "2.16.0"
+
+drumPitchNames =
+#'((acousticbassdrum . acousticbassdrum)
+   (bassdrum . bassdrum)
+   (hisidestick . hisidestick)
+   (sidestick . sidestick)
+   (losidestick . losidestick)
+   (acousticsnare . acousticsnare)
+   (snare . snare)
+   (handclap . handclap)
+   (electricsnare . electricsnare)
+   (lowfloortom . lowfloortom)
+   (closedhihat . closedhihat)
+   (hihat . hihat)
+   (highfloortom . highfloortom)
+   (pedalhihat . pedalhihat)
+   (lowtom . lowtom)
+   (openhihat . openhihat)
+   (halfopenhihat . halfopenhihat)
+   (lowmidtom . lowmidtom)
+   (himidtom . himidtom)
+   (crashcymbala . crashcymbala)
+   (crashcymbal . crashcymbal)
+   (hightom . hightom)
+   (ridecymbala . ridecymbala)
+   (ridecymbal . ridecymbal)
+   (chinesecymbal . chinesecymbal)
+   (ridebell . ridebell)
+   (tambourine . tambourine)
+   (splashcymbal . splashcymbal)
+   (cowbell . cowbell)
+   (crashcymbalb . crashcymbalb)
+   (vibraslap . vibraslap)
+   (ridecymbalb . ridecymbalb)
+   (mutehibongo . mutehibongo)
+   (hibongo . hibongo)
+   (openhibongo . openhibongo)
+   (mutelobongo . mutelobongo)
+   (lobongo . lobongo)
+   (openlobongo . openlobongo)
+   (mutehiconga . mutehiconga)
+   (muteloconga . muteloconga)
+   (openhiconga . openhiconga)
+   (hiconga . hiconga)
+   (openloconga . openloconga)
+   (loconga . loconga)
+   (hitimbale . hitimbale)
+   (lotimbale . lotimbale)
+   (hiagogo . hiagogo)
+   (loagogo . loagogo)
+   (cabasa . cabasa)
+   (maracas . maracas)
+   (shortwhistle . shortwhistle)
+   (longwhistle . longwhistle)
+   (shortguiro . shortguiro)
+   (longguiro . longguiro)
+   (guiro . guiro)
+   (claves . claves)
+   (hiwoodblock . hiwoodblock)
+   (lowoodblock . lowoodblock)
+   (mutecuica . mutecuica)
+   (opencuica . opencuica)
+   (mutetriangle . mutetriangle)
+   (triangle . triangle)
+   (opentriangle . opentriangle)
+   (oneup . oneup)
+   (twoup . twoup)
+   (threeup . threeup)
+   (fourup . fourup)
+   (fiveup . fiveup)
+   (onedown . onedown)
+   (twodown . twodown)
+   (threedown . threedown)
+   (fourdown . fourdown)
+   (fivedown . fivedown)
+   (bda . acousticbassdrum)
+   (bd . bassdrum)
+   (ssh . hisidestick)
+   (ss . sidestick)
+   (ssl . losidestick)
+   (sna . acousticsnare)
+   (sn . snare)
+   (hc . handclap)
+   (sne . electricsnare)
+   (tomfl . lowfloortom)
+   (hhc . closedhihat)
+   (hh . hihat)
+   (tomfh . highfloortom)
+   (hhp . pedalhihat)
+   (toml . lowtom)
+   (hho . openhihat)
+   (hhho . halfopenhihat)
+   (tomml . lowmidtom)
+   (tommh . himidtom)
+   (cymca . crashcymbala)
+   (cymc . crashcymbal)
+   (tomh . hightom)
+   (cymra . ridecymbala)
+   (cymr . ridecymbal)
+   (cymch . chinesecymbal)
+   (rb . ridebell)
+   (tamb . tambourine)
+   (cyms . splashcymbal)
+   (cb . cowbell)
+   (cymcb . crashcymbalb)
+   (vibs . vibraslap)
+   (cymrb . ridecymbalb)
+   (bohm . mutehibongo)
+   (boh . hibongo)
+   (boho . openhibongo)
+   (bolm . mutelobongo)
+   (bol . lobongo)
+   (bolo . openlobongo)
+   (cghm . mutehiconga)
+   (cglm . muteloconga)
+   (cgho . openhiconga)
+   (cgh . hiconga)
+   (cglo . openloconga)
+   (cgl . loconga)
+   (timh . hitimbale)
+   (timl . lotimbale)
+   (agh . hiagogo)
+   (agl . loagogo)
+   (cab . cabasa)
+   (mar . maracas)
+   (whs . shortwhistle)
+   (whl . longwhistle)
+   (guis . shortguiro)
+   (guil . longguiro)
+   (gui . guiro)
+   (cl . claves)
+   (wbh . hiwoodblock)
+   (wbl . lowoodblock)
+   (cuim . mutecuica)
+   (cuio . opencuica)
+   (trim . mutetriangle)
+   (tri . triangle)
+   (trio . opentriangle)
+   (tt . tamtam)
+   (ua . oneup)
+   (ub . twoup)
+   (uc . threeup)
+   (ud . fourup)
+   (ue . fiveup)
+   (da . onedown)
+   (db . twodown)
+   (dc . threedown)
+   (dd . fourdown)
+   (de . fivedown)
+   )
+
+midiDrumPitches =
+#`((acousticbassdrum . ,(ly:make-pitch -3 6 NATURAL))
+   (bassdrum . ,(ly:make-pitch -2 0 NATURAL))
+   (hisidestick . ,(ly:make-pitch -3 6 DOUBLE-SHARP))
+   (sidestick . ,(ly:make-pitch -2 0 SHARP))
+   (losidestick . ,(ly:make-pitch -2 1 FLAT))
+   (acousticsnare . ,(ly:make-pitch -2 1 NATURAL))
+   (snare . ,(ly:make-pitch -2 2 DOUBLE-FLAT))
+   (handclap . ,(ly:make-pitch -2 1 SHARP))
+   (electricsnare . ,(ly:make-pitch -2 2 NATURAL))
+   (lowfloortom . ,(ly:make-pitch -2 3 NATURAL))
+   (closedhihat . ,(ly:make-pitch -2 3 SHARP))
+   (hihat . ,(ly:make-pitch -2 4 FLAT))
+   (highfloortom . ,(ly:make-pitch -2 4 NATURAL))
+   (pedalhihat . ,(ly:make-pitch -2 4 SHARP))
+   (lowtom . ,(ly:make-pitch -2 5 NATURAL))
+   (openhihat . ,(ly:make-pitch -2 5 SHARP))
+   (halfopenhihat . ,(ly:make-pitch -2 5 SHARP))
+   (lowmidtom . ,(ly:make-pitch -2 6 NATURAL))
+   (himidtom . ,(ly:make-pitch -1 0 NATURAL))
+   (crashcymbala . ,(ly:make-pitch -1 0 SHARP))
+   (crashcymbal . ,(ly:make-pitch -1 1 FLAT))
+   (hightom . ,(ly:make-pitch -1 1 NATURAL))
+   (ridecymbala . ,(ly:make-pitch -1 1 SHARP))
+   (ridecymbal . ,(ly:make-pitch -1 2 FLAT))
+   (chinesecymbal . ,(ly:make-pitch -1 2 NATURAL))
+   (ridebell . ,(ly:make-pitch -1 3 NATURAL))
+   (tambourine . ,(ly:make-pitch -1 3 SHARP))
+   (splashcymbal . ,(ly:make-pitch -1 4 NATURAL))
+   (cowbell . ,(ly:make-pitch -1 4 SHARP))
+   (crashcymbalb . ,(ly:make-pitch -1 5 NATURAL))
+   (vibraslap . ,(ly:make-pitch -1 5 SHARP))
+   (ridecymbalb . ,(ly:make-pitch -1 6 NATURAL))
+   (mutehibongo . ,(ly:make-pitch -1 6 SHARP))
+   (hibongo . ,(ly:make-pitch 0 0 NATURAL))
+   (openhibongo . ,(ly:make-pitch 0 1 DOUBLE-FLAT))
+   (mutelobongo . ,(ly:make-pitch -1 6 DOUBLE-SHARP))
+   (lobongo . ,(ly:make-pitch 0 0 SHARP))
+   (openlobongo . ,(ly:make-pitch 0 1 FLAT))
+   (mutehiconga . ,(ly:make-pitch 0 1 NATURAL))
+   (muteloconga . ,(ly:make-pitch 0 2 DOUBLE-FLAT))
+   (openhiconga . ,(ly:make-pitch 0 1 SHARP))
+   (hiconga . ,(ly:make-pitch 0 2 FLAT))
+   (openloconga . ,(ly:make-pitch 0 1 DOUBLE-SHARP))
+   (loconga . ,(ly:make-pitch 0 2 NATURAL))
+   (hitimbale . ,(ly:make-pitch 0 3 NATURAL))
+   (lotimbale . ,(ly:make-pitch 0 3 SHARP))
+   (hiagogo . ,(ly:make-pitch 0 4 NATURAL))
+   (loagogo . ,(ly:make-pitch 0 4 SHARP))
+   (cabasa . ,(ly:make-pitch 0 5 NATURAL))
+   (maracas . ,(ly:make-pitch 0 5 SHARP))
+   (shortwhistle . ,(ly:make-pitch 0 6 NATURAL))
+   (longwhistle . ,(ly:make-pitch 1 0 NATURAL))
+   (shortguiro . ,(ly:make-pitch 1 0 SHARP))
+   (longguiro . ,(ly:make-pitch 1 1 NATURAL))
+   (guiro . ,(ly:make-pitch 1 0 DOUBLE-SHARP))
+   (claves . ,(ly:make-pitch 1 1 SHARP))
+   (hiwoodblock . ,(ly:make-pitch 1 2 NATURAL))
+   (lowoodblock . ,(ly:make-pitch 1 3 NATURAL))
+   (mutecuica . ,(ly:make-pitch 1 3 SHARP))
+   (opencuica . ,(ly:make-pitch 1 4 NATURAL))
+   (mutetriangle . ,(ly:make-pitch 1 4 SHARP))
+   (triangle . ,(ly:make-pitch 1 4 DOUBLE-SHARP))
+   (opentriangle . ,(ly:make-pitch 1 5 NATURAL))
+
+   ;; "transposing" pitches:
+   (oneup . ,(ly:make-pitch 0 1 NATURAL))
+   (twoup . ,(ly:make-pitch 0 2 NATURAL))
+   (threeup . ,(ly:make-pitch 0 3 NATURAL))
+   (fourup . ,(ly:make-pitch 0 4 NATURAL))
+   (fiveup . ,(ly:make-pitch 0 5 NATURAL))
+   (onedown . ,(ly:make-pitch -1 6 NATURAL))
+   (twodown . ,(ly:make-pitch -1 5 NATURAL))
+   (threedown . ,(ly:make-pitch -1 4 NATURAL))
+   (fourdown . ,(ly:make-pitch -1 3 NATURAL))
+   (fivedown . ,(ly:make-pitch -1 2 NATURAL))
  )
 
 
-\version "1.3.146"
+#(for-each
+  (lambda (k-v)
+    (module-define! (current-module)
+                    (car k-v)
+                    (alist->hash-table (cdr k-v)))
+    )
+   '((drums-style .
+     (
+      (acousticbassdrum () #f -3)
+      (bassdrum () #f -3)
+      (sidestick cross #f 1)
+      (acousticsnare () #f 1)
+      (snare () #f 1)
+      (handclap triangle #f 1)
+      (electricsnare () #f 1)
+      (lowfloortom () #f -4)
+      (closedhihat cross "stopped" 3)
+      (hihat cross #f 3)
+      (highfloortom () #f -2)
+      (pedalhihat cross #f -5)
+      (lowtom () #f -1)
+      (openhihat cross "open" 3)
+      (halfopenhihat xcircle #f 3)
+      (lowmidtom () #f 0)
+      (himidtom () #f 2)
+      (crashcymbala xcircle #f 5)
+      (crashcymbal xcircle #f 5)
+      (hightom () #f 4)
+      (ridecymbala cross #f 5)
+      (ridecymbal cross #f 5)
+      (chinesecymbal mensural #f 5)
+      (ridebell () #f 5)
+      (splashcymbal diamond #f 5)
+      (cowbell triangle #f 5)
+      (crashcymbalb cross #f 5)
+      (vibraslap diamond #f 4)
+      (ridecymbalb cross #f 5)
+      ))
+
+
+   (agostini-drums-style .
+     ((acousticbassdrum () #f -6)
+      (bassdrum () #f -5)
+      (sidestick cross #f 0)
+      (acousticsnare () #f 1)
+      (snare () #f 0)
+      (handclap triangle #f 0)
+      (electricsnare () #f 0)
+      (lowfloortom () #f -3)
+      (closedhihat cross #f 5)
+      (hihat cross #f 5)
+      (highfloortom () #f -2)
+      (pedalhihat cross #f -7)
+      (lowtom () #f -3)
+      (openhihat xcircle #f 5)
+      (halfopenhihat xcircle #f 5)
+      (lowmidtom () #f 2)
+      (himidtom () #f 3)
+      (crashcymbala cross #f 7)
+      (crashcymbal cross #f 8)
+      (hightom () #f 3)
+      (ridecymbala cross #f 6)
+      (ridecymbal cross #f 6)
+      (chinesecymbal mensural #f 6)
+      (ridebell mi #f 7)
+      (splashcymbal diamond #f 6)
+      (cowbell triangle #f 6)
+      (crashcymbalb cross #f 6)
+      (vibraslap diamond #f 4)
+      (ridecymbalb cross #f 7)
+      ))
+
+
+   (timbales-style .
+     ((losidestick cross #f -1)
+      (lotimbale () #f -1)
+      (cowbell triangle #f 2)
+      (hisidestick cross #f 1)
+      (hitimbale () #f 1)
+      ))
+
+
+   (congas-style .
+     ((losidestick cross #f -1)
+      (loconga () #f -1)
+      (openloconga () "open" -1)
+      (muteloconga () "stopped" -1)
+      (hisidestick cross #f 1)
+      (hiconga () #f 1)
+      (openhiconga () "open" 1)
+      (mutehiconga () "stopped" 1)
+      ))
+
+
+   (bongos-style .
+     ((losidestick cross #f -1)
+      (lobongo () #f -1)
+      (openlobongo () "open" -1)
+      (mutelobongo () "stopped" -1)
+      (hisidestick cross #f 1)
+      (hibongo () #f 1)
+      (openhibongo () "open" 1)
+      (mutehibongo () "stopped" 1)
+      ))
+
+
+   (percussion-style .
+     ((opentriangle cross "open" 0)
+      (mutetriangle cross "stopped" 0)
+      (triangle cross #f 0)
+      (shortguiro () staccato 0)
+      (longguiro () tenuto 0)
+      (guiro () #f 0)
+      (cowbell triangle #f 0)
+      (claves () #f 0)
+      (tambourine () #f 0)
+      (cabasa cross #f 0)
+      (maracas () #f 0)
+      (handclap () #f 0)
+      ))
+   ))