Changed setup of all scores, now possible to extend easily

strathspeys/molly_connell/bass.ly

@@ -12,8 +12,9 @@
 		>>
 	}
 	\header {
-		title = "Molly Connell"
-		meter = "Strathspey"
-		instrument = "Bass"
+		title = \title
+		meter = \meter
+		instrument = \instrumentBass
+		composer = \composerBass
 	}
 }

strathspeys/molly_connell/config.ily

@@ -2,7 +2,12 @@
 %% Globals
 global = {
 	\time 4/4
+	\tempo 4 = 120
 	}
 %% Format
-part = {\partial 8 s8 }
+part = { \partial 8 s8 }
 line = { \repeat unfold 4 { s1 } }
+
+%% Headers
+title = "Molly Connell"
+meter = "Strathspey"

strathspeys/molly_connell/drums.ly

@@ -3,13 +3,13 @@
 \include "config.ily"
 \include "notes.bass.ily"
 \include "notes.tenor.ily"
-\include "notes.side.ily"
+\include "notes.side.v1.1.ily"
 
 \score {
 	\new StaffGroup <<
 		\new PipeBandDrumStaff = "side" {
-			\set PipeBandDrumStaff.instrumentName = #"Side"
-			\set PipeBandDrumStaff.shortInstrumentName = #"S.D."
+			\set PipeBandDrumStaff.instrumentName = \markup{\instrumentSide}
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide}
 
 			\global
 			<<
@@ -35,8 +35,8 @@
 			>>
 		}
 		\new PipeBandDrumStaff = "bass" {
-			\set PipeBandDrumStaff.instrumentName = #"Bass "
-			\set PipeBandDrumStaff.shortInstrumentName = #"B.D. "
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}
 
 			\bassAA
 			\bassAB
@@ -47,8 +47,8 @@
 			\bassAB
 		}
 		\new PipeBandDrumStaff = "tenor" {
-			\set PipeBandDrumStaff.instrumentName = #"Tenor"
-			\set PipeBandDrumStaff.shortInstrumentName = #"T.D. "
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
 
 			\tenorA
 			\tenorA
@@ -60,7 +60,19 @@
 		}
 	>>
 	\header {
-		title = "Molly Connell"
-		meter = "Slow Air"
+		title = \title
+		meter = \meter
+		composer = \markup {
+			\column \right-align {
+				$(if (not (string=? "" composerSide))  #{ \markup {\line { \composerSide  ":" }} #} )
+				$(if (not (string=? "" composerTenor)) #{ \markup {\line { \composerTenor  ":" }} #} )
+				$(if (not (string=? "" composerBass))  #{ \markup {\line { \composerBass  ":" }} #} )
+			}
+			\column \right-align {
+				$(if (not (string=? "" composerSide))  #{ \markup {\line { \instrumentSide }}#} )
+				$(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} )
+				$(if (not (string=? "" composerBass))  #{ \markup {\line { \instrumentBass }}#} )
+			}
+		}
 	}
 }

strathspeys/molly_connell/notes.bass.ily

@@ -1,6 +1,7 @@
 % 4/4 Molly Connell
 % Bass
 \version "2.18.2"
+composerBass  = "W.H. de Boone / E.T. de Boone, 2014"
 bassAA = \drummode {
 	d4-> g4-> d4 g4 |
 	d4 g4 d4 g4 |

strathspeys/molly_connell/notes.side.ily

@@ -1,6 +1,7 @@
 % 4/4 Molly Connell
 % Side
 \version "2.18.2"
+composerSide  = "v1.0, 21-2-2014"
 snareA = \drummode {
 	\flam d4		\flam g8.[ d16:64(]		d8.[) \drag d16]		d8.[ g16] |
 	d8.:64[( g16])		\triplet  { d16[ g d g d8]}		\triplet  { g8[ d8 \flam g8] }		\flam d8.[ g16] |

strathspeys/molly_connell/notes.side.v1.1.ily

@@ -0,0 +1,28 @@
+% 4/4 Molly Connell
+% Side
+\version "2.18.2"
+composerSide  = "v1.1, 2015"
+snareA = \drummode {
+	\flamddr d4 	\flam g8.[\fr d16:64(]		d8.[) \dragddr d16]		d8.[ \fr g16] |
+	d8.:64[(-> g16])		\triplet  { d16[ g d g d8]}		\triplet  { g8[ d8 \flam g8] }		\flam d8.[ g16] \dr |
+
+	d16:64[( d8.]) \fr		g8.[ \drag d16]		\triplet  { d16[ g d g d8] }		g8.[ g16] \dr|
+	\flamd \triplet  { d8 g d }		\flam g8.[ \flam g16]		\triplet  { d16 g d g d8 } g8 \fr
+}
+
+snareBA = \drummode {
+	\partial 8 g8 \dr |
+	d4:32(		d8.[) \drag d16] \fr		\triplet { d16[ g d g d8] }		g8.[ g16] \dr |
+	\drag d16[ d8.]		\flam d8.[ \flam g16] \fr		\triplet  { d16[ g d g d8] }		\triplet  { g8[ d g] \dr } |
+
+	\flamd \triplet  { d8[ \fr g16 g16 d8] }		g8.[ g16]\dr		\flamd \triplet  { d8[->\fr g16 g16 d8] }		g8.[ g16] \dr |
+	\flamd \triplet  { d8[ g d] }		\flam g8.[ \flam g16]		\triplet  { d16[ g d g d8] } g8 s8 \fr |
+}
+snareBB = \drummode {
+	\partial 8 g8 |
+	d4:32(		d8.[) \drag d16]		\triplet  { d16[ g d g d8] }		g8.[ g16] |
+	\drag d16[ d8.]		\flam d8.[ \flam g16]		\triplet  { d16[ g d g d8] }		\triplet  { g8[\> d g] } |
+
+	\flam d4		\flam g8.[\! d16:64](		d8.[) \drag d16]		d8.[ g16] |
+	\flamd \triplet  { d8[ g d] }		\flam g8.[ \flam g16]		\triplet  { d16[ g d g d8] } g8 s8 |
+}

strathspeys/molly_connell/notes.tenor.ily

@@ -1,6 +1,7 @@
 % 4/4 Molly Connell
 % Tenor
 \version "2.18.2"
+composerTenor = "S.J. de Boone / M. Jansen / N. Kuijkhoven / E.T. de Boone, 2014"
 tenorA = \drummode {
 	d4 g4 d8. g16 d4
 	d4 g4 r8. g16 d4 |

strathspeys/molly_connell/side.ly

@@ -1,19 +1,20 @@
 \version "2.18.2"
 
 \include "config.ily"
-\include "notes.side.ily"
+\include "notes.side.v1.1.ily"
 
 \score {
     \new PipeBandDrumStaff {
         \global
         <<
-			{\repeat volta 2 { \line } \break \part \line \break \part \line \bar "|." }
+			{\repeat volta 2 { \line } \break \part \line \break \bar "||" \part \line \bar "|." }
 			{\snareA s8 \snareBA \snareBB }
 		>>
 	}
 	\header {
-		title = "Molly Connell"
-		meter = "Strathspey"
-		instrument = "Side"
+		title = \title
+		meter = \meter
+		instrument = \instrumentSide
+		composer = \composerSide
 	}
 }

strathspeys/molly_connell/tenor.ly

@@ -7,13 +7,14 @@
     \new PipeBandDrumStaff {
 		\global
         <<
-			{\repeat volta 2 {\line} \break \line \break \line \bar "|." }
+			{\repeat volta 2 {\line} \break \line \bar "||" \break \line \bar "|." }
 			{\tenorA \tenorBA \tenorBB }
 		>>
 	}
 	\header {
-		title = "Molly Connell"
-		meter = "Strathspey"
-		instrument = "Tenor"
+		title = \title
+		meter = \meter
+		instrument = \instrumentTenor
+		composer = \composerTenor
 	}
 }