From 998910338da48aeb73b98f4efced3f3819e73d10 Mon Sep 17 00:00:00 2001
From: Eric Teunis de Boone <ericteunis@gmail.com>
Date: Wed, 18 Dec 2019 00:28:01 +0100
Subject: [PATCH] CMPD: Removed STB with full unisons

---
 .../scotland_the_brave/high-side.cmpd.ly      | 36 ----------
 4-4_marches/scotland_the_brave/side.cmpd.ly   | 36 ----------
 strathspeys/molly_connell/mid.ly              | 68 +++++++++++++++++++
 3 files changed, 68 insertions(+), 72 deletions(-)
 delete mode 100644 4-4_marches/scotland_the_brave/high-side.cmpd.ly
 delete mode 100644 4-4_marches/scotland_the_brave/side.cmpd.ly
 create mode 100644 strathspeys/molly_connell/mid.ly

diff --git a/4-4_marches/scotland_the_brave/high-side.cmpd.ly b/4-4_marches/scotland_the_brave/high-side.cmpd.ly
deleted file mode 100644
index 7fb5d20..0000000
--- a/4-4_marches/scotland_the_brave/high-side.cmpd.ly
+++ /dev/null
@@ -1,36 +0,0 @@
-\version "2.18.2"
-
-\include "lilydrum.ly"
-
-\include "./config.ily"
-\include "./notes.side.ily"
-
-markTextEol = #(define-music-function (parser location text) (string?) #{
-	\once \override Score.RehearsalMark #'break-visibility = #end-of-line-visible
-	\once \override Score.RehearsalMark #'self-alignment-X = #RIGHT
-	\mark \markup $text
-#})
-
-\score {
-    \new PipeBandDrumStaff {
-        \global
-	\sideglobal
-        <<
-			{
-				\repeat volta 2 {\part \line \markTextEol "Fine" \break }
-				\part \line \markTextEol "D.C. al Fine" \bar "||"
-			}
-			{
-				\removeWithTag #'tutti { \snareA s8 }
-
-				\removeWithTag #'tutti { \snareBAhigh }
-			}
-		>>
-	}
-	\header {
-		title = #(string-append title " (high)" )
-		meter = \meter
-		instrument = \instrumentSide
-		composer = \composerSide
-	}
-}
diff --git a/4-4_marches/scotland_the_brave/side.cmpd.ly b/4-4_marches/scotland_the_brave/side.cmpd.ly
deleted file mode 100644
index 52a3a0e..0000000
--- a/4-4_marches/scotland_the_brave/side.cmpd.ly
+++ /dev/null
@@ -1,36 +0,0 @@
-\version "2.18.2"
-
-\include "lilydrum.ly"
-
-\include "./config.ily"
-\include "./notes.side.ily"
-
-markTextEol = #(define-music-function (parser location text) (string?) #{
-	\once \override Score.RehearsalMark #'break-visibility = #end-of-line-visible
-	\once \override Score.RehearsalMark #'self-alignment-X = #RIGHT
-	\mark \markup $text
-#})
-
-\score {
-    \new PipeBandDrumStaff {
-        \global
-	\sideglobal
-        <<
-			{
-				\repeat volta 2 {\part \line \markTextEol "Fine" \break }
-				\part \line \markTextEol "D.C. al Fine" \bar "||"
-			}
-			{
-				\removeWithTag #'tutti { \snareA s8 }
-
-				\removeWithTag #'tutti { \snareBA }
-			}
-		>>
-	}
-	\header {
-		title = \title
-		meter = \meter
-		instrument = \instrumentSide
-		composer = \composerSide
-	}
-}
diff --git a/strathspeys/molly_connell/mid.ly b/strathspeys/molly_connell/mid.ly
new file mode 100644
index 0000000..5c3534b
--- /dev/null
+++ b/strathspeys/molly_connell/mid.ly
@@ -0,0 +1,68 @@
+\version "2.19.0"
+
+\include "lilydrum.ly"
+
+\include "./config.ily"
+\include "./notes.bass.ily"
+\include "./notes.tenor.ily"
+
+\layout {
+	indent = 5.0
+	short-indent = 2.0
+}
+
+\score {
+	\new StaffGroup <<
+		\new PipeBandDrumStaff = "tenor" \with {
+			instrumentName = \markup{ \instrumentTenor }
+			shortInstrumentName = \markup{ \shortInstrumentTenor }
+		} {
+			\tenorglobal
+			\global
+			<<
+				{
+					\line \break
+					\line \break
+					\bar "||"
+	
+					\line \break
+					\line \break
+					\bar "|."
+				}%Format
+				{
+					\tenorA
+					\tenorA
+			
+					\tenorBA
+					\tenorBB
+				}%Music
+			>>
+		}
+		\new PipeBandDrumStaff = "bass" \with {
+			instrumentName = \markup{ \instrumentBass }
+			shortInstrumentName = \markup{ \shortInstrumentBass }
+		} {
+			\bassglobal
+
+			\bassAA
+			\bassAB
+	
+			\bassAA
+			\bassAB
+		}
+	>>
+	\header {
+		title = \title
+		meter = \meter
+		composer = \markup {
+			\column \right-align {
+				$(if (not (string=? "" composerTenor)) #{ \markup {\line { \composerTenor  ":" }} #} )
+				$(if (not (string=? "" composerBass))  #{ \markup {\line { \composerBass  ":" }} #} )
+			}
+			\column \right-align {
+				$(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} )
+				$(if (not (string=? "" composerBass))  #{ \markup {\line { \instrumentBass }}#} )
+			}
+		}
+	}
+}