New Snarescore for Jock Wilson's Ball

reels/jock_wilsons_ball/full.ly

@@ -42,8 +42,8 @@
 			\set PipeBandDrumStaff.instrumentName = \markup \column {\instrumentSide}
 			\set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide}
 
-				\sideA 
+				\snareA
-				\sideB
+				\snareB
 		}
 		\new PipeBandDrumStaff = "tenor" {
 			\tenorglobal

reels/jock_wilsons_ball/notes.side.ily

@@ -1,82 +1,63 @@
 % 2/2 Jock Wilson's Ball
 % Side
 \version "2.18.2"
-composerSide = "E.T. de Boone, 2016"
+composerSide = "E.T. de Boone, v0.5, 2023"% 2023-07-14 Andre Rieu, Maastricht
+arrangerSide = ""
 sideglobal = {
-	\eighthReelBeaming
+%	\eighthReelBeaming
 }
 % Music
-sideAAmain = \drummode {
+snareAA = \drummode {
-		\flam g8. g16
+	\flam d4 g4:32( d4:32)(-> g4) |
-	d8.:32(  d16)->	g8. g16 
+	\flam \triplet { d8-> g \flam d8 } \flam g8. d16\v	%g8.[ \drag d16 d4 |
-	|
-	\flam d8. [ \drag g16	d32 g d g d8 ]
-	g8. [ \drag d16		d8. g16 ]
-	|
 }
-sideAAA = \drummode {
+snareABA = \drummode {
-	g16 |
+	g8.[ \drag d16] d4 |
-	\flam d4 \sideAAmain
+	\flam g8. d16:64( d8.) g16	d4:32( d4) |
+	g8.[ d16-> g8. \drag d16]	d16 g d g d16-> g d g->
 }
-sideABA = \drummode {
+snareABB = \drummode {
-	d4) \sideAAmain
+	g8.[ \drag d16 d8. g16] |
-}
+	%d16 d g d g8.-> g16	d4:32( d8.) d16:64(\> |
-sideAAB = \drummode {
+	%d4)\! \flam d8.\v g16	d8. \flam g16-> \triplet { d8 g8 d8 } |
-	\flam d8. [ \drag g16	d32 g d g d8 ]
+	d16 d g d g8.-> g16	d4:32( d8.) d16:64( |
-	g8.:32->([  d16)	g8. g16 ]
+	d4) \flam d8.\v g16	d8. \flam g16-> d4 | % \triplet { d8 g8 d8 } |
-	|
-	\triplet {d8 [  d g } d16 g32 g d8 ]
-	g32 [ d g d g8-> d8. d16:64( ]
-	|
 }
 
-sideABB = \drummode {
+snareA = \drummode {
-	\flam d32[  d g8.		d16 g8. ]
+	\repeat volta 2 {
-	d4:32(	 d8.) g16
+	  \snareAA
-	|
+	  \alternative{
-	\triplet {d8[  g d }	\flam g8. \drag g16 ]
+		\snareABA
-	d32 [ g d g d8	g8. ]
+		\snareABB
-}
+	  }
-sideA = \drummode {
+	}
-	\sideAAA
-	\sideAAB
-	\sideABA
-	\sideABB
 }
 
-
+snareBA = \drummode {
-
+	g4	\flam d8.\v d16	g8. d16 \triplet { g8 d g } |
-
+	%\flam \triplet { d8 g \flam d8 }	\flam g8 d32 g d16	%g8.[ \drag d16 d4 |
-sideBA = \drummode {
+	\flam d8.[ d16	\flam g8.  \triplet { d32 g d] }	%g8.[ \drag d16 d4 |
-	g16 |
-	\flam d4  g4:32(
-	d8.:32)(-> g16) \flam d8. g16  
-	|
-	\flamd \triplet { d8[ g \flam d } \flam g8 \triplet { d16 g d ]} 
-	g8.[  \drag d16		d8. g16 ]
-	|
-	\flam d4  g4:32(	
-	d8.:32)(-> g16) \flam d8. g16  
-	|
-	\triplet { d8 [ d g } d16 g32 g d8]
-	g32 [ d g d g8-> d8. d16:64( ]
-	|
 }
-sideBB = \drummode {
+snareBBA = \drummode {
-	d4)  g4:32(
+	g8.[-> \drag d16]% d4 |
-	d8.:32()-> g16) \flam d8. g16  
+	d4 |
-	|
+	d16->\< g d g d16-> g d g		d8.->\! g16 d8. d16:64( |
-	\flam d8.[  \drag g16	d32 g d g d8 ]
+	d4) \flam d8.\v g16	d8. \flam g16-> d8. d16 | %\triplet { d8 g8 d8 } |
-	g8.[  \drag d16		d8. g16 ]
+}
-	|
+snareBBB = \drummode {
-	\flam d16[ g8.	d8. g16  ]
+	g8.[-> \drag d16]% d4 |
-	d4:32(	d8.) g16
+	d4 |
-	|
+	d2.:32(\<	d8.)\!\v g16 |
-	d8.:32( g16) d8. g16
+	d8.:32(-> g16) \triplet { d8 g d }	g16 d8.:32(-> g4)->
-	d16 g8.:32(	d8.)
 }
 
-sideB = \drummode {
+snareB = \drummode {
-	\sideBA
+	\repeat volta 2 {
-	\sideBB
+	  \snareBA
+	  \alternative{
+		\snareBBA
+		\snareBBB
+	  }
+	}
 }

reels/jock_wilsons_ball/notes.side.old.ily

@@ -0,0 +1,81 @@
+% 2/2 Jock Wilson's Ball
+% Side
+\version "2.18.2"
+composerSide = "E.T. de Boone, 2016"
+sideglobal = {
+	\eighthReelBeaming
+}
+% Music
+sideAAmain = \drummode {
+		d8. g16
+	d8.:32(  d16)->	g8. g16 
+	|
+	%\flamdr d8.\fr [ g16	d8. \flam g16 ]
+	\flamdr d8.\fr [ \drag g16	\triplet { d16 g d g d8] }
+	g8. [ \dragdr d16		d8. g16 ] 
+	|
+}
+sideAAA = \drummode {
+	\flam d4 \sideAAmain
+}
+sideABA = \drummode {
+	d4) \sideAAmain
+}
+sideAAB = \drummode {
+	\flam d8. \fr [ \drag g16	\triplet { d16 g d g d8] }
+	g8.:32->([  d16)	g8. g16 ]
+	|
+	\triplet {d8 [  d g } \triplet { d8 g16 g d8 ] }
+	d16 [ g d g d8. d16:64( ]
+	|
+}
+
+sideABB = \drummode {
+	\flam d32[  d g8.		d16 g8. ]
+	d4:32(	 d8.) g16
+	|
+	\triplet {d8[  g d }	\flam g8. \drag g16 ]
+	\triplet { d16 g d g d8] } g4
+}
+sideA = \drummode {
+	\sideAAA
+	\sideAAB
+	\removeWithTag #'tutti \sideABA
+	\sideABB
+}
+
+
+
+
+sideBA = \drummode {
+	\flam d4  g4:32(
+	d8.:32)(-> g16) \flam d8. g16  
+	|
+	\flamd \triplet { d8[ g \flam d } \flam g8 \triplet { d16 g d ]} 
+	g8.[  \drag d16		d8. g16 ]
+	|
+	\flam d4  g4:32(	
+	d8.:32)(-> g16) \flam d8. g16  
+	|
+	\triplet {d8 [  d g } \triplet { d8 g16 g d8 ] }
+	d16 [ g d g d8. d16:64( ]
+	|
+}
+sideBB = \drummode {
+	d4)  g4:32(
+	d8.:32()-> g16) \flam d8. g16  
+	|
+	\flam d8.[  \drag g16	d32 g d g d8 ]
+	g8.[  \drag d16		d8. g16 ]
+	|
+	\flam d16[ g8.	d8. g16  ]
+	d4:32(	d8.) g16
+	|
+	d8.:32( g16) \triplet { d8 g d8 }
+	g16 d8.:32(->	g4)
+}
+
+sideB = \drummode {
+	\sideBA
+	\sideBB
+}

reels/jock_wilsons_ball/side.ly

@@ -1,4 +1,4 @@
-\version "2.18.2"
+\version "2.24.2"
 
 \include "lilydrum.ly"
 
@@ -8,33 +8,20 @@
 \score {
     \new PipeBandDrumStaff {
         \global
-	\sideglobal
+			\unfoldRepeats \new DrumVoice = "side" {
-		<<
+				\sideglobal
-			{ 
+				\snareA
-				\partial 16 s16
-				\halfline
 				\break
-				\halfline
+				\section
-				\bar "|."
+				\snareB
-
+				\fine
-				\break
-				\partial 16 s16
-				\halfline
-				\break
-				\halfline
-				\bar "|."
-			}%Format
-			{
-			\sideA s16
-
-			\sideB
 			}
-		>>
 	}
 	\header {
 		title = \title
 		meter = \meter
 		instrument = \instrumentSide
 		composer = \composerSide
+		arranger = \arrangerSide
 	}
 }