Updated file structure for Flett of Flotta, Crusader's March and Scotland the Brave (high)

Introduced tags into standards to remove upbeats / endrest

4-4_marches/flett_from_flotta/full.ly

@@ -20,12 +20,14 @@
 				{
 					\repeat volta 2 {
 						\part \line \break
-						\line \break
+						\line
 					}
+					\break
 					\repeat volta 2 {
-						\part \line \break
+						\part \line
-						\line \break
+						\line
 					}
+					\break
 				}%Format
 				{
 					\pipesA s4
@@ -38,9 +40,9 @@
 			\sideglobal
 			\set PipeBandDrumStaff.instrumentName = \markup \column {\instrumentSide}
 			\set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide}
-			s8 \snareA s8
+			r8 \snareA s4
 
-			s4 \snareB s8
+			\snareB s4
 		}
 %		\new PipeBandDrumStaff = "bass" {
 %			\bassglobal

4-4_marches/flett_from_flotta/notes.side.ily

@@ -1,7 +1,7 @@
 % 4/4 Flett from Flotta
 % Snare
 \version "2.18.2"
-composerSide = "v1.3"
+composerSide = "v1.4"
 sideglobal = {
 	\eighthBeaming
 	}
@@ -24,10 +24,10 @@ snareA = \drummode {
 		\flam d8 \tuplet 3/2 { g16 d g }	d8:32(-> g8:32)(->		\tuplet 3/2 { d16) g d } \flamg g8		\flamd d8 d8:32( |
 		g4)->		d4:32(		d4)
 	}
-	r8
 }
 % Part 2
 snareB = \drummode {
+	\flam d8 \flam g8 |
 	d4:32(		d8) d32 g d g		d32 g d g d8		\flamg g8
 	\tutti {
 		d8:32( |
@@ -43,5 +43,5 @@ snareB = \drummode {
 		g8) \tuplet 3/2 { d16 g d-> }		g16. g32 \flam d8		\flamg g4		d8:32( g8) |
 		\flamd d8 \tuplet 3/2 { g16 d g }	d8:32(-> g8:32)(->		\tuplet 3/2 { d16) g d } \flamg g8		\flamd d8 d8:32( |
 		g4)->		d4:32(		d4)
-	} r8
+	}
 }

4-4_marches/flett_from_flotta/side.ly

@@ -10,12 +10,12 @@
         \global
         <<
 			{
-				\repeat volta 2 { \partial 8 s8 \line \break \line }
+				\repeat volta 2 { \part \line \break \line }
-				\repeat volta 2 { \line \break \line }
+				\break
-
+				\repeat volta 2 { \part \line \break \line }
 			}
 			{
-			 \snareA s8
+			 r8 \snareA s4
 
 			 \snareB s8
 			}

4-4_marches/scotland_the_brave/high-side.ly

@@ -5,14 +5,20 @@
 \include "./config.ily"
 \include "./notes.side.ily"
 
+markTextEol = #(define-music-function (parser location text) (string?) #{
+	\once \override Score.RehearsalMark #'break-visibility = #end-of-line-visible
+	\once \override Score.RehearsalMark #'self-alignment-X = #RIGHT
+	\mark \markup $text
+#})
+
 \score {
     \new PipeBandDrumStaff {
         \global
 	\sideglobal
         <<
 			{
-				\repeat volta 2 {\part \line \break }
+				\repeat volta 2 {\part \line \markTextEol "Fine" \break }
-				\part \line \bar "||"
+				\part \line \markTextEol "D.C. al Fine" \bar "||"
 			}
 			{
 			 \snareA s8

4-4_marches/scotland_the_brave/side.ly

@@ -5,14 +5,20 @@
 \include "./config.ily"
 \include "./notes.side.ily"
 
+markTextEol = #(define-music-function (parser location text) (string?) #{
+	\once \override Score.RehearsalMark #'break-visibility = #end-of-line-visible
+	\once \override Score.RehearsalMark #'self-alignment-X = #RIGHT
+	\mark \markup $text
+#})
+
 \score {
     \new PipeBandDrumStaff {
         \global
 	\sideglobal
         <<
 			{
-				\repeat volta 2 {\part \line \break }
+				\repeat volta 2 {\part \line \markTextEol "Fine" \break }
-				\part \line \bar "||"
+				\part \line \markTextEol "D.C. al Fine" \bar "||"
 			}
 			{
 			 \snareA s8

4-4_marches/the_crusaders_march/drums.ly

@@ -26,11 +26,11 @@
 					\bar "|."
 				}%End of Format
 				\new DrumVoice = "side" {
-					s8 \snareAA r8
+					s8 \snareAA
 					\snareAB
 
-					\snareBA r8
+					\snareBA
-					\snareBB r8 s8
+					\snareBB s8
 				}%End of side
 			>>
 		}

4-4_marches/the_crusaders_march/full.ly

@@ -60,11 +60,11 @@
 			\set PipeBandDrumStaff.instrumentName = \markup \column {\instrumentSide}
 			\set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide}
 
-			s8 \snareAA r8
+			s8 \snareAA
 			\snareAB
 
-			\snareBA r8
+			\snareBA
-			\snareBB r8 s8
+			\removeWithTag #'endrest \snareBB s4
 		}
 		\new PipeBandDrumStaff = "tenor" {
 			\tenorglobal

4-4_marches/the_crusaders_march/notes.side.ily

@@ -1,106 +1,56 @@
 % 4/4 The Crusaders March
 % Side
 \version "2.18.2"
+\include "../../standards/24_44_standards.side.ily"
 composerSide = "E.T. de Boone, 2016"
 sideglobal = {
 	\eighthBeaming
 }
 % Music
 
-snareAA = \drummode {
+pcrusadersI = \drummode {
-	d16. g32 |
+	\tag #'upbeat { d16. g32 } |
-	\flam d8 d16. g32
-	\flam d8 d16 g16
-	r16. d32 g16. g32
-	\flam d8 
-	
-	\tutti {
-		d8:32( |
-		\tuplet 3/2 { g16) d g } \flamd d16. g32
-		\tuplet 3/2 { d16 g d } \flamg g16. g32
-		d16. g32 \tuplet 3/2 { d16 g d }
-		\flamg g8
-	}
-
-	d16. g32 |
-	\flam d8 d16. g32
-	\flam d8 d16 g16
-	r16. d32 g16. g32
-	\flam d8 g |
-
-	\tutti {
-		\flam d4 d4:32( d4)
-	}
-}
-snareAB = \drummode {
-	\tutti {
-		d16. g32 |
-		\flam d8 d16. g32
-		\flam d8 d16 g16
-		r16. d32 g16. g32
-		\flam d8 
-	
-		d8:32( |
-		\tuplet 3/2 { g16) d g } \flamd d16. g32
-		\tuplet 3/2 { d16 g d } \flamg g16. g32
-		d16. g32 \tuplet 3/2 { d16 g d }
-		\flamg g8
-
-		d16. g32 |
 	d8:32( \triplet { g16) d g }
 	d8:32( g8:32)(->
 	\triplet { d16) g d-> } g16. g32
 	d8:32( \triplet { g16) d g } |
+}
 
-		\flam g4 d4:32( d4)
+pcrusadersII = \drummode {
+	\tag #'upbeat { d16. g32 } |
+	\flam d4
+	\flam g8. g16
+	d8:32([ g8)]
+	\flam d8
+}
+
+snareAA = \drummode {
+	\peight
+	\midone
+	\pthree
+	\endone
+}
+snareAB = \drummode {
+	\tutti {
+		\peight
+		\removeWithTag #'tutti \midone
+		\pcrusadersI
+		\removeWithTag #'upbeat \removeWithTag #'endrest \endone
 	}
 	\flam d16 d \flam g g
 }
 
 snareBA = \drummode {
-	\flam d4
+	\removeWithTag #'upbeat \pcrusadersII
-	\flam g8. g16
+	\midone
-	d8:32( g8)
+	\pthree
-	\flam d8
+	\endone
-
-	\tutti {
-		d8:32( |
-		\tuplet 3/2 { g16) d g } \flamd d16. g32
-		\tuplet 3/2 { d16 g d } \flamg g16. g32
-		d16. g32 \tuplet 3/2 { d16 g d }
-		\flamg g8
-	}
-
-	d16. g32 |
-	\flamd d16. g32 d16. d32
-	\flamg g16. d32 g16. g32
-	d16. \flamg g32 d16. d32
-	\flamg g16. d32 \flam g8 |
-
-	\tutti {
-		\flam d4 d4:32( d4)
-	}
 }
 snareBB = \drummode {
 	\tutti {
-		d16. g32 |
+		\pcrusadersII
-		\flam d4
+		\removeWithTag #'tutti \midone
-		\flam g8. g16
+		\pcrusadersII
-		d8:32( g8)
+		\removeWithTag #'upbeat \endone
-		\flam d8
-
-		d8:32( |
-		\tuplet 3/2 { g16) d g } \flamd d16. g32
-		\tuplet 3/2 { d16 g d } \flamg g16. g32
-		d16. g32 \tuplet 3/2 { d16 g d }
-		\flamg g8
-	
-		d16. g32 |
-		d8:32( \triplet { g16) d g }
-		d8:32( g8:32)(->
-		\triplet { d16) g d-> } g16. g32
-		d8:32( \triplet { g16) d g } |
-	
-		\flam g4 d4:32( d4)
 	}
 }

4-4_marches/the_crusaders_march/side.ly

@@ -11,18 +11,18 @@
 	\sideglobal
 		<<
 			{
-				\part \line  
+				\part \line \break
-				\line \bar "|."
+				\line \bar "||"
 				\break
-				\line
+				\line \break
 				\line \bar "|."
 			}%Format
 			{
-				s8 \snareAA r8
+				s8 \snareAA
 				\snareAB
 
-				\snareBA r8
+				\snareBA
-				\snareBB r8 s8
+				\snareBB s8
 			}
 		>>
 	}

standards/24_44_standards.side.ily

@@ -35,10 +35,10 @@ midfour = \drummode {
 % Endings
 endone = \drummode {
 	\tutti {
-		g8 |
+		\tag #'upbeat g8 |
 		\flamd d4 	d4:32(
 		d4)
-	}	r8
+	}	\tag #'endrest r8
 }
 
 endtwo = \drummode {
@@ -53,7 +53,7 @@ endthree = \drummode {
 		d8:32( |
 		d4)		d4:32(
 		d4)
-	} 	r8
+	} 	\tag #'endrest r8
 }
 endfour = \drummode {
 	\tutti {
@@ -65,54 +65,54 @@ endfour = \drummode {
 
 % Several Parts
 pempty = \drummode {
-	s8 |
+	\tag #'upbeat s8 |
 	s2
 	s4 s8
 }
 pone = \drummode {
-	d16. g32 |
+	\tag #'upbeat { d16. g32 } |
 	\flamd d8 \tuplet 3/2 { d16 g d }		\flamg g8 d8:32(
 	g16.) d32-> g16. g32				\flamd d8
 }
 
 ptwo = \drummode {
-	d16. g32 |
+	\tag #'upbeat { d16. g32 } |
 	d4:32(		d8) \flamg g8
 	d16. g32-> d16. d32		\flamg g8
 }
 pthree = \drummode {
-	d16. g32 |
+	\tag #'upbeat { d16. g32 } |
 	\flamd d16. g32 d16. d32		\flamg g16. d32 g16. g32
 	d16. \flamg g32 d16. d32		\flamg g8
 }
 pfour = \drummode {
-	d16. g32 |
+	\tag #'upbeat { d16. g32 } |
 	\flamd d8. g16		\flamd d8 d8:32(
 	g16.) d32-> g16. g32		\flamd d8
 }
 pfive = \drummode {
-	d16. g32 |
+	\tag #'upbeat { d16. g32 } |
 	d4:32(		d8) d8:32(
 	d8:32)( d16.) g32		\flamd d8
 }
 psix = \drummode {
-	d16. g32 |
+	\tag #'upbeat { d16. g32 } |
 	\tuplet 3/2 { d16 g d } \flamg g8		\tuplet 3/2 { d16 g d } g8
 	d16. g32-> d16. d32		\flamd d8
 }
 
 pseven = \drummode {
-	d16. g32 |
+	\tag #'upbeat { d16. g32 } |
 	\flam d16. g32 d16. \flam g32		\parenthesize \flam d16. g32 d16.  \flam g32
 	d16. \flam g32 d16. \parenthesize \flam g32		\flam d8
 }
 peight = \drummode {
-	d16. g32 |
+	\tag #'upbeat { d16. g32 } |
 	\flam d8 d16. g32 	\flam d8 d16 g16
-	r16 d16 g16. g32 	\flam d8
+	r16. d32 g16. g32 	\flam d8
 }
 pnine = \drummode {
-	d16. g32 |
+	\tag #'upbeat { d16. g32 } |
 	d16.:64~ d32 g16. d32:128~
 	d16. g32 d16.:64~ d32
 	g16. d32:128~ d16. g32

standards/68_standards.side.ily

@@ -4,37 +4,41 @@
 % Midpart
 midone = \drummode {
 	\tutti {
-		\flam d8. g16 d8		d4.:32( |
+		\flam d8.\v g16 d8		d4.:32( |
 		d8.) g16 d8		\flamd d4
 	}
 }
 midtwo = \drummode {%Stonehaven PnD
 	\tutti {
-		\flam d8. g16 \flam d8	d16 g d g-> d g |
+		\flam d8.\v g16 \flam d8	d16 g d g-> d g |
 		d8. g16 d8	\flam d4
 	}
 }
+
 % Endings
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 endone = \drummode {
 	\tutti {
-		\flam d8. d16:64( d8)		d4.:32( |
+		\flam d8.\v d16:64( d8)		d4.:32( |
 		d8.) g16 d8 		\flamd d4
 	}
 }
 
 endtwo = \drummode {
 	\tutti {
-		\flam d8. g16 d8	d16 g d g d8 |
+		\flam d8.\v g16 d8	d16 g d g d8 |
 		d4.:32(		d4)
 	}
 }
 endthree = \drummode {%Stonehaven PnD
 	\tutti {
-		\flam d8. g16 d32 g d g	d8. g16 \flam d8 |
+		\flam d8.\v g16 d32 g d g	d8. g16 \flam d8 |
 		d4.:32(		d4)
 	}
 }
+
 % Parts
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 pempty = \drummode {
 	s8 |
 	s1. |
@@ -51,7 +55,7 @@ ptwo = \drummode {
 }
 
 pthree = \drummode {
-g8 |
+	g8 |
 	d4.:32(\<		d4.:32)( |
 	d8.)\! g16 d8		\flamd d8. g16 d8 |
 }
@@ -103,11 +107,23 @@ pnine = \drummode { %Stonehaven PnD
 pten = \drummode {
 	d8:32( |
 	g8.) g16 \flam d8	\flam g8. g16 \flam d8 |
-	d8. g16 d8	\flam g8. d16 g8|
+	d8. g16 d8	\flam g8. d16 g8 |
 }
 
 peleven = \drummode {
 	d8:32( |
 	g8.) g16 \flam d8	\flam g8. g16 d32\< g d g <>\!|
-	d8. g16 d8	\flam g8. d16 g8|
+	d8. g16 d8	\flam g8. d16 g8 |
+}
+
+ptwelve = \drummode { %C. Ooms
+	d8 |
+	d4:32(-> g8:32)(->	g8.:32 d16:32)(-> \< g8:32 |
+	d8.)-\v \! g16 d8	\flam d8. d16 \flam g8 |
+}
+
+pthirteen = \drummode { %C. Ooms
+	d8:32( \> |
+	g8.) \! d16 \flam g8->	d8. g16 \flam d8-> |
+	g8. \flam g16 d8	\flam d8. d16 \flam g8-> |
 }

standards/68_standards_extra.side.ly

@@ -10,7 +10,8 @@
         \drummode {
 	       	\repeat volta 2 { \partial 8 \pseven \midone \peight \endone}	\break
 	       	\repeat volta 2 { \partial 8 \pnine \midtwo \pten \endtwo}	\break
-	    	\repeat volta 2 { \partial 8 \pten \midone \pempty \endthree}	\break
+	    	\repeat volta 2 { \partial 8 \peleven \midone \ptwelve \endthree}	\break
+	    	\repeat volta 2 { \partial 8 \pthirteen \midone \pempty \endthree}	\break
 		}% End of drums %	
 	}
 	\header{