From 7863836a5df1584ff9248fa69732b0e0262150eb Mon Sep 17 00:00:00 2001
From: Eric Teunis de Boone <ericteunis@gmail.com>
Date: Wed, 28 Dec 2016 18:52:02 +0100
Subject: [PATCH] Tune fix, mainly for the full score of 51st

---
 4-4_marches/51st_highland_division/full.ly    | 68 +++++++++++--------
 .../51st_highland_division/notes.side.ily     |  6 +-
 .../51st_highland_division/notes.tenor.ily    |  4 +-
 4-4_marches/51st_highland_division/side.ly    |  8 +--
 4-4_marches/51st_highland_division/tenor.ly   |  5 +-
 5 files changed, 53 insertions(+), 38 deletions(-)

diff --git a/4-4_marches/51st_highland_division/full.ly b/4-4_marches/51st_highland_division/full.ly
index 0c09217..4a83b2e 100644
--- a/4-4_marches/51st_highland_division/full.ly
+++ b/4-4_marches/51st_highland_division/full.ly
@@ -3,12 +3,9 @@
 \include "bagpipe.ly"
 \include "lilydrum.ly"
 
-\include "bagpipe.ly"
-\include "lilydrum.ly"
-
 \include "./config.ily"
 %\include "./notes.bass.ily"
-%\include "./notes.tenor.ily"
+\include "./notes.tenor.ily"
 \include "./notes.side.ily"
 \include "./notes.pipes.ily"
 
@@ -21,20 +18,24 @@
 			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentPipes }
 			<<
 				{
-
-					\repeat volta 2 { \part \halfline \break}
-						\alternative { {\halfline} {\halfline } }
-						\bar "|." \break
-					\part \line \bar "||" \break
-					\line \bar "|."
+					\repeat unfold 2 {
+						\repeat unfold 2 {
+							\part \line \break
+							\line \bar "||"
+							\break
+						}
+						\bar "|."
+					}
 				}%Format
 				{
-					\pipesAA
-					\pipesAB s4
-
-					\pipesBA
-					\pipesBB s4
-				
+					\repeat unfold 2 {
+						\pipesAA
+						\pipesAB s4
+					}
+					\repeat unfold 2 {
+						\pipesBA
+						\pipesBB s4
+					}
 				}%Pipes
 			>>
 		}
@@ -42,27 +43,40 @@
 			\sideglobal
 			\set PipeBandDrumStaff.instrumentName = \markup \column {\instrumentSide}
 			\set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide}
-			s8 \snareA
-				\snareAA s8
-				\snareAB s8
 
-			 s8 \snareB
-			 \snareA \snareAB
+			\repeat unfold 2 {
+				s8 \snareA 
+				\snareAA  r8
+
+				\snareA 
+				\snareAB r8 s8
+
+				s8 \snareB
+
+				r8 \snareA \snareAB r8 s8
+			}
 
 
 
+		}
+		\new PipeBandDrumStaff = "tenor" {
+			\tenorglobal
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
+			
+			\repeat unfold 2 {
+				\repeat unfold 2 {
+					s8 \tenorAA r8 
+					\tenorAB r8 s8
+				}
+			}
+
 		}
 %		\new PipeBandDrumStaff = "bass" {
 %			\bassglobal
 %			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
 %			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}
 %
-%		}
-%		\new PipeBandDrumStaff = "tenor" {
-%			\tenorglobal
-%			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
-%			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
-%
 %		}
 	>>
 	\header {
diff --git a/4-4_marches/51st_highland_division/notes.side.ily b/4-4_marches/51st_highland_division/notes.side.ily
index defaa9d..9471959 100644
--- a/4-4_marches/51st_highland_division/notes.side.ily
+++ b/4-4_marches/51st_highland_division/notes.side.ily
@@ -13,11 +13,11 @@ snareA = \drummode {
 }
 snareAA = \drummode {
 	d8:32(-> g8)		r8 d8:32(		g8) g16. d32->		g16. g32 \flamd d8 |
-	\flamg g4		d4:32(		d4) r8
+	\flamg g4		d4:32(		d4)
 }
 snareAB = \drummode {
 	d8:32(->[ g8)]		\flamd d8[ d8:32(]		\tuplet 3/2 { g16) d g } \flamd d16. g32->		d16. d32 \flamg g8 |
-	\flamg g4		d4:32(		d4) r8
+	\flamg g4		d4:32(		d4)
 }
 % Part 2
 snareB = \drummode {
@@ -27,5 +27,5 @@ snareB = \drummode {
 
 	d8:32(-> g8)		r8 d8:32(		g8) g16. d32->		g16. g32 \flamd d8 |
 
-	\flamg g4		d4:32(		d4) r8
+	\flamg g4		d4:32(		d4)
 }
diff --git a/4-4_marches/51st_highland_division/notes.tenor.ily b/4-4_marches/51st_highland_division/notes.tenor.ily
index 98439c8..885cb20 100644
--- a/4-4_marches/51st_highland_division/notes.tenor.ily
+++ b/4-4_marches/51st_highland_division/notes.tenor.ily
@@ -10,12 +10,12 @@ tenorAA = \drummode {
 	d4 g d8[ g] d[ g] |
 	d4 g d8[ g] d[ g] |
 	d4 d8[ g] d4 d8[ g] |
-	d4 g d r8 
+	d4 g d 
 }
 tenorAB = \drummode {
 	g8 |
 	d4 g d r8 g8 |
 	d4 g d8[ g] d[ g] |
 	d4 g d8[ g] d[ g] |
-	d4 g d r8
+	d4 g d
 }
diff --git a/4-4_marches/51st_highland_division/side.ly b/4-4_marches/51st_highland_division/side.ly
index c264f2d..2897ffe 100644
--- a/4-4_marches/51st_highland_division/side.ly
+++ b/4-4_marches/51st_highland_division/side.ly
@@ -18,11 +18,11 @@
 			}
 			{
 					s8 \snareA
-						\snareAA s8
-						\snareAB s8
+						\snareAA r8 s8
+						\snareAB r8 s8
 
-					 s8 \snareB s8
-					 s8 \snareA \snareAB
+					 s8 \snareB r8 s8
+					 s8 \snareA \snareAB r8
 			}
 		>>
 	}
diff --git a/4-4_marches/51st_highland_division/tenor.ly b/4-4_marches/51st_highland_division/tenor.ly
index 7e33e5b..0e84bd7 100644
--- a/4-4_marches/51st_highland_division/tenor.ly
+++ b/4-4_marches/51st_highland_division/tenor.ly
@@ -15,6 +15,7 @@
 					\repeat repeat 2 {
 						\partial 8 s8 \line
 						\break
+						\partial 8 s8
 						\line
 					}
 					\break
@@ -22,8 +23,8 @@
 			}%Format
 			
 			\new DrumVoice = "tenor" {
-				\tenorAA \tenorAB s8
-				\tenorAA \tenorAB s8
+				\tenorAA r8 s8 \tenorAB r8 s8
+				\tenorAA r8 s8 \tenorAB r8 s8
 			}
 	>>
 	}