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 {
+snareA = \drummode {
-	\flam d4. d4.:32(
+	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}
+snareB = \drummode { \snareA }
-ptwo = \drummode {\pone}
-pthree = \drummode { \pempty }
-pthreeb = \drummode {s8 | s2. | s4. \flam d4. |}
-pfour = \drummode { \pthree }
-pfourb = \drummode {\pthreeb}
 
+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 {
+	d4.:32( |
-	\pone \midone \pone \endfour
+	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
@@ -22,32 +23,22 @@
 				}
 				\break
 
-				\part
+				\repeat volta 2 {
-				\line
+					\part
-				\break
+					\line
-				\line
+					\break
-				\measure
+					\line
-				
+					\measure
-				\break
+				}
-				\part
-				\line
-				\break
-				\line
-				\measure
-				
 
 			}%Format
 
 			\new DrumVoice = "side" {
-				\snareA r4 s8
+				\snareA s4.
 
-				\snareB r4 s8
+				\snareB s4.
 
-				\snareCA r4
+				\snareC
-				\snareCB r4 s8
-
-				\snareDA r4
-				\snareDB r4 s8
 
 			}
 		>>
@@ -55,6 +46,7 @@
 	\header {
 		title = \title
 		meter = \meter
+		info = \info
 		instrument = \instrumentSide
 		composer = \composerSide
 		arranger = \arrangerSide

airs/bells_of_dunblane/notes.side.ily

@@ -34,7 +34,8 @@ snarePIV = \drummode {
 				|
 }
 snarePV = \drummode {
-				\flamg \backstick g1
+	\mark \markup "Fine"
+	\flamg \backstick g1
 }
 
 snareA = \drummode {

airs/highland_cathedral/notes.tenor.cmpd.ily

@@ -6,11 +6,11 @@ arrangerTenor = ""
 tenorglobal = {}
 % Music
 stfe = \drummode {
-	\stf <d g >2
+	\stf d2
 }
 
 tenorAA = \drummode {
-  \flourish { g8[ g] d8[ d] } \stfe |
+  \flourish { d8[ d] g8[ g] } \stfe |
 }
 tenorA = \drummode {
 	\repeat percent 8 {
@@ -24,8 +24,8 @@ tenorB = \drummode {
 		d4\< g\! d4 r4 |
 	}
 	d2 g2 |
-	g8 d g8 d g8 d g8 d |
+	d8 g d8 g d8 g d8 g |
-	g8 d g8 d g8 d g8 d |
+	d8 g d8 g d8 g d8 g |
 }
 
 tenorC = \drummode {

airs/highland_cathedral/tenor.cmpd.ly

@@ -21,10 +21,13 @@
 				\break
 
 				\line
+				\break
 				\bar "||"
 				\line
 				\measure
 				\bar "|."
+				\break
+				\line
 			}%Format
 			\new DrumVoice = "tenor" {
 					\repeat percent 8 {

airs/morag_of_dunvegan/notes.side.ily

@@ -3,6 +3,7 @@
 \version "2.18.2"
 sideglobal={}
 composerSide="2018, v1.1"
+arrangerSide = "E.T. de Boone"
 snareA = \drummode {
 	\flam d8 d8:32( g8)		\flam d8 r8 \flam d8 |
 	g8 d8:32( g8)		\flam d8 \tuplet 3/2 { d16 g d } g8 |

airs/rose_of_kelvingrove/notes.tenor.ily

@@ -1,53 +1,53 @@
 % 4/4 Rose of Kelvingrove
 % Tenor
 \version "2.18.2"
-composerTenor = ""
+composerTenor = "v0.5, 2019"
 arrangerTenor = ""
 tenorglobal = {}
 % Music
 
 stfe = \drummode {
-  \stfd2 
+  \stf d2 
 }
-xg = \drummode {
+pianomotion = \drummode {
-  g8^\markup{ "x" }
+  d8\startGroup^\markup{"piano"} g d  g8\stopGroup
 }
 
 tenorA = \drummode {
 	\repeat percent 3 {
-		g4 d4 \stfe |
+		d4 g4 \stf d2 |
 	}
-	g4 d4 d8 g d \xg |
+	d4 g4 \pianomotion|
 
 	\repeat percent 2 {
-		g4 d4 \stfe |
+		d4 g4 \stf d2 |
 	}
-	g4 d4 d8 g d \xg |
+	d4 g4 \pianomotion|
-	g4 d4 \stfe |
+	d4 g4 \stf d2 |
 }
 tenorB = \drummode {
 	\repeat percent 2 {
-		g4 d4 \stfe |
+		d4 g4 \stf d2 |
-		g4 d4 d8 g d \xg |
+		d4 g4 \pianomotion|
 	}
 
 	\repeat percent 2 {
-		g4 d4 \stfe |
+		d4 g4 \stf d2 |
 	}
-	g4 d4 d8 g d \xg |
+	d4 g4 \pianomotion|
-	g4 d4 \stfe |
+	d4 g4 \stf d2 |
 }
 tenorC = \drummode {
 	\tenorA
 }
 tenorD = \drummode {
 	\repeat percent 2 {
-		g4 d4 \stfe |
+		d4 g4 \stf d2 |
-		g4 d4 d8 g d \xg |
+		d4 g4 \pianomotion|
 	}
 
 	\repeat percent 3 {
-		g4 d4 \stfe |
+		d4 g4 \stf d2 |
 	}
-	\stfe \stfe \stfe
+	\stf d2 \stf d2 \stf d2
 }

standards/standards.bass.ily

@@ -15,7 +15,15 @@ bassFourfoursOne = \drummode {
 }
 
 bassSixeightsOne = \drummode {
-	\repeat unfold 8 { d4. g4. }
+  d4.	g4. |
+  d4.	r4. |
+  d4.	g4 g8 |
+  d4 d8	g4. |
+
+  d4.	g4. |
+  d4.	r4. |
+  d4.	g4. |
+  d4.	d4. |
 }
 
 bassNineeightsOne = \drummode {

standards/standards.mid.cmpd.ly

@@ -18,6 +18,7 @@
 % ----------------------
 % Standard 2/4
 % ----------------------
+#(set-global-staff-size 18)
 \score {
 	\new StaffGroup <<
 		\time 2/4
@@ -25,21 +26,21 @@
 			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
 			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
 
-			\repeat volta 2 {
+			\tenorTwoFoursPI
-				\tenorTwoFoursFII
+			\bar "||"
-			}
 			\break
-			\repeat volta 2 {
+			\tenorTwoFoursFII
-				\tenorTwoFoursFIII
+			\bar "||"
-			}
 			\break
-			\repeat volta 2 {
+			\tenorTwoFoursFIII
-				\tenorTwoFoursFIV
+			\bar "||"
-			}
 			\break
-			\repeat volta 2 {
+			\tenorTwoFoursFIV
-				\tenorTwoFoursFV
+			\bar "||"
-			}
+			\break
+			\tenorTwoFoursFV
+			\bar "||"
+
 		}
 		\new PipeBandDrumStaff = "bass" {
 			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
@@ -53,7 +54,6 @@
 		band = "" % Make Sure the band is not displayed
 	}
 }
-
 % ----------------------
 % Standard 3/4
 % ----------------------
@@ -76,7 +76,6 @@
 			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}
 
 			\bassThreefoursOne
-			\bassThreefoursOne
 		}
 	>>
 	\header {
@@ -108,7 +107,6 @@
 			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}
 
 			\bassSixeightsOne
-			\bassSixeightsOne
 		}
 	>>
 	\header {
@@ -139,7 +137,6 @@
 			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}
 			
 			\bassNineeightsOne
-			\bassNineeightsOne
 		}
 	>>
 	\header {

standards/standards.tenor.cmpd.ly

@@ -12,21 +12,20 @@
 		\time 2/4
 
 		\drummode {
-			\repeat volta 2 {
+			\tenorTwoFoursPI
-				\tenorTwoFoursFII
+			\bar "||"
-			}
 			\break
-			\repeat volta 2 {
+			\tenorTwoFoursFII
-				\tenorTwoFoursFIII
+			\bar "||"
-			}
 			\break
-			\repeat volta 2 {
+			\tenorTwoFoursFIII
-				\tenorTwoFoursFIV
+			\bar "||"
-			}
 			\break
-			\repeat volta 2 {
+			\tenorTwoFoursFIV
-				\tenorTwoFoursFV
+			\bar "||"
-			}
+			\break
+			\tenorTwoFoursFV
+			\bar "||"
 		}
 	}
 

standards/standards.tenor.ily

@@ -29,8 +29,15 @@ tenorTwofoursOneB = \drummode {
 	d4\splitTheFeather r |
 
 }
+tenorTwoFoursPI = \drummode {
+	\repeat unfold 2 {
+		d4^\markup{"Swing"} \flourish { d4 g d } |
+	}
+	d4^\markup{"Swing"} \flourish { d4 g d } |
+	d4^\markup{"Swing"} d4 g4 \stf d4 |
+}
 
-tenorTwoFoursII = \drummode {
+tenorTwoFoursPII = \drummode {
 	d8-> g	d8 g |
 	d8-> g	d8 g |
 	d8^\markup{"M"} g^\markup{"L"}	\triplet { d8 g^\markup{"H"} d } g^\markup{"H"} |