Merge branch 'stable'

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

diff --git a/input/regression/drums.ly b/input/regression/drums.ly
index 6314dec18d4e4bfdc4b234529a00aced63bca038..ddc05e4d5ae0e49834c7ca77fabd079e49119c96 100644 (file)
--- a/input/regression/drums.ly
+++ b/input/regression/drums.ly
@@ -1,36 +1,48 @@
 
 \header {
-   texidoc = "Test drum notation."
+   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."
 }
 
 
-\version "2.1.22"
+\version "2.12.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}
+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
+  \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 }
-       >>
+      \new DrumStaff \with {
+       drumStyleTable = #timbales-style
+       \override StaffSymbol #'line-count = #2
+       \override BarLine #'bar-size = #2
+      } <<
+       \set Staff.instrumentName = "timbales"
+       \timb
+      >>
+      \new DrumStaff <<
+       \set Staff.instrumentName = "drums"
+       \new DrumVoice {\stemUp \drh }
+       \new DrumVoice {\stemDown \drl }
+      >>
     >>
-    \paper {}
+  }
+  \layout {}
+
+  %% broken:
+  
+  \midi {
+    \context {
+      \Score
+      tempoWholesPerMinute = #(ly:make-moment 120 4)
+      }
+    }
+
 
-    %% broken:
-    \midi{ \tempo 4=120 }
 }