summaryrefslogtreecommitdiff
path: root/03-circus
diff options
context:
space:
mode:
authorRicardo Wurmus <rekado@elephly.net>2017-02-23 11:59:26 +0100
committerRicardo Wurmus <rekado@elephly.net>2017-02-23 11:59:26 +0100
commit15e26d5cf1cc3ffc0b28db94744bfc33b4932409 (patch)
tree1a3e4e62f664c744d392bac5e676dc5d92dd096f /03-circus
parent42da410946a5f6338922e07ba85001fa51660d56 (diff)
Make all songs share the same score layouts.
Diffstat (limited to '03-circus')
-rw-r--r--03-circus/03-circus.ly32
-rw-r--r--03-circus/music/click.ly1
2 files changed, 2 insertions, 31 deletions
diff --git a/03-circus/03-circus.ly b/03-circus/03-circus.ly
index 18132ce..c28f1b4 100644
--- a/03-circus/03-circus.ly
+++ b/03-circus/03-circus.ly
@@ -50,34 +50,4 @@ AllMusic = <<
} { \stick }
>>
-%% Two scores are needed: one with unfolded repeats for MIDI and the
-%% other with regular repeats for notation.
-\score {
- \unfoldRepeats {
- <<
- \AllMusic
- \new DrumStaff { \click }
- >>
- }
- \midi { \tempo 4 = 120 }
-}
-
-\score {
- \AllMusic
- \layout {
- \tempo 4 = 120
- \context {
- %% add the RemoveEmptyStaffContext that erases rest-only staves
- \Staff \RemoveEmptyStaves
- }
- \context {
- \Score
- \numericTimeSignature
- markFormatter = #format-mark-box-alphabet
- %% Remove all-rest staves also in the first system
- \override VerticalAxisGroup.remove-first = ##t
- %% If only one non-empty staff in a system exists, still print the starting bar
- \override SystemStartBar.collapse-height = #1
- }
- }
-}
+\include "../layouts.ly"
diff --git a/03-circus/music/click.ly b/03-circus/music/click.ly
index df88100..6e7c3d8 100644
--- a/03-circus/music/click.ly
+++ b/03-circus/music/click.ly
@@ -1,6 +1,7 @@
click = \drummode {
%% intro
\time 2/4
+ \tempo 4 = 120
hh4 hh | hh hh |
\repeat volta 2 {
hh4 hh | hh hh |