*** empty log message ***

[lilypond.git] / input / regression / drums.ly

diff --git a/input/regression/drums.ly b/input/regression/drums.ly
index 86ca73505bf28d97490e5f714760e6a8a47f7243..a9f459c6da858a8418dce48310a2636a181d83c2 100644 (file)
--- a/input/regression/drums.ly
+++ b/input/regression/drums.ly
@@ -1,64 +1,39 @@
-% 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. Though, << chord >> does not work because the chords need to be split into threads."
+   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 "1.9.0"
-
-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.2.0"
+
+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
+           \override StaffSymbol #'line-count = #2
+           \override BarLine #'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 }
 }