Small fixes + new Tune: Castle Dangerous

other/wilhelmus/config.ily

@@ -2,10 +2,11 @@
 %% Globals
 global = {
 	\time 2/4
-	}
-confTempo = { 
-	\tempo 4 = 80 
-	}
+	\key d \major
+}
+confTempo = {
+	\tempo 4 = 80
+}
 %% Format
 part = { \partial 4 \grace {s1} s4 }
 measure = { \grace {s1} s2 | }
@@ -13,5 +14,5 @@ halfline = { \repeat unfold 4 \measure }
 line = { \repeat unfold 2 { \halfline } }
 
 %% Headers
-title = "Wilhelmus"
+title = "Wilhelmus van Nassouwe"
 meter = "Dutch National Anthem"

other/wilhelmus/lyrics.ly

@@ -7,11 +7,20 @@
 \include "./notes.pipes.seconds.ily"
 \include "./notes.lyrics.ily"
 
+\layout {
+	indent = 8.0
+	short-indent = 2.0
+}
+
 \score {
 	\new StaffGroup <<
-	    \new Staff {
+		\new Staff = "pipes" \with {
+			instrumentName = \markup{ \instrumentPipes }
+			shortInstrumentName = \markup{ \shortInstrumentPipes }
+		} {
 			\global
 			\lyricsglobal
+			\pipeglobal
 			<<
 			  	\new NullVoice = "format" {
 					\part
@@ -22,7 +31,7 @@
 					\repeat unfold 7 \measure
 					\bar "|."
 					\break
-	
+
 					\part
 					\line
 					\break
@@ -30,33 +39,29 @@
 					\bar "|."
 				}%Format
 				\new Voice = "tune" {
-				  \bagpipeKey
 				  \pipesA s4
 				  \pipesA s4
-	
+
 				  \pipesB
-					
+
 				}
 			>>
-		}
-		\new Staff {
-			
 		}
 		\new Lyrics = "lyrics1" {
-			\lyricsto "tune" { 
+			\lyricsto "tune" {
 				\lyricsA
 			}
 		}
 		\new Lyrics = "lyrics2" {
-			\lyricsto "tune" { 
+			\lyricsto "tune" {
 				\lyricsF
 			}
 		}
-		\new Staff = "seconds" {
+		\new Staff = "seconds" \with {
+			instrumentName = \markup{ \instrumentPipesSecnd }
+			shortInstrumentName = \markup{ \shortInstrumentPipesSecnd }
+		} {
 			\pipessecndglobal
-			\set Staff.instrumentName = \markup{ \instrumentSecnd }
-			\set Staff.shortInstrumentName = \markup{ \shortInstrumentPipes \shortInstrumentSecnd}
-			
 			\pipessecndAA s4
 			\pipessecndAB s4
 

other/wilhelmus/notes.pipes.seconds.ily

@@ -3,8 +3,8 @@
 \version "2.18.2"
 composerPipessecnd = "PM Michael J. Evans"
 pipessecndglobal = {
-	\bagpipeKey
-	}
+	\key d \major
+}
 pipessecndAA = {
 	\grg a4 |
 	\thrwd d4 a4 |
@@ -13,10 +13,10 @@ pipessecndAA = {
 	b4 c4 |
 	a8 [ b8 ] \grg c4 |
 	\dblf f2 |
-	g4  
+	g4
 }
 pipessecndAB = {
-  	A4 |
+	A4 |
 	f2 |
 	\grg c8 [ d8 ] \grg e8 [ c8 ] |
 	d4 \grg c8 [ a8 ] |
@@ -34,8 +34,7 @@ pipessecndB = {
 	e4 d4 |
 	\grg c4 b4 |
 	c8 [ b8 ] a4 |
-	b4 c4 | 
-
+	b4 c4 |
 
 	\thrwd d8 [ c8 ] \grg d8 [ e8 ] |
 	\grg d4 \grg c4 |