Various Tune Fixes

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

6-8_marches/cock_o_the_north/config.ily

@@ -7,7 +7,7 @@ confTempo = {
 	\tempo 2. = 90 
 	}
 %% Format
-part = { \partial 8 s8 }
+part = { \partial 8 \grace { s4 } s8 }
 measure = { \grace { s4 } s1. | }
 halfline = { \repeat unfold 2 { \measure } }
 line = { \repeat unfold 2 { \halfline } }

6-8_marches/cock_o_the_north/pipes.ly

@@ -9,38 +9,37 @@
     \new Staff {
 		\global
 		\pipeglobal
-		<<
-			{
-			\repeat volta 2 {\part \line}
-			\break
-
-			\part \line
-			\break
-			\part \line
-			\break
-			\repeat volta 2 {\part \line}
-			\break
-			\part \line
-			\break
-			\part \line
-			\bar "|."
-			}%Format
-			{ 
-			\pipesA s8
-
-			\pipesBA
-			\pipesBBA s8
-			\pipesBA
-			\pipesBBB s8
-
-			\pipesC s8
-
-			\pipesDA
-			\pipesDBA s8
-			\pipesDA
-			\pipesBBB s8
+			\repeat volta 2 {
+				\partial 8
+				\pipesA s8
 			}
-		>>
+			\break
+			
+			\repeat volta 2 {
+				\partial 8
+				\pipesBA
+			} \alternative {
+				{ \pipesBBA s8 }
+				{ \pipesBBB s8 }
+			}
+			\bar ".|:-||"
+			\break
+			
+			\repeat volta 2 {
+				\partial 8
+				\pipesC s8
+
+			}
+			\break
+			
+			\repeat volta 2 {
+				\partial 8
+				\pipesDA
+			} \alternative {
+				{ \pipesDBA s8 }
+				{ \pipesBBB s8 }
+			}
+			\bar "|."
 	}
 	\header {
 		title = \title