X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Fdrums.ly;h=6314dec18d4e4bfdc4b234529a00aced63bca038;hb=197f00037dc4c9e7bd17368f50d11dd8cde7a994;hp=4d770fdbf2c93671d0269938e0a45379bea08d1d;hpb=95e7eaeeffd28d3a32b3e32578e257197248456b;p=lilypond.git

diff --git a/input/regression/drums.ly b/input/regression/drums.ly
index 4d770fdbf2..6314dec18d 100644
--- a/input/regression/drums.ly
+++ b/input/regression/drums.ly
@@ -1,63 +1,36 @@
-% tests drum notation and midi-drums.
-% see ly/drumpitch.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 = "Test drum notation."
 }
 
-\include "drumpitch-init.ly"
-
-\version "1.5.68"
-
-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}
-
-\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 }
+\version "2.1.22"
+
+drh = \drums { cymc4.^"crash" hhc16^"h.h." hh \repeat "unfold" 5 {hhc8 hho hhc8 hh16 hh} hhc4 r4 r2 }
+drl = \drums {\repeat "unfold" 3 {bd4 sn8 bd bd4 << bd ss >> } bd8 tommh tommh bd toml toml bd tomfh16 tomfh }
+timb = \drums \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
+	    StaffSymbol \override #'line-count = #2
+	    BarLine \override #'bar-size = #2
+	} <<
+	    \set Staff.instrument = "timbales"
+	    \timb
+	>>
+	\new DrumStaff <<
+	    \set Staff.instrument = "drums"
+	    \new DrumVoice {\stemUp \drh }
+	    \new DrumVoice {\stemDown \drl }
+	>>
+    >>
+    \paper {}
+
+    %% broken:
+    \midi{ \tempo 4=120 }
 }
 
+