From 1a1d2229392b4055f0a9163c429b2bc5ef431ea5 Mon Sep 17 00:00:00 2001
From: Eric Teunis de Boone <ericteunis@deboone.nl>
Date: Sun, 1 May 2016 13:33:13 +0200
Subject: [PATCH] Fix in data of Pikeman's March (makeup was missing) Reworking
 Black Bear Finishing Jock Wilson's Ball

---
 2-4_marches/black_bear/full.ly                |  12 +-
 2-4_marches/black_bear/notes.bass.ily         |  61 +++++++++
 2-4_marches/black_bear/notes.side.ily         |  26 ++--
 2-4_marches/black_bear/notes.tenor.ily        |  20 +--
 4-4_marches/the_pikemans_march/config.ily     |   6 +-
 4-4_marches/the_pikemans_march/drums.ly       |   2 +-
 4-4_marches/the_pikemans_march/notes.side.ily | 120 ++++++++++++++----
 .../the_pikemans_march/notes.side.v1.0.ily    |  42 ++++++
 .../the_pikemans_march/notes.side.v1.8.ily    | 116 -----------------
 4-4_marches/the_pikemans_march/side.ly        |   2 +-
 reels/jock_wilsons_ball/notes.bass.ily        |  26 +++-
 reels/jock_wilsons_ball/notes.side.ily        |  15 +--
 12 files changed, 263 insertions(+), 185 deletions(-)
 create mode 100644 2-4_marches/black_bear/notes.bass.ily
 create mode 100644 4-4_marches/the_pikemans_march/notes.side.v1.0.ily
 delete mode 100644 4-4_marches/the_pikemans_march/notes.side.v1.8.ily

diff --git a/2-4_marches/black_bear/full.ly b/2-4_marches/black_bear/full.ly
index f93640d..e9dc6aa 100644
--- a/2-4_marches/black_bear/full.ly
+++ b/2-4_marches/black_bear/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"
@@ -50,14 +50,10 @@
 		\new PipeBandDrumStaff = "bass" {
 			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
 			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}
-			s8
-			s2*7
-			s4 s4
+			r8 \bassA s8
 
-			s8
-			s2*8
-			s2*7
-			s4 s4
+			\bassB
+			\bassA s8
 		}
 	>>
 	\header {
diff --git a/2-4_marches/black_bear/notes.bass.ily b/2-4_marches/black_bear/notes.bass.ily
new file mode 100644
index 0000000..d72c965
--- /dev/null
+++ b/2-4_marches/black_bear/notes.bass.ily
@@ -0,0 +1,61 @@
+% 2/4 Black Bear>
+% Bass
+\version "2.18.2"
+composerBass  = "E.T. de Boone, 2016"
+bassglobal = {}
+% Music
+bassA = \drummode {
+	d8 g
+	d4
+	|
+	d8 g8
+	d4
+	|
+	d8 d8
+	g4
+	|
+	r4
+	g8 d8
+	
+	|
+	d8 g
+	d4
+	|
+	d8 g
+	d4
+	|
+	d8. g16
+	d8 g8
+	|
+	d8 g8
+	d8
+
+}
+bassB = \drummode {
+	g8
+	|
+	d4
+	g4
+	|
+	d4
+	r4
+	|
+	d4
+	g4
+	|
+	d4
+	r4
+
+	|
+	d4
+	g4
+	|
+	d8 g
+	d4 
+	|
+	d8 g
+	d8 g
+	|
+	d4
+	g4	
+}
diff --git a/2-4_marches/black_bear/notes.side.ily b/2-4_marches/black_bear/notes.side.ily
index ff6f629..5acbebb 100644
--- a/2-4_marches/black_bear/notes.side.ily
+++ b/2-4_marches/black_bear/notes.side.ily
@@ -6,36 +6,36 @@ sideglobal = { \eighthBeaming }
 %%music
 
 snareAnotmeasone = \drummode {
-	d8:32(-> g:32)(->	\triplet { d16) g d-> } g16. g32 |
-	\flam d8 d8:32(		g8) d16. g32 |
-	d16.:64( d32) \triplet { g16 d g }	\flam d16. \flam g32 d16. g32 |
+	d8:32(-> \dr g:32)(->	\triplet { d16) g d-> } g16. g32 |
+	\flam d8 d8:32(		g8) \fr d16. g32 |
+	d16.:64( d32) \triplet { g16 d g }	\flam d16. \flam g32 d16. g32 \dr |
 
-	\flam d8 g8:32(->	\triplet { d16) g d-> } g16. g32 |
-	d8:32(-> g:32)(->	\triplet { d16) g d-> } g16. g32 |
+	\flam d8 g8:32(->	\triplet { d16)\fr g d-> } g16. g32 |
+	d8:32(-> \dr g:32)(->	\triplet { d16) g d-> } g16. g32 |
 	\flam d8 d8:32(		\triplet { g16) d g } \flam d16. g32 |
-	\flam d16. g32-> d32 g d g	d8
+	\flam d16. g32-> d32 g d g	d8 \fr
 }
 
 snareA = \drummode {
 	d16. g32 |
-	d8:32(-> g:32)(->	\triplet { d16) g d-> } g16. g32 |
+	d8:32(-> \dr g:32)(->	\triplet { d16) \fr g d-> } g16. g32 |
 	\snareAnotmeasone
 }
 
 snareBA = \drummode {
 	g8 |
+	\flam d16. \dr g32 d16. \flam g32		d16. g32-> d32 g d g |
+	d8-> \fr d16. \pp g32	\triplet { d16 d g } d16.-> g32 \dr \mf  |
 	\flam d16. g32 d16. \flam g32		d16. g32-> d32 g d g |
-	d8-> d16. \pp g32	\triplet { d16 d g } d16.-> g32 \mf |
-	\flam d16. g32 d16. \flam g32		d16. g32-> d32 g d g |
-	d16.-> g32 d16. \flam g32	d32 g d g d16. g32 |
+	d16.-> g32 d16. \fr \flam g32	d32 g d g d16. g32 |
 
 	\flam d16. g32 d16. g32:128(->		g16:64 d8:32)(-> g16) |
-	d8.:32(-> g16:64)(->	g16:64 d8:32)(-> g16) |
+	d8.:32(-> \dr g16:64)(->	g16:64 d8:32)(-> g16) |
 	\flam d16. g32 d16. \flam d32		d16. \flam g32 d32 g d g |
-	d8-> \triplet { d16 \< d g } \triplet { d16 d g } d8-> \!
+	d8->\fr  \triplet { d16 \< d g } \triplet { d16 d g } d8-> \!
 }
 snareBB = \drummode {
-	\flam d8 g8:32(->	\triplet { d16) g d-> } g16. g32 |
+	\flam d8 \dr g8:32(->	\triplet { d16)\fr g d-> } g16. g32 |
 	\snareAnotmeasone
 }
 
diff --git a/2-4_marches/black_bear/notes.tenor.ily b/2-4_marches/black_bear/notes.tenor.ily
index b9413b1..42824e6 100644
--- a/2-4_marches/black_bear/notes.tenor.ily
+++ b/2-4_marches/black_bear/notes.tenor.ily
@@ -25,10 +25,10 @@ tenorApiece = \drummode {
 	\triplet { d16 g d } g8
 	|
 	d8 g16. g32
-	d8 g16. g32
+	d16. g8 d32
 	|
 	d8 d8
-	g41
+	g8
 }
 tenorA = \drummode {
 	g8 |
@@ -36,30 +36,30 @@ tenorA = \drummode {
 }
 
 tenorBA = \drummode {
-	d8 |
-	g16. g32 d16. d32
-	r4
+	g8 |
+	d16. g32 d16. d32
+	g4
 	|
 	r4
 	d32 g16. g32 d16.
 	|
 	d16. g32 d16. d32
-	r4
+	g4
 	|
 	r4
 	d32 g16. g32 d16.
 	|
 
-	d32 g16. d32 g16.
-	g32 d16. g32 d16.
+	d32 g16. g32 d16.
+	d32 g16. g32 d16.
 	|
-	d32 g16. d32 g16.
+	g32 d16. g32 d16.
 	g32 d16. g32 d16.
 	|
 	d16. g32 d16. d32
 	g16. d32 g16. g32
 	|
-	r4
+	d4
 	d16. g32 g16. d32
 }
 tenorBB = \drummode {
diff --git a/4-4_marches/the_pikemans_march/config.ily b/4-4_marches/the_pikemans_march/config.ily
index dcafc87..183f831 100644
--- a/4-4_marches/the_pikemans_march/config.ily
+++ b/4-4_marches/the_pikemans_march/config.ily
@@ -8,9 +8,9 @@ confTempo = {
 	}
 %% Format
 part = { \partial 8 s8 }
-halfline = { \repeat unfold 4 { s1 | } }
+halfline = { \repeat unfold 2 { s1 | } }
 line = { \repeat unfold 2 { \halfline } }
 
 %% Headers
-title = "Title"
-meter = "Meter"
+title = "The Pikeman's March"
+meter = "March"
diff --git a/4-4_marches/the_pikemans_march/drums.ly b/4-4_marches/the_pikemans_march/drums.ly
index 4868c6f..615a09f 100644
--- a/4-4_marches/the_pikemans_march/drums.ly
+++ b/4-4_marches/the_pikemans_march/drums.ly
@@ -3,7 +3,7 @@
 \include "config.ily"
 \include "notes.bass.ily"
 \include "notes.tenor.ily"
-\include "notes.side.v1.8.ily"
+\include "notes.side.ily"
 
 \score {
 	\new StaffGroup <<
diff --git a/4-4_marches/the_pikemans_march/notes.side.ily b/4-4_marches/the_pikemans_march/notes.side.ily
index 9cfc63f..5cf921e 100644
--- a/4-4_marches/the_pikemans_march/notes.side.ily
+++ b/4-4_marches/the_pikemans_march/notes.side.ily
@@ -1,42 +1,116 @@
 % 4/4 The Pikeman's March
 % Side
 \version "2.18.2"
-composerSide = "E.T. de Boone, 2014"
+composerSide = "E.T. de Boone, v1.8, 2016"
 sideglobal = {
 	\eighthBeaming
 	}
 
 %%music
 snareAA = \drummode {
-	g8 |
-	\flamd d4_^		d32 g d g d8->		\flamd d8 \flamg g8		r8 d8:32( |
-	g16.) d32-> g16. g32		d16. g32-> d16. d32		\flamg g8 d8:32(		g8) g8 |
-	\flamd d4		\flamd d16 g-> d d		\flamg g16 d-> g g		\flamd d16 g-> d d |
-	\flamd d4		d4:32(		d4)		r8 g8 |
+	g16. \dr g32
+	|
+	\flamd d4\v \fr
+	d32\< g d g d8->\!
+	\flamddr d8\> \flamg g8\!
+	r8 d8:32(
+	|
+	g16.) d32-> g16. g32
+	d16. g32-> d16. d32
+	\flamg g8 d8:32(
+	g8..) \fr g32
+	|
+
+	\flamd d4
+	\flamd d16 g-> d d
+	\flamg g16 d-> g g
+	\flamd d16 g-> d d
+	|
+	\flamddr d4
+	d8:32( g8:32)(->
+	d4)
+	r8 \tuplet 3/2 { g16\< d g\! }
 }
 snareAB = \drummode {
-	\flamd d4_^		d32 g d g d8->		\flamd d8 \flamg g8		r8 d8:32( |
-	\tuplet 3/2 { g16) d g } \flamd d16. g32		\tuplet 3/2 { d16 g d } \flamg g16. g32		\flamd d16. g32 d32 g d g		d8-> d16. g32 |
-	d8:32( d8:32)(->		d8:32)( d8:32)(->		d8)-> d32 g d g		d8-> g8	|
-	\flamd d4		d4:32(		d4)		r8
+	\flamd d4\v \fr
+	d32\< g d g d8->\!
+	\flamddr d8\> \flamg g8\!
+	r8 d8:32(
+	|
+	\tuplet 3/2 { g16) d g } \flamd d16. g32
+	\tuplet 3/2 { d16 g d } \flamg g16.  g32
+	\flamd d16.\fr g32 d32 g d g
+	d8-> g16. \dr g32
+	|
+
+	d8:32( g8:32)(->
+	d8:32)( g8:32)(->
+	d8)->\fr \tuplet 3/2 { g16 d g}	\flam d8 g32\dr d d g
+	|
+	\flam d8. g16	d8:32(-> g8:32)(->  
+	d8.)->\fr d16:64(
+	d8)
 }
 snareBA = \drummode {
-	d16. g32 |
-	\flamd d8 \tuplet 3/2 { d16 g d }		\flamg g8 d8:32(		g16.) d32-> g16. g32		\flamd d8 d8:32( |
-	g16.) d32-> g16. g32		d16. g32-> d16. d32		\flamg g8 d8:32(		g8) g8 |
-	d8:32( d8:32)(->		d8:32)( d8:32)(->		d8)-> d32 g d g		d8-> d16. g32	|
-	\flamd d4		d8:32( g8:32)(->		d4)		\flamd d16 \p g \flamg g d |
+	d16. g32
+	|
+	\flam d8 d16. g32	\flam d16. d32:128( d16.) g32->
+	r16. \flam d32 g16. g32
+	d4:32( \dr \<
+	|
+	d16.)\! g32 \flam d16. g32	d16. g32-> d32 g d g
+	\flam g8 \fr d8:32(
+	g16:64 g16) d8 \dr
+	|
+	
+	d8:32( g8:32)(->
+	d8:32)( g8:32)(->
+	d8)->\fr d32 g d g
+	d8-> d16. \dr g32
+	|
+	\flamd d4
+	d8:32( g8:32)(->
+	d4)	\fr	\tuplet 6/4 {d16 \< g d g16 d g\! }
 }
 snareBB = \drummode {
-	\flamd d8\f \flamg g8		r8 d8:32(		g16.) d32-> g16. g32		\flamd d8 d8:32( |
-	g16.) d32-> g16. g32		d16. g32-> d16. d32		\flamg g8 d8:32(		g8) d16. g32 |
-	d8.:32(-> g16:64)(->		d8:32)(-> g8)->		\flamd d16.\> g32-> d16. d32\!		\flamg g16.\> d32-> g16. g32\! |
-	\flamd d4		d4:32(		d4)		r8 d16. g32 |
+	\flamd d8\f \flamg g8
+	r8 d8:32(
+	g16.) d32-> g16. g32
+	\flamd d8 d8:32(\dr
+	|
+	g16.)\! g32 \flam d16. g32	d16. g32-> d32 g d g
+	\flam g8 \fr d8:32(
+	g16:64 g16) d16. g32
+	|
+	
+	d8.:32(->\dr g16:64)(->
+	d8:32)(-> g8)->\fr
+	\flamd d16.\> g32-> d16. d32\!
+	\flamg g16.\> d32-> g16. g32\!
+	|
+	\flamddr d4
+	d4:32(
+	d8) \fr	\flam g8  r8  d16.\dr g32
 }
 
 snareBC = \drummode {
-	\flamd d8\f \flamg g8		r8 d8:32(		g16.) d32-> g16. g32		\flamd d8 d8:32( |
-	g16.) d32-> g16. g32		d16. g32-> d16. d32		\flamg g8 d8:32(		g8) d16. g32 |
-	d8.:32(-> g16:64)(->		d8:32)(-> g8)->		d32 g d g d16.-> g32->		d32 g d g d8-> |
-	\flamd d4		d8:32( g8:32)(->		d4)		r4
+	\flamd d8\f \flamg g8
+	r8 d8:32(
+	g16.) d32-> g16. g32
+	\flamd d8 d8:32(
+	|
+	g16.)\! g32 \flam d16. g32	d16. g32-> d32 g d g
+	\flam g8 d8:32(
+	g16:64 g16) d16. g32
+	|
+
+	d8.:32(-> g16:64)(->
+	d8:32)(-> g16.)-> g32->
+	d32 g d g d16.-> g32->
+	d32 g d g d8->
+	|
+	\flamd d4
+	d8:32( g8:32)(->
+	d4)
+	r8 
 }
diff --git a/4-4_marches/the_pikemans_march/notes.side.v1.0.ily b/4-4_marches/the_pikemans_march/notes.side.v1.0.ily
new file mode 100644
index 0000000..9cfc63f
--- /dev/null
+++ b/4-4_marches/the_pikemans_march/notes.side.v1.0.ily
@@ -0,0 +1,42 @@
+% 4/4 The Pikeman's March
+% Side
+\version "2.18.2"
+composerSide = "E.T. de Boone, 2014"
+sideglobal = {
+	\eighthBeaming
+	}
+
+%%music
+snareAA = \drummode {
+	g8 |
+	\flamd d4_^		d32 g d g d8->		\flamd d8 \flamg g8		r8 d8:32( |
+	g16.) d32-> g16. g32		d16. g32-> d16. d32		\flamg g8 d8:32(		g8) g8 |
+	\flamd d4		\flamd d16 g-> d d		\flamg g16 d-> g g		\flamd d16 g-> d d |
+	\flamd d4		d4:32(		d4)		r8 g8 |
+}
+snareAB = \drummode {
+	\flamd d4_^		d32 g d g d8->		\flamd d8 \flamg g8		r8 d8:32( |
+	\tuplet 3/2 { g16) d g } \flamd d16. g32		\tuplet 3/2 { d16 g d } \flamg g16. g32		\flamd d16. g32 d32 g d g		d8-> d16. g32 |
+	d8:32( d8:32)(->		d8:32)( d8:32)(->		d8)-> d32 g d g		d8-> g8	|
+	\flamd d4		d4:32(		d4)		r8
+}
+snareBA = \drummode {
+	d16. g32 |
+	\flamd d8 \tuplet 3/2 { d16 g d }		\flamg g8 d8:32(		g16.) d32-> g16. g32		\flamd d8 d8:32( |
+	g16.) d32-> g16. g32		d16. g32-> d16. d32		\flamg g8 d8:32(		g8) g8 |
+	d8:32( d8:32)(->		d8:32)( d8:32)(->		d8)-> d32 g d g		d8-> d16. g32	|
+	\flamd d4		d8:32( g8:32)(->		d4)		\flamd d16 \p g \flamg g d |
+}
+snareBB = \drummode {
+	\flamd d8\f \flamg g8		r8 d8:32(		g16.) d32-> g16. g32		\flamd d8 d8:32( |
+	g16.) d32-> g16. g32		d16. g32-> d16. d32		\flamg g8 d8:32(		g8) d16. g32 |
+	d8.:32(-> g16:64)(->		d8:32)(-> g8)->		\flamd d16.\> g32-> d16. d32\!		\flamg g16.\> d32-> g16. g32\! |
+	\flamd d4		d4:32(		d4)		r8 d16. g32 |
+}
+
+snareBC = \drummode {
+	\flamd d8\f \flamg g8		r8 d8:32(		g16.) d32-> g16. g32		\flamd d8 d8:32( |
+	g16.) d32-> g16. g32		d16. g32-> d16. d32		\flamg g8 d8:32(		g8) d16. g32 |
+	d8.:32(-> g16:64)(->		d8:32)(-> g8)->		d32 g d g d16.-> g32->		d32 g d g d8-> |
+	\flamd d4		d8:32( g8:32)(->		d4)		r4
+}
diff --git a/4-4_marches/the_pikemans_march/notes.side.v1.8.ily b/4-4_marches/the_pikemans_march/notes.side.v1.8.ily
deleted file mode 100644
index e6a6426..0000000
--- a/4-4_marches/the_pikemans_march/notes.side.v1.8.ily
+++ /dev/null
@@ -1,116 +0,0 @@
-% 4/4 The Pikeman's March
-% Side
-\version "2.18.2"
-composerSide = "E.T. de Boone, v1.8, 2016"
-sideglobal = {
-	\eighthBeaming
-	}
-
-%%music
-snareAA = \drummode {
-	g16. \dr g32
-	|
-	\flamd d4\v \fr
-	d32\< g d g d8->\!
-	\flamddr d8\> \flamg g8\!
-	r8 d8:32(
-	|
-	g16.) d32-> g16. g32
-	d16. g32-> d16. d32
-	\flamg g8 d8:32(
-	g8..) \fr g32
-	|
-
-	\flamd d4
-	\flamd d16 g-> d d
-	\flamg g16 d-> g g
-	\flamd d16 g-> d d
-	|
-	\flamddr d4
-	d8:32( g8:32)(->
-	d4)
-	r8 \tuplet 3/2 { g16\< d g\! }
-}
-snareAB = \drummode {
-	\flamd d4\v \fr
-	d32\< g d g d8->\!
-	\flamddr d8\> \flamg g8\!
-	r8 d8:32(
-	|
-	\tuplet 3/2 { g16) d g } \flamd d16. g32
-	\tuplet 3/2 { d16 g d } \flamg g16.  g32
-	\flamd d16.\fr g32 d32 g d g
-	d8-> g16. \dr g32
-	|
-
-	d8:32( g8:32)(->
-	d8:32)( g8:32)(->
-	d8)->\fr \tuplet 3/2 { g16 d g}	\flam d8 g32\dr d d g
-	|
-	\flam d8. g16	d8:32(-> g8:32)(->  
-	d8.)->\fr d16:64(
-	d8)
-}
-snareBA = \drummode {
-	d16. g32
-	|
-	\flam d8 d16. g32	\flam d16. d32:128( d16.) g32->
-	r16. \flam d32 g16. g32
-	d4:32( \dr \<
-	|
-	d16.)\! g32 \flam d16. g32	d16. g32-> d32 g d g
-	\flam g8 \fr d8:32(
-	g16:64 g16) d8 \dr
-	|
-	
-	d8:32( g8:32)(->
-	d8:32)( g8:32)(->
-	d8)->\fr d32 g d g
-	d8-> d16. \dr g32
-	|
-	\flamd d4
-	d8:32( g8:32)(->
-	d4)	\fr	\tuplet 6/4 {d16 \< g d g16 d g\! }
-}
-snareBB = \drummode {
-	\flamd d8\f \flamg g8
-	r8 d8:32(
-	g16.) d32-> g16. g32
-	\flamd d8 d8:32(\dr
-	|
-	g16.)\! g32 \flam d16. g32	d16. g32-> d32 g d g
-	\flam g8 \fr d8:32(
-	g16:64 g16) d16. g32
-	|
-	
-	d8.:32(->\dr g16:64)(->
-	d8:32)(-> g8)->\fr
-	\flamd d16.\> g32-> d16. d32\!
-	\flamg g16.\> d32-> g16. g32\!
-	|
-	\flamddr d4
-	d4:32(
-	d8) \fr	\flam g8  r8  d16.\dr g32
-}
-
-snareBC = \drummode {
-	\flamd d8\f \flamg g8
-	r8 d8:32(
-	g16.) d32-> g16. g32
-	\flamd d8 d8:32(
-	|
-	g16.)\! g32 \flam d16. g32	d16. g32-> d32 g d g
-	\flam g8 d8:32(
-	g16:64 g16) d16. g32
-	|
-
-	d8.:32(-> g16:64)(->
-	d8:32)(-> g16.)-> g32->
-	d32 g d g d16.-> g32->
-	d32 g d g d8->
-	|
-	\flamd d4
-	d8:32( g8:32)(->
-	d4)
-	r4 
-}
diff --git a/4-4_marches/the_pikemans_march/side.ly b/4-4_marches/the_pikemans_march/side.ly
index b43c75d..6f95f6d 100644
--- a/4-4_marches/the_pikemans_march/side.ly
+++ b/4-4_marches/the_pikemans_march/side.ly
@@ -1,7 +1,7 @@
 \version "2.18.2"
 
 \include "config.ily"
-\include "notes.side.v1.8.ily"
+\include "notes.side.ily"
 
 \score {
     \new PipeBandDrumStaff {
diff --git a/reels/jock_wilsons_ball/notes.bass.ily b/reels/jock_wilsons_ball/notes.bass.ily
index d3aa0fb..2c57a5b 100644
--- a/reels/jock_wilsons_ball/notes.bass.ily
+++ b/reels/jock_wilsons_ball/notes.bass.ily
@@ -34,7 +34,29 @@ bassA = \drummode {
 }
 
 bassB = \drummode {
-	s1*4
+	d4 g4->
+	d4 g8. g16
 	|
-	s1*4
+	d4 g4
+	d2
+	|
+	d4 g4->
+	d4 g8. g16
+	|
+	g4.. g16
+	d2
+	|
+
+	d4 g4->
+	d4 g8. g16
+	|
+	d4 g4
+	d2
+	|
+	d8. g16 d4
+	g4 g4
+	|
+	d8. g16 d4
+	g4 d4
+
 }
diff --git a/reels/jock_wilsons_ball/notes.side.ily b/reels/jock_wilsons_ball/notes.side.ily
index be899da..ce89f30 100644
--- a/reels/jock_wilsons_ball/notes.side.ily
+++ b/reels/jock_wilsons_ball/notes.side.ily
@@ -36,22 +36,21 @@ sideA = \drummode {
 
 sideB = \drummode {
 	g16 |
-	\flam d8[  d8:32 ~	d8.:32(-> g16)  ]
-	\flam d8[  d16:64( d16)	\flam d8. g16 ]
+	\flam d4  g4:32(
+	d8.:32)(-> g16) \flam d8. g16  
 	|
 	\flamd \triplet { d8[  g8 \flam d8 } \flam g8 \triplet { d16 g d ]} 
 	g8.[  \drag d16		d8. g16 ]
 	|
-	\flam d8[  d16:64~ d16	d8.:32(-> g16) ]
-	\flam d8[  d16:64~ d16	\flam d8. g16 ]
+	\flam d4  g4:32(	
+	d8.:32)(-> g16) \flam d8. g16  
 	|
 	\triplet { d8 [ d g } d16 g32 g]
 	d8[  g32 d g d g8-> d8. d16:64( ]
 	
 	|
-	
-	d8)[  d16:64~ d16		d8.:32(-> g16) ]
-	\flam d8[  d16:64~ d16	\flam d8. g16 ]
+	d4)  g4:32(
+	d8.:32()-> g16) \flam d8. g16  
 	|
 	\flam d8.[  \drag g16	d32 g d g d8 ]
 	g8.[  \drag d16		d8. g16 ]
@@ -59,7 +58,7 @@ sideB = \drummode {
 	\flam d16[ g8.	d8. g16  ]
 	d4:32(	d8.) g16
 	|
-	d8:32( g8) d8. g16
+	d8.:32( g16) d8. g16
 	d16 g8.:32(	d4)
 
 }