Renamed Flett from Flotta to Flett of Flotta

4-4_marches/flett_of_flotta/config.ily

@@ -13,5 +13,5 @@ halfline = { \repeat unfold 2 { \measure } }
 line = { \repeat unfold 2 { \halfline } }
 
 %% Headers
-title = "Flett from Flotta"
+title = "Flett of Flotta"
 meter = "March"

4-4_marches/green_glens_of_antrim/antrim.ly

@@ -1,57 +0,0 @@
-\include "bagpipe.ly"
-melody = {
-		\set Staff.midiInstrument = #"bagpipe"
-		\hideKeySignature
-		\cadenzaOn
-		\once \override Score.BreakAlignment #'break-align-orders =
-			#(make-vector 3 '(instrument-name
-									left-edge
-									ambitus
-									span-bar
-									breathing-sign
-									clef
-									key-signature
-									time-signature
-									staff-bar
-									custos
-									span-bar))
-		\time 4/4
-		%{&D",(F,R,0,0,Times%} %{New%} %{Roman,10,400,0,0,18,0,0,0)%} %{"",(F,C,0,0,Times%} %{New%} %{Roman,10,400,0,0,18,0,0,0)%} %{"januari%} %{2019",(F,L,0,0,Times%} %{New%} \bar ":|:" \break
-
- a8. [ d16 ] \bar "|"
- \grg f4 \dblf f8 [ e8 ] \thrwd d4 \dbld d8 [ c8 ] \bar "|"
- \grg b4 \thrwd d8 [ b8 ] \grG a4 \grg f8. [ g16 ] \bar "|"
- A4 \grg A8. [ g16 ] \hdblf f4 \dble e8 [ d8 ] \bar "|"
- \dbld d4 \grg c8. [ d16 ] \dble e4 \grg a8. [ d16 ] \bar "|" \break
-
- \grg f4 \dblf f8 [ e8 ] \thrwd d4 \dbld d8 [ c8 ] \bar "|"
- \grg b4 \thrwd d8 [ b8 ] \grG a4 \grg f8. [ g16 ] \bar "|"
- A4 \grg A8. [ g16 ] \hdblf f8 [ a8~ ] a8 [ d8 ] \bar "|"
- \dblc c4 \grg d8 [ e8 ] \thrwd d4 \bar "|" \break
-
- A4 \grg A8. [ g16 ] \hdblf f4 g8 [ A8 ] \bar "|"
- \grf g4 \thrwd d8. [ e16 ] \dblf f4 \grg f8. [ g16 ] \bar "|"
- A4 \hdblf f8 [ e8 ] \thrwd d4 \grg c8 [ d8 ] \bar "|"
- \dblf f4 \dble e8. [ d16 ] \dble e4 \grg a8. [ d16 ] \bar "|" \break
-
- \grg f4 \dblf f8 [ e8 ] \thrwd d4 \dbld d8 [ c8 ] \bar "|"
- \grg b4 \thrwd d8 [ b8 ] \grG a4 \grg f8. [ g16 ] \bar "|"
- A4 \grg A8. [ g16 ] \hdblf f8 [ a8~ ] a8 [ d8 ] \bar "|"
- \dblc c4 \grg d8 [ e8 ] \thrwd d4 \bar ":|" \break
-
-			}
-
-\score {
-	\melody
-	\layout {
-	indent = 0.0\cm
-	\context { \Score \remove "Bar_number_engraver" }
-	}
-	\header {
-	title = "Green Glens of Antrim"
-	meter = "March"
-	arranger = "Traditional"
-	}
-	
-}
-

4-4_marches/green_glens_of_antrim/full.ly

@@ -1,103 +0,0 @@
-\version "2.19.0"
-
-\include "bagpipe.ly"
-\include "lilydrum.ly"
-
-\include "./config.ily"
-\include "./notes.bass.ily"
-\include "./notes.tenor.ily"
-\include "./notes.side.ily"
-\include "./notes.pipes.ily"
-%\include "./notes.pipes.seconds.ily"
-%\include "./notes.lyrics.ily"
-
-\layout {
-	indent = 5.0
-	short-indent = 2.0
-}
-
-\score {
-	\new StaffGroup <<
-		\new Staff \with {
-			instrumentName = \markup{ \instrumentPipes }
-			shortInstrumentName = \markup{ \shortInstrumentPipes }
-		} {
-			\global
-			\pipeglobal
-			<<
-				\new NullVoice = "format" {
-
-				}%Format
-
-				\new Voice = "pipes" {
-
-				}%Pipes
-			>>
-		}
-%{		\new Staff = "song" {
-  			\lyricsglobal
-			\new Voice = "lyrics" {
-
-			}
-		}
-}%
-%{		\new Lyrics = "verse1" {
-		  \lyricsglobal
-		  \lyricsto "lyrics" {
-			\verseA
-		  }
-		}
-%}
-%{		\new Staff = "seconds" \with {
-			instrumentName = \markup{ \instrumentPipes \instrumentSecnd }
-			shortInstrumentName = \markup{ \shortInstrumentPipes \shortInstrumentSecnd }
-		} {
-			\pipessecndglobal
-
-		}
-%}
-		\new PipeBandDrumStaff = "side" \with {
-			instrumentName = \markup { \instrumentSide }
-			shortInstrumentName = \markup{ \shortInstrumentSide }
-		} {
-			\sideglobal
-
-		}
-		\new PipeBandDrumStaff = "tenor" \with {
-			instrumentName = \markup{ \instrumentTenor }
-			shortInstrumentName = \markup{ \shortInstrumentTenor }
-		} {
-			\tenorglobal
-
-		}
-		\new PipeBandDrumStaff = "bass" \with {
-			instrumentName = \markup{ \instrumentBass }
-			shortInstrumentName = \markup{ \shortInstrumentBass }
-		} {
-			\bassglobal
-
-		}
-	>>
-	\header {
-		title = \title
-		meter = \meter
-		composer = \markup \large {
-			\column \right-align {
-				$(if (not (string=? "" composerLyrics)) #{ \markup { \line { \composerLyrics ":" } } #} )
-				$(if (not (string=? "" composerPipes))  #{ \markup {\line { \composerPipes  ":" }} #} )
-				$(if (not (string=? "" composerPipessecnd))  #{ \markup {\line { \composerPipessecnd ":" }} #} )
-				$(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=? "" composerLyrics)) #{ \markup { \line { "Lyrics" } } #} )
-				$(if (not (string=? "" composerPipes))  #{ \markup {\line { \instrumentPipes }}#} )
-				$(if (not (string=? "" composerPipessecnd))  #{ \markup {\line { \instrumentPipessecnd }}#} )
-				$(if (not (string=? "" composerSide))  #{ \markup {\line { \instrumentSide }}#} )
-				$(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} )
-				$(if (not (string=? "" composerBass))  #{ \markup {\line { \instrumentBass }}#} )
-			}
-		}
-	}
-}

init-sets

@@ -69,8 +69,8 @@ airs/morag_of_dunvegan/$f.ly \
 $D/set_1.$f.ly \
 ;
 
-$COM $D/set_11.$f.ly -t "Set 11: Flett from Flotta / the Crusader's March / the Pikeman's March" \
-4-4_marches/flett_from_flotta/$f.ly \
+$COM $D/set_11.$f.ly -t "Set 11: Flett of Flotta / the Crusader's March / the Pikeman's March" \
+4-4_marches/flett_of_flotta/$f.ly \
 4-4_marches/the_crusaders_march/$f.ly \
 4-4_marches/the_pikemans_march/$f.ly \
 ;