* Documentation/user/refman.itely (Percussion): Small

	clarifications and fixes.

	* scm/drums.scm: Bugfix: Use string instead of symbol when naming
	threads. This fixes different heads playing simultainously.

diff --git a/ChangeLog b/ChangeLog
index e7e428a7931af7e3115d2dd016d2351583cb0304..175c51cee155bec7d5cc3cefe213f302906b52dd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-07-27  Rune Zedeler  <rz@daimi.au.dk>
+
+       * Documentation/user/refman.itely (Percussion): Small
+       clarifications and fixes.
+
+       * scm/drums.scm: Bugfix: Use string instead of symbol when naming
+       threads. This fixes different heads playing simultainously.
+
 2003-07-27  Heikki Junes  <hjunes@cc.hut.fi>
 
        * Documentation/user/{ many }: increase readability (read through 

diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely
index 561950e8155f8d80ee0e3c10f80562811b5c2309..72d6efc22aeaf70f00abb67fa4e49f7956370f87 100644 (file)
--- a/Documentation/user/refman.itely
+++ b/Documentation/user/refman.itely
@@ -2633,10 +2633,10 @@ functions. The system is based on the general MIDI drum-pitches.
 Include @file{drumpitch-init.ly} to use drum pitches. This file
 defines the pitches from the Scheme variable @code{drum-pitch-names},
 the definition of which can be read in @file{scm/drums.scm}.  Each
-piece of percussion has a full name and an abbreviated name, and both
+piece of percussion has a full name and an abbreviated name, and either
 the full name or the abbreviation may be used in input files.
 
-to typeset the music on a staff apply the function @code{drums->paper}
+To typeset the music on a staff apply the function @code{drums->paper}
 to the percussion music. This function takes a list of percussion
 instrument names, notehead scripts and staff positions (that is:
 pitches relative to the C-clef) and transforms the input
@@ -2851,14 +2851,15 @@ To use a modified existing list, one can prepend modifications to the
 the existing list:
 
 @example
-#(set-drum-kit mydrums (append `(
+#(set-drum-kit 'mydrums (append `(
    (bassdrum default #f ,(ly:make-pitch -1 2 0))
    (lowtom   diamond #f ,(ly:make-pitch -1 6 0))
 ) (get-drum-kit 'drums)))
 @end example
 
-The file @file{drumpitch-init.ly} replaces the normal pitch names, so
-you have to reinclude @file{nederlands.ly} after the
+You can easily combine percussion notation with pitched notation.
+Indeed, the file @file{drumpitch-init.ly} replaces the normal pitch
+names, so you will have to reinclude @file{nederlands.ly} after the
 drum-pattern-definitions to enter normal notes:
 @c
 @lilypond[singleline,verbatim]

diff --git a/scm/drums.scm b/scm/drums.scm
index 35b5a6919af9cb7811b7b4bbd9d4352eabf562cb..90a0cef020c1a2d05eb1b0e0647e9d6b37e5dfe9 100644 (file)
--- a/scm/drums.scm
+++ b/scm/drums.scm
@@ -93,85 +93,85 @@
   percussive-instrument-init-settings
   `((drums
     . (
-          (acousticbassdrum default    #f        ,(ly:make-pitch -1 4 0))
-          (bassdrum      default       #f        ,(ly:make-pitch -1 4 0))
-          (sidestick     cross         #f        ,(ly:make-pitch 0 1 0))
-          (acousticsnare         default       #f        ,(ly:make-pitch 0 1 0))
-          (snare                 default       #f        ,(ly:make-pitch 0 1 0))
-          (handclap      triangle      #f        ,(ly:make-pitch 0 1 0))
-          (electricsnare         default       #f        ,(ly:make-pitch 0 1 0))
-          (lowfloortom   default       #f        ,(ly:make-pitch -1 3 0))
-          (closedhihat   cross         "stopped" ,(ly:make-pitch 0 3 0))
-          (hihat                 cross         #f        ,(ly:make-pitch 0 3 0))
-          (highfloortom          default       #f        ,(ly:make-pitch -1 5 0))
-          (pedalhihat    cross         #f        ,(ly:make-pitch -1 2 0))
-          (lowtom                default       #f        ,(ly:make-pitch -1 6 0))
-          (openhihat     cross         "open"    ,(ly:make-pitch 0 3 0))
-          (halfopenhihat         xcircle       #f        ,(ly:make-pitch 0 3 0))
-          (lowmidtom     default       #f        ,(ly:make-pitch 0 0 0))
-          (himidtom      default       #f        ,(ly:make-pitch 0 2 0))
-          (crashcymbala          xcircle       #f        ,(ly:make-pitch 0 5 0))
-          (crashcymbal   xcircle       #f        ,(ly:make-pitch 0 5 0))
-          (hightom       default       #f        ,(ly:make-pitch 0 4 0))
-          (ridecymbala   cross         #f        ,(ly:make-pitch 0 5 0))
-          (ridecymbal    cross         #f        ,(ly:make-pitch 0 5 0))
-          (chinesecymbal         mensural      #f        ,(ly:make-pitch 0 5 0))
-          (ridebell      default       #f        ,(ly:make-pitch 0 5 0))
-          (splashcymbal          diamond       #f        ,(ly:make-pitch 0 5 0))
-          (cowbell       triangle      #f        ,(ly:make-pitch 0 5 0))
-          (crashcymbalb          cross         #f        ,(ly:make-pitch 0 5 0))
-          (vibraslap     diamond       #f        ,(ly:make-pitch 0 4 0))
-          (ridecymbalb   cross         #f        ,(ly:make-pitch 0 5 0))
-          ))
+       (acousticbassdrum default       #f        ,(ly:make-pitch -1 4 0))
+       (bassdrum         default       #f        ,(ly:make-pitch -1 4 0))
+       (sidestick        cross         #f        ,(ly:make-pitch 0 1 0))
+       (acousticsnare    default       #f        ,(ly:make-pitch 0 1 0))
+       (snare            default       #f        ,(ly:make-pitch 0 1 0))
+       (handclap         triangle      #f        ,(ly:make-pitch 0 1 0))
+       (electricsnare    default       #f        ,(ly:make-pitch 0 1 0))
+       (lowfloortom      default       #f        ,(ly:make-pitch -1 3 0))
+       (closedhihat      cross         "stopped" ,(ly:make-pitch 0 3 0))
+       (hihat            cross         #f        ,(ly:make-pitch 0 3 0))
+       (highfloortom     default       #f        ,(ly:make-pitch -1 5 0))
+       (pedalhihat       cross         #f        ,(ly:make-pitch -1 2 0))
+       (lowtom           default       #f        ,(ly:make-pitch -1 6 0))
+       (openhihat        cross         "open"    ,(ly:make-pitch 0 3 0))
+       (halfopenhihat    xcircle       #f        ,(ly:make-pitch 0 3 0))
+       (lowmidtom        default       #f        ,(ly:make-pitch 0 0 0))
+       (himidtom         default       #f        ,(ly:make-pitch 0 2 0))
+       (crashcymbala     xcircle       #f        ,(ly:make-pitch 0 5 0))
+       (crashcymbal      xcircle       #f        ,(ly:make-pitch 0 5 0))
+       (hightom          default       #f        ,(ly:make-pitch 0 4 0))
+       (ridecymbala      cross         #f        ,(ly:make-pitch 0 5 0))
+       (ridecymbal       cross         #f        ,(ly:make-pitch 0 5 0))
+       (chinesecymbal    mensural      #f        ,(ly:make-pitch 0 5 0))
+       (ridebell         default       #f        ,(ly:make-pitch 0 5 0))
+       (splashcymbal     diamond       #f        ,(ly:make-pitch 0 5 0))
+       (cowbell          triangle      #f        ,(ly:make-pitch 0 5 0))
+       (crashcymbalb     cross         #f        ,(ly:make-pitch 0 5 0))
+       (vibraslap        diamond       #f        ,(ly:make-pitch 0 4 0))
+       (ridecymbalb      cross         #f        ,(ly:make-pitch 0 5 0))
+      ))
 
   (timbales
    . (
-      (losidestick       cross         #f        ,(ly:make-pitch -1 6 0))
-      (lotimbale         default       #f        ,(ly:make-pitch -1 6 0))
-      (cowbell   triangle      #f        ,(ly:make-pitch 0 2 0))
-      (hisidestick       cross         #f        ,(ly:make-pitch 0 1 0))
-      (hitimbale         default       #f        ,(ly:make-pitch 0 1 0))
+       (losidestick      cross         #f        ,(ly:make-pitch -1 6 0))
+       (lotimbale        default       #f        ,(ly:make-pitch -1 6 0))
+       (cowbell          triangle      #f        ,(ly:make-pitch 0 2 0))
+       (hisidestick      cross         #f        ,(ly:make-pitch 0 1 0))
+       (hitimbale        default       #f        ,(ly:make-pitch 0 1 0))
       ))
 
   (congas
    . (
-      (losidestick       cross         #f        ,(ly:make-pitch -1 6 0))
-      (loconga   default       #f        ,(ly:make-pitch -1 6 0))
-      (openloconga      default       "open"    ,(ly:make-pitch -1 6 0))
-      (muteloconga      default       "stopped" ,(ly:make-pitch -1 6 0))
-      (hisidestick       cross         #f        ,(ly:make-pitch 0 1 0))
-      (hiconga   default       #f        ,(ly:make-pitch 0 1 0))
-      (openhiconga      default       "open"    ,(ly:make-pitch 0 1 0))
-      (mutehiconga      default       "stopped" ,(ly:make-pitch 0 1 0))
+       (losidestick      cross         #f        ,(ly:make-pitch -1 6 0))
+       (loconga          default       #f        ,(ly:make-pitch -1 6 0))
+       (openloconga      default       "open"    ,(ly:make-pitch -1 6 0))
+       (muteloconga      default       "stopped" ,(ly:make-pitch -1 6 0))
+       (hisidestick      cross         #f        ,(ly:make-pitch 0 1 0))
+       (hiconga          default       #f        ,(ly:make-pitch 0 1 0))
+       (openhiconga      default       "open"    ,(ly:make-pitch 0 1 0))
+       (mutehiconga      default       "stopped" ,(ly:make-pitch 0 1 0))
       ))
 
   (bongos
     . (
-       (losidestick      cross         #f        ,(ly:make-pitch -1 6 0))
-       (lobongo          default       #f        ,(ly:make-pitch -1 6 0))
-       (openlobongo      default       "open"    ,(ly:make-pitch -1 6 0))
-       (mutelobongo      default       "stopped" ,(ly:make-pitch -1 6 0))
-       (hisidestick      cross         #f        ,(ly:make-pitch 0 1 0))
-       (hibongo          default       #f        ,(ly:make-pitch 0 1 0))
-       (openhibongo      default       "open"    ,(ly:make-pitch 0 1 0))
-       (mutehibongo      default       "stopped" ,(ly:make-pitch 0 1 0))
-       ))
+       (losidestick      cross         #f        ,(ly:make-pitch -1 6 0))
+       (lobongo          default       #f        ,(ly:make-pitch -1 6 0))
+       (openlobongo      default       "open"    ,(ly:make-pitch -1 6 0))
+       (mutelobongo      default       "stopped" ,(ly:make-pitch -1 6 0))
+       (hisidestick      cross         #f        ,(ly:make-pitch 0 1 0))
+       (hibongo          default       #f        ,(ly:make-pitch 0 1 0))
+       (openhibongo      default       "open"    ,(ly:make-pitch 0 1 0))
+       (mutehibongo      default       "stopped" ,(ly:make-pitch 0 1 0))
+      ))
 
 
   (percussion
    . (
-      (opentriangle      cross         "open"    ,(ly:make-pitch 0 0 0))
-      (mutetriangle      cross         "stopped" ,(ly:make-pitch 0 0 0))
-      (triangle          cross         #f        ,(ly:make-pitch 0 0 0))
-      (shortguiro        default       "staccato",(ly:make-pitch 0 0 0))
-      (longguiro         default       "tenuto"  ,(ly:make-pitch 0 0 0))
-      (guiro             default       #f        ,(ly:make-pitch 0 0 0))
-      (cowbell   triangle      #f        ,(ly:make-pitch 0 0 0))
-      (claves            default       #f        ,(ly:make-pitch 0 0 0))
-      (tambourine        default       #f        ,(ly:make-pitch 0 0 0))
-      (cabasa            cross         #f        ,(ly:make-pitch 0 0 0))
-      (maracas   default       #f        ,(ly:make-pitch 0 0 0))
-      (handclap          default       #f        ,(ly:make-pitch 0 0 0))
+       (opentriangle     cross         "open"    ,(ly:make-pitch 0 0 0))
+       (mutetriangle     cross         "stopped" ,(ly:make-pitch 0 0 0))
+       (triangle         cross         #f        ,(ly:make-pitch 0 0 0))
+       (shortguiro       default       "staccato",(ly:make-pitch 0 0 0))
+       (longguiro        default       "tenuto"  ,(ly:make-pitch 0 0 0))
+       (guiro            default       #f        ,(ly:make-pitch 0 0 0))
+       (cowbell          triangle      #f        ,(ly:make-pitch 0 0 0))
+       (claves           default       #f        ,(ly:make-pitch 0 0 0))
+       (tambourine       default       #f        ,(ly:make-pitch 0 0 0))
+       (cabasa           cross         #f        ,(ly:make-pitch 0 0 0))
+       (maracas          default       #f        ,(ly:make-pitch 0 0 0))
+       (handclap         default       #f        ,(ly:make-pitch 0 0 0))
       ))
   ))
 
@@ -255,7 +255,7 @@
              )
          (add-articulation-script req-ch script)
          (ly:set-mus-property! fe 'pitch pitch)
-         (set! req-ch (make-thread-context style seq))
+         (set! req-ch (make-thread-context (symbol->string style) seq))
         req-ch
        )
       )