From a69bc52462888004e47cdc6ccf70e72c4e982d7e Mon Sep 17 00:00:00 2001
From: Eric Teunis de Boone <ericteunis@gmail.com>
Date: Tue, 13 Aug 2019 14:09:24 +0200
Subject: [PATCH] Royal Scots Polka side and pipes edited

---
 2-4_marches/royal_scots_polka/full.ly         |  4 ++--
 2-4_marches/royal_scots_polka/notes.pipes.ily | 16 ++++++++--------
 2-4_marches/royal_scots_polka/notes.side.ily  |  7 ++++++-
 2-4_marches/royal_scots_polka/side.ly         |  4 ++--
 4 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/2-4_marches/royal_scots_polka/full.ly b/2-4_marches/royal_scots_polka/full.ly
index bcc4a00..4d98159 100644
--- a/2-4_marches/royal_scots_polka/full.ly
+++ b/2-4_marches/royal_scots_polka/full.ly
@@ -104,14 +104,14 @@
 
 			\snareApart \snareMid \snareApart \snareEnd s8
 
-			\snareBApart \snareMid s8
+			\snareBApart \snareMidTwo s8
 			\snareBApart \snareEnd s8
 			\snareBDpart \snareEnd s8
 
 
 			\snareCpart \snareMid \snareCpart \snareEnd s8
 
-			\snareDApart \snareMid s8
+			\snareDApart \snareMidTwo s8
 			\snareDApart \snareEnd s8
 			\snareDDpart \snareEnd s8
 
diff --git a/2-4_marches/royal_scots_polka/notes.pipes.ily b/2-4_marches/royal_scots_polka/notes.pipes.ily
index b147aa9..c89c3a4 100644
--- a/2-4_marches/royal_scots_polka/notes.pipes.ily
+++ b/2-4_marches/royal_scots_polka/notes.pipes.ily
@@ -13,7 +13,7 @@ pipesA = {
 	\thrwd d8 \gre a16. d32	\dblf f4 |
 	\dble e8 g16. e32	\dblc c8 [ \dble e16. c32 ] |
 	\grg a16. \grd c32 e16. f32	\dblg g8
-	
+
 	\grA f16. e32 |
 	\thrwd d8 \gre a8	\dblb b8 \gre a8 |
 	\thrwd d8 \gre a16. d32	\dblf f8 \grg e16. f32 |
@@ -28,19 +28,19 @@ pipesBA = {
 	\dblg g8. e16 	\dblc c8 [ \dble e16. c32 ] |
 	\grg a16. \grd c32 e16. f32 	\dblg g8
 }
-pipesBB = { 
+pipesBB = {
 	\grA f16. g32 |
 	\dblA A8. g16 	\hdblf f8. d16 |
 	\gre a8 [ \thrwd d16. f32 ] 	\dblA A8 e16. f32 |
 	\dblg g8 e16. c32 	\grg a16. \grd c32 e16. g32 |
-	\hdblf f8 d8 	\dbld d8 
+	\hdblf f8 d8 	\dbld d8
 }
 pipesBD = {
 	\grA f16. g32 |
-	A16. g32 g16. f32 	\grg f16. e32 e16. 	d32 |
-	\grg d16. c32 c16. 	\grd b32 	\dblA A8 e16. f32 |
+	A16. g32 \grA g16. f32 	\grg f16. e32 \grg e16. 	d32 |
+	\grg d16. c32 \grg c16. 	\grd b32 	\dblA A8 e16. f32 |
 	\dblg g8 e16. c32 	\grg a16. \grd c32 e16. 	g32 |
-	\hdblf f8 d8 	\dbld d8 
+	\hdblf f8 d8 	\dbld d8
 }
 
 pipesC = {
@@ -49,7 +49,7 @@ pipesC = {
 	\thrwd d8 \gre a16. d32 	\dblf f4 |
 	\dble e8 g16. e32 	\dblc c8 [ \dble e16. c32 ] |
 	\grg a16. \grd c32 e16. f32 	\dblg g8
-	
+
 
 	\grA f16. e32 |
 	\thrwd d8 \grg c16. d32 	\dblb b8 \gre a8 |
@@ -62,7 +62,7 @@ pipesDA = {
 	\grg f16. g32 |
 	A8 \grg A16. g32 	\hdblf f8 [ \thrwd d8 ] |
 	\grg f16. g32 A16. g32 	\dblf f8 \grg e16. f32 |
-	\dblg g8 [ \slurf g16. e32 ] 	\dblc c8 [ \dble e16. c32 ] |
+	\dblg g8 [ \grA g16. e32 ] 	\dblc c8 [ \dble e16. c32 ] |
 	\grg a16. \grd c32 e16. f32 	\dblg g8
 }
 pipesDB = {
diff --git a/2-4_marches/royal_scots_polka/notes.side.ily b/2-4_marches/royal_scots_polka/notes.side.ily
index b99484b..a27411b 100644
--- a/2-4_marches/royal_scots_polka/notes.side.ily
+++ b/2-4_marches/royal_scots_polka/notes.side.ily
@@ -14,6 +14,11 @@ snareMid = \drummode {
 	g16.) d32 g16. \flam d32	r16. g32 d16. \flam g32 |
 	r16. d32 g16. g32	d32:64(-> d16.)
 }
+snareMidTwo = \drummode {
+	d4:32(-> |
+	g8) d16. g32	\tuplet 3/2 { d16 g d } g16. \flam g32 |
+	r16. d32 g16. g32	d32:64(-> d16.)
+}
 snareEnd = \drummode {
 	d8:32(-> g16.) d32 |
 	g8 \flam d16. g32	d16. g32 d32 g d g |
@@ -37,7 +42,7 @@ snareBDpart = \drummode {
 }
 
 snareCpart = \drummode {
-	r16. g32 |
+	g8 |
 	d8:32( g16.) d32:64(	\triplet { d16) g d } g16. d32 |
 	g16. \flam d32 g16. g32
 }
diff --git a/2-4_marches/royal_scots_polka/side.ly b/2-4_marches/royal_scots_polka/side.ly
index 996c07b..2ab9536 100644
--- a/2-4_marches/royal_scots_polka/side.ly
+++ b/2-4_marches/royal_scots_polka/side.ly
@@ -15,7 +15,7 @@ snare_royal_scots_polka = \drummode {
 
 	\repeat volta 2 {
 		\partial 8
-		\snareBApart \snareMid
+		\snareBApart \snareMidTwo
 
 	} \alternative {
 		{ \snareBApart \snareEnd }
@@ -33,7 +33,7 @@ snare_royal_scots_polka = \drummode {
 
 	\repeat volta 2 {
 		\partial 8
-		\snareDApart \snareMid
+		\snareDApart \snareMidTwo
 	} \alternative {
 		{ \snareDApart \snareEnd }
 		{ \snareDDpart \snareEnd }