From 38c9742103814a4146fa83ed370054408253f184 Mon Sep 17 00:00:00 2001
From: Eric Teunis de Boone <ericteunis@deboone.nl>
Date: Fri, 8 Sep 2023 22:05:43 +0200
Subject: [PATCH] [side] improve typeseeting A.A. Cameron's

---
 strathspeys/aa_camerons/notes.side.ily |  7 +++--
 strathspeys/aa_camerons/side.ly        | 41 +++++++++++---------------
 2 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/strathspeys/aa_camerons/notes.side.ily b/strathspeys/aa_camerons/notes.side.ily
index d5cf8fd..8d088cd 100644
--- a/strathspeys/aa_camerons/notes.side.ily
+++ b/strathspeys/aa_camerons/notes.side.ily
@@ -2,6 +2,9 @@
 % Side
 \version "2.18.2"
 composerSide = "G. Clark, 1988"
+sideglobal = {
+	\eighthBeaming
+}
 snareAA = \drummode {
 	\flamd d8.-> \tuplet 3/2 { g32 d32 d32 } g8.[ \dragd d16] \tuplet 3/2 { d16 g d g d8 } g4:32(-> |
 	d8.) g16 \tuplet 3/2 { d8:32( d8) g8-> } \tuplet 3/2 { d8[ g8 \dragd d8] } \tuplet 3/2 { d16 g d g d8 } |
@@ -18,7 +21,7 @@ snareABB = \drummode {
 % Part 2
 snareBA = \drummode {
 	d4:32(-> \tuplet 3/2 { d16) g16 d16 } \flamg g8 \tuplet 3/2 { d8 g d } d4:32( |
-	d8.) \flamg g16 \tuplet 3/2 { d8 g d } \tuplet 3/2 { \flamd d16 g d } g8-> \tuplet 3/2 { d8 g d } |
+	d8.) \flamg g16 \tuplet 3/2 { d8 g d } \flam \tuplet 3/2 { d16 g d } g8-> \tuplet 3/2 { d8 g d } |
 }
 snareBBA = \drummode {
 	\flamd d8. g16 \tuplet 3/2 { d16-> g d d g-> d } \tuplet 3/2 { g16 g d8-> g }   d8.-> \tuplet 3/2 { g32 d d } |
@@ -27,4 +30,4 @@ snareBBA = \drummode {
 snareBBB = \drummode {
 	\flamd d8. g16 \tuplet 3/2 { d16 g d g d8-> } \tuplet 3/2 { g8 d16 g16 d16 g16 } d4:32(-> |
 	d8.) g16 \flamd \tuplet 3/2 { d8 g \flamg g } \tuplet 3/2 { d16 g d g d8 } \tuplet 3/2 { d8 g d }
-}
\ No newline at end of file
+}
diff --git a/strathspeys/aa_camerons/side.ly b/strathspeys/aa_camerons/side.ly
index aaadeef..29eca30 100644
--- a/strathspeys/aa_camerons/side.ly
+++ b/strathspeys/aa_camerons/side.ly
@@ -6,33 +6,28 @@
 \include "./notes.side.ily"
 
 \score {
+	\unfoldRepeats
     \new PipeBandDrumStaff {
         \global
-        <<
-			{
-			\repeat unfold 2 {
-				\line
-				\bar "||"
-				\break
-				\line
-				\bar "|."
-				\break
-				}
-			\bar "|."
-			}
-			{
+		\sideglobal
+		\repeat volta 2 {
 			\snareAA
-			\snareABA
-			\snareAA
-			\snareABB
-
-
-			\snareBA
-			\snareBBA
-			\snareBA
-			\snareBBB
+			\alternative {
+				\snareABA
+				\snareABB
 			}
-		>>
+		}
+		\section
+		\break
+		\repeat volta 2 {
+			\snareBA
+			\alternative {
+				\snareBBA
+				\snareBBB
+			}
+		}
+		\fine
+		\fine
 	}
 	\header {
 		title = \title