Make all songs share the same score layouts.

2 files changed, 2 insertions, 30 deletions

diff --git a/02-song2/02-song2.ly b/02-song2/02-song2.ly
index e8c2327..b563088 100644
--- a/02-song2/02-song2.ly
+++ b/02-song2/02-song2.ly
@@ -55,33 +55,4 @@ AllMusic = <<
   } { \tabChordRepeats \guitar }
 >>
 
-%% 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 = 90 }
-}
-
-\score {
-  \AllMusic
-  \layout {
-    \tempo 4 = 90
-    \context {
-      %% add the RemoveEmptyStaffContext that erases rest-only staves
-      \Staff \RemoveEmptyStaves
-    }
-    \context {
-      \Score
-      \numericTimeSignature
-      %% 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/02-song2/music/click.ly b/02-song2/music/click.ly
index eaccc18..ee30e48 100644
--- a/02-song2/music/click.ly
+++ b/02-song2/music/click.ly
@@ -1,5 +1,6 @@
 click = \drummode {
   \time 4/4
+  \tempo 4 = 90
   %% intro
   \repeat unfold 8 { hh4 hh hh hh |}