Quite a few errors fixed

jigs/seaforth_sticks/notes.side.ily

@@ -2,6 +2,13 @@
 % Side
 \version "2.18.2"
 composerSide = ""
+arrangerSide = ""
+
+Y = #(define-music-function (parser location note) (ly:music?)
+	#{
+		<>^"Y" $note
+	#}
+   )
 snareA = \drummode {
 	\flamd d8 g8 d8		\flamg g4 g8 |
 	d16 g d g d8->		g8 d8 g8 |
@@ -22,7 +29,7 @@ snareB = \drummode {
 	d16) g d g d8->		g8 d8 g8 |
 
 	\flamd d8-^ g8 \flamd d8-^		g8 d8 \flamg g8-^ |
-	d8 g8 \flamg g8-^		\flamg g4-^ g8 |
+	d8 g8 \flamg d8		\flamg g4-^ g8 |
 
 	d4.:32(->		d4.:32)(-> |
 	d16) g d g d8->		g8 d8 g8 |
@@ -32,14 +39,14 @@ snareB = \drummode {
 }
 %C
 snareC = \drummode {
-	d8:32( |
+	d8:32(\< |
-	d4) \flamd d8		g8 d8 g8-^|
+	d4)\! \flamd d8		g8 d8 g8-^|
 	d16 g d g d8		g8 d8 g8 |
 
 	\flamd d8-^ g8 \flamd d8-^		g8 d8 \flamg g8-^ |
-	d8 g8 \flamg g8-^		\flamg g4-^ d8:32( |
+	d8 g8 \flamg d8		\flamg g4-^ d8:32(\< |
 
-	d4) \flamd d8		g8 d8 g8-^|
+	d4)\! \flamd d8		g8 d8 g8-^|
 	d16 g d g d8->		g8 d8 g8 |
 
 	d16 g d g d8->		g8 d8 g8 |
@@ -51,8 +58,8 @@ snareD = \drummode {
 	d4.:32(->		d8) g8 g8 |
 	d4.:32(->		d8) g8 g8 |
 
-	\flamd d8 g8 d8		\flamg g4 g8-^ |
+	\flamd d8\> g8 d8		\flamg g4\! g8-\v |
-	d8 g8 \flamg g8-^		\flamg g4 g8 |
+	d8\< g8 \flamg d8		\flamg g4\! g8 |
 
 	d4.:32(->		d8) g8 g8|
 	d16 g d g d8->		g8 d8 g8 |
@@ -79,43 +86,43 @@ snareE = \drummode {
 snareF = \drummode {
 	g8 |
 	d4.:32(->		d4.:32)(-> |
-	d16) g d g d8->		g8^"Y" d8 g8 |
+	d8) g d		\Y g8 d g |
 
-	\flamd d8-^ g8 \flamd d8-^		g8^"Y" d8 g8 |
+	\flam d8 g d		g8^"Y" d g |
-	\flamd d8 g8 d8		\backstick d4 g8 |
+	\flam d8 g d		\backstick d4 g8 |
 
-	d4.:32(->		d8) g8 g8 |
+	d4.:32(->		d4.:32)(-> |
-	d16 g d g d8->		g8 d8 g8 |
+	d8) g d		\Y g8 d g |
 
-	d16 g d g d8->		db4 g8 |
+	\flam d8 g d		\Y g8 d g |
 	d4.:32(		d4.)
 }
 %G
 snareG = \drummode {
 	d8:32( |
-	d4)-^  \backstick d8		g8 d8 g8-^|
+	d4)-^  \backstick d8		g8 d g|
-	d16 g d g d8		g8 d8 g8 |
+	d16 g d g d8-^		g8 d8 g8 |
 
-	\flamd d8 g8 d8		\backstick d4 g8  |
+	\flamd d8 g8 d8		\Y d8 g d  |
-	\flamd d8 g8 g8		\backstick d4 d8:32( |
+	\flamd d8 g8 d8		\backstick d4 d8:32( |
 
 	d4)-> \backstick d8		g8 d8 g8|
 	d16 g d g d8->		g8 d8 g8 |
 
-	\flamd d8 g d8->		\backstick d4 g8 |
+	\flamd d8 g d		\Y d8 g d |
 	d4.:32(		d4.)
 }
 %H
 snareH = \drummode {
 	g8 |
-	\flamd d8 d16 g16 d8		\repeat unfold 3 { \crossstick sn8^"X" }|
+	\flamd d8 d16 g16 d8		\crossstick { d8 d d }|
-	\flamd d8 g8 d8		g8^"Y" d8 g8|
+	\flamd d8 g8 d8		\Y g8 d8 g8|
 
 	\flamd d8 g8 d8		\backstick d4 g8 |
 	\flamd d8 g8 d8		\backstick d4 g8 |
 
-	\flamd d8 d16 g16 d8		\repeat unfold 3 { sn8^"X" }|
+	\flamd d8 d16 g16 d8		\crossstick { d8 d d }|
-	\flamd d8 g8 d8		g8^"Y" d8 g8|
+	\flamd d8 g8 d8		\Y g8 d8 g8|
 
 	\flam d8 g8 d8		\backstick d4 g8 |
 	d4.:32(		d4.)

strathspeys/molly_connell/drums.ly

@@ -2,8 +2,6 @@
 
 \include "lilydrum.ly"
 
-\include "lilydrum.ly"
-
 \include "./config.ily"
 \include "./notes.bass.ily"
 \include "./notes.tenor.ily"
@@ -12,56 +10,72 @@
 \score {
 	\new StaffGroup <<
 		\new PipeBandDrumStaff = "side" {
-			\set PipeBandDrumStaff.instrumentName = \markup{\instrumentSide}
-			\set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide}
-
 			\global
+			\sideglobal
+			\set PipeBandDrumStaff.instrumentName = \markup \column {\instrumentSide}
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide}
 				<<
-				{
+				\new NullVoice = "format" {
+					\mark \markup { \normalsize {Intro } }
+					\emptyline
+					\bar "|."
+					
+					\mark \markup { \normalsize {Tune } }
 				  	\line \break
 					\line \break
 					\bar "|."
 	
 					\part \line \break
-					\part \line \break
+					\line \break
 					\bar "|."
-			}%End of Format
+				}%Format
-				{
+	
-					\snareA
+				\new DrumVoice = "side" {
-					s8
+					\intro
-					\snareA
+					\snareA s8
-					s8
+					\snareA s8
 			
 					\snareBA
 					\snareBB
-				}
+				
+				}%Pipes
 			>>
-		}
-		\new PipeBandDrumStaff = "bass" {
-			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
-			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}
 
-			\bassAA
-			\bassAB
-
-			s8
-			\bassAA
-			s8
-			\bassAB
 			}
 		\new PipeBandDrumStaff = "tenor" {
+			\tenorglobal
 			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
 			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
 	
+			\emptyline
+	
 			\tenorA
 			\tenorA
 	
-			s8
+			s8 \tenorBA
-			\tenorBA
-			s8
 			\tenorBB
 		}
+		\new PipeBandDrumStaff = "bass" {
+			\bassglobal
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}
+	
+			\emptyline
+	
+			\bassAA
+			\bassAB
+	
+			s8 \bassAA
+			\bassAB
+		}
 	>>
+	\layout {
+		\context {
+			\PipeBandDrumStaff
+			\RemoveEmptyStaves
+			\override VerticalAxisGroup.remove-first = ##t
+		}
+	}
 	\header {
 		title = \title
 		meter = \meter

strathspeys/molly_connell/full.ly

@@ -3,9 +3,6 @@
 \include "bagpipe.ly"
 \include "lilydrum.ly"
 
-\include "bagpipe.ly"
-\include "lilydrum.ly"
-
 \include "./config.ily"
 \include "./notes.bass.ily"
 \include "./notes.tenor.ily"
@@ -16,6 +13,7 @@
 \score {
 	<<
 		\new PipeBandDrumStaff = "intro" {
+			\global
 			\sideglobal
 			\set PipeBandDrumStaff.instrumentName = \markup \column {\instrumentSide}
 			\set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide}
@@ -30,7 +28,11 @@
 				\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentPipes }
 				<<
 					\new NullVoice = "format" {
+						\mark \markup { \normalsize {Intro } }
 						\emptyline
+						\bar "|."
+						
+						\mark \markup { \normalsize {Tune } }
 					  	\line \break
 						\line \break
 						\bar "|."
@@ -109,8 +111,7 @@
 				\bassAB
 			}
 		>>
-	>>
+	>>	\layout {
-	\layout {
 		\context {
 		  	\PipeBandDrumStaff
 			\RemoveEmptyStaves

strathspeys/molly_connell/side.ly

@@ -13,15 +13,20 @@
         <<
 			{
 		  		\mark \markup { \normalsize {Intro } }
-				\line
+				\line \bar ".|:-|."
 				\break
 				\mark \markup { \normalsize {Tune } }
-				\repeat volta 2 { \line } \break \part \line \break \bar "||" \part \line \bar "|." 
+				\repeat volta 2 { \line } 
+				\break 
+				\part \line  \bar "||" 
+				\break
+				\part \line \bar "|." 
 			}
 			{
 			  \intro 
 			  \snareA s8 
-			  \snareBA \snareBB 
+			  \snareBA s8 
+			  \snareBB 
 			}
 		>>
 	}