From 5bd00276601b0d2c6a010a1231af62acc510db44 Mon Sep 17 00:00:00 2001
From: Eric Teunis de Boone <ericteunis@gmail.com>
Date: Mon, 20 Nov 2017 21:46:36 +0100
Subject: [PATCH] Added Tenorscore for Kilaloe

---
 6-8_marches/kilaloe/full.ly         | 12 ++++----
 6-8_marches/kilaloe/notes.tenor.ily | 43 ++++++++++++++++-------------
 6-8_marches/kilaloe/tenor.ly        | 18 ++++--------
 3 files changed, 36 insertions(+), 37 deletions(-)

diff --git a/6-8_marches/kilaloe/full.ly b/6-8_marches/kilaloe/full.ly
index 523c1da..195fac4 100644
--- a/6-8_marches/kilaloe/full.ly
+++ b/6-8_marches/kilaloe/full.ly
@@ -83,14 +83,14 @@
 		} {
 			\tenorglobal
 
-			s8 \tenorA
-			\tenorA
+			s8 \tenorAA
+			\tenorAB
 
-			\tenorB
-			\tenorB
+			\tenorAA
+			\tenorAB
 
-			\tenorCA
-			\tenorCB 
+			\tenorBA
+			\tenorBB
 			r4. | % Volta bracket for pipes
 		}
 %		\new PipeBandDrumStaff = "bass" \with {
diff --git a/6-8_marches/kilaloe/notes.tenor.ily b/6-8_marches/kilaloe/notes.tenor.ily
index df835fd..02e65db 100644
--- a/6-8_marches/kilaloe/notes.tenor.ily
+++ b/6-8_marches/kilaloe/notes.tenor.ily
@@ -1,29 +1,34 @@
 % 6/8 Kilaloe
 % Tenor
 \version "2.18.2"
-composerTenor = ""
+composerTenor = "N. Kuijkhoven, 2017"
 arrangerTenor = ""
 tenorglobal = {}
+
 % Music
-tenorA = \drummode {
-	d4. g4. | d4. r4. | 
-	d4. g4. | d4. r4. |
-	d4. g4. | d8. g16 d8 g8. d16 g8 |
-	d4. g4. | d4. r4. |
+tenorAA = \drummode {
+	d4. g4. | d4. r4.\rswipe | 
+	d4. g4. | d4. r4.\rswipe |
+	d4. g4. | d4. g4. |
+	d4.\up g4.\up | d4.\up r4. |
 }
-tenorB = \drummode {
-	d4. g4. d4. g4. |
-	d4. g4. d4. r4. |
-	d4. g4. d8. g16 d8 g8. d16 g8 |
-	d4. g4. d4. r4. |
+tenorAB = \drummode {
+	\flourish{
+	  d4. d4. | g4. g4. |
+	  d4. d4. | g4. g4. |
+	  d4. d4. | g4. g4. |
+	}
+	d4.\up g4.\up | d4. \up r4. |
 }
-tenorCA = \drummode {
-	\tenorB
+tenorBA = \drummode {
+	\tenorAA
 }
-tenorCB = \drummode {
-	d4. g4. d4. r4. |
-	d4. g4. d4. r4. |
-	d4. g4. d8. g16 d8 g4. |
-	r4.^"Oii" r4. d4. g4. |
-	d4. r4. |
+tenorBB = \drummode {
+  \flourish{
+	  d4. d4. | g4. g4. |
+	  d4. d4. | g4. g4. |
+	  d4. d4. | g4. g4. |
+	}
+	r4. r4. |
+	d4.\up g4.\up | d4. \up r4. |
 }
diff --git a/6-8_marches/kilaloe/tenor.ly b/6-8_marches/kilaloe/tenor.ly
index c50c174..783962c 100644
--- a/6-8_marches/kilaloe/tenor.ly
+++ b/6-8_marches/kilaloe/tenor.ly
@@ -11,23 +11,17 @@
 		\tenorglobal
 		<<
 			\new NullVoice = "format" {
-				\repeat volta 2 \line
+				\repeat volta 2 { \line \line }
 				\break
-				\repeat volta 2 \line
-				\break
-				
-				\line
-				\break
-				\line \measure \bar "|."
+				\repeat volta 2 { \line \line s2. }
 			}%Format
 			
 			\new DrumVoice = "tenor" {
-				\tenorA
+				\tenorAA
+				\tenorAB
 
-				\tenorB
-
-				\tenorCA
-				\tenorCB
+				\tenorBA
+				\tenorBB
 			}
 		>>
 	}