From 6ed723f58ff5078c183df296f690f735a057f3e0 Mon Sep 17 00:00:00 2001
From: Eric Teunis de Boone <ericteunis@deboone.nl>
Date: Wed, 27 Sep 2023 18:45:55 +0200
Subject: [PATCH] [side] Tweaks/Unisons Rowan Tree and Wings

---
 4-4_marches/rowan_tree/notes.side.ily | 15 +++++++--------
 4-4_marches/wings/notes.side.ily      |  2 +-
 4-4_marches/wings/side.ly             |  8 ++++----
 4-4_marches/wings/side.nofine.ly      | 10 ++++++----
 4 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/4-4_marches/rowan_tree/notes.side.ily b/4-4_marches/rowan_tree/notes.side.ily
index 93ca63d..e9792ac 100644
--- a/4-4_marches/rowan_tree/notes.side.ily
+++ b/4-4_marches/rowan_tree/notes.side.ily
@@ -1,7 +1,7 @@
 % 4/4 Rowan Tree
 % Snare
 \version "2.18.2"
-composerSide = "v1.1"
+composerSide = "v1.2"
 sideglobal = { \eighthBeaming }
 
 %%music
@@ -10,9 +10,9 @@ snareEnding = \drummode {
 	d8:32(
 	g8[) d8]:32(
 	\tuplet 3/2 { g16) d g } \flam d16. g32
-	d16.\fr g32-> d g d g
+	d16. g32-> d g d g
 	|
-	\flamdr d4	d4:32(	d4) \fr
+	d4	d4:32(	d4)
 }
 snareA = \drummode {
 	r8 \tutti {
@@ -29,15 +29,14 @@ snareA = \drummode {
 	|
 	\flamdr d8
 	\snareEnding
+	\fr
 }
 % Part 2
 snareBA = \drummode {
 	d8. g16 |
-	\tutti {
-		d8[:32(->
-		g8]:32)(->	d8[:32)( g8]:32)(->	d8[:32)( g8]:32)(->	d8[)->
-	} d8]:32( \pp |
-	g8.) g16	d8:32( g8)	\flam d8 d8:32(	g8.) g16\mf\dr |
+	\tutti{d8[:32(->} \tutti{g8]:32)(->}	d8[:32)( \tutti{g8]:32)(->}	d8[:32)( \tutti{g8]:32)(->}	\tutti{ d8[)-> d8]:32( |
+	g8.) }  g16\pp	d8:32( g8)	\flam d8 d8:32(	g8.) g16\mf\dr |
 	\flam d8\v
 	\snareEnding
+	\fr
 }
diff --git a/4-4_marches/wings/notes.side.ily b/4-4_marches/wings/notes.side.ily
index 370d3c1..b1a726d 100644
--- a/4-4_marches/wings/notes.side.ily
+++ b/4-4_marches/wings/notes.side.ily
@@ -28,7 +28,7 @@ snareABB = \drummode {
 % Part 2
 snareBA = \drummode {
 	d8:32(\dr |
-	g8) d16. g32	\flam d16. d32:128( d8)	\flam d8 d16. g32	d8:32(-> \< g8:32)(-> |
+	g8) d16. g32	\flam d16. d32:128( d8)	\flam d8 d16.\p\< g32	d8:32(-> g8:32)(-> |
 	d8.)->\fr \! g16	d8:32( g16.) g32	d8:32( g16.) g32	\sextuplet { d16[ g d-> g d g] } |
 
 	\flamdr d8 d16. g32->	d16. d32 \flam g8	\flam d4	\triplet { <> \p d16 g d } \flam g8 |
diff --git a/4-4_marches/wings/side.ly b/4-4_marches/wings/side.ly
index f346135..fbfd1e6 100644
--- a/4-4_marches/wings/side.ly
+++ b/4-4_marches/wings/side.ly
@@ -17,11 +17,11 @@ mbreak = {\break}
 				\repeat segno 2 {
 					\repeat volta 2 {
 						\quartline
-					} \alternative {
-						\quartline
-						{	\quartline
-							\fine
+						\alternative {
+							\quartline
+							\quartline
 						}
+						\volta 2 { \fine }
 					}
 
 					\volta 1 {
diff --git a/4-4_marches/wings/side.nofine.ly b/4-4_marches/wings/side.nofine.ly
index 51fa633..e668823 100644
--- a/4-4_marches/wings/side.nofine.ly
+++ b/4-4_marches/wings/side.nofine.ly
@@ -6,17 +6,19 @@
 \include "./notes.side.ily"
 
 \score {
-    \new PipeBandDrumStaff {
-        \global
-        <<
+	\new PipeBandDrumStaff {
+		\global
+		<<
 			\new NullVoice = "format" {
 				\partial 8 s8 \line \bar "||"
 				\break
 				\partial 8 s8 \halfline \bar "||"
-				\halfline \bar "|."
+				\halfline
+				\fine
 			}%Format
 
 			\new DrumVoice = "side" {
+			\sideglobal
 				\snareAA	\snareABA
 				<>\dr
 					\removeWithTag #'tutti { \snareAAI \snareABB r8 s8 } \fr