Removed a few double includes for "bagpipe.ly" and "lilydrum"

This needs to be done for every file

New Scores for Tenor mostly (not fully integrated yet)

Some bugfixes in layout

2-4_marches/mackenzie_highlanders/config.ily

@@ -5,7 +5,7 @@ global = {
 	}
 confTempo = { \tempo 4 = 90 } 
 %% Format
-part = { \partial 8 s8 }
+part = { \partial 8 \grace{s4} s8 }
 measure = { \grace { s4 } s2 | }
 halfline = { \repeat unfold 4 { \measure } }
 line = { \repeat unfold 2 { \halfline } }

2-4_marches/mackenzie_highlanders/notes.tenor.alt.ily

@@ -7,7 +7,7 @@ tenorglobal = {
 }
 % Music
 
-tenorA = \drummode {
+tenorAold = \drummode {
 	g8 |
 	d4 d8 g |
 	d8 \< g8 d4 \! |
@@ -19,7 +19,7 @@ tenorA = \drummode {
 	d16-> g16 r8	g16-> g8 g16 |
 	d4 g4 |
 }
-tenorA = \drummode {
+tenorAvold = \drummode {
 	s8 |
 	d4 g4 |
 	d4 d8 g |
@@ -31,13 +31,31 @@ tenorA = \drummode {
 	d16-> g16 r8	g16-> d8 g16 |
 	d4 g4 |
 }
-tenorBA = \drummode {
-s2*4 |
+tenorA = \drummode {
+	s8 |
+	d8 g d g |
+	d8-> g16\< g	r16 d16\< g8 |
+	d4 g4 |
+	d4 r4 |
 
-s2*4 |
-}
-tenorBB = \drummode {
-s2*4 |
-s2*4 |
+	d8 g d g |
+	d4 g4 |
+	d8. g16 r8 d8 |
+	g8 d d4 |
 }
+tenorB = \drummode {
+	d4 g4 |
+	d8. g16 r8 d8 |
+	d8 g d4 |
+	d4 g4 |
+
+	d8 g d4 |
+	d8. g16 r8 d8 |
+	d4 g4 |
+	d8 g d4
+}
+%tenorBB = \drummode {
+%s2*4 |
+%s2*4 |
+%}
 

2-4_marches/mackenzie_highlanders/tenor.alt.ly

@@ -1,15 +1,21 @@
 \version "2.18.2"
 
 \include "lilydrum.ly"
+\include "bagpipe.ly"
+
+\include "./notes.pipes.ily"
+\include "./notes.bass.ily"
+\include "./notes.side.ily"
 
 \include "./config.ily"
 \include "./notes.tenor.alt.ily"
 
 \score {
-    \new PipeBandDrumStaff {
-	\global
-	\tenorglobal
-	<<
+  \new StaffGroup <<
+		\new PipeBandDrumStaff = "side" {
+		\tenorglobal
+			\global
+		<<
 			{
 				\repeat volta 2 {
 					\part \line
@@ -17,16 +23,44 @@
 				\break
 
 				\part \line \bar "||" \break
+
 				\line \bar "|."
 			}%Format
 			{
-				\tenorA s8
+				\tenorA
 
-				\tenorBA
-				\tenorBB s8
+				\tenorB
+				\tenorB
 			}
+		>>
+		}
+		\new PipeBandDrumStaff = "bass" {
+		  \tenorAold
+		}
+
+		\new PipeBandDrumStaff {
+		  \tenorAvold
+		}
+		\new Staff {
+			\pipesA
+
+			\pipesB
+			\pipesBA s8
+			\pipesBB
+		}
+		\new PipeBandDrumStaff {
+			s8 \bassA
+
+			s8 \bassBA
+			\bassBB
+		}
+		\new PipeBandDrumStaff {
+			\snareA s8
+
+			\snareBA
+			\snareBB
+		}
 	>>
-	}
 	\header {
 		title = \title
 		meter = \meter