song2: Move layout to score file.

[music/pretentious.git] / 02-song2 / 02-song2.ly

diff --git a/02-song2/02-song2.ly b/02-song2/02-song2.ly
index 92bb2347f1a593f75c6350b90afb8f6bc1d817e2..29c7005c8ca5d426189b750c12d72ddbbbd592c3 100644 (file)
--- a/02-song2/02-song2.ly
+++ b/02-song2/02-song2.ly
@@ -3,8 +3,7 @@
 \header {
   title = "Song 2"
   composer = "The very pretentious elephlies"
-  arranger = "Ricardo Wurmus"
-  copyright = "2002--2015 Ricardo Wurmus"
+  copyright = \markup { \char ##x00A9 "2002—2016 Ricardo Wurmus" }
 }
 
 \include "parts/bass.ly"
@@ -12,17 +11,27 @@
 \include "parts/stick.ly"
 \include "parts/click.ly"
 
+\layout {
+  ragged-last = ##t
+  indent = 2\cm
+  short-indent = 1.5\cm
+}
+
 AllMusic = <<
   \new Staff = "keyboard"    { \keyboard }
   \new Staff = "bass"        { \bass }
   \new Staff = "grand stick" { \stick }
-  \new DrumStaff { \click }
 >>
 
 %% Two scores are needed: one with unfolded repeats for MIDI and the
 %% other with regular repeats for notation.
 \score {
-  \unfoldRepeats { \AllMusic }
+  \unfoldRepeats {
+    <<
+      \AllMusic
+      \new DrumStaff { \click }
+    >>
+  }
   \midi { \tempo 4 = 90 }
 }