From 66e6fd7805482ace0de1d44be664da3245be500b Mon Sep 17 00:00:00 2001
From: Eric Teunis de Boone <ericteunis@deboone.nl>
Date: Wed, 27 Jul 2022 02:10:12 +0200
Subject: [PATCH] Update Amazing Grace Side notation

---
 airs/amazing_grace/config.ily     |  2 +-
 airs/amazing_grace/full.ly        | 25 +++++++------
 airs/amazing_grace/notes.side.ily | 58 ++++++++++++++++++++++---------
 airs/amazing_grace/pipes.ly       |  1 +
 airs/amazing_grace/side.ly        | 11 ++++--
 5 files changed, 67 insertions(+), 30 deletions(-)

diff --git a/airs/amazing_grace/config.ily b/airs/amazing_grace/config.ily
index 17dd254..0d99028 100644
--- a/airs/amazing_grace/config.ily
+++ b/airs/amazing_grace/config.ily
@@ -8,7 +8,7 @@ confTempo = {
 	\tempo 4 = 60
 	}
 %% Format
-part = { \partial 4 s4 }
+part = { \partial 4 \grace{ s4 } s4 }
 measure = { \grace { s4 } s4*3 | }
 halfline = { \repeat unfold 2 { \measure } }
 line = { \repeat unfold 2 { \halfline } }
diff --git a/airs/amazing_grace/full.ly b/airs/amazing_grace/full.ly
index ef4f84a..d0ab287 100644
--- a/airs/amazing_grace/full.ly
+++ b/airs/amazing_grace/full.ly
@@ -9,17 +9,23 @@
 \include "./notes.side.ily"
 \include "./notes.pipes.ily"
 
+\layout {
+	indent = 5.0
+	short-indent = 2.0
+}
+
 \score {
 	\new StaffGroup <<
-		\new Staff {
+		\new Staff \with {
+			instrumentName = \markup{ \instrumentPipes }
+			shortInstrumentName = \markup{ \shortInstrumentPipes }
+		} {
 			\global
 			\pipeglobal
-			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentPipes }
-			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentPipes }
 			<<
 				{
+					\part
 					\repeat volta 2 {
-					  \part
 					  \line \break
 					  \line \break
 					  \line \break
@@ -38,18 +44,17 @@
 				}%Pipes
 			>>
 		}
-		\new PipeBandDrumStaff = "side" {
+		\new PipeBandDrumStaff = "side" \with {
+			instrumentName = \markup { \instrumentSide }
+			shortInstrumentName = \markup{ \shortInstrumentSide }
+		} {
 			\sideglobal
-			\set PipeBandDrumStaff.instrumentName = \markup \column {\instrumentSide}
-			\set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide}
 
 				\snarePart
 				\snareAA
 				\snareAB
 				\snareAC
-				\snareAD
-
-				\snareADendA
+				\keepWithTag #'with-volta \snareAD
 				\snareADendB
 		}
 %		\new PipeBandDrumStaff = "tenor" {
diff --git a/airs/amazing_grace/notes.side.ily b/airs/amazing_grace/notes.side.ily
index 7dcb7fa..ee15340 100644
--- a/airs/amazing_grace/notes.side.ily
+++ b/airs/amazing_grace/notes.side.ily
@@ -2,31 +2,55 @@
 % Side
 \version "2.18.2"
 composerSide = ""
+arrangerSide = "v1.0"
 sideglobal = {}
+
+optdragd = \drummode { \drumgrace { \startParenthesis g16[ \endParenthesis g] } } 
+optdragg = \drummode { \drumgrace { \startParenthesis d16[ \endParenthesis d] } } 
+optdrag = #(autohandFunc optdragg optdragd)
+
 snarePart = \drummode {
-			\flamd d8. g16 |
+			\optflam d8. g16 |
 }
+snareAAraw = \drummode {
+	\tag #'repeating { d2->)\! }
+	\tag #'not-repeating {\flam d2 }
+		\flam d8 g32 d16. |
+	\flam g2 \flam d8. g16 |
+	d2:32( d4:32)(\> |
+	d2)\! \flam d8. g16 |
+}
+
+
 snareAA = \drummode {
-	\flamd d2)\! \flamd d8 g32 d16. |
-	\flamd d2 \flamd d8. g16 |
-	d4:32( d4:32)( d4:32)(\> |
-	d2)\! \flamd d8. g16 |
+	\keepWithTag #'not-repeating \snareAAraw
 }
 snareAB = \drummode {
-	\flamd d2 \flamd d8 g32 d16. |
-	\flamd d2 \flamd d8. \flamg g16-> |
-	d4:32(\< d4:32)( d4:32)(\> |
-	d4:32)(\! d4:32)( d4:32)(\< |
+	\flam d2 \flam d8 g32 d16. |
+	\flam g2 \flam d8. g16 |
+	d2.:32(\<  |
+	d4:32)(\> d4:32)(\! d4:32)(\< |
 }
 snareAC = \drummode {
-	d2->)\! d8 g32 d16. |
-	\flamd d2 d8. g16 |
-	d4:32( d4:32)( d4:32)(\> |
-	d2)\! \flamd d8. g16 |
+	\keepWithTag #'repeating \snareAAraw
+}
+
+snareADA = \drummode {
+	\flam d2 \flam d8 g32 d16. |
+	\flam g2 \optdrag g4 |
+}
+snareADendA = \drummode {
+	d4:32(\> d4:32)( d4:32)(\! |
+	d4:32)( d4:32)(\<
+		\tag #'with-volta {d4:32) \! \laissezVibrer}
+		\tag #'no-volta { d4:32)( }
+}
+snareADendB = \drummode {
+	d2.:32( \f \>  |
+	d2.:32)\p
 }
 snareAD = \drummode {
-	\flamd d2 d8 g32 d16. |
-	\flamd d2 \dragd d4 |
-	d4:32(\> d4:32)( d4:32)(\! |
-	d4:32)( d4:32)(\< d4:32( <>)\!)
+	\snareADA
+	\snareADendA
 }
+
diff --git a/airs/amazing_grace/pipes.ly b/airs/amazing_grace/pipes.ly
index 025c52b..ef60c9d 100644
--- a/airs/amazing_grace/pipes.ly
+++ b/airs/amazing_grace/pipes.ly
@@ -42,6 +42,7 @@
 	\new Staff { \global \pipeglobal
 		\set Staff.midiInstrument = #"bagpipe"
 		%%Tune
+		\partial 4
 		\pipesA
 		\pipesAendA
 
diff --git a/airs/amazing_grace/side.ly b/airs/amazing_grace/side.ly
index 66f8e8b..2d28de6 100644
--- a/airs/amazing_grace/side.ly
+++ b/airs/amazing_grace/side.ly
@@ -15,15 +15,21 @@
 					\line \break
 					\line \break
 					\line \break
-					\line \break
+					\halfline
 				}
+				\alternative {
+					{ \halfline }
+					{ \halfline }
+				}
+				\bar "|."
 			}
 			{
 				\snarePart
 				\snareAA
 				\snareAB
 				\snareAC
-				\snareAD
+				\keepWithTag #'with-volta \snareAD
+				\snareADendB
 			}
 		>>
 	}
@@ -32,5 +38,6 @@
 		meter = \meter
 		instrument = \instrumentSide
 		composer = \composerSide
+		arranger = \arrangerSide
 	}
 }