Make all songs share the same score layouts.
[music/pretentious.git] / 02-song2 / 02-song2.ly
index f68c286d4e3484cb6a293575cb343b1d66e27468..b5630885f06792b5f8a00427afdfb61957355436 100644 (file)
@@ -7,11 +7,11 @@
 }
 
 \include "../settings.ly"
-\include "parts/bass.ly"
-\include "parts/keys.ly"
-\include "parts/stick.ly"
-\include "parts/guitar.ly"
-\include "parts/click.ly"
+\include "music/bass.ly"
+\include "music/keys.ly"
+\include "music/stick.ly"
+\include "music/guitar.ly"
+\include "music/click.ly"
 
 \layout {
   ragged-last = ##t
 }
 
 AllMusic = <<
-  \new Staff = "keyboard"
+  \new PianoStaff = "keyboard"
   \with {
     instrumentName = #"Synthesizer"
     shortInstrumentName = #"Synth"
     pedalSustainStyle = #'bracket
-  } { \keyboard }
+  } {
+    <<
+      \new Staff {
+        \clef treble
+        \keyboard
+      }
+    >>
+  }
   \new StaffGroup = "bass"
   \with {
     instrumentName = #"Bass"
     shortInstrumentName = #"Bass"
   } { \bass }
-  \new PianoStaff = "grand stick" \with {
+  \new PianoStaff = "grand stick"
+  \with {
     instrumentName = #"Grand Stick"
     shortInstrumentName = #"Stick"
     midiInstrument = #"clav"
@@ -47,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"