Merge branch 'stable'

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

diff --git a/input/regression/drums.ly b/input/regression/drums.ly
index d49ddd4ac7f246be2f3571c6d2078c406e1344bb..ddc05e4d5ae0e49834c7ca77fabd079e49119c96 100644 (file)
--- a/input/regression/drums.ly
+++ b/input/regression/drums.ly
@@ -7,7 +7,7 @@
 }
 
 
-\version "2.7.13"
+\version "2.12.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 }
@@ -21,11 +21,11 @@ timb = \drummode { \repeat "unfold" 2 {timh4 ssh timl8 ssh r timh r4 ssh8 timl r
        \override StaffSymbol #'line-count = #2
        \override BarLine #'bar-size = #2
       } <<
-       \set Staff.instrument = "timbales"
+       \set Staff.instrumentName = "timbales"
        \timb
       >>
       \new DrumStaff <<
-       \set Staff.instrument = "drums"
+       \set Staff.instrumentName = "drums"
        \new DrumVoice {\stemUp \drh }
        \new DrumVoice {\stemDown \drl }
       >>
@@ -34,7 +34,15 @@ timb = \drummode { \repeat "unfold" 2 {timh4 ssh timl8 ssh r timh r4 ssh8 timl r
   \layout {}
 
   %% broken:
-  \midi{ \tempo 4=120 }
+  
+  \midi {
+    \context {
+      \Score
+      tempoWholesPerMinute = #(ly:make-moment 120 4)
+      }
+    }
+
+
 }