.gitignore

@@ -3,4 +3,3 @@ sets
 **/*.midi
 **/*.png
 **/*.bww
-**/rec/

2-4_marches/caller_herrin/bass.ly

@@ -5,31 +5,24 @@
 \include "./config.ily"
 \include "./notes.bass.ily"
 
-mbreak = {\break}
-
 \score {
     \new PipeBandDrumStaff {
         \global
 		<<
 			\new NullVoice = "format" {
-				\repeat segno 2 {
 					\repeat volta 2 {
-						\part
 						\halfline
-						\volta 2 { \segnoMark \default }
+						\mark \markup { \musicglyph "scripts.segno"}
+						\inStaffSegno
 						\halfline
-						\volta 2 { \fine }
+						\fine
 					}
+					\break
 
-					\volta 1 {
+					\halfline
-						\allowBreak
+					\halfline
-						\mbreak
+					\dsalfine
-						\part
+					\bar "||"
-						\halfline
-						\halfline
-						\bar "||"
-					}
-				}
 			}%Format
 			\new DrumVoice = "bass" {
 				\bassglobal

2-4_marches/caller_herrin/drums.ly

@@ -13,29 +13,6 @@
 	short-indent = 2.0
 }
 
-mbreak = {\break}
-
-timing = \new NullVoice = "format" {
-			\repeat segno 2 {
-				\repeat volta 2 {
-					\part
-					\halfline
-					\volta 2 { \segnoMark \default }
-					\halfline
-					\volta 2 { \fine }
-				}
-
-				\volta 1 {
-					\allowBreak
-					\mbreak
-					\part
-					\halfline
-					\halfline
-					\bar "||"
-				}
-			}
-		} % Format
-
 \score {
 	\new StaffGroup <<
 		\new PipeBandDrumStaff = "side" \with {
@@ -44,7 +21,28 @@ timing = \new NullVoice = "format" {
 		} {
 			\global
 			<<
-				\timing
+				\new NullVoice = "format" {
+					\repeat volta 2 {
+						\part
+						\halfline
+						\mark \markup { \musicglyph "scripts.segno"}
+						\inStaffSegno
+						\halfline
+						\fine
+					}
+					\break
+
+					\part
+					\halfline
+					\halfline
+					\dsalfine
+					\bar "||"
+					%\break
+					%\halfline
+					%\break
+					%\halfline
+					%\bar "|."
+				}%End of Format
 				\new DrumVoice = "side" {
 					\sideglobal
 					\sideA s8
@@ -57,22 +55,16 @@ timing = \new NullVoice = "format" {
 			shortInstrumentName = \markup{ \shortInstrumentTenor }
 		} {
 			\tenorglobal
-			<< \timing
+			\tenorA s8
-			{
+			\removeWithTag #'fine \tenorB
-				\tenorA s8
-				\removeWithTag #'fine \tenorB
-			} >>
 		}
 		\new PipeBandDrumStaff = "bass" \with {
 			instrumentName = \markup{ \instrumentBass }
 			shortInstrumentName = \markup{ \shortInstrumentBass }
 		} {
 			\bassglobal
-			<< \timing
+			s8 \bassA
-			{
+			s8 \removeWithTag #'fine \bassB
-				s8 \bassA
-				s8 \removeWithTag #'fine \bassB
-			} >>
 		}
 	>>
 	\header {

2-4_marches/caller_herrin/full.ly

@@ -18,29 +18,6 @@
 
 #(set-global-staff-size 18)
 
-mbreak = {\break}
-
-timing = \new NullVoice = "format" {
-			\repeat segno 2 {
-				\repeat volta 2 {
-					\part
-					\halfline
-					\volta 2 { \segnoMark \default }
-					\halfline
-					\volta 2 { \fine }
-				}
-
-				\volta 1 {
-					\allowBreak
-					\mbreak
-					\part
-					\halfline
-					\halfline
-					\bar "||"
-				}
-			}
-		} % Format
-
 \score {
 	\new StaffGroup <<
 		\new Staff \with {
@@ -50,7 +27,28 @@ timing = \new NullVoice = "format" {
 			\global
 			\pipeglobal
 			<<
-				\timing
+				\new NullVoice = "format" {
+					\repeat volta 2 {
+						\part
+						\halfline
+						\mark \markup { \musicglyph "scripts.segno"}
+						\inStaffSegno
+						\halfline
+						\fine
+					}
+					\break
+
+					\part
+					\halfline
+					\halfline
+					\dsalfine
+					\bar "||"
+					%\break
+					%\halfline
+					%\break
+					%\halfline
+					%\bar "|."
+				} % Format
 				\new Voice = "pipes" {
 				  \pipesA s8
 				  \removeWithTag #'fine \pipesB
@@ -84,33 +82,27 @@ timing = \new NullVoice = "format" {
 			shortInstrumentName = \markup{ \shortInstrumentSide }
 		} {
 			\sideglobal
-			<< \timing
+
-			{
+			\sideA s8
-				\sideA s8
+			\removeWithTag #'fine \sideB
-				\removeWithTag #'fine \sideB
-			} >>
 		}
 		\new PipeBandDrumStaff = "tenor" \with {
 			instrumentName = \markup{ \instrumentTenor }
 			shortInstrumentName = \markup{ \shortInstrumentTenor }
 		} {
 			\tenorglobal
-			<< \timing
+
-			{
+			\tenorA s8
-				\tenorA s8
+			\removeWithTag #'fine \tenorB
-				\removeWithTag #'fine \tenorB
-			} >>
 		}
 		  \new PipeBandDrumStaff = "bass" \with {
 			instrumentName = \markup{ \instrumentBass }
 			shortInstrumentName = \markup{ \shortInstrumentBass }
 		} {
 			\bassglobal
-			<< \timing
+
-			{
+			s8 \bassA
-				s8 \bassA
+			s8 \removeWithTag #'fine \bassB
-				s8 \removeWithTag #'fine \bassB
-			} >>
 		}
 	>>
 	\header {

2-4_marches/caller_herrin/mid.ly

@@ -11,28 +11,6 @@
 	short-indent = 2.0
 }
 
-mbreak = {\break}
-timing = \new NullVoice = "format" {
-			\repeat segno 2 {
-				\repeat volta 2 {
-					\part
-					\halfline
-					\volta 2 { \segnoMark \default }
-					\halfline
-					\volta 2 { \fine }
-				}
-	
-				\volta 1 {
-					\allowBreak
-					\mbreak
-					\part
-					\halfline
-					\halfline
-					\bar "||"
-				}
-			}
-		}%End of Format
-
 \score {
 	\new StaffGroup <<
 		\new PipeBandDrumStaff = "tenor" \with {
@@ -41,7 +19,23 @@ timing = \new NullVoice = "format" {
 		} {
 			\global
 			<<
-				\timing
+				\new NullVoice = "format" {
+					\repeat volta 2 {
+						\part
+						\halfline
+						\mark \markup { \musicglyph "scripts.segno"}
+						\inStaffSegno
+						\halfline
+						\fine
+					}
+					\break
+
+					\part
+					\halfline
+					\halfline
+					\dsalfine
+					\bar "||"
+				}%End of Format
 				\new DrumVoice = "tenor" {
 					\tenorglobal
 					\tenorA s8
@@ -54,10 +48,8 @@ timing = \new NullVoice = "format" {
 			shortInstrumentName = \markup{ \shortInstrumentBass }
 		} {
 			\bassglobal
-			<< \timing
+			s8 \bassA
-			{ s8 \bassA
+			s8 \removeWithTag #'fine \bassB
-			  s8 \removeWithTag #'fine \bassB
-			} >>
 		}
 	>>
 	\header {

2-4_marches/caller_herrin/notes.tenor.ily

@@ -1,28 +1,15 @@
 % 2/4 Caller Herrin
 % Tenor
 \version "2.18.2"
-composerTenor = "E.T. de Boone, v0.3"
+composerTenor = "E.T. de Boone, v0.2"
 arrangerTenor = ""
 tenorglobal = {}
-
-startRPiano = #(define-event-function (parser location) () #{
-    -\tweak HorizontalBracketText.text "R"
-    \startGroup
-#})
-
-startTPiano = #(define-event-function (parser location) () #{
-    -\tweak HorizontalBracketText.text "T"
-    \startGroup
-#})
-
 % Music
 tenorA = \drummode {
 	\tag #'fineRemove {
 		\tag #'upbeat { d8 | }
-		g4\up 
+		g4\up	d8 g |
-			
+		d8 g	d4 |
-			d8\startRPiano g |
-		d8 g	d4\stopGroup |
 		g4\up d8.\up
 		g16 |
 		d4	g8
@@ -30,8 +17,8 @@ tenorA = \drummode {
 		d8 |
 	}
 
-	g4\up	d8\startRPiano g |
+	g4\up	d8 g |
-	d8 g	d4\stopGroup |
+	d8 g	d4 |
 	g4	\scoop { d8. g16 |
 	d4 } r8
 }

2-4_marches/caller_herrin/pipes.cairns.ly

@@ -5,7 +5,16 @@
 \include "./config.ily"
 \include "./notes.pipes.ily"
 
-mbreak = {\break}
+markTextEolDown = #(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
+    \once \override Score.RehearsalMark #'direction = #DOWN
+    \mark \markup $text
+#})
+
+fine = {\markTextEolDown "Fine" }
+dsalfine = {\markTextEolDown "D.S. al Fine" }
+
 
 \score {
     \new Staff {
@@ -13,24 +22,26 @@ mbreak = {\break}
 		\pipeglobal
 		<<
 			\new NullVoice = "format" {
-				\repeat segno 2 {
+				\repeat volta 2 {
-					\repeat volta 2 {
+					\part
-						\part
+					\halfline
-						\halfline
+					\mark \markup { \musicglyph "scripts.segno"}
-						\volta 2 { \segnoMark \default }
+					%\inStaffSegno
-						\halfline
+					\halfline
-						\volta 2 { \fine }
+					\fine
-					}
-	
-					\volta 1 {
-						\allowBreak
-						\mbreak
-						\part
-						\halfline
-						\halfline
-						\bar "||"
-					}
 				}
+				\break
+
+				\part
+				\halfline
+				\halfline
+				\dsalfine
+				\bar "||"
+				%\break
+				%\halfline
+				%\break
+				%\halfline
+				%\bar "|."
 			} % Format
 			\new Voice = "pipes" {
 				\pipesAvI s8

2-4_marches/caller_herrin/pipes.full.ly

@@ -45,7 +45,7 @@
 
 			\pipesSecA s8
 
-			\pipesSecB s8
+			\pipesSecB
 
 		}
 	>>

2-4_marches/caller_herrin/pipes.ly

@@ -5,7 +5,16 @@
 \include "./config.ily"
 \include "./notes.pipes.ily"
 
-mbreak = {\break}
+markTextEolDown = #(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
+    \once \override Score.RehearsalMark #'direction = #DOWN
+    \mark \markup $text
+#})
+
+fine = {\markTextEolDown "Fine" }
+dsalfine = {\markTextEolDown "D.S. al Fine" }
+
 
 \score {
     \new Staff {
@@ -13,24 +22,26 @@ mbreak = {\break}
 		\pipeglobal
 		<<
 			\new NullVoice = "format" {
-				\repeat segno 2 {
 				\repeat volta 2 {
 					\part
 					\halfline
-					\volta 2 { \segnoMark \default}
+					\mark \markup { \musicglyph "scripts.segno"}
+					%\inStaffSegno
 					\halfline
-					\volta 2 { \fine }
+					\fine
 				}
+				\break
 
-				\volta 1 {
+				\part
-					\allowBreak
+				\halfline
-					\mbreak
+				\halfline
-					\part
+				\dsalfine
-					\halfline
+				\bar "||"
-					\halfline
+				%\break
-					\bar "||"
+				%\halfline
-				}
+				%\break
-				}
+				%\halfline
+				%\bar "|."
 			} % Format
 			\new Voice = "pipes" {
 				\pipesA s8

2-4_marches/caller_herrin/side.ly

@@ -5,30 +5,26 @@
 \include "./config.ily"
 \include "./notes.side.ily"
 
-mbreak = {\break}
 \score {
     \new PipeBandDrumStaff {
         \global
 		<<
 			\new NullVoice = "format" {
-				\repeat segno 2 {
+				\repeat volta 2 {
-					\repeat volta 2 {
+					\part
-						\part
+					\halfline
-						\halfline
+					\mark \markup { \musicglyph "scripts.segno"}
-						\volta 2 { \segnoMark \default }
+					%\inStaffSegno
-						\halfline
+					\halfline
-						\volta 2 { \fine }
+					\fine
-					}
-
-					\volta 1 {
-						\allowBreak
-						\mbreak
-						\part
-						\halfline
-						\halfline
-						\bar "||"
-					}
 				}
+				\break
+
+				\part
+				\halfline
+				\halfline
+				\dsalfine
+				\bar "||"
 			} % Format
 			\new DrumVoice = "side" {
 				\sideglobal

2-4_marches/caller_herrin/tenor.ly

@@ -5,31 +5,26 @@
 \include "./config.ily"
 \include "./notes.tenor.ily"
 
-mbreak = {\break}
-
 \score {
     \new PipeBandDrumStaff {
 		\global
 		<<
 			\new NullVoice = "format" {
-				\repeat segno 2 {
+				\repeat volta 2 {
-					\repeat volta 2 {
+					\part
-						\part
+					\halfline
-						\halfline
+					\mark \markup { \musicglyph "scripts.segno"}
-						\volta 2 { \segnoMark \default }
+					%\inStaffSegno
-						\halfline
+					\halfline
-						\volta 2 { \fine }
+					\fine
-					}
-
-					\volta 1 {
-						\allowBreak
-						\mbreak
-						\part
-						\halfline
-						\halfline
-						\bar "||"
-					}
 				}
+				\break
+
+				\part
+				\halfline
+				\halfline
+				\dsalfine
+				\bar "||"
 			}%Format
 			\new DrumVoice = "tenor" {
 				\tenorglobal

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

@@ -2,7 +2,7 @@
 % Side
 \version "2.18.2"
 composerSide = "Seaforth Highlanders of Canada"
-arrangerSide = "E.T. de Boone, 2018, v2.0.1"
+arrangerSide = "E.T. de Boone, 2018, v2.0"
 arrangerSideOrig = ""
 sideglobal = {
 	\eighthBeaming
@@ -82,7 +82,7 @@ snareAA = \drummode {
 	\tutti { 
 		r8 \triplet { g16 d g }	
 		\flam d16. d32 \flam g16. g32
-		d16.[ \drag d32 d8  ]
+		d16.[ \drag d32 \triplet { d16 g d ] }
 		g8\v
 	}
 
@@ -104,7 +104,7 @@ snareAB = \drummode {
 		|
 		r8 \triplet { g16 d g }
 		\flam d16. d32 \flam g16. g32
-		d16.[ \drag d32 d8  ]
+		d16.[ \drag d32 \triplet { d16 g d ] }
 		g8\v
 
 		%% \simpleSnareEndingII
@@ -131,7 +131,7 @@ snareBA = \drummode {
 	\tutti {
 		r16. g32 d16. g32
 		d32 g d g d16.\v g32
-		d16.[ \drag d32 d8 ]
+		d16.[ \drag d32 \triplet { d16 g d ] }
 		g8\v
 	}
 
@@ -154,7 +154,7 @@ snareBB = \drummode {
 		|
 		r16. g32 d16. g32	
 		d32 g d g d16.\v g32
-		d16.[ \drag d32 d8 ]
+		d16.[ \drag d32 \triplet { d16 g d ] }
 		g8\v
 
 		%% \simpleSnareEndingII
@@ -182,7 +182,7 @@ snareCA = \drummode {
 	\tutti {
 		r16 d8:32(-> g16)\v
 		d8:32(-> g)\v
-		d16.[ \drag d32 d8 ]
+		d16.[ \drag d32 \triplet { d16 g d ] }
 		g8\v
 	}
 
@@ -204,7 +204,7 @@ snareCB = \drummode {
 		|
 		r16 d8:32(-> g16)\v
 		d8:32(-> g)\v
-		d16.[ \drag d32 d8 ]
+		d16.[ \drag d32 \triplet { d16 g d ] }
 		g8\v
 
 		%% \simpleSnareEndingII

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

@@ -1,7 +1,7 @@
 % 4/4 Rowan Tree
 % Snare
 \version "2.18.2"
-composerSide = "v1.2"
+composerSide = "v1.1"
 sideglobal = { \eighthBeaming }
 
 %%music
@@ -10,9 +10,9 @@ snareEnding = \drummode {
 	d8:32(
 	g8[) d8]:32(
 	\tuplet 3/2 { g16) d g } \flam d16. g32
-	d16. g32-> d g d g
+	d16.\fr g32-> d g d g
 	|
-	d4	d4:32(	d4)
+	\flamdr d4	d4:32(	d4) \fr
 }
 snareA = \drummode {
 	r8 \tutti {
@@ -29,14 +29,15 @@ snareA = \drummode {
 	|
 	\flamdr d8
 	\snareEnding
-	\fr
 }
 % Part 2
 snareBA = \drummode {
 	d8. g16 |
-	\tutti{d8[:32(->} \tutti{g8]:32)(->}	d8[:32)( \tutti{g8]:32)(->}	d8[:32)( \tutti{g8]:32)(->}	\tutti{ d8[)-> d8]:32( |
+	\tutti {
-	g8.) }  g16\pp	d8:32( g8)	\flam d8 d8:32(	g8.) g16\mf\dr |
+		d8[:32(->
+		g8]:32)(->	d8[:32)( g8]:32)(->	d8[:32)( g8]:32)(->	d8[)->
+	} d8]:32( \pp |
+	g8.) g16	d8:32( g8)	\flam d8 d8:32(	g8.) g16\mf\dr |
 	\flam d8\v
 	\snareEnding
-	\fr
 }

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

@@ -28,7 +28,7 @@ snareABB = \drummode {
 % Part 2
 snareBA = \drummode {
 	d8:32(\dr |
-	g8) d16. g32	\flam d16. d32:128( d8)	\flam d8 d16.\p\< g32	d8:32(-> g8:32)(-> |
+	g8) d16. g32	\flam d16. d32:128( d8)	\flam d8 d16. g32	d8:32(-> \< g8:32)(-> |
 	d8.)->\fr \! g16	d8:32( g16.) g32	d8:32( g16.) g32	\sextuplet { d16[ g d-> g d g] } |
 
 	\flamdr d8 d16. g32->	d16. d32 \flam g8	\flam d4	\triplet { <> \p d16 g d } \flam g8 |

4-4_marches/wings/side.ly

@@ -17,11 +17,11 @@ mbreak = {\break}
 				\repeat segno 2 {
 					\repeat volta 2 {
 						\quartline
-						\alternative {
+					} \alternative {
-							\quartline
+						\quartline
-							\quartline
+						{	\quartline
+							\fine
 						}
-						\volta 2 { \fine }
 					}
 
 					\volta 1 {

4-4_marches/wings/side.nofine.ly

@@ -6,19 +6,17 @@
 \include "./notes.side.ily"
 
 \score {
-	\new PipeBandDrumStaff {
+    \new PipeBandDrumStaff {
-		\global
+        \global
-		<<
+        <<
 			\new NullVoice = "format" {
 				\partial 8 s8 \line \bar "||"
 				\break
 				\partial 8 s8 \halfline \bar "||"
-				\halfline
+				\halfline \bar "|."
-				\fine
 			}%Format
 
 			\new DrumVoice = "side" {
-			\sideglobal
 				\snareAA	\snareABA
 				<>\dr
 					\removeWithTag #'tutti { \snareAAI \snareABB r8 s8 } \fr

5-4_marches/cullen_bay/full.ly

@@ -8,31 +8,23 @@
 \include "./notes.tenor.ily"
 \include "./notes.side.ily"
 \include "./notes.pipes.ily"
-\include "./notes.pipes.seconds.ily"
-%\include "./notes.lyrics.ily"
-
-\layout {
-	indent = 5.0
-	short-indent = 2.0
-}
 
 \score {
 	\new StaffGroup <<
-		\new Staff \with {
+		\global
-			instrumentName = \markup{ \instrumentPipes }
+		\new Staff {
-			shortInstrumentName = \markup{ \shortInstrumentPipes }
+			\pipeglobal
-		} {
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentPipes }
-			\global
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentPipes }
 			<<
-				\new NullVoice = "format" {
+				\global
+				{
 					\repeat unfold 4 {
 						\line \bar "||"	\break
 						\line \bar "|." \break
 					}		
 				}%Format
-				\new Voice = "pipes" {
+				{
-					\pipeglobal
-
 					\repeat unfold 2 { \pipesA }
 					\repeat unfold 2 { \pipesB }
 					\repeat unfold 2 { \pipesC }
@@ -40,82 +32,48 @@
 				}%Pipes
 			>>
 		}
-%{		\new Staff = "song" {
+		\new PipeBandDrumStaff = "side" {
-  			\lyricsglobal
+			\set PipeBandDrumStaff.instrumentName = \markup \column {\instrumentSide}
-			\new Voice = "lyrics" {
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide}
-
-			}
-		}
-}%
-%{		\new Lyrics = "verse1" {
-		  \lyricsglobal
-		  \lyricsto "lyrics" {
-			\verseA
-		  }
-		}
-%}
-		\new Staff = "seconds" \with {
-			instrumentName = \markup{ \instrumentPipes \instrumentSecnd }
-			shortInstrumentName = \markup{ \shortInstrumentPipes \shortInstrumentSecnd }
-		} {
-			\pipessecndglobal
-
-			\repeat unfold 2 { \pipessecndA }
-			\repeat unfold 2 { \pipessecndB }
-			\repeat unfold 2 { \pipessecndC }
-			\repeat unfold 2 { \pipessecndD }
-		}
-		\new PipeBandDrumStaff = "side" \with {
-			instrumentName = \markup { \instrumentSide }
-			shortInstrumentName = \markup{ \shortInstrumentSide }
-		} {
-			\sideglobal
-
 			\repeat unfold 2 { \snareA }
 			\repeat unfold 2 { \snareB }
 			\repeat unfold 2 { \snareC }
 			\repeat unfold 2 { \snareD }
+
 		}
-		\new PipeBandDrumStaff = "tenor" \with {
+		\new PipeBandDrumStaff = "tenor" {
-			instrumentName = \markup{ \instrumentTenor }
-			shortInstrumentName = \markup{ \shortInstrumentTenor }
-		} {
 			\tenorglobal
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
 
 			\repeat unfold 4 {
 				\tenorAA
 				\tenorAB
 			}
 		}
-		\new PipeBandDrumStaff = "bass" \with {
+		\new PipeBandDrumStaff = "bass" {
-			instrumentName = \markup{ \instrumentBass }
-			shortInstrumentName = \markup{ \shortInstrumentBass }
-		} {
 			\bassglobal
-
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}
 			\repeat unfold 4 {
 				\bassAA
 				\bassAB
 			}
+
 		}
 	>>
 	\header {
 		title = \title
-		subtitle = \subtitle
 		meter = \meter
 		composer = \markup \large {
 			\column \right-align {
-				$(if (not (string=? "" composerLyrics)) #{ \markup { \line { \composerLyrics ":" } } #} )
 				$(if (not (string=? "" composerPipes))  #{ \markup {\line { \composerPipes  ":" }} #} )
-				$(if (not (string=? "" composerPipessecnd))  #{ \markup {\line { \composerPipessecnd ":" }} #} )
 				$(if (not (string=? "" composerSide))  #{ \markup {\line { \composerSide  ":" }} #} )
 				$(if (not (string=? "" composerTenor)) #{ \markup {\line { \composerTenor  ":" }} #} )
 				$(if (not (string=? "" composerBass))  #{ \markup {\line { \composerBass  ":" }} #} )
 			}
 			\column \right-align {
-				$(if (not (string=? "" composerLyrics)) #{ \markup { \line { "Lyrics" } } #} )
 				$(if (not (string=? "" composerPipes))  #{ \markup {\line { \instrumentPipes }}#} )
-				$(if (not (string=? "" composerPipessecnd))  #{ \markup {\line { \instrumentPipessecnd }}#} )
 				$(if (not (string=? "" composerSide))  #{ \markup {\line { \instrumentSide }}#} )
 				$(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} )
 				$(if (not (string=? "" composerBass))  #{ \markup {\line { \instrumentBass }}#} )

5-4_marches/cullen_bay/notes.pipes.ily

@@ -1,35 +1,35 @@
 % 5/4 Cullen Bay
 % Pipes
 \version "2.18.2"
-composerPipes = "Ian Duncan"
+composerPipes = "I. Duncan"
 pipeglobal = {
-  \key a \mixolydian
+	\key a \mixolydian
 }
 % Music
 pipesA = {
-  \grg a8. b16	\dblc c8 \gre a8	\grg b8 \grd c16. b32	\grG a2 |
+	\grg c8. [ d16 ] \dble e8 [ \grg c8 ] \thrwd d8 [ \grg e16. d32 ] \grg c2 |
-  \grg c8. d16	\dble e8 c8	\thrwd d8 e32 f16.	\dble e2 |
+	\grg a8. [ b16 ] \dblc c8 [ \grg a8 ] \grip b8 [ c32 d16. ] \dblc c2 |
-  \grg f8 A8	\hdble e8 c8	\thrwd d8 \grg e16. d32	\dblc c2 |
+	\grg d8 [ f8 ] \dblc c8 [ \gre a8 ] \grip b8 [ \grg c16. b32 ] \dblc e2 |
-  \grg a8. b16	\dblc c8 \gre a8	\grg b8 \grd c16. b32	\grG a2 |
+	\grg c8. [ d16 ] \dble e8 [ \grg c8 ] \thrwd d8 [ \grg e16. d32 ] \grg c2
 }
 
 pipesB = {
-  \dblA A8 e8	\dble e8 c32 e16.	\grg f8 e32 c16.	\dble e2 |
+	\dblf f8 [ c8 ] \dblc c8 [ a32 c16. ] \grg d8 [ c32 a16. ] \dblc c2 |
-  \dblA A8 e8	\dble e8 c32 e16.	\grg f8 e32 c16.	\dblb b2 |
+	\dblf f8 [ c8 ] \dblc c8 [ a32 c16. ] \grg d8 [ c32 a16. ] \dbld d2 |
-  \dblA A8 e8	\dble e8 c32 e16.	\grg f8 e32 c16.	\dble e2 |
+	\dblf f8 [ c8 ] \dblc c8 [ a32 c16. ] \grg d8 [ c32 a16. ] \dblc c2 |
-  \grg a8. b16	\dblc c8 \gre a8	\grg b8 \grd c16. b32	\grG a2 |
+	\grg c8. [ d16 ] \dble e8 [ \grg c8 ] \thrwd d8 [ \grg e16. d32 ] \grg c2
 }
 
 pipesC = {
-  \dblc c8 \gre a8	\wbirl a8 b32 c16.	\thrwd d8 c32 b16.	\dblc c2 |
+	\dble e8 [ \gre c8 ] c8 [ d32 e16. ] f8 [ e32 d16. ] \grG a2 |
-  \dble e8 c8	\grG c8 d32 e16.	\thrwd d8 e32 f16.	\dblc c2 |
+	\dblc c8 [ a8 ] a8 [ b32 c16. ] b8 [ c32 d16. ] \dblc c2 |
-  \grg f8 A8	\hdble e8 c8	\thrwd d8 \grg e16. d32	\dblc c2 |
+	\grg d8 [ f8 ] \dblc c8 [ a8 ] \dblb b8 [ \grg c16. b32 ] \dblc c2 |
-  \grg a8. b16	\dblc c8 \gre a8	\grg b8 \grd c16. b32	\grG a2 |
+	\grg c8. [ d16 ] \dble e8 [ \grg c8 ] \thrwd d8 [ \grg e16. d32 ] \grg c2 
 }
 
 pipesD = {
-  \dble e8 c32 e16.	\dblA A8 e	\grg f8 e32 c16.	\dble e2 |
+	\dblc c8 [ \grg a32 c16. ] \dblf f8 [ c8 ] \dbld d8 [ c32 a16. ] \dblc c2 |
-  \dblc c8 \gre a8	\wbirl a8 b32 c16.	e8 d32 c16.	\dblb b2 |
+	\dble e8 [ \grg c8 ] \grip c8 [ \grg d32 e16. ] \dblc c8 [ b32 a16. ] \dblG G2 |
-  \dble e8 c32 e16.	\dblg f8 A8	f16. e32 \grg d16. f32	\dble e2 |
+	\dblc c8 [ \grg a32 c16. ] \grg d8 [ f8 ] \grg d16. [ c32 b16. ] d32 ] \dblc c2 |
-  \grg a8. b16	\dblc c8 \gre a8	\grg b8 \grd c16. b32	\grG a2 |
+	\grg c8. [ d16 ] \dble e8 [ \grg c8 ] \thrwd d8 [ \grg e16. d32 ] \dblc c2 
 }

5-4_marches/cullen_bay/notes.pipes.seconds.ily

@@ -1,33 +0,0 @@
-% 5/4 Cullen Bay
-% Pipes (Seconds)
-\version "2.18.2"
-composerPipesSecnd = "Ian Duncan"
-arrangerPipesSecnd = ""
-pipessecndglobal = {
-  \key a \mixolydian
-}
-% Music
-pipessecndA = {
-  \grg c8. [ d16 ]	\dble e8 [ \grg c8 ]	\thrwd d8 [ \grg e16. d32 ]	\grg c2 |
-  \grg a8. [ b16 ]	\dblc c8 [ \grg a8 ]	\grip b8 [ c32 d16. ]	\dblc c2 |
-  \grg d8 [ f8 ]	\dblc c8 [ \gre a8 ]	\grip b8 [ \grg c16. b32 ]	\dblc e2 |
-  \grg c8. [ d16 ]	\dble e8 [ \grg c8 ]	\thrwd d8 [ \grg e16. d32 ]	\grg c2
-}
-pipessecndB = {
-  \dblf f8 [ c8 ]	\dblc c8 [ a32 c16. ]	\grg d8 [ c32 a16. ]	\dblc c2 |
-  \dblf f8 [ c8 ]	\dblc c8 [ a32 c16. ]	\grg d8 [ c32 a16. ]	\dbld d2 |
-  \dblf f8 [ c8 ]	\dblc c8 [ a32 c16. ]	\grg d8 [ c32 a16. ]	\dblc c2 |
-  \grg c8. [ d16 ]	\dble e8 [ \grg c8 ]	\thrwd d8 [ \grg e16. d32 ]	\grg c2
-}
-pipessecndC = {
-  \dble e8 [ \gre c8 ]	c8 [ d32 e16. ]	f8 [ e32 d16. ]	\grG a2 |
-  \dblc c8 [ a8 ]	a8 [ b32 c16. ]	b8 [ c32 d16. ]	\dblc c2 |
-  \grg d8 [ f8 ]	\dblc c8 [ a8 ]	\dblb b8 [ \grg c16. b32 ]	\dblc c2 |
-  \grg c8. [ d16 ]	\dble e8 [ \grg c8 ]	\thrwd d8 [ \grg e16. d32 ]	\grg c2 
-}
-pipessecndD = {
-  \dblc c8 [ \grg a32 c16. ]	\dblf f8 [ c8 ]	\dbld d8 [ c32 a16. ]	\dblc c2 |
-  \dble e8 [ \grg c8 ]	\grip c8 [ \grg d32 e16. ]	\dblc c8 [ b32 a16. ]	\dblG G2 |
-  \dblc c8 [ \grg a32 c16. ]	\grg d8 [ f8 ]	\grg d16. [ c32 b16. d32 ]	\dblc c2 |
-  \grg c8. [ d16 ]	\dble e8 [ \grg c8 ]	\thrwd d8 [ \grg e16. d32 ]	\dblc c2 
-}

5-4_marches/cullen_bay/pipes.full.ly

@@ -1,123 +0,0 @@
-\version "2.19.0"
-
-\include "bagpipe.ly"
-
-\include "./config.ily"
-\include "./notes.pipes.ily"
-\include "./notes.pipes.seconds.ily"
-%\include "./notes.pipes.thirds.ily"
-
-\layout {
-	indent = 8.0
-	short-indent = 2.0
-}
-
-\score {
-	\new StaffGroup <<
-		\new Staff = "pipes" \with {
-			instrumentName = \markup{ \instrumentPipes }
-			shortInstrumentName = \markup{ \shortInstrumentPipes }
-		} {
-			\global
-			\pipeglobal
-			<<
-			  	\new NullVoice = "format" {
-					\repeat unfold 4 {
-						\repeat volta 2 { \line } \break
-					}
-				}%Format
-				\new Voice = "pipes" {
-					\pipesA
-					\pipesB
-					\pipesC
-					\pipesD
-				}%Pipes
-			>>
-		}
-		\new Staff = "seconds" \with {
-			instrumentName = \markup{ \instrumentPipesSecnd }
-			shortInstrumentName = \markup{ \shortInstrumentPipesSecnd }
-		} {
-			\pipessecndglobal
-			\pipessecndA
-			\pipessecndB
-			\pipessecndC
-			\pipessecndD
-		}
-%{		\new Staff = "thirds" \with {
-			instrumentName = \markup{ \instrumentPipesThrd }
-			shortInstrumentName = \markup{ \shortInstrumentPipeTthrd }
-		} {
-			\pipesthrdglobal
-
-		}
-%}
-	>>
-	\header {
-		title = \title
-		subtitle = \subtitle
-		meter = \meter
-		composer = \markup \large {
-			\column \right-align {
-				$(if (not (string=? "" composerPipes))  #{ \markup {\line { \composerPipes  ":" }} #} )
-				$(if (not (string=? "" composerPipessecnd))  #{ \markup {\line { \composerPipessecnd ":" }} #} )
-				$(if (not (string=? "" composerPipesthrd))  #{ \markup {\line { \composerPipesthrd  ":" }} #} )
-			}
-			\column \right-align {
-				$(if (not (string=? "" composerPipes))  #{ \markup {\line { \instrumentPipes }}#} )
-				$(if (not (string=? "" composerPipessecnd))  #{ \markup {\line { \instrumentPipessecnd }}#} )
-				$(if (not (string=? "" composerPipesthrd))  #{ \markup {\line { \instrumentPipesthrd }}#} )
-			}
-		}
-	}
-}
-\score {
-	\new StaffGroup <<
-		\global
-		\new Staff = "pipes" \with {
-			midiInstrument = #"bagpipe"
-			instrumentName = \markup{ \instrumentPipes }
-			shortInstrumentName = \markup{ \shortInstrumentPipes }
-		} {
-			\pipeglobal
-			%%Tune
-			\unfoldRepeats{
-		\repeat volta 2 { \pipesA } \break
-		\repeat volta 2 { \pipesB } \break
-		\repeat volta 2 { \pipesC } \break
-		\repeat volta 2 { \pipesD } \break
-			}
-		}
-		\new Staff = "seconds" \with {
-			midiInstrument = #"bagpipe"
-			instrumentName = \markup{ \instrumentPipesSecnd }
-			shortInstrumentName = \markup{ \shortInstrumentPipesSecnd }
-		} {
-			\pipessecndglobal
-			%% Seconds
-			\unfoldRepeats{
-		\repeat volta 2 { \pipessecndA } \break
-		\repeat volta 2 { \pipessecndB } \break
-		\repeat volta 2 { \pipessecndC } \break
-		\repeat volta 2 { \pipessecndD } \break
-			}
-		}
-%{		\new Staff = "thirds" \with {
-			midiInstrument = #"bagpipe"
-			instrumentName = \markup{ \instrumentPipesThrd }
-			shortInstrumentName = \markup{ \shortInstrumentPipeThrd }
-		} {
-			\pipesthrdglobal
-			%% Thirds
-		}
-%}
-	>>
-	\midi { \confTempo }
-	\header {
-		title = \title
-		subtitle = \subtitle
-		meter = \meter
-		instrument = \instrumentPipes
-		composer = \composerPipes
-	}
-}

5-4_marches/cullen_bay/pipes.ly

@@ -9,12 +9,21 @@
     \new Staff {
 		\global
 		\pipeglobal
-		\new Voice = "pipes" {
+		<<
-			\repeat volta 2 { \pipesA } \break
+			{
-			\repeat volta 2 { \pipesB } \break
+				\repeat unfold 4 {
-			\repeat volta 2 { \pipesC } \break
+				\repeat volta 2 {
-			\repeat volta 2 { \pipesD } \break
+					\line
-		}
+				}\break
+				}
+			}%Format
+			{
+				\pipesA
+				\pipesB
+				\pipesC
+				\pipesD
+			}
+		>>
 	}
 	\header {
 		title = \title
@@ -31,12 +40,8 @@
 		%% Tune
 
 		\pipesA
-		\pipesA
-		\pipesB
 		\pipesB
 		\pipesC
-		\pipesC
-		\pipesD
 		\pipesD
 	}
 	\midi { \confTempo }

5-4_marches/cullen_bay/pipes.seconds.ly

@@ -1,48 +0,0 @@
-\version "2.18.2"
-
-\include "bagpipe.ly"
-
-\include "./config.ily"
-\include "./notes.pipes.seconds.ily"
-
-\score {
-    \new Staff {
-		\global
-		\pipessecndglobal
-
-		\repeat volta 2 { \pipessecndA } \break
-		\repeat volta 2 { \pipessecndB } \break
-		\repeat volta 2 { \pipessecndC } \break
-		\repeat volta 2 { \pipessecndD } \break
-	}
-	\header {
-		title = \title
-		subtitle = \subtitle
-		meter = \meter
-		instrument = \instrumentSecnd
-		composer = \composerPipesSecnd
-		arranger = \arrangerPipesSecnd
-	}
-}
-\score {
-	\new Staff { \global \pipessecndglobal
-		\set Staff.midiInstrument = #"bagpipe"
-		%%Tune
-			\unfoldRepeats{
-		\repeat volta 2 { \pipessecndA } \break
-		\repeat volta 2 { \pipessecndB } \break
-		\repeat volta 2 { \pipessecndC } \break
-		\repeat volta 2 { \pipessecndD } \break
-			}
-	}
-	\midi { \confTempo }
-	\header {
-		title = \title
-		subtitle = \subtitle
-		meter = \meter
-		instrument = \instrumentSecnd
-		composer = \composerPipesSecnd
-		arranger = \arrangerPipesSecnd
-	}
-
-}

5-4_marches/cullen_bay/side.ly

@@ -9,11 +9,19 @@
     \new PipeBandDrumStaff {
         \global
         \sideglobal
-
+		<<
-		\repeat volta 2 { \snareA } \break
+			{
-		\repeat volta 2 { \snareB } \break
+				\repeat unfold 4 {
-		\repeat volta 2 { \snareC } \break
+					\repeat volta 1 { \line } \break
-		\repeat volta 2 { \snareD } \break
+				}
+			}
+			{
+				\snareA
+				\snareB
+				\snareC
+				\snareD
+			}
+		>>
 	}
 	\header {
 		title = \title

airs/alexander_mackenzie/config.ily

@@ -9,8 +9,8 @@ confTempo = {
 }
 
 %% Format
-part = { \partial 8 \grace {s1} s8 }
+part = { \partial 8 s8 }
-halfline = { \repeat unfold 4 { \grace {s1} s2. | } }
+halfline = { \repeat unfold 4 { s2. | } }
 line = { \repeat unfold 2 { \halfline } }
 
 %% Headers

airs/alexander_mackenzie/full.ly

@@ -10,20 +10,13 @@
 \include "./notes.pipes.ily"
 \include "./notes.pipes.seconds.ily"
 
-\layout {
-	indent = 5.0
-	short-indent = 2.0
-}
-
-
 \score {
 	\new StaffGroup <<
-		\new Staff \with {
+		\new Staff {
-			instrumentName = \markup{ \instrumentPipes }
-			shortInstrumentName = \markup{ \shortInstrumentPipes }
-		} {
 			\global
 			\pipeglobal
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentPipes }
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentPipes }
 			<<
 				{
 					\repeat volta 2 {
@@ -54,15 +47,10 @@
 				}%Pipes
 			>>
 		}
-		\new Staff = "seconds" \with {
+		\new Staff = "seconds" {
-			instrumentName = \markup{ \instrumentPipesHarmony }
+			\pipessecndglobal
-			shortInstrumentName = \markup{ \shortInstrumentPipesSecnd }
+			\set Staff.instrumentName = \markup{ \instrumentPipes Seconds }
-		} <<
+			\set Staff.shortInstrumentName = \markup{ \shortInstrumentPipes 2nd}
-		    {
-				\global
-				\pipessecndglobal
-				\part
-			} {
 			\pipessecndA s8
 
 			\pipessecndBA
@@ -70,40 +58,35 @@
 
 			\pipessecndBA
 			\pipessecndBBB s8
-		    }
+		}
-		>>
+		\new PipeBandDrumStaff = "side" {
-		\new PipeBandDrumStaff = "side" \with {
-			instrumentName = \markup \column {\instrumentSide}
-			shortInstrumentName = \markup{\shortInstrumentSide}
-		} {
 			\sideglobal
+			\set PipeBandDrumStaff.instrumentName = \markup \column {\instrumentSide}
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide}
 			\snareAA \snareAB s8
 
 			\snareBA 
 			\snareBB s8
 			
-			\removeWithTag #'tutti {
 			\snareBA \snareAB s8
-			}
-		}
-		\new PipeBandDrumStaff = "tenor" \with {
-			instrumentName = \markup{ \instrumentTenor }
-			shortInstrumentName = \markup{ \shortInstrumentTenor }
-		} {
-			\tenorglobal
 
-			s8 \tenorAA \tenorAB s8
+		}
+		\new PipeBandDrumStaff = "tenor" {
+			\tenorglobal
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
+
+			s8 \tenorAA r8 \tenorAB s8
 
 			\tenorBA 
 			\tenorBB s8
 			
 			\tenorBA r8 \tenorAB s8
 		}
-		\new PipeBandDrumStaff = "bass" \with {
+		\new PipeBandDrumStaff = "bass" {
-			instrumentName = \markup{ \instrumentBass }
-			shortInstrumentName = \markup{ \shortInstrumentBass}
-		} {
 			\bassglobal
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}
 			
 			s8 \bassAA \bassAB
 			s8 \bassBA \bassBB

airs/alexander_mackenzie/notes.pipes.ily

@@ -1,7 +1,7 @@
 % 6/8 Alexander MacKenzie
 % Pipes
 \version "2.18.2"
-composerPipes = "PM Don M. Carigan"
+composerPipes = ""
 pipeglobal = {
 	\key a \mixolydian
 }

defs.ily

@@ -57,14 +57,3 @@ arrangerPipesSecnd = ""
 arrangerPipessecnd = \arrangerPipesSecnd %TODO: Remove Me
 arrangerPipesThrd = ""
 arrangerPipesthrd = \arrangerPipesThrd %TODO: Remove Me
-
-
-commitUrl = "https://git.deboone.nl/kastdeur/pipeband-music/commit/"
-
-\layout {
-	\context {
-		\Score
-		segnoStyle = #'bar-line
-		\numericTimeSignature
-	}
-}

other/muss_i_denn/notes.side.ily

@@ -7,7 +7,7 @@ sideglobal = {
 	\eighthBeaming
 }
 % Music
-snareAA = \drummode {
+snareA = \drummode {
   \flam d8 g |
   d4:32(	d8) g	d8:32([ g)]	\flam d8 d8:32(
   |
@@ -15,12 +15,7 @@ snareAA = \drummode {
   |
   g16.) d32-> g16. g32	\flam d8 g	\tuplet 3/2 { d16 g d } g16. g32	\flam d8 \flam g
   |
-  \tag #'removeForB {
+  d4:32(	d8) g	\tuplet 3/2 { d16 g d } g16. g32	\flam d8 \flam g
-    d4:32(	d8) g	\tuplet 3/2 { d16 g d } g16. g32	\flam d8 \flam g
-  }
   |
   d4:32(	d4:32)(	d4)
 }
-snareBA = \drummode { \removeWithTag #'removeForB \snareAA
-}
-snareBB = \drummode { \snareAA }

other/muss_i_denn/side.ly

@@ -7,20 +7,19 @@
 
 \score {
     \new PipeBandDrumStaff {
-			\new DrumVoice = "side" {
+        \global
-				\global
+		<<
-				\sideglobal
+			\new NullVoice = "format" {
 				\repeat volta 2 {
-					\partial 4
+					\part \line
-					<>\dr \snareAA \fr
 				}
-				\break
+			}%Format
 			
-				\partial 4
+			\new DrumVoice = "side" {
-				\snareBA
+		\sideglobal
-				<>\dr \snareAA \fr
+				\snareA
-				\bar "|."
 			}
+		>>
 	}
 	\header {
 		title = \title

reels/jock_wilsons_ball/notes.tenor.ily

@@ -1,34 +1,34 @@
 % 2/2 Jock Wilson's Ball
 % Tenor
 \version "2.18.2"
-composerTenor = "E.T. de Boone, v0.2"
+composerTenor = "v0.1"
 arrangerTenor = ""
 tenorglobal = {}
 % Music
 tenorAA = \drummode {
-	d4 \startRPiano g	d\stopGroup g->\up |
+	d4 g	d g |
-	d8. g16 r4	d2\up |
+	d8. g16 \parenthesize d4	d2 |
-	d4 \triplet { g8 d g }	d2 |
+	d4 \triplet{ g8 d g }	d2 |
-	d8 g d4	d2
+	d8. g16 d8. g16	d8. d16 g8. g16 |
 }
 tenorAB = \drummode {
-	d4 \startRPiano g	d\stopGroup g->\up |
+	d4 g	d g |
-	d8. g16 r4	d2\up |
+	d8. g16 \parenthesize d4	d2 |
-	d8. g16 d4	\triplet { g8 d g } d4 |
+	d8. g16	d4	\triplet{ g8 d g } d4 |
-	d8 g d4 d2
+	d8 g d4	d2 |
 }
 tenorA = \drummode{ \tenorAA \tenorAB }
 
 tenorBA = \drummode {
-	d4 g d2 |
+	d4 g	d2 |
-	d4 g8. g16 d2 |
+	d4 g8. g16	d2 |
-	d4 g d2 |
+	d4\< g	d2\! |
-	d8 g d4 d2 |
+	d8 g d4	d2 |
 }
 tenorBB = \drummode {
-	d4 g d2 |
+	d4 g	d2 |
-	d4 g8. g16 d2 |
+	d4 g8. g16	d2 |
-	d4 g8. g16 d4 d4 |
+	d4 d8. d16	g4 g4 |
-	g4 d8. d16 g4 g4 |
+	d8. g16 d8.	d16 g4 d4 |
 }
 tenorB = \drummode{ \tenorBA \tenorBB }

reels/jock_wilsons_ball/tenor.ly

@@ -16,7 +16,6 @@ pBreak = {\break}
 				\pBreak
 				\halfline
 				\section
-				\break
 				\halfline
 				\pBreak
 				\halfline

strathspeys/aa_camerons/notes.side.ily

@@ -2,9 +2,6 @@
 % Side
 \version "2.18.2"
 composerSide = "G. Clark, 1988"
-sideglobal = {
-	\eighthBeaming
-}
 snareAA = \drummode {
 	\flamd d8.-> \tuplet 3/2 { g32 d32 d32 } g8.[ \dragd d16] \tuplet 3/2 { d16 g d g d8 } g4:32(-> |
 	d8.) g16 \tuplet 3/2 { d8:32( d8) g8-> } \tuplet 3/2 { d8[ g8 \dragd d8] } \tuplet 3/2 { d16 g d g d8 } |
@@ -21,7 +18,7 @@ snareABB = \drummode {
 % Part 2
 snareBA = \drummode {
 	d4:32(-> \tuplet 3/2 { d16) g16 d16 } \flamg g8 \tuplet 3/2 { d8 g d } d4:32( |
-	d8.) \flamg g16 \tuplet 3/2 { d8 g d } \flam \tuplet 3/2 { d16 g d } g8-> \tuplet 3/2 { d8 g d } |
+	d8.) \flamg g16 \tuplet 3/2 { d8 g d } \tuplet 3/2 { \flamd d16 g d } g8-> \tuplet 3/2 { d8 g d } |
 }
 snareBBA = \drummode {
 	\flamd d8. g16 \tuplet 3/2 { d16-> g d d g-> d } \tuplet 3/2 { g16 g d8-> g }   d8.-> \tuplet 3/2 { g32 d d } |

strathspeys/aa_camerons/side.ly

@@ -6,28 +6,33 @@
 \include "./notes.side.ily"
 
 \score {
-	\unfoldRepeats
     \new PipeBandDrumStaff {
         \global
-		\sideglobal
+        <<
-		\repeat volta 2 {
+			{
+			\repeat unfold 2 {
+				\line
+				\bar "||"
+				\break
+				\line
+				\bar "|."
+				\break
+				}
+			\bar "|."
+			}
+			{
 			\snareAA
-			\alternative {
+			\snareABA
-				\snareABA
+			\snareAA
-				\snareABB
+			\snareABB
-			}
+
-		}
+
-		\section
-		\break
-		\repeat volta 2 {
 			\snareBA
-			\alternative {
+			\snareBBA
-				\snareBBA
+			\snareBA
-				\snareBBB
+			\snareBBB
 			}
-		}
+		>>
-		\fine
-		\fine
 	}
 	\header {
 		title = \title