From 98d9649275e9af3861b36d24e1d3d31242be0da2 Mon Sep 17 00:00:00 2001
From: Eric Teunis de Boone <ericteunis@gmail.com>
Date: Wed, 23 Sep 2020 23:23:59 +0200
Subject: [PATCH] New Tenorscore: Cabar Feidh

---
 4-4_marches/cabar_feidh/drums.ly        | 98 +++++++++++++++++++++++++
 4-4_marches/cabar_feidh/full.ly         |  1 +
 4-4_marches/cabar_feidh/notes.tenor.ily | 73 ++++++++++++++++++
 4-4_marches/cabar_feidh/tenor.ly        | 50 +++++++++++++
 4 files changed, 222 insertions(+)
 create mode 100644 4-4_marches/cabar_feidh/drums.ly
 create mode 100644 4-4_marches/cabar_feidh/notes.tenor.ily
 create mode 100644 4-4_marches/cabar_feidh/tenor.ly

diff --git a/4-4_marches/cabar_feidh/drums.ly b/4-4_marches/cabar_feidh/drums.ly
new file mode 100644
index 0000000..dc73b24
--- /dev/null
+++ b/4-4_marches/cabar_feidh/drums.ly
@@ -0,0 +1,98 @@
+\version "2.19.0"
+
+\include "lilydrum.ly"
+
+\include "./config.ily"
+%\include "./notes.bass.ily"
+\include "./notes.tenor.ily"
+\include "./notes.side.ily"
+
+
+\layout {
+	indent = 8.0
+	short-indent = 3.0
+}
+
+#(set-global-staff-size 19)
+halfbreak = {  \break }
+
+\score {
+	\new StaffGroup <<
+		\new PipeBandDrumStaff = "side" \with {
+			instrumentName = \markup{ \instrumentSide }
+			shortInstrumentName = \markup{ \shortInstrumentSide }
+		} {
+			\global
+			\sideglobal
+			<<
+				\new NullVoice = "format" {
+					\repeat unfold 2 {
+						\part
+						\halfline
+						\halfline
+						\bar "||"
+						\break
+					}
+					\pageBreak
+					\repeat unfold 2 {
+						\part
+						\halfline
+						\halfline
+						\bar "||"
+						\break
+					}
+					\bar "|."
+				}
+				\new DrumVoice = "side" {
+					\snareAA r8
+					\snareAB s8
+
+					\snareBA r8
+					\snareBB s8
+
+					\snareCA r8
+					\snareCB s8
+
+					\snareDA r8
+					\snareDB s8
+				}
+			>>
+		}
+		\new PipeBandDrumStaff = "tenor" \with {
+			instrumentName = \markup{ \instrumentTenor }
+			shortInstrumentName = \markup{ \shortInstrumentTenor }
+		} {
+			\tenorglobal
+
+			\tenorA s8
+			\tenorB s8
+			\tenorC s8
+			\tenorD s8
+
+		}
+		%\new PipeBandDrumStaff = "bass" \with {
+		%	instrumentName = \markup{ \instrumentBass }
+		%	shortInstrumentName = \markup{ \shortInstrumentBass}
+		%} {
+		%	\bassglobal
+		%}
+	>>
+	\header {
+		title = \title
+		subtitle = \subtitle
+		meter = \meter
+		info = \info
+		composer = \markup {
+			\column \right-align {
+				$(if (not (string=? "" composerSide))  #{ \markup {\line { \composerSide  ":" }} #} )
+				$(if (not (string=? "" composerTenor)) #{ \markup {\line { \composerTenor  ":" }} #} )
+				$(if (not (string=? "" composerBass))  #{ \markup {\line { \composerBass  ":" }} #} )
+			}
+			\column \right-align {
+				$(if (not (string=? "" composerSide))  #{ \markup {\line { \instrumentSide }}#} )
+				$(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} )
+				$(if (not (string=? "" composerBass))  #{ \markup {\line { \instrumentBass }}#} )
+			}
+		}
+	}
+}
diff --git a/4-4_marches/cabar_feidh/full.ly b/4-4_marches/cabar_feidh/full.ly
index 5e7e598..be3193b 100644
--- a/4-4_marches/cabar_feidh/full.ly
+++ b/4-4_marches/cabar_feidh/full.ly
@@ -115,6 +115,7 @@
 	\header {
 		title = \title
 		meter = \meter
+		info  = \info
 		composer = \markup \large {
 			\column \right-align {
 				$(if (not (string=? "" composerLyrics)) #{ \markup { \line { \composerLyrics ":" } } #} )
diff --git a/4-4_marches/cabar_feidh/notes.tenor.ily b/4-4_marches/cabar_feidh/notes.tenor.ily
new file mode 100644
index 0000000..a2dee07
--- /dev/null
+++ b/4-4_marches/cabar_feidh/notes.tenor.ily
@@ -0,0 +1,73 @@
+% 4/4 Cabar Feidh
+% Tenor
+\version "2.18.2"
+composerTenor = "E.T. de Boone, v0.1, 2020" % 2020-09-23
+arrangerTenor = ""
+tenorglobal = {
+	\set Timing.beamExceptions = #'()
+	\set baseMoment = #(ly:make-moment 1 8)
+	\set beatStructure = #'(2 2 2 2 2)
+}
+
+
+% Music
+tenorEndA = \drummode {
+	d4	g4	d4	r8
+}
+tenorEndB = \drummode {
+	d8. g16	d8 g	d8\< g	d8 g8 |
+	d4->\!	g4	d4	r8
+}
+
+% Music Pieces
+tenorA = \drummode {
+	g8 |
+	d8. g16	d8 g	d4	g4 |
+	d8-> g	r8 d	r8 g	d8 g |
+	d8. g16	d8 g	d4	g4 |
+	\tenorEndA
+
+	g8 |
+	d8. g16	d8 g	d4	g4 |
+	d8-> g	r8 d	r8 g	d8 g |
+	\tenorEndB
+}
+
+tenorB = \drummode {
+	g8 |
+	d8 g8	d8. g16	d8 g8	d4 |
+	d8-> g	r8 d	r8 g	d8 g |
+	d8 g8	d8. g16	d8 g8	d4 |
+	\tenorEndA
+
+	g8 |
+	d8 g8	d8. g16	d8 g8	d4 |
+	d8-> g	r8 d	r8 g	d8 g |
+	\tenorEndB
+}
+
+tenorC = \drummode {
+	g8 |
+	d8 g16 d	g8 g8	d16 g d8	d4 |
+	d8. g16	d8 g	d8. g16	d8 g |
+	d8 g16 d	g8 g8	d16 g d8	d4 |
+	\tenorEndA
+
+	g8 |
+	d8 g16 d	g8 g8	d16 g d8	d4 |
+	d8. g16	d8 g	d8. g16	d8 g |
+	\tenorEndB
+}
+
+tenorD = \drummode {
+	g8 |
+	d4	g4	d16 g8 g16	d8 g |
+	d2->		d8. g16	d8 g |
+	d4	g4	d16 g8 g16	d8 g |
+	\tenorEndA
+
+	g8 |
+	d4	g4	d16 g8 g16	d8 g |
+	d2->		d8. g16	d8 g |
+	\tenorEndB
+}
diff --git a/4-4_marches/cabar_feidh/tenor.ly b/4-4_marches/cabar_feidh/tenor.ly
new file mode 100644
index 0000000..caf438c
--- /dev/null
+++ b/4-4_marches/cabar_feidh/tenor.ly
@@ -0,0 +1,50 @@
+\version "2.18.2"
+
+\include "lilydrum.ly"
+
+\include "./config.ily"
+\include "./notes.tenor.ily"
+
+\score {
+    \new PipeBandDrumStaff {
+		\global
+		\tenorglobal
+		<<
+			\new NullVoice = "format" {
+				\repeat unfold 2 {
+					\part
+					\halfline
+					\break
+					\halfline
+					\bar "||"
+					\break
+				}
+				\repeat unfold 2 {
+					\part
+					\halfline
+					\break
+					\halfline
+					\bar "||"
+					\break
+				}
+				\bar "|."
+			}%Format
+
+			\new DrumVoice = "tenor" {
+				\tenorA s8
+				\tenorB s8
+				\tenorC s8
+				\tenorD s8
+			}
+		>>
+	}
+	\header {
+		title = \title
+		subtitle = \subtitle
+		meter = \meter
+		info = \info
+		instrument = \instrumentTenor
+		composer = \composerTenor
+		arranger = \arrangerTenor
+	}
+}