Changed standard structure for Kilaloe

6-8_marches/kilaloe/full.ly

@@ -11,6 +11,7 @@
 %\include "./notes.pipes.seconds.ily"
 %\include "./notes.lyrics.ily"
 
+part = { \partial 4. \grace {s4} s4. }
 \score {
 	\new StaffGroup <<
 		\new Staff \with {
@@ -24,29 +25,29 @@
 					\part
 					\line
 					\break
-					\line \bar "!"
-					\break
-					\line
-					\break
 					\line \bar "||"
 					\break
+					\part
+					\line
+					\break
+					\line \bar ".|:-||"
+					\break
 					\repeat volta 2 {
+						\part
 						\line
 						\break
 						\line
-						s4.
+						\measure
 					}
-					\alternative{ {\grace {s4} s4. } {\grace {s4} s4. } }
-					\bar "|."
 
 				}%Format
 
 				\new Voice = "pipes" {
-					\pipesA
+					r4 \pipesA s4.
 
-					\pipesB
+					\pipesB s4.
 
-					\pipesC \pipesCBA \pipesCBB
+					\pipesC s4.
 				}%Pipes
 			>>
 		}
@@ -83,15 +84,15 @@
 		} {
 			\tenorglobal
 
-			s8 \tenorAA r4.
+			r4. \tenorAA
-			\tenorAB r4.
+			\tenorAB
+			
+			r4.	\tenorAA
+			\tenorAB
 
-			\tenorAA r4.
+			r4. \tenorBA
-			\tenorAB r4.
+			\tenorBB
-
+			| % Volta bracket for pipes
-			\tenorBA r4.
-			\tenorBB r4.
-			r4. | % Volta bracket for pipes
 		}
 %		\new PipeBandDrumStaff = "bass" \with {
 %			instrumentName = \markup{ \instrumentBass }

6-8_marches/kilaloe/full.n.ly

@@ -1,127 +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"
-
-part = { \partial 4. \grace {s4} s4. }
-\score {
-	\new StaffGroup <<
-		\new Staff \with {
-			instrumentName = \markup{ \instrumentPipes }
-			shortInstrumentName = \markup{ \shortInstrumentPipes }
-		} {
-			\global
-			\pipeglobal
-			<<
-				\new NullVoice = "format" {
-					\part
-					\line
-					\break
-					\line \bar "!"
-					\break
-					\part
-					\line
-					\break
-					\line \bar ".|:-||"
-					\break
-					\repeat volta 2 {
-						\part
-						\line
-						\break
-						\line
-						\measure
-					}
-
-				}%Format
-
-				\new Voice = "pipes" {
-					r4 \pipesA s4.
-
-					\pipesB s4.
-
-					\pipesC s4.
-				}%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
-
-			r4. \tenorAA r4.
-			\tenorAB s4. 
-			
-			r4.	\tenorAA r4.
-			\tenorAB s4.
-
-			r4. \tenorBA r4.
-			\tenorBB s4.
-			| % Volta bracket for pipes
-		}
-%		\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 }}#} )
-			}
-		}
-	}
-}

6-8_marches/kilaloe/notes.tenor.ily

@@ -10,7 +10,7 @@ tenorAA = \drummode {
 	d4. g4. | d4. r4.\rswipe | 
 	d4. g4. | d4. r4.\rswipe |
 	d4. g4. | d4. g4. |
-	d4.\up g4.\up | d4.\up 
+	d4.\up g4.\up | d4.\up r4. |
 }
 tenorAB = \drummode {
 	\flourish{
@@ -18,17 +18,17 @@ tenorAB = \drummode {
 	  d4. d4. | g4. g4. |
 	  d4. d4. | g4. g4. |
 	}
-	d4.\up g4.\up | d4.\up
+	d4.\up g4.\up | d4.\up r4. |
 }
 tenorBA = \drummode {
 	\tenorAA
 }
 tenorBB = \drummode {
-  \flourish{
+	\flourish{
 	  d4. d4. | g4. g4. |
 	  d4. d4. | g4. g4. |
 	  d4. d4. | g4. g4. |
 	}
-	r4.^\markup{Yell} r4. |
+	r4. r4. |
-	d4.\up g4.\up | d4.\up 
+	d4.\up g4.\up | d4.\up r4. |
 }

6-8_marches/kilaloe/pipes.ly

@@ -5,36 +5,38 @@
 \include "./config.ily"
 \include "./notes.pipes.ily"
 
+part = { \partial 4. \grace {s4} s4. }
+
 \score {
     \new Staff {
 		\global
 		\pipeglobal
 		<<
-			{
+			\new NullVoice = "format" {
-			\part
+				\part
-			\line
-			\break
-			\line \bar "|."
-			\break
-			\line
-			\break
-			\line \bar "|."
-			\break
-			\repeat volta 2 {
 				\line
 				\break
+				\line \bar "||"
+				\break
+				\part
 				\line
-				s4.
+				\break
-			}
+				\line \bar ".|:-||"
-			\alternative{ {\grace{s4} s4.} {\grace{s4} s4.} }
+				\break
-			\bar "|."
+				\repeat volta 2 {
+					\part
+					\line
+					\break
+					\line
+					\measure
+				}
 			}%Format
 			{ 
-			\pipesA
+			r4 \pipesA s4.
 
-			\pipesB
+			\pipesB s4.
 
-			\pipesC \pipesCBA \pipesCBB
+			\pipesC s4.
 
 			}
 		>>
@@ -46,24 +48,3 @@
 		composer = \composerPipes
 	}
 }
-\score {
-	\new Staff { \global \pipeglobal
-		\set Staff.midiInstrument = #"bagpipe"
-		%%Tune
-		
-		\partial 8
-		\pipesA
-
-		\pipesB
-
-		\pipesC	\pipesC	\pipesCBB
-		
-	}
-	\midi { \confTempo }
-	\header {
-		title = \title
-		meter = \meter
-		instrument = \instrumentPipes
-		composer = \composerPipes
-	}
-}

6-8_marches/kilaloe/pipes.n.ly

@@ -1,50 +0,0 @@
-\version "2.18.2"
-
-\include "bagpipe.ly"
-
-\include "./config.ily"
-\include "./notes.pipes.ily"
-
-part = { \partial 4. \grace {s4} s4. }
-
-\score {
-    \new Staff {
-		\global
-		\pipeglobal
-		<<
-			{
-				\part
-				\line
-				\break
-				\line \bar "!"
-				\break
-				\part
-				\line
-				\break
-				\line \bar ".|:-||"
-				\break
-				\repeat volta 2 {
-					\part
-					\line
-					\break
-					\line
-					\measure
-				}
-			}%Format
-			{ 
-			r4 \pipesA s4.
-
-			\pipesB s4.
-
-			\pipesC s4.
-
-			}
-		>>
-	}
-	\header {
-		title = \title
-		meter = \meter
-		instrument = \instrumentPipes
-		composer = \composerPipes
-	}
-}

6-8_marches/kilaloe/tenor.ly

@@ -11,17 +11,17 @@
 		\tenorglobal
 		<<
 			\new NullVoice = "format" {
-				\repeat volta 2 { \line \break \line }
+				\repeat volta 2 { \line \line }
 				\break
-				\repeat volta 2 { \line \break \line \measure }
+				\repeat volta 2 { \line \line s2. }
 			}%Format
 			
 			\new DrumVoice = "tenor" {
-				\tenorAA r4.
+				\tenorAA
-				\tenorAB r4.
+				\tenorAB
 
-				\tenorBA r4.
+				\tenorBA
-				\tenorBB r4.
+				\tenorBB
 			}
 		>>
 	}