From 159efc9ca8ffd684400213bc0688a8bc39b8e93d Mon Sep 17 00:00:00 2001
From: Eric Teunis de Boone <ericteunis@deboone.nl>
Date: Tue, 1 Nov 2022 17:14:09 +0100
Subject: [PATCH] KeySig and Text rearrangement for GStK

---
 other/god_save_the_king/config.ily |  5 ++--
 other/god_save_the_king/lyrics.ly  | 39 ++++++++++++++++++------------
 2 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/other/god_save_the_king/config.ily b/other/god_save_the_king/config.ily
index 6aa4eae..7fc81d6 100644
--- a/other/god_save_the_king/config.ily
+++ b/other/god_save_the_king/config.ily
@@ -2,10 +2,11 @@
 %% Globals
 global = {
 	\time 3/4
-	}
+	\key d \major
+}
 confTempo = { 
 	\tempo 4 = 60 
-	}
+}
 %% Format
 measure = { \grace {s1} s2. | }
 halfline = { \repeat unfold 2 \measure }
diff --git a/other/god_save_the_king/lyrics.ly b/other/god_save_the_king/lyrics.ly
index 25a09da..4b1b21b 100644
--- a/other/god_save_the_king/lyrics.ly
+++ b/other/god_save_the_king/lyrics.ly
@@ -3,13 +3,14 @@
 \include "bagpipe.ly"
 
 \include "./config.ily"
-%\include "./notes.pipes.ily"
+\include "./notes.pipes.ily"
 \include "./notes.lyrics.ily"
 
 \score {
     \new Staff {
 		\global
 		\lyricsglobal
+		\pipeglobal
 		<<
 		  	\new NullVoice = "format"{
 				\line \halfline
@@ -20,10 +21,14 @@
 				\bar "|."
 			}%Format
 
-			\new Voice = "tune" {
+			\new NullVoice = "tune" {
 				\songA
 			}
-
+			\new Voice = "pipes" {
+				\pipesA
+				\pipesB
+				\pipesC
+			}
 			\new Lyrics = "lyrics" {
 				\lyricsto "tune" { 
 					\lyricsA
@@ -49,18 +54,20 @@
 	}
 }
 \markup {
-  \line{
-	\column {
-	  \verseA
-	  \combine \null \vspace #0.5
-	  \verseC
-	  \combine \null \vspace #0.5
-	  \verseE
+	\combine \null \vspace #0.5
+	\fill-line {
+		\column {
+			\verseB
+			\combine \null \vspace #0.5
+			\verseC
+		}
+		\column {
+			\verseD
+			\combine \null \vspace #0.5
+			\verseE
+		}
+		\column {
+			\verseF
+		}
 	}
-	\column {
-	  \verseB
-	  \combine \null \vspace #0.5
-	  \verseD
-	}
-  }
 }