X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Fdrums.ly;h=517930db87695826a1c3349809d82cd4bdc61ff2;hb=97b34b56e2cf3f8465f651717b5e0f6ea10d7543;hp=95ba4501af79871db52d7e53c4212ffd2b2ad666;hpb=4c8187e65dd9708d7733692842acc696da121bf1;p=lilypond.git

diff --git a/input/regression/drums.ly b/input/regression/drums.ly
index 95ba4501af..517930db87 100644
--- a/input/regression/drums.ly
+++ b/input/regression/drums.ly
@@ -1,64 +1,48 @@
-% tests drum notation and midi-drums.
-% 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 = "In drum notation, there is a special clef symbol, drums are
+   placed to their own staff positions and have note heads according to the 
+   drum, an extra symbol may be attached to the drum, and the number of lines 
+   may be restricted."
 }
 
-\include "drumpitch-init.ly"
 
-\version "2.1.7"
+\version "2.14.0"
+
+drh = \drummode { cymc4.^"crash" hhc16^"h.h." hh \repeat "unfold" 5 {hhc8 hho hhc8 hh16 hh} hhc4 r4 r2 }
+drl = \drummode {\repeat "unfold" 3 {bd4 sn8 bd bd4 << bd ss >> } bd8 tommh tommh bd toml toml bd tomfh16 tomfh }
+timb = \drummode { \repeat "unfold" 2 {timh4 ssh timl8 ssh r timh r4 ssh8 timl r4 cb8 cb} }
+
+\score {
+  \repeat "volta" 2 {
+    <<
+      \new DrumStaff \with {
+	drumStyleTable = #timbales-style
+	\override StaffSymbol #'line-count = #2
+	\override BarLine #'bar-extent = #'(-1 . 1)
+      } <<
+	\set Staff.instrumentName = "timbales"
+	\timb
+      >>
+      \new DrumStaff <<
+	\set Staff.instrumentName = "drums"
+	\new DrumVoice {\stemUp \drh }
+	\new DrumVoice {\stemDown \drl }
+      >>
+    >>
+  }
+  \layout {}
 
-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 }
-timb = \notes \repeat "unfold" 2 {timh4 ssh timl8 ssh r timh r4 ssh8 timl r4 cb8 cb}
+  %% broken:
+  
+  \midi {
+    \context {
+      \Score
+      tempoWholesPerMinute = #(ly:make-moment 120 4)
+      }
+    }
 
-\score { \repeat "volta" 2
- <<
-  \context TwoLineStaff=timbst \notes <<
-    \property Staff.instrument="timbales"
-    \clef "percussion"
-    \apply #(drums->paper 'timbales) \timb
-  >>
-  \context Staff=drumst \notes <<
-    \property Staff.instrument="drums"
-    \clef "percussion"
-    \apply #(drums->paper 'drums) <<
-      \context Voice=voa {\stemUp \drh }
-      \context Voice=vob {\stemDown \drl }
-    >>
-  >>
- >>
- \paper {
-   \translator {
-      \StaffContext
-      \consists Instrument_name_engraver
-      Script \override #'padding = #0.5
-   }
-   \translator {
-      \StaffContext
-      \name TwoLineStaff
-      \alias Staff
-      \consists Instrument_name_engraver
-      StaffSymbol \override #'line-count = #2
-      BarLine \override #'bar-size = #2
-   }
-   \translator {
-      \ScoreContext
-      \accepts TwoLineStaff
-   }
- }
-}
 
-\score { \repeat "unfold" 2
-  \context Staff \notes <<
-    \property Staff.instrument="drums"
-    \timb
-    \drh
-    \drl
-  >>
-  \midi{ \tempo 4=120 }
 }