Split out Standards for Bass and Side

standards/standards.bass.ily

@@ -0,0 +1,19 @@
+\version "2.18.2"
+
+\include "lilydrum.ly"
+
+bassTwofoursOne = \drummode {
+	\repeat unfold 8 { d4-> g4 }
+}
+
+bassThreefoursOne = \drummode {
+	\repeat unfold 8 { d4-> g4 g4 }
+}
+
+bassFourfoursOne = \drummode {
+	\repeat unfold 8 { d4\v g4 d4-> g4}
+}
+
+bassSixeightsOne = \drummode {
+	\repeat unfold 8 { d4. g4. }
+}

standards/standards.bass.ly

@@ -1,6 +1,7 @@
 \version "2.18.2"
 
-\include "lilydrum.ly"
+\include "./standards.bass.ily"
+
 \header {
 		title = "Standards"
 		instrument = "Bass"
@@ -11,7 +12,7 @@
 		\time 2/4
 		\drummode {
 			\repeat volta 2 {
-				\repeat unfold 8 { d4-> g4 }
+				\bassTwofoursOne
 			}
 		}
 	}
@@ -19,14 +20,14 @@
 		title = "2/4 Standard"
 	}
 }
-\break
+
 \score {
 	\new PipeBandDrumStaff {
 		\time 3/4
 
 		\drummode {
 			\repeat volta 3 {
-				\repeat unfold 8 { d4-> g4 g4 }
+				\bassThreefoursOne
 			}
 		}
 	}
@@ -34,14 +35,14 @@
 		title = "3/4 Standard"
 	}
 }
-\break
+
 \score {
 	\new PipeBandDrumStaff {
 		\time 4/4
 
 		\drummode {
 			\repeat volta 2 {
-				\repeat unfold 8 { d4\v g4 d4-> g4}
+				\bassFourfoursOne
 			}
 		}
 	}
@@ -49,14 +50,14 @@
 		title = "4/4 Standard"
 	}
 }
-\break
+
 \score {
 	\new PipeBandDrumStaff {
 		\time 6/8
 
 		\drummode {
 			\repeat volta 2 {
-				\repeat unfold 8 { d4. g4. }
+				\bassSixeightsOne
 			}
 		}
 	}

standards/standards.tenor.ily

@@ -0,0 +1,97 @@
+\version "2.18.2"
+
+\include "lilydrum.ly"
+
+% --------------------------
+% 2/4s
+% --------------------------
+tenorTwofoursOneA = \drummode {
+	d8-> g  d g |
+	d8-> g  d g |
+	d8-> g  d g |
+	d8-> g  d g |
+	d8-> g  d g |
+	d8-> g  d g |
+	d8-> g  d g |
+	d4-> r  |
+}
+tenorTwofoursOneB = \drummode {
+	\flourish {
+		d4 d |
+		g4 g |
+		d4 d |
+		g4 g |
+		d4 d |
+		g4 g |
+		d4 g |
+	}
+	d4\splitTheFeather r |
+
+}
+
+
+% --------------------------
+% 3/4s
+% --------------------------
+tenorThreefoursOneA = \drummode {
+	\repeat unfold 2 {
+		d8.-> g16 d8 g r g |
+		d4-> d8^"scoop"\dr g d4^"end" \fr |
+	}
+}
+
+tenorThreefoursOneB = \drummode {
+				\flourish{
+					d4-> d d |
+					g4-> g g |
+					d4-> d g |
+					g4-> d g |
+				}
+}
+
+
+% --------------------------
+% 4/4s
+% --------------------------
+tenorFourfoursOneA = \drummode {
+				d8-> g	d g	 d-- g	d g |
+				d8-> g	d g	 d-- g	d g |
+				d8-> g	d g	 d-- g	d g |
+				d4-> d8^"scoop"\dr g d4^"end"\fr r |
+}
+
+tenorFourfoursOneB = \drummode {
+				\flourish {
+					d4 d g g |
+					d4 d g g |
+					d4 d g g |
+				}
+				\flourish d4 \flourish g d^\splitTheFeather r |
+}
+
+% --------------------------
+% 6/8s
+% --------------------------
+tenorSixeightsOneA = \drummode {
+				d4.\up g\up |
+				d^\splitTheFeather r |
+				d g |
+				d8^"scoop"\dr r8 g8 d4.^"end"\fr |
+				\flourish d4. \flourish g |
+				d^\splitTheFeather r |
+				d g |
+				d8^"scoop"\dr r8 g8 d4.^"end"\fr |
+}
+
+tenorSixeightsOneB = \drummode {
+				\flourish {
+					d4. d |
+					g g |
+					d d |
+					g g |
+					d d |
+					g g |
+					d g |
+				}
+				d^\splitTheFeather r |
+}

standards/standards.tenor.ly

@@ -1,6 +1,7 @@
 \version "2.18.2"
 
-\include "lilydrum.ly"
+\include "./standards.tenor.ily"
+
 \header {
 	instrument = "Tenor"
 	title = "Standards"
@@ -12,26 +13,10 @@
 
 		\drummode {
 			\repeat volta 2 {
-				d8-> g  d g |
+				\tenorTwofoursOneA
-				d8-> g  d g |
-				d8-> g  d g |
-				d8-> g  d g |
-				d8-> g  d g |
-				d8-> g  d g |
-				d8-> g  d g |
-				d4-> r  |
 				\bar "||"
-			\break
+				\break
-				\flourish {
+				\tenorTwofoursOneB
-					d4 d |
-					g4 g |
-					d4 d |
-					g4 g |
-					d4 d |
-					g4 g |
-					d4 g |
-				}
-				d4\splitTheFeather r |
 			}
 		}
 	}
@@ -47,18 +32,10 @@
 
 		\drummode {
 			\repeat volta 2 {
-				\repeat unfold 2 {
+				\tenorThreefoursOneA
-					d8.-> g16 d8 g r g |
-					d4-> d8^"scoop"\dr g d4^"end" \fr |
-				}
 				\bar "||"
-			\break
+				\break
-				\flourish{
+				\tenorThreefoursOneB
-					d4-> d d |
-					g4-> g g |
-					d4-> d g |
-					g4-> d g |
-				}
 			}
 		}
 	}
@@ -74,18 +51,10 @@
 
 		\drummode {
 			\repeat volta 2 {
-				d8-> g	d g	 d-- g	d g |
+				\tenorFourfoursOneA
-				d8-> g	d g	 d-- g	d g |
-				d8-> g	d g	 d-- g	d g |
-				d4-> d8^"scoop"\dr g d4^"end"\fr r |
 				\bar "||"
-			\break
+				\break
-				\flourish {
+				\tenorFourfoursOneB
-					d4 d g g |
-					d4 d g g |
-					d4 d g g |
-				}
-				\flourish d4 \flourish g d^\splitTheFeather r |
 			}
 		}
 	}
@@ -101,26 +70,10 @@
 
 		\drummode {
 			\repeat volta 2 {
-				d4.\up g\up |
+				\tenorSixeightsOneA
-				d^\splitTheFeather r |
-				d g |
-				d8^"scoop"\dr r8 g8 d4.^"end"\fr |
-				\flourish d4. \flourish g |
-				d^\splitTheFeather r |
-				d g |
-				d8^"scoop"\dr r8 g8 d4.^"end"\fr |
 				\bar "||"
-			\break
+				\break
-				\flourish {
+				\tenorSixeightsOneB
-					d4. d |
-					g g |
-					d d |
-					g g |
-					d d |
-					g g |
-					d g |
-				}
-				d^\splitTheFeather r |
 			}
 		}
 	}