CMPD: mostly tenor scores reworked

6-8_marches/kilaloe/config.ily

@@ -14,4 +14,5 @@ line = { \repeat unfold 2 { \halfline } }
 
 %% Headers
 title = "Kilaloe"
-meter = "Regimental March Past of The Royal Irish Rangers"
+info = "Regimental March Past of The Royal Irish Rangers"
+meter = "March"

6-8_marches/kilaloe/notes.side.48th.ily

@@ -1,43 +0,0 @@
-% 6/8 Kilaloe
-% Side
-\version "2.18.2"
-composerSide = ""
-arrangerSide = "2018"
-sideglobal = {}
-
-% Music
-snareA = \drummode {
-	d4.:32(\< |
-	d4)\! g8 \flam d4 g8 |
-	d4.:32( d4.:32)(\<|
-	d4) \!g8 \flam d8 g d |
-	g4.:32( d4.:32)(\<|
-	d4)\! g8 \flam d4 d8:32( |
-	d8) g d \flam g8 d g |
-	\flam d4. d4.:32( |
-	d4.)
-}
-snareB = \drummode { \snareA }
-
-snareC = \drummode {
-	\flam d8\< g d |
-	\flam g4\! g8 \flam d4 g8 |
-	d4.:32( d8)\< g d |
-	\flam g4\! g8 \flam d4 g8 |
-	d4.:32( d8)\< g d |
-	\flam g4\! g8-> d8 g d-> |
-	g8 d g-> d g d-> |
-	\flam g4-> g8 d4.:32( |
-	d4.)
-
-	d4.:32( |
-	d4) g8 \flam d4 g8 |
-	d2.:32( |
-	d4.) \flam d8 g d |
-	g2.:32( |
-	d4) g8:32( g4) d8:32( |
-	d8) g d \flam d4. |
-	r4. r4 d8:32( |
-	d8) g d \flam d4 g8 |
-	d4.:32(
-}

6-8_marches/kilaloe/notes.side.ily

@@ -2,44 +2,42 @@
 % Side
 \version "2.18.2"
 composerSide = ""
-arrangerSide = ""
+arrangerSide = "2018"
 sideglobal = {}
-\include "../../standards/68_standards.side.ily"
 
 % Music
-endfour = \drummode {
-	\flam d4. d4.:32(
-	|
+snareA = \drummode {
+	d4.:32(\< |
+	d4)\! g8	\flam d4 g8 |
+	d4.:32(	d4.:32)(\<|
+	d4) \!g8	\flam d8 g d |
+	g4.:32(	d4.:32)(\<|
+	d4)\! g8	\flam d4 d8:32( |
+	d8) g d	\flam g8 d g |
+	\flam d4.	d4.:32( |
 	d4.)
 }
-pone = \drummode {\pempty}
-ptwo = \drummode {\pone}
-pthree = \drummode { \pempty }
-pthreeb = \drummode {s8 | s2. | s4. \flam d4. |}
-pfour = \drummode { \pthree }
-pfourb = \drummode {\pthreeb}
+snareB = \drummode { \snareA }
 
+snareC = \drummode {
+	\flam d8\< g d |
+	\flam g4\! g8	\flam d4 g8 |
+	d4.:32(	d8)\< g d |
+	\flam g4\! g8	\flam d4 g8 |
+	d4.:32(	d8)\< g d |
+	\flam g4\! g8->	d8 g d-> |
+	g8 d g->	d g d-> |
+	\flam g4-> g8	d4.:32( |
+	d4.)
 
-snareA = \drummode {
-	\pone \midone \pone \endfour
+	d4.:32( |
+	d4) g8	\flam d4 g8 |
+	d2.:32( |
+	d4.)	\flam d8 g d |
+	g2.:32( |
+	d4) d8:32(	g4) d8:32( |
+	g8) d g	\flam d4. |
+	r4.^\markup{Yell}	r4 d8:32( |
+	g8) d g	\flam d4 g8 |
+	d4.:32(
 }
-
-snareB = \drummode {
-	\ptwo \midone \ptwo \endfour
-}
-
-snareCA = \drummode {
-	\pthree \midone \pthree \endfour
-}
-snareCB = \drummode {
-	\pthree \midone \pthreeb | r2.^\markup{Yell} \endfour
-}
-
-snareDA = \drummode {
-	\pfour \midone \pfour \endfour
-}
-snareDB = \drummode {
-	\pfour \midone \pfourb | r2.^\markup{Yell} \endfour
-}
-
-

6-8_marches/kilaloe/side.48th.ly

@@ -1,54 +0,0 @@
-\version "2.18.2"
-
-\include "lilydrum.ly"
-
-\include "./config.ily"
-\include "./notes.side.48th.ily"
-
-part = {\partial 4. \grace{ s4 } s4. }
-\score {
-    \new PipeBandDrumStaff {
-        \global
-		\sideglobal
-		<<
-			\new NullVoice = "format" {
-				\repeat volta 2 {
-					\part
-					\line
-				}
-				\break
-				\repeat volta 2 {
-					\part
-					\line
-				}
-				\break
-
-				\repeat volta 2 {
-					\part
-					\line
-					\break
-					\line
-					\measure
-				}
-
-			}%Format
-
-			\new DrumVoice = "side" {
-				\snareA s4.
-
-				\snareB s4.
-
-				\snareC
-
-			}
-		>>
-	}
-	\header {
-		title = \title
-		band = "48th HIGHRS"
-		meter = \meter
-		instrument = \instrumentSide
-		composer = \composerSide
-		arranger = \arrangerSide
-	}
-}

6-8_marches/kilaloe/side.ly

@@ -5,6 +5,7 @@
 \include "./config.ily"
 \include "./notes.side.ily"
 
+part = {\partial 4. \grace{ s4 } s4. }
 \score {
     \new PipeBandDrumStaff {
         \global
@@ -21,40 +22,31 @@
 					\line
 				}
 				\break
-				
-				\part
-				\line
-				\break
-				\line
-				\measure
-				
-				\break
-				\part
-				\line
-				\break
-				\line
-				\measure
-				
+
+				\repeat volta 2 {
+					\part
+					\line
+					\break
+					\line
+					\measure
+				}
 
 			}%Format
-			
+
 			\new DrumVoice = "side" {
-				\snareA r4 s8
+				\snareA s4.
 
-				\snareB r4 s8
+				\snareB s4.
 
-				\snareCA r4
-				\snareCB r4 s8
+				\snareC
 
-				\snareDA r4
-				\snareDB r4 s8
-			
 			}
 		>>
 	}
 	\header {
 		title = \title
 		meter = \meter
+		info = \info
 		instrument = \instrumentSide
 		composer = \composerSide
 		arranger = \arrangerSide