From 743099ea26b3049bb85548870814d72d6f464e8d Mon Sep 17 00:00:00 2001
From: Eric Teunis de Boone <ericteunis@gmail.com>
Date: Thu, 27 Oct 2016 12:03:24 +0200
Subject: [PATCH] Added bass for Alexander MacKenzie

---
 airs/alexander_mackenzie/bass.ly         | 33 ++++++++++++++++++++++++
 airs/alexander_mackenzie/drums.ly        | 29 +++++++++++----------
 airs/alexander_mackenzie/full.ly         | 21 ++++++++-------
 airs/alexander_mackenzie/notes.bass.ily  | 18 ++++++++++++-
 airs/alexander_mackenzie/notes.tenor.ily |  2 --
 airs/alexander_mackenzie/tenor.ly        | 33 ++++++++++++++++++++++++
 6 files changed, 110 insertions(+), 26 deletions(-)
 create mode 100644 airs/alexander_mackenzie/bass.ly
 create mode 100644 airs/alexander_mackenzie/tenor.ly

diff --git a/airs/alexander_mackenzie/bass.ly b/airs/alexander_mackenzie/bass.ly
new file mode 100644
index 0000000..5fbae50
--- /dev/null
+++ b/airs/alexander_mackenzie/bass.ly
@@ -0,0 +1,33 @@
+\version "2.18.2"
+
+\include "config.ily"
+\include "notes.bass.ily"
+
+\score {
+    \new PipeBandDrumStaff {
+        \global
+	\bassglobal
+	<<
+		{
+			\repeat volta 2 { \line \break } \break
+			\repeat volta 2 { \halfline \break }
+				\alternative{ {\halfline \break}{\halfline \break} }
+			\bar "|."
+		}
+		{
+			\bassAA 
+			\bassAB 
+
+			\bassBA 
+			\bassBB  
+			\bassAB 
+		}
+	>>
+	}
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentBass
+		composer = \composerBass
+	}
+}
diff --git a/airs/alexander_mackenzie/drums.ly b/airs/alexander_mackenzie/drums.ly
index b2b4c43..1101af7 100644
--- a/airs/alexander_mackenzie/drums.ly
+++ b/airs/alexander_mackenzie/drums.ly
@@ -1,7 +1,7 @@
 \version "2.19.0"
 
 \include "config.ily"
-%\include "notes.bass.ily"
+\include "notes.bass.ily"
 \include "notes.tenor.ily"
 \include "notes.side.ily"
 
@@ -34,21 +34,22 @@
 			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
 			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
 
-			\tenorAA \tenorAB s8
-			\tenorBA s8
+			s8 \tenorAA \tenorAB s8
+
+			s8 \tenorBA s8
 			\tenorBB s8
-			\tenorAB s8
+			r8 \tenorAB s8
+		}
+		\new PipeBandDrumStaff = "bass" {
+			\bassglobal
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}
+
+			s8 \bassAA \bassAB 
+			s8 \bassBA 
+			s8 \bassBB 
+			s8 \bassAB 
 		}
-%		\new PipeBandDrumStaff = "bass" {
-%			\bassglobal
-%			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
-%			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}
-%
-%			\bassAA \bassAB s8
-%			\bassBA s8
-%			\bassBB s8
-%			\bassAB s8
-%		}
 	>>
 	\header {
 		title = \title
diff --git a/airs/alexander_mackenzie/full.ly b/airs/alexander_mackenzie/full.ly
index 2768970..349fa03 100644
--- a/airs/alexander_mackenzie/full.ly
+++ b/airs/alexander_mackenzie/full.ly
@@ -1,7 +1,7 @@
 \version "2.19.0"
 
 \include "config.ily"
-%\include "notes.bass.ily"
+\include "notes.bass.ily"
 \include "notes.tenor.ily"
 \include "notes.side.ily"
 \include "notes.pipes.ily"
@@ -73,19 +73,22 @@
 			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
 			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
 
-			\tenorAA \tenorAB s8
+			s8 \tenorAA r8 \tenorAB s8
 
 			\tenorBA 
 			\tenorBB s8
 			
-			\tenorBA \tenorAB s8
+			\tenorBA r8 \tenorAB s8
+		}
+		\new PipeBandDrumStaff = "bass" {
+			\bassglobal
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}
+			
+			s8 \bassAA \bassAB
+			s8 \bassBA \bassBB
+			s8 \bassBA \bassAB
 		}
-%		\new PipeBandDrumStaff = "bass" {
-%			\bassglobal
-%			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
-%			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}
-%
-%		}
 	>>
 	\header {
 		title = \title
diff --git a/airs/alexander_mackenzie/notes.bass.ily b/airs/alexander_mackenzie/notes.bass.ily
index bc42201..021a87c 100644
--- a/airs/alexander_mackenzie/notes.bass.ily
+++ b/airs/alexander_mackenzie/notes.bass.ily
@@ -1,16 +1,32 @@
 % 6/8 Alexander MacKenzie
 % Bass
 \version "2.18.2"
-composerBass  = "v0, E.T. de Boone, 2016"
+composerBass  = "v0.5, E.T. de Boone, 2016"
 bassglobal = {}
 % Music
 bassAA = \drummode {
+	d8 g4	d4 g8 |
+	d8 g4	d4. |
+	d4 g8	d8 g d |
+	d4 g8 	d4. |
 }
 bassAB = \drummode {
+	d8 g4	d4 g8 |
+	d8 g4	d4. |
+	d8 d4	g8 d4 |
+	d4. 	d4. |
 }
 
 
 bassBA = \drummode {
+  d4 g8		d8 g d |
+  g8. d8 g16	d4 g8 |
+  d4 g8		d8 g d |
+  d4.		d4. |
 }
 bassBB = \drummode {
+  d4 g8		d8 g d |
+  d8. d8 g16	d4 g8 |
+  d8 d4		g8 d4 |
+  d4. 	d4. |
 }
diff --git a/airs/alexander_mackenzie/notes.tenor.ily b/airs/alexander_mackenzie/notes.tenor.ily
index 8da16c9..39226b4 100644
--- a/airs/alexander_mackenzie/notes.tenor.ily
+++ b/airs/alexander_mackenzie/notes.tenor.ily
@@ -5,14 +5,12 @@ composerTenor = "v0.9, E.T. de Boone, 2016"
 tenorglobal = {}
 % Music
 tenorAA = \drummode {
-  s8 |
   d8 g4 	d4. |
   d8 g16 d g8	d4 d16 \< g16 |
   d4.-> \!	d8 g d |
   g8 d16\< g d g	d4\!
 }
 tenorAB = \drummode {
-  s8 |
   d8 g4		d4. |
   d8 g16 d g8	d4. |
   d8 d8.-> g16	d8 d8.-> g16 |
diff --git a/airs/alexander_mackenzie/tenor.ly b/airs/alexander_mackenzie/tenor.ly
new file mode 100644
index 0000000..b455d17
--- /dev/null
+++ b/airs/alexander_mackenzie/tenor.ly
@@ -0,0 +1,33 @@
+\version "2.18.2"
+
+\include "config.ily"
+\include "notes.tenor.ily"
+
+\score {
+    \new PipeBandDrumStaff {
+	\global
+	\tenorglobal
+	<<
+			{
+			\repeat volta 2 { \line \break } \break
+			\repeat volta 2 { \part \halfline \break }
+				\alternative{ {\part \halfline \break}{\part \halfline \break} }
+			\bar "|."
+		}
+		{
+			\tenorAA s8
+			\tenorAB s8
+
+			\tenorBA s8
+			\tenorBB s8
+			r8 \tenorAB s8
+		}
+	>>
+	}
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentTenor
+		composer = \composerTenor
+	}
+}