From 15e26d5cf1cc3ffc0b28db94744bfc33b4932409 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Thu, 23 Feb 2017 11:59:26 +0100
Subject: Make all songs share the same score layouts.

---
 03-circus/03-circus.ly   | 32 +-------------------------------
 03-circus/music/click.ly |  1 +
 2 files changed, 2 insertions(+), 31 deletions(-)

(limited to '03-circus')

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 |
-- 
cgit v1.2.3