X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fdrumpitch-init.ly;h=05d15436443406204b9e8f16b9a30f8de494e131;hb=a6a51abfd0195a3cf7d6ea095cf69808852f21ce;hp=65eec67cc1922f9e283b0a13452e916ec588eed2;hpb=2055f35c47a045a50a01ff4dba8524322cfc3b48;p=lilypond.git

diff --git a/ly/drumpitch-init.ly b/ly/drumpitch-init.ly
index 65eec67cc1..05d1543644 100644
--- a/ly/drumpitch-init.ly
+++ b/ly/drumpitch-init.ly
@@ -1,5 +1,5 @@
 
-\version "2.14.0"
+\version "2.16.0"
 
 drumPitchNames =
 #'((acousticbassdrum . acousticbassdrum)
@@ -151,90 +151,90 @@ drumPitchNames =
    (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))
-)
+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))
+ )
 
-#(map
+
+#(for-each
   (lambda (k-v)
     (module-define! (current-module)
-		    (car k-v)
-		    (alist->hash-table (cdr k-v)))
+                    (car k-v)
+                    (alist->hash-table (cdr k-v)))
     )
    '((drums-style .
      (
@@ -269,6 +269,40 @@ midiDrumPitches = #`(
       (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)
@@ -317,5 +351,3 @@ midiDrumPitches = #`(
       (handclap () #f 0)
       ))
    ))
-
-