drum fixes

diff --git a/ChangeLog b/ChangeLog
index a6e05856cd972c01245165b33cc80cc57e5eae15..d4917aad5761dddf3ecfda29bdb8006a473002be 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-12-10  Rune Zedeler  <rz@daimi.au.dk>
+
+       * scm/drums.scm : use 1.7.x names.
+
+       * input/regression/drums.ly : Don't use << chords >>
+
 2002-12-10  Heikki Junes <hjunes@cc.hut.fi>
 
        * lilypond-mode.el: tidy, add TODO

diff --git a/autogen.sh b/autogen.sh
index 01e60397aa003d08a44b2221e5b2a00b95077658..36d6b4939ff9eb10f10577314e3449466910a05a 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -3,11 +3,6 @@
 
 srcdir=`dirname $0`
 
-if [ stepmake/aclocal.m4 -nt aclocal.m4 ]; then
-    echo "stepmake/aclocal.m4 is newer. Copying file." 
-    cp -f stepmake/aclocal.m4 aclocal.m4
-fi
-
 if [ stepmake/autogen.sh -nt autogen.sh ]; then
     echo "stepmake/autogen.sh is newer. Copying file." 
     cp -f stepmake/autogen.sh autogen.sh

diff --git a/input/regression/drums.ly b/input/regression/drums.ly
index 1625957e98ce715e4cdd02a4db3fce18a5001190..d1bced2b65d5eddfb999dd673b60e1d45772b31f 100644 (file)
--- a/input/regression/drums.ly
+++ b/input/regression/drums.ly
@@ -1,17 +1,17 @@
 % tests drum notation and midi-drums.
-% see ly/drumpitch.ly for list of instruments and paper-kits.
+% see ly/drumpitch-init.ly for list of instruments and paper-kits.
 %     scm/midi.scm for list of midi-drumkits.
 
 \header {
-texidoc = "Drum notation, although kludgy, should work. "
+texidoc = "Drum notation, although kludgy, should work. Though, << chord >> does not work because the chords need to be split into threads."
 }
 
 \include "drumpitch-init.ly"
 
-\version "1.7.6"
+\version "1.7.9"
 
 drh = \notes { cymc4.^"crash" hhc16^"h.h." hh \repeat "unfold" 5 {hhc8 hho hhc8 hh16 hh} hhc4 r4 r2 }
-drl = \notes {\repeat "unfold" 3 {bd4 sn8 bd bd4 <<bd ss>>} bd8 tommh tommh bd toml toml bd tomfh16 tomfh }
+drl = \notes {\repeat "unfold" 3 {bd4 sn8 bd bd4 < bd ss > } bd8 tommh tommh bd toml toml bd tomfh16 tomfh }
 timb = \notes \repeat "unfold" 2 {timh4 ssh timl8 ssh r timh r4 ssh8 timl r4 cb8 cb}
 
 \score { \repeat "volta" 2

diff --git a/scm/drums.scm b/scm/drums.scm
index 8c1a7efc8b2c6f514a0c792907e1ebc4a00d525b..9162e6821fe9457b1f43e2f5687c9db23cce033b 100644 (file)
--- a/scm/drums.scm
+++ b/scm/drums.scm
@@ -1,4 +1,4 @@
-;;;; drum-"hack". See input/tricks/drums.ly and ly/drumpitch.ly
+;;;; drum-"hack". See input/regression/drums.ly and ly/drumpitch-init.ly
 ;;;; 2001/03/25 Rune Zedeler <rune@zedeler.dk>
 
 ;;;; changed eval to primitive-eval for guile 1.4/1.4.1 compatibility --jcn
@@ -172,7 +172,7 @@
 ;; adds the articulation script x to m if x is not #f.
 (define (add-articulation-script m x)
   (if x
-   (if (and x (equal? (ly:music-name m) "Event_chord"))
+   (if (and x (equal? (ly:get-mus-property m 'name) 'EventChord))
      (ly:set-mus-property! m 'elements
        (cons (make-articulation-script x) (ly:get-mus-property m 'elements))
      )
@@ -254,7 +254,7 @@
      (cond ((eq? pitches '())
              (begin
               (ly:warn (string-append "Kit `" (symbol->string kit) "' doesn't contain drum `" n
-                                      "'\nSee lily/drumpitch.ly for supported drums."))
+                                      "'\nSee ly/drumpitch-init.ly for supported drums."))
               (cdar (primitive-eval kit))
             ))
            ((eq? n (caar pitches))  (cdar pitches) )
@@ -267,7 +267,7 @@
 ;; converts a midi-pitched (ly/drumpitch.ly) file to paper output.
 (define-public ((drums->paper kit) music)
   (begin
-   (if (equal? (ly:music-name music) "Event_chord")
+   (if (equal? (ly:get-mus-property music 'name) 'EventChord)
     (set! music (make-drum-head kit music))
     (let* ((es (ly:get-mus-property music 'elements))
            (e (ly:get-mus-property music 'element))