Various Tune Fixes

Most are fixing (gracing) alignment by restructuring the Staff.

4-4_marches/wings/config.ily

@@ -7,10 +7,10 @@ confTempo = {
 	\tempo 4 = 90
 	}
 %% Format
-part = { \partial 4 s4 }
+part = { \partial 4 \grace { s4 } s4 }
 measure = { \grace { s4 } s1 | }
 quartline = { \repeat unfold 2 { \measure } }
-halfline = { \repeat unfold 2 { \measure } }
+halfline = { \repeat unfold 2 { \quartline } }
 line = { \repeat unfold 2 { \halfline } }
 
 %% Headers

4-4_marches/wings/full.ly

@@ -11,20 +11,26 @@
 %\include "./notes.pipes.seconds.ily"
 %\include "./notes.lyrics.ily"
 
+\layout {
+	indent = 5.0
+	short-indent = 2.0
+}
+
 \score {
 	\new StaffGroup <<
-		\new Staff {
+		\new Staff \with {
+			instrumentName = \markup{ \instrumentPipes }
+			shortInstrumentName = \markup{ \shortInstrumentPipes }
+		} {
 			\global
 			\pipeglobal
-			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentPipes }
-			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentPipes }
 			<<
 				\new NullVoice = "format" {
-					\part \line \bar "||"
-					\line \bar "|."
+					\part \halfline
+					\halfline \bar "||"
 					\break
-					\part \line \bar "||"
-					\line \bar "|."
+					\part \halfline
+					\halfline \bar "|."
 				}%Format
 
 				\new Voice = "pipes" {
@@ -53,10 +59,11 @@
 %
 %
 %		}
-		\new PipeBandDrumStaff = "side" {
+		\new PipeBandDrumStaff = "side" \with {
+			instrumentName = \markup \column {\instrumentSide}
+			shortInstrumentName = \markup{\shortInstrumentSide}
+		} {
 			\sideglobal
-			\set PipeBandDrumStaff.instrumentName = \markup \column {\instrumentSide}
-			\set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide}
 
 				r8 \snareAA	\snareABA
 					\snareAAI \snareABB s4

4-4_marches/wings/notes.pipes.ily

@@ -8,7 +8,7 @@ pipeglobal = {
 }
 % Music
 pipesAA = {
-	a8 e8 |
+	a8) e8 |
 	\grg a4 \taor a8 [ b8 ] \grip c4~ c8 [ e8 ] |
 	\grg f8. [ e16 ] \grg f8 [ A8 ] e4 \dblc c8 [ e8 ] |
 	\grg f8. [ g16 ] A8 [ f8 ] \dble e16 [ c8. ] \grg b8 [ a8 ] |
@@ -18,11 +18,11 @@ pipesAB = {
 	\grg a4 \taor a8 [ b8 ] \grip c4~ c8 [ e8 ] |
 	\grg f8. [ e16 ] \grg f8 [ A8 ] e4 \dblc c8 [ e8 ] |
 	\grg f8. [ g16 ] A8 [ f8 ] \dble e16 [ c8. ] \grg b8. [ c16 ] |
-	\grg a2 \wbirl a4~
+	\grg a2 \wbirl a4(
 }
 
 pipesBA = {
-	a8 [ e8 ] |
+	a8) [ e8 ] |
 	A4 \grg A4 \grip A8 [ g8 ] \hdblf f8 [ e8 ] |
 	\grg f8. [ e16 ] \grg f8 [ A8 ] \hdblf f8 [ e8 ] \dblc c8 [ e8 ] |
 	\grg f8. [ g16 ] A8 [ f8 ] \dble e16 [ c8. ] \grg b8 [ a8 ] |

4-4_marches/wings/pipes.ly

@@ -34,6 +34,7 @@
 	\new Staff { \global \pipeglobal
 		\set Staff.midiInstrument = #"bagpipe"
 		%%Tune
+		\partial 4 
 		\pipesAA \pipesAB
 
 		\pipesBA \pipesAB

4-4_marches/wings/side.ly

@@ -29,7 +29,7 @@ markTextEol = #(define-music-function (parser location text) (string?) #{
 				\break
 
 				\partial 8 s8
-				\line 
+				\halfline 
 				\markTextEol "D.C. al Fine"
 				\bar "||"
 			}%Format