From 39e252df146a3db359af9c5767eea2656b19db50 Mon Sep 17 00:00:00 2001
From: Eric Teunis de Boone <ericteunis@deboone.nl>
Date: Tue, 8 Aug 2023 11:03:26 +0200
Subject: [PATCH] Tweak Molly Connell Snare Intro

---
 strathspeys/molly_connell/notes.side.ily   | 18 ++++++-------
 strathspeys/molly_connell/side.ly          | 31 +++++++++-------------
 strathspeys/molly_connell/side.no-intro.ly | 24 +++++++++++++++++
 3 files changed, 45 insertions(+), 28 deletions(-)
 create mode 100644 strathspeys/molly_connell/side.no-intro.ly

diff --git a/strathspeys/molly_connell/notes.side.ily b/strathspeys/molly_connell/notes.side.ily
index 79a1950..5e46f20 100644
--- a/strathspeys/molly_connell/notes.side.ily
+++ b/strathspeys/molly_connell/notes.side.ily
@@ -3,8 +3,8 @@
 \version "2.18.2"
 composerSide  = "C. Ooms, v1.2, 2015"
 sideglobal = {}
-intro = \drummode {% by Dean Hall, 2006
-	\flam d4
+intro = \drummode {% inspired by Dean Hall, 2006
+	\flam d4\v
 	\triplet { d8:32( g8:32 g8) }
 	d8. d16
 	\flam g8. d16:64(
@@ -14,14 +14,14 @@ intro = \drummode {% by Dean Hall, 2006
 	g8. g16
 	d4:32(\<
 	|
-	d4)-> \!
-	\triplet { d8:32( g8:32 g8) }
-	\triplet { d8 d g }
-	\triplet { d8 g g }
+	d4)\v \!
+	\triplet { d8:32( d) g-> }
+	\triplet { d8 g \flam d }
+	\flam g8.-> \triplet { g32 d d }
 	|
-	\flam d8.-> g16
-	\tuplet 3/2 { d16 g d g d8 }
-	g4:32(
+	g8.\v g16
+	\triplet { d16[ g d g \drag d8] }
+	d4:32(
 	d4)
 	|
 }
diff --git a/strathspeys/molly_connell/side.ly b/strathspeys/molly_connell/side.ly
index 34da216..5dd77da 100644
--- a/strathspeys/molly_connell/side.ly
+++ b/strathspeys/molly_connell/side.ly
@@ -8,25 +8,18 @@
 \score {
     \new PipeBandDrumStaff {
         \global
-        <<
-			{
-		  		\mark \markup { \normalsize {Intro } }
-				\line \bar ".|:-|."
-				\break
-				\mark \markup { \normalsize {Tune } }
-				\repeat volta 2 { \line } 
-				\break 
-				\part \line  \bar "||" 
-				\break
-				\part \line \bar "|." 
-			}
-			{
-			  \intro 
-			  \snareA s8 
-			  \snareBA s8 
-			  \snareBB 
-			}
-		>>
+		\sideglobal
+
+		\mark \markup { \normalsize {Intro } }
+		\intro
+		\break
+
+
+		\mark \markup { \normalsize {Tune } }
+		\repeat volta 2 { \snareA s8 }
+		\snareBA s8
+		\snareBB s8
+		\bar "|."
 	}
 	\header {
 		title = \title
diff --git a/strathspeys/molly_connell/side.no-intro.ly b/strathspeys/molly_connell/side.no-intro.ly
new file mode 100644
index 0000000..308ff56
--- /dev/null
+++ b/strathspeys/molly_connell/side.no-intro.ly
@@ -0,0 +1,24 @@
+\version "2.18.2"
+
+\include "lilydrum.ly"
+
+\include "./config.ily"
+\include "./notes.side.ily"
+
+\score {
+    \new PipeBandDrumStaff {
+        \global
+		\sideglobal
+
+		\repeat volta 2 { \snareA s8 }
+		\snareBA s8 
+		\snareBB s8
+		\bar "|."
+	}
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentSide
+		composer = \composerSide
+	}
+}