[pipes] Missing gracenotes in Jock Wilson's Ball (not verified)

[side] Rerender Leaving of Liverpool
[side] small tweaks Set 11: Flett from Flotta and Pikeman's March
2023-08-14 21:48:00 +02:00 · 2023-08-14 21:43:01 +02:00 · 2023-08-14 21:43:01 +02:00 · 2023-08-14 21:42:56 +02:00 · 2023-08-14 21:42:56 +02:00 · 2023-08-08 17:21:20 +02:00
19 changed files with 294 additions and 191 deletions
--- a/4-4_marches/flett_of_flotta/full.ly
+++ b/4-4_marches/flett_of_flotta/full.ly
@ -9,6 +9,11 @@
 \include "./notes.side.ily"
 \include "./notes.pipes.ily"

+\layout {
+	indent = 5.0
+	short-indent = 2.0
+}
+
 \score {
 	\new StaffGroup <<
 		\new Staff \with {
@ -42,7 +47,7 @@
 			shortInstrumentName = \markup{\shortInstrumentSide}
 		} {
 			\sideglobal
-			r8 \snareA s4
+			\snareA s4

 			\snareB s4
 		}
--- a/4-4_marches/flett_of_flotta/notes.side.ily
+++ b/4-4_marches/flett_of_flotta/notes.side.ily
@ -5,11 +5,18 @@ composerSide = "v1.4"
 arrangerSide = "E.T. de Boone"
 sideglobal = {
 	\eighthBeaming
-	}
+}
+
+snareEnding = \drummode {
+	g8) \triplet { d16 g d-> }		g16. g32 \flam d8		\flam g4		d8:32( g8) |
+	\flam d8 \triplet { g16 d g }	d8:32(-> g8:32)(->		\triplet { d16) g d } \flam g8		\flam d8 d8:32( |
+	g4)->		d4:32(		d4)
+}
+
 %%music
 snareA = \drummode {
-	d8:32(\> |
-	g8.)\! g16		d8:32( g8)		d4:32(\<		d8)\!
+	d8:32(\< g8:32)(\> |
+	d8.)\! g16		d8:32( g8)		d4:32(\<		d8)\!
 	\tutti {
 		d8:32( |
 		g8) \tuplet 3/2 { d16 g d-> }		g16. g32 \flam d8		\flam g4		d8:32(\< g8:32)(-> |
@ -17,13 +24,10 @@ snareA = \drummode {
 	} d8:32(-> \tuplet 3/2 { g16) d g }		\flamd d16. g32 d16. d32		\flam g8 \tutti {
 		d8:32( |
 		g4)->		d4:32(		d4)
-	}
-	\tutti { d8:32(\< g8:32)(\> |

+		d8:32(\< g8:32)(\> |
 		d8.)\! g16		d8:32( g8)		d4:32(\<		d8)\! d8:32( |
-		g8) \tuplet 3/2 { d16 g d-> }		g16. g32 \flam d8		\flam g4		d8:32( g8) |
-		\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)
+		\snareEnding
 	}
 }
 % Part 2
@ -40,9 +44,7 @@ snareB = \drummode {
 	} d32 g d g d16
 	\tutti { g16->		r16 g16-> r16 g16-> |

-		d8.:32(-> g16)		d8:32(-> g8)		d4:32(		d8) d8:32( |
-		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)
+		d8.:32(-> g16)		d8:32(-> g8)		d4:32(\<		d8)\! d8:32( |
+		\snareEnding
 	}
 }
--- a/4-4_marches/flett_of_flotta/side.ly
+++ b/4-4_marches/flett_of_flotta/side.ly
@ -8,6 +8,7 @@
 \score {
    \new PipeBandDrumStaff {
        \global
+        \sideglobal
        <<
 			{
 				\repeat volta 2 { \part \line \break \line }
@ -15,9 +16,9 @@
 				\repeat volta 2 { \part \line \break \line }
 			}
 			{
-			 r8 \snareA s4
+			 \snareA s4

-			 \snareB s8
+			 \snareB s4
 			}
 		>>
 	}
--- a/4-4_marches/the_leaving_of_liverpool/drums.ly
+++ b/4-4_marches/the_leaving_of_liverpool/drums.ly
@ -7,6 +7,11 @@
 \include "./notes.tenor.ily"
 \include "./notes.side.ily"

+\layout {
+	indent = 5.0
+	short-indent = 2.0
+}
+
 \score {
 	\new StaffGroup <<
 		\new PipeBandDrumStaff = "side" {
@ -21,7 +26,7 @@
 					\line \bar "|."
 				}
 				{
-				 \snareA s4
+				 r8 \snareA s4

 				 \snareBA
 				 \snareBB
@ -35,13 +40,13 @@
 		%	\bassA
 		%	s16 \bassBA \bassBB
 		%}
-		\new PipeBandDrumStaff = "tenor" {
-			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
-			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
-
-			r8 r16 \tenorA s4
-			r8 r16 \tenorA
-			r8 r16 \tenorA
+		\new PipeBandDrumStaff = "tenor" \with {
+			instrumentName = \markup{ \instrumentTenor }
+			shortInstrumentName = \markup{ \shortInstrumentTenor }
+		} {
+			r8. \tenorA s4
+			r8. \tenorA
+			r8. \tenorA
 			s4

 		}
--- a/4-4_marches/the_leaving_of_liverpool/full.ly
+++ b/4-4_marches/the_leaving_of_liverpool/full.ly
@ -28,9 +28,11 @@
 						\part
 						\line 
 						\break
-						\line \bar "|."
+						\line
+						\bar "||"
 						\break
 					}
+					\bar "|."
 				}%Format
 				{
 					\pipesAA
@ -46,7 +48,7 @@
 			shortInstrumentName = \markup{ \shortInstrumentSide }
 		} {
 			\sideglobal
-			\snareA
+			r8 \snareA s8
 			\snareA s4

 			\snareBA
--- a/4-4_marches/the_leaving_of_liverpool/notes.side.ily
+++ b/4-4_marches/the_leaving_of_liverpool/notes.side.ily
@ -7,29 +7,29 @@ sideglobal = {
 }
 %%music
 snareA = \drummode {
-	r8 d16. g32 |
-	\flamd d8 \tuplet 3/2 { d16 g d }		\flamg g8 d8:32(		g16.) d32-> g16. g32		\flamd 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 |
+	d16. g32 |
+	\flam d8 \triplet { d16 g d }		\flam g8 d8:32(		g16.) d32-> g16. g32		\flam d8 d8:32(\dr |
+	\triplet { g16) d g } \flam d16. g32		\triplet { d16 g d } \flam g16. g32		d16. g32 \triplet { d16 g d }		\flam g8\fr d16. g32 |

-	\flamd d8 \tuplet 3/2 { d16 g d }		\flamg g8 d8:32(		g16.) d32-> g16. g32		\flamd d8 d8 |
-	\flamd d4	d4:32(		d4)
+	\flam d8 \triplet { d16 g d }		\flam g8 d8:32(		g16.) d32-> g16. g32		\flam d8 d8 |
+	\flamdr d4	d4:32(		d4)\fr
 }
 % Part 2
 snareBA = \drummode {
-	\flamd d4 |
-	d4:32(\<		d4:32)(->		d8)\! d32 g d g		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 |
+	\flam d4\v |
+	d4:32(\<		d4:32)(->		d8)\! d32 g d g		d8-> d8:32(\dr |
+	\triplet { g16) d g } \flam d16. g32		\triplet { d16 g d } \flam g16. g32		d16. g32 \triplet { d16 g d }		\flam g8\fr d16. g32 |

 	d4:32(\<		d4:32)(->		d8)\! d32 g d g		d8-> g8 |
-	\flamd d4	d4:32(		d4)
+	\flamdr d4	d4:32(		d4)
 }
 snareBB = \drummode{
-	\flamd d4 |
+	\flam d4\v |
 	d4:32(\<		d4:32)(->		d8)\! d32 g d g		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 |
+	\triplet { g16) d g } \flam d16. g32		\triplet { d16 g d } \flam g16. g32		d16. g32 \triplet { d16 g d }		\flam g8 d16. g32 |

-	\flamg g16. d32:128( d16.) g32		d16.:64( d32) \tuplet 3/2 { g16 d g }		\flamd d16. g32-> d32 g d g		d16. g32-> d32 g d g |
+	\flam g16. d32:128( d16.) g32		d16.:64( d32) \triplet { g16 d g }		\flam d16. g32-> d32 g d g		d16. g32-> d32 g d g |

-	d4	d4:32(		d4)
+	d4	d4:32(		d4)\fr
 }
--- a/4-4_marches/the_leaving_of_liverpool/side.ly
+++ b/4-4_marches/the_leaving_of_liverpool/side.ly
@ -8,20 +8,16 @@
 \score {
    \new PipeBandDrumStaff {
        \global
-        <<
-			{
-				\repeat volta 2 { \part \line } \break
-				\part \line \break
-				\line \bar "|."
-
-			}
-			{
-			 \snareA s4
-
-			 \snareBA
-			 \snareBB
-			}
-		>>
+		\sideglobal
+		\repeat volta 2 {
+			\partial 4 r8
+			\snareA s4
+		}
+		\break
+		\partial 4
+		\snareBA
+		\snareBB
+		\fine
 	}
 	\header {
 		title = \title
--- a/4-4_marches/the_pikemans_march/drums.ly
+++ b/4-4_marches/the_pikemans_march/drums.ly
@ -7,6 +7,11 @@
 \include "./notes.tenor.ily"
 \include "./notes.side.ily"

+\layout {
+	indent = 5.0
+	short-indent = 2.0
+}
+
 \score {
 	\new StaffGroup <<
 		\new PipeBandDrumStaff = "side" {
--- a/4-4_marches/the_pikemans_march/notes.side.ily
+++ b/4-4_marches/the_pikemans_march/notes.side.ily
@ -4,7 +4,16 @@
 composerSide = "E.T. de Boone, v2.0, 2016"
 sideglobal = {
 	\eighthBeaming
-	}
+}
+
+lddr = #(define-event-function (parser location) () #{
+	-\tweak HorizontalBracket.bracket-flare #'(0.5, 0.5)
+	-\tweak HorizontalBracketText.text "LD"
+	-\tweak HorizontalBracketText.parent-alignment-X -1
+	-\tweak HorizontalBracketText.self-alignment-X -1
+	\dr
+#})
+
 %%music
 snareAA = \drummode {
 	\tutti {
@ -54,7 +63,7 @@ snareAB = \drummode {
 	d8-> \tutti {
 		g16. g32
 		|
-		d8:32( g8:32)(->
+		d8:32(\staccato g8:32)(->
 		d8:32)( g8:32)(->
 		d8)->
 	} \tuplet 3/2 { g16 d g}
@ -63,8 +72,10 @@ snareAB = \drummode {
 		\flam d8. g16
 		d8:32(-> g8:32)(->
 		d8.)->
-	} d16:64(
-	d8)
+	}
+
+	  d16:64( \lddr
+		d8)\fr
 }
 snareBA = \drummode {
 	d16. g32
@ -82,7 +93,7 @@ snareBA = \drummode {
 	g8) g8
 	|
 	\tutti {
-		d8:32( g8:32)(->
+		d8:32(\staccato g8:32)(->
 		d8:32)( g8:32)(->
 		d8)->
 	} d32 g d g
@ -97,7 +108,7 @@ snareBA = \drummode {
 	|
 }
 snareBB = \drummode {
-	\flam d8\f \flam g8
+	\tutti { \flam d8-> \flam g8-> }
 	r8 d8:32(
 	g16.) d32-> g16. g32
 	\flam d8 \tutti {
@ -127,7 +138,7 @@ snareBB = \drummode {
 snareBC = \drummode {
 	d16. g32 |
 	\tutti {
-		\flam d8\f \flam g8
+		\flam d8-> \flam g8->
 		r8 d8:32(
 		g16.) d32-> g16. g32
 		\flam d8 d8:32(
--- a/reels/jock_wilsons_ball/notes.pipes.ily
+++ b/reels/jock_wilsons_ball/notes.pipes.ily
@ -8,22 +8,22 @@ pipeglobal = {
 % Music
 pipesAA = {
 	\thrwd d4 c4 \dblb b4 \grg f4 |
-	\grg b8. [ c16 d8.  e16 ] \grg f8. [ b16 b8.  c16 ] |
+	\grg b8. [ c16 d8.  e16 ] \grg f8. [ b16 \grG b8.  c16 ] |
 	\thrwd d4 c4 \dblb b4 \grg f4 |
-	\birl a4 \grg e8. [ a16 ] \grg c8. [ \grd a16 a8.  b16 ] | 
+	\birl a4 \grg e8. [ a16 ] \grg c8. [ \grd a16 \gre a8.  b16 ] |
 }
 pipesAB = {
 	\thrwd d4 c4 \dblb b4 \grg f4 |
-	\grg b8. [ c16 d8.  e16 ] \grg f8. [ b16 b8. c16 ] |
+	\grg b8. [ c16 d8.  e16 ] \grg f8. [ b16 \grG b8. c16 ] |
 	\grg d8. [ b16 \grg c16 \grd a8. ] \gbirl a4 \grg e4 |
-	\birl a4 \grg e8. [ a16 ] \grg c8. [ \grd a16 a8.  b16 ]
+	\birl a4 \grg e8. [ a16 ] \grg c8. [ \grd a16 \gre a8.  b16 ]
 }

 pipesBA = {
 	\thrwd d4 A4 \hdblf f4 \grg e8. [ f16 ] |
-	\thrwd d4 \grg f8. [ e16 ] \grg f8. [ b16 b8. c16 ] |
+	\thrwd d4 \grg f8. [ e16 ] \grg f8. [ b16 \grG b8. c16 ] |
 	\thrwd d4 A4 \hdblf f4 \grg e8. [ f16 ] |
-	\birl a4 \grg e8. [ a16 ] \grg c8. [ \grd a16 a8.  b16 ] | 
+	\birl a4 \grg e8. [ a16 ] \grg c8. [ \grd a16 \gre a8.  b16 ] |
 }

 pipesBB = {
--- a/reels/jock_wilsons_ball/notes.side.ily
+++ b/reels/jock_wilsons_ball/notes.side.ily
@ -1,41 +1,23 @@
 % 2/2 Jock Wilson's Ball
 % Side
 \version "2.18.2"
-composerSide = "E.T. de Boone, v0.6, 2023"% 2023-07-14 Andre Rieu, Maastricht
+composerSide = "E.T. de Boone, v0.7, 2023"% 2023-07-14 Andre Rieu, Maastricht
 arrangerSide = ""
 sideglobal = {
 %	\eighthReelBeaming
 }
 % Music
-snareAAA = \drummode {
-	\flam d4\fr g4:32( d4:32)(-> g4) |
-	\flamdr \triplet { d8->\fr g \optflam d8 } \flamdr g8. d16\v	%g8.[ \drag d16 d4 |
-}
-snareABA = \drummode {
-	g8.[ \drag d16] d4\fr |
-	\flam g8. d16:64(\dr d8.)\fr g16	d4:32( d4) |
-	%g8.[ d16-> g8. \drag d16]	d16 g d g d16-> g d g->
-	g8.[ d16->\dr g8. \drag d16]	d8.\fr g16-> d8. g16\dr
-}
-snareAAB = \drummode {% only different for unisons
-	\flam d4\fr g4:32( d4:32)(-> g4) |
-	\flamdr \triplet { d8-> g \optflam d8 } \flam g8. d16\v	%g8.[ \drag d16 d4 |
-}
-snareABB = \drummode {
-	g8.[ \drag d16 d8.\fr g16] |
-	%d16 d g d g8.-> g16	d4:32( d8.) d16:64(\> |
-	%d4)\! \flam d8.\v g16	d8. \flam g16-> \triplet { d8 g8 d8 } |
-	d16 d g d g8.->\dr g16	d4:32( d8.)\fr d16:64( |
-	d4) \flamdr d8.\v g16	d8. \flam g16->\fr d4 | % \triplet { d8 g8 d8 } |
-}
-
 snareAA = \drummode {
-	\snareAAA
-	\snareABA
+	\flam d4 g4	d4:32(\staccato\dr g4:32)(->\fr\> |
+	d8.)\!\dr g16-> d16\<\fr g d g\!	d8.[->\dr \drag d16 d8. g16] |
+	d4:32(-> g8.)\fr d16:64(	d8.) g16 d4:32(->\>\dr |
+	g8.[)\p\fr d16 g8. \drag d16]	d8.[ \dragdr d16->\mf  d8. g16] |
 }
 snareAB = \drummode {
-	\snareAAB
-	\snareABB
+	\flam d4 g4	d4:32(\staccato g4:32)(->\> |
+	d8.)\! g16-> d16\< g d g\!	d8.[->\fr \drag d16 d8. g16]\dr |
+	d8.:32(-> g16) d4\fr	r4 \flamdr \triplet { d8\fr g d } |
+	g8 g8 \flamdr d8. g16	d4 d4:32(\< |
 }

 snareA = \drummode {
@ -43,38 +25,17 @@ snareA = \drummode {
 	\snareAB
 }

-snareBAA = \drummode {
-	g4	\flamdr d8.\v\fr d16	g8. d16\dr \triplet { g8 d g } |
-	%\flam \triplet { d8 g \flam d8 }	\flam g8 d32 g d16	%g8.[ \drag d16 d4 |
-	\flam d8.[\fr d16	\flam g8.  g32\dr d] %g8.[ \drag d16 d4 |
-}
-snareBBA = \drummode {
-	g8.[->\fr \drag d16]% d4 |
-	d4 |
-	%\tutti{ d16->\< } g d g \tutti{ d16-> g d g		d8.->\! g16 d8. } d16:64( |
-	\tutti{ d16->\< } g d g \tutti{ d16-> g d g		d8.[->\! \drag g16 g8.}  d16:64(] |
-	d4) \flamdr d8.\v g16	d8. \flam g16-> d8. d16 | %\triplet { d8 g8 d8 } |
-}
-snareBAB = \drummode {% only different for unisons
-	%<>\dr
-	g4	\flam d8.\v\fr d16	g8. d16\dr \triplet { g8 d g } |
-	%\flam \triplet { d8 g \flam d8 }	\flam g8 d32 g d16	%g8.[ \drag d16 d4 |
-	\flam d8.[\fr d16	\flam g8.  g32\dr d] %g8.[ \drag d16 d4 |
-}
-snareBBB = \drummode {
-	g8.[-> \drag d16]% d4 |
-	d4 |
-	d2.:32(\<	d8.)\!\v\fr g16 |
-	d8.:32(->\rn g16) \triplet { d8 g d }	g16\dr d8.:32(-> g4)->\fr
-}
-
 snareBA = \drummode {
-	\snareBAA
-	\snareBBA
+	g4)\! \flam d8.\v\fr d16	g8. d16\dr \triplet { g8 d g } |
+	d4:32(->\fr g8.:32)(-> g16)->	\triplet { d8[\dr g \drag d] } d4 |
+	d16->\fr\< g d g d16->\dr g d g	d8.[->\!\fr \drag d16] d4 |
+	g8\dr g \flam d8. g16 d4 d4:32(\< |
 }
 snareBB = \drummode {
-	\snareBAB
-	\snareBBB
+	g4)\! \flam d8.\v d16	g8. d16 \triplet { g8 d g } |
+	d4:32(-> g8.:32)(-> g16)->	\triplet { d8[ g \drag d] } d4\fr |
+	d2:32(	d4:32)(\dr\< d8.)\!-> g16 |
+	d8.:32(-> g16) d8. g16	d4:32(-> g4)->\fr
 }

 snareB = \drummode {
--- a/reels/jock_wilsons_ball/notes.side.v0.6.ily
+++ b/reels/jock_wilsons_ball/notes.side.v0.6.ily
@ -0,0 +1,84 @@
+% 2/2 Jock Wilson's Ball
+% Side
+\version "2.18.2"
+composerSide = "E.T. de Boone, v0.6, 2023"% 2023-07-14 Andre Rieu, Maastricht
+arrangerSide = ""
+sideglobal = {
+%	\eighthReelBeaming
+}
+% Music
+snareAAA = \drummode {
+	\flam d4\fr g4:32( d4:32)(-> g4) |
+	\flamdr \triplet { d8->\fr g \optflam d8 } \flamdr g8. d16\v	%g8.[ \drag d16 d4 |
+}
+snareABA = \drummode {
+	g8.[ \drag d16] d4\fr |
+	%\flam g8. d16:64(\dr d8.)\fr g16	d4:32( d4) |
+	d4:32( g8.) d16:64(\dr d8.)\fr d16 \flam g4 |
+	%g8.[ d16-> g8. \drag d16]	d16 g d g d16-> g d g->
+	g8.[ d16->\dr g8. \drag d16]	d8.\fr g16-> d8. g16\dr
+}
+snareAAB = \drummode {% only different for unisons
+	\flam d4\fr g4:32( d4:32)(-> g4) |
+	\flamdr \triplet { d8-> g \optflam d8 } \flam g8. d16\v	%g8.[ \drag d16 d4 |
+}
+snareABB = \drummode {
+	g8.[ \drag d16 d8.\fr g16] |
+	%d16 d g d g8.-> g16	d4:32( d8.) d16:64(\> |
+	%d4)\! \flam d8.\v g16	d8. \flam g16-> \triplet { d8 g8 d8 } |
+	d16 d g d g8.->\dr g16	d4:32( d8.)\fr d16:64( |
+	d4) \flamdr d8.\v g16	d8. \flam g16->\fr d4 | % \triplet { d8 g8 d8 } |
+}
+
+snareAA = \drummode {
+	\snareAAA
+	\snareABA
+}
+snareAB = \drummode {
+	\snareAAB
+	\snareABB
+}
+
+snareA = \drummode {
+	\snareAA
+	\snareAB
+}
+
+snareBAA = \drummode {
+	g4	\flamdr d8.\v\fr d16	g8. d16\dr \triplet { g8 d g } |
+	%\flam \triplet { d8 g \flam d8 }	\flam g8 d32 g d16	%g8.[ \drag d16 d4 |
+	\flam d8.[\fr d16	\flam g8.  g32 d] %g8.[ \drag d16 d4 |
+}
+snareBBA = \drummode {
+	g8.[-> \dragdr d16]% d4 |
+	d4\fr |
+	%\tutti{ d16->\< } g d g \tutti{ d16-> g d g		d8.->\! g16 d8. } d16:64( |
+	\tutti{ d16->\< } g d g \tutti{ d16-> g d g		d8.[->\! \drag g16 g8.}  d16:64(] |
+	d4) \flamdr d8.\v g16	d8. \flam g16-> d8. d16 | %\triplet { d8 g8 d8 } |
+}
+snareBAB = \drummode {% only different for unisons
+	%<>\dr
+	g4	\flam d8.\v\fr d16	g8. d16\dr \triplet { g8 d g } |
+	%\flam \triplet { d8 g \flam d8 }	\flam g8 d32 g d16	%g8.[ \drag d16 d4 |
+	\flam d8.[\fr d16	\flam g8.  g32 d] %g8.[ \drag d16 d4 |
+}
+snareBBB = \drummode {
+	g8.[-> \dragdr d16]% d4 |
+	d4 |
+	d2.:32(\<	d8.)\!\v\fr g16 |
+	d8.:32(-> g16) \triplet { d8\dr g d }	g16 d8.:32(-> g4)->\fr
+}
+
+snareBA = \drummode {
+	\snareBAA
+	\snareBBA
+}
+snareBB = \drummode {
+	\snareBAB
+	\snareBBB
+}
+
+snareB = \drummode {
+	\snareBA
+	\snareBB
+}
--- a/reels/jock_wilsons_ball/side.ly
+++ b/reels/jock_wilsons_ball/side.ly
@ -5,15 +5,22 @@
 \include "./config.ily"
 \include "./notes.side.ily"

+mbreak = { \break }
 \score {
    \new PipeBandDrumStaff {
        \global
 			\unfoldRepeats \new DrumVoice = "side" {
 				\sideglobal
-				\snareA
+				<<
+					\snareA
+					{ s1*4 \mbreak | \grace{s8} s1}
+				>>
 				\break
 				\section
-				\snareB
+				<<
+					\snareB
+					{ s1*4 \mbreak | \grace{s8} s1 }
+				>>
 				\fine
 			}
 	}
--- a/reels/piper_of_drummond/notes.side.ily
+++ b/reels/piper_of_drummond/notes.side.ily
@ -16,22 +16,22 @@ snareABA = \drummode {
 	g8.[ \drag d16 d16\< g d g]
 	|
 	d8.\!\v\fr g16 d8. \flamdr g16 \fr
-	d8.[ \drag d16 d8. g16]
+	d8.[ \drag d16] d4
 	|
-	\flamdr d8.->\fr g16 \triplet { d8 d g }
+	\flamdr d8.-> g16 \triplet { d8\fr d g }
 	d8. d16\dr \< \triplet { g8 g d\! }
 }
 snareAAB = \drummode {% only different for unisons
-	\flam d4->\fr d8. g16
-	d4:32( g8.) d16:64(
+	\flam d4-> d8. g16
+	d4:32( g8.)\fr d16:64(
 	|
 	\triplet { d8) g d } \flam g8. d16->\dr
 }
 snareABB = \drummode {
 	g8. g16 \flam d4\fr
 	|
-	d4:32( d8.) g16
-	\flam d8. g16 d4:32(\<\dr
+	d4:32( g8.) g16\dr
+	\flam d4 d4:32(\<
 	|
 	d8.)->\! g16 d8. \flam g16
 	d4\fr d16 g d g
@ -54,34 +54,35 @@ snareA = \drummode {


 snareBAA = \drummode {
-	d4:32(->\dr g8.)\fr g16
-	d4:32(\< \triplet { g8)\staccato d\dr g\! }
+	d4:32(->\dr g8.) g16
+	d4:32(\< \triplet { g8)\staccato d g\! }
 	|
-	d8.->\fr g16 d8. g16:64(->\rn
+	d8.->\fr g16 d8. g16:64(->
 	g8.:32 d16) g8. g16\dr
 	|
 }
 snareBBA = \drummode {
-	d8.\fr g16 \p\< \triplet { d8 g d\! }
-	\flamdr \triplet { g8 d g } \flam d8. g16
+	d8. g16 \p\< \triplet { d8 g d\! }
+	\flam \triplet { g8\fr d g } \flam d4
 	|
-	\flam d8.\v\fr g16 d8. \flam g16
-	d4 d16\dr g d g
+	\flamdr d8.\v g16 d8. \flam g16
+	d4 d16 g d g
 	|
 }
 snareBAB = \drummode {% only different for unisons
-	d4:32(-> g8.)\fr g16
-	d4:32(\<\dr \triplet { g8)\staccato d g\! }
+	%d4:32(-> g8.)\fr g16
+	%d4:32(\<\dr \triplet { g8)\staccato d g\! }
+	d4:32(->\> g8.:32)\!(\staccato g16:32)(\staccato d2:32)(\<
 	|
-	d8.->\fr g16 d8. g16:64(->\rn
-	g8.:32 d16) g8. g16\dr
+	d8.)->\! g16 d8. \flam g16
+	d2
 	|
 }
 snareBBB = \drummode {
-	\flam d8.[\v\fr g16 d8. \dragdr g16]
-	g8.\fr g16 \flam d8. g16\dr
+	\flam d4\v d8.[ \drag g16]
+	g8.\fr g16 \flam d4
 	|
-	\flam d8.\v\fr g16 \triplet { d8 d \flamdr g }
+	\flamdr d8.\v g16 \triplet { d8 d \flam g }
 	\triplet { d8 g g } d4\staccato \fr
 }

--- a/reels/piper_of_drummond/side.ly
+++ b/reels/piper_of_drummond/side.ly
@ -1,20 +1,26 @@
-\version "2.18.2"
+\version "2.24.2"

 \include "lilydrum.ly"

 \include "./config.ily"
 \include "./notes.side.ily"

+mbreak = { \break }
 \score {
    \new PipeBandDrumStaff {
        \global
 			\unfoldRepeats \new DrumVoice = "side" {
 				\sideglobal
-
-				\snareA
+				<<
+					\snareA
+					{ s1*4 \mbreak | \grace{s8} s1}
+				>>
 				\break
 				\section
-				\snareB
+				<<
+					\snareB
+					{ s1*4 \mbreak | \grace{s8} s1 }
+				>>
 				\fine
 			}%Side
 	}
--- a/strathspeys/molly_connell/notes.side.ily
+++ b/strathspeys/molly_connell/notes.side.ily
@ -3,8 +3,8 @@
 \version "2.18.2"
 composerSide  = "C. Ooms, v1.2, 2015"
 sideglobal = {}
-intro = \drummode {% by Dean Hall, 2006
-	\flam d4
+intro = \drummode {% inspired by Dean Hall, 2006
+	\flam d4\v
 	\triplet { d8:32( g8:32 g8) }
 	d8. d16
 	\flam g8. d16:64(
@ -14,14 +14,14 @@ intro = \drummode {% by Dean Hall, 2006
 	g8. g16
 	d4:32(\<
 	|
-	d4)-> \!
-	\triplet { d8:32( g8:32 g8) }
-	\triplet { d8 d g }
-	\triplet { d8 g g }
+	d4)\v \!
+	\triplet { d8:32( d) g-> }
+	\triplet { d8 g \flam d }
+	\flam g8.-> \triplet { g32 d d }
 	|
-	\flam d8.-> g16
-	\tuplet 3/2 { d16 g d g d8 }
-	g4:32(
+	g8.\v g16
+	\triplet { d16[ g d g \drag d8] }
+	d4:32(
 	d4)
 	|
 }
--- a/strathspeys/molly_connell/side.ly
+++ b/strathspeys/molly_connell/side.ly
@ -8,25 +8,18 @@
 \score {
    \new PipeBandDrumStaff {
        \global
-        <<
-			{
-		  		\mark \markup { \normalsize {Intro } }
-				\line \bar ".|:-|."
-				\break
-				\mark \markup { \normalsize {Tune } }
-				\repeat volta 2 { \line } 
-				\break 
-				\part \line  \bar "||" 
-				\break
-				\part \line \bar "|." 
-			}
-			{
-			  \intro 
-			  \snareA s8 
-			  \snareBA s8 
-			  \snareBB 
-			}
-		>>
+		\sideglobal
+
+		\mark \markup { \normalsize {Intro } }
+		\intro
+		\break
+
+
+		\mark \markup { \normalsize {Tune } }
+		\repeat volta 2 { \snareA s8 }
+		\snareBA s8
+		\snareBB s8
+		\bar "|."
 	}
 	\header {
 		title = \title
--- a/strathspeys/molly_connell/side.no-intro.ly
+++ b/strathspeys/molly_connell/side.no-intro.ly
@ -0,0 +1,24 @@
+\version "2.18.2"
+
+\include "lilydrum.ly"
+
+\include "./config.ily"
+\include "./notes.side.ily"
+
+\score {
+    \new PipeBandDrumStaff {
+        \global
+		\sideglobal
+
+		\repeat volta 2 { \snareA s8 }
+		\snareBA s8 
+		\snareBB s8
+		\bar "|."
+	}
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentSide
+		composer = \composerSide
+	}
+}
--- a/strathspeys/orange_and_blue/notes.side.ily
+++ b/strathspeys/orange_and_blue/notes.side.ily
@ -1,7 +1,7 @@
 % 4/4 Orange and Blue
 % Side
 \version "2.18.2"
-composerSide = "E.T. de Boone, v0.8, 2021 (2023)" % 2021-11-08
+composerSide = "E.T. de Boone, v0.9, 2021 (2023)" % 2021-11-08
 arrangerSide = ""
 sideglobal = {
 	\sixteenthBeaming
@ -9,38 +9,38 @@ sideglobal = {

 % Music
 snareEnding = \drummode {
-	g16	\flam d4	\drag \quintuplet { d16 d g d g }	d8.\! g16\dr |
+	g16	\flam d4	\dragdr \quintuplet { d16\fr d g d g }	d8.\! g16\dr |
 	\drag d16 d8.	\triplet { g8 d \flam g }	d4:32(	d4)\fr |
 }

 snareA = \drummode {
-	\flam d16 g8.	d4:32(\<\dr	d8.)\!\fr d16	\drag g16 g8. |
-	d8.->\dr d16	\triplet { g8 d16 g d g }	d8.->\fr \flam g16
+	\flamdr d16\fr g8.	d4:32(\<\dr	d8.)\!\fr d16	\drag g16 g8. |
+	d8.->\dr d16	\triplet { g8\fr d16 g d g }	\dragdr d8.->\fr\< \flam g16

-	\tutti{ d4:32(\< |
-	d4)\! }	 \triplet { d16 g d g d8 } \triplet { g8 d8:64( d8)}	g8. g16\dr |
-	d4:32(	d8.) d16:64(	d16)\fr g8.->	d32 g d g d8
+	\tutti{ d4:32( |
+	d4)->\! }	 \quintuplet { d16 g d g d }	g8.-> d32:64( d32)	g8.-> g16\dr |
+	d4:32(	d8.) d16:64(	d16) g8.->\fr	d32 g d g d8

 	% repeat
-	\flamdr d16 g8.	 d4:32(\<	d8.)\!\fr d16	\drag g16 g8. |
-	d8.->\dr d16	\triplet { g8 d16 g d g }	d8.->\fr \flam g16
+	\flamdr d16 g8.	 d4:32(\<	d8.)\! d16	\drag g16\fr g8. |
+	d8.->\dr d16	\triplet { g8 d16 g d g }	\drag d8.->\fr\< \flam g16

-	d4:32(\<\dr |
-	d8.)\!\fr \snareEnding
+	d4:32(\dr |
+	d8.)->\!\fr \snareEnding
 }

 snareB = \drummode {
-	\flamdr d8.\fr d16:64(	d8.) g16	d16:64(\dr d8.)\fr	\flam d8. \flamdr g16 |
+	\flamdr d8.\fr d16:64(	d8.) g16\dr	d16:64( d8.)\fr	\flam d8. \flamdr g16 |
 	\triplet { d8 d8 \flam g8 }	\flam d8.\fr g16	\flam d8.[ \dragdr d16]

 	\triplet { d16\< g d g d8 } |
-	g4\v\!\fr	\triplet { d16 d g g d8 }	g4:32(\<	d4:32)(->\>\dr |
-	\triplet { g8)\! d g }	\triplet { d8 g16 d g d }	g8.->\fr g16	\flam d4 |
+	g4->\!\fr	\triplet { d16 d g g d8 }	g4:32(\<	d4:32)(->\>\dr |
+	\triplet { g8)\! d g }	\triplet { d8\fr g16 d g d }	g8.->\dr g16	\flam d4 |

 	% repeat
-	\flamdr d8. d16:64(	d8.)\fr g16	d16:64( d8.)	\flam d8. \flamdr g16 |
+	\flam d8. d16:64(	d8.)\fr g16	d16:64( d8.)	\flam d8. \flamdr g16 |
 	\triplet { d8 d8 \flam g8 }	\flam d8.\fr g16	\flam d8.[  \dragdr d16]

 	\triplet { d16\< g d g d8 } |
-	g8.\v\!\fr \snareEnding
+	g8.->\!\fr \snareEnding
 }
Author	SHA1	Message	Date
Eric Teunis de Boone	8066ef7a60	[pipes] Missing gracenotes in Jock Wilson's Ball (not verified)	2023-08-14 21:48:00 +02:00
Eric Teunis de Boone	c13f28fdfc	[side] Rerender Leaving of Liverpool	2023-08-14 21:43:01 +02:00
Eric Teunis de Boone	88522ce669	[side] small tweaks Set 11: Flett from Flotta and Pikeman's March	2023-08-14 21:43:01 +02:00
Eric Teunis de Boone	f8d2904406	[side] Piper of Drummond v0.6 unisons change	2023-08-14 21:42:56 +02:00
Eric Teunis de Boone	34c3f3c72f	[side] Jock Wilson's Ball v0.7	2023-08-14 21:42:56 +02:00
Eric Teunis de Boone	1cb1fa37c7	Orange and Blue Side v0.9	2023-08-08 17:21:20 +02:00
Eric Teunis de Boone	39e252df14	Tweak Molly Connell Snare Intro	2023-08-08 17:21:20 +02:00