Template update + Lyrics Green Berets

3-4_marches/ballad_of_the_green_berets/lyrics.ly

@@ -0,0 +1,65 @@
+\version "2.18.2"
+
+\include "config.ily"
+\include "notes.pipes.ily"
+\include "notes.lyrics.ily"
+
+\score {
+    \new Staff {
+		\global
+		\lyricsglobal
+		<<
+		  	\new NullVoice = "format"
+			{ 
+				\line
+				\bar "||"
+				\break
+				\line
+				\bar "|."
+			}%Format
+			\new Voice = "tune"
+			{
+				\pipeglobal
+				\pipesA
+				\pipesA
+			}
+			\new NullVoice = "song" {
+			  \lyricsAA
+			  \lyricsAB
+			}
+			\new Lyrics = "lyrics" {
+				\lyricsto "song" { 
+					\verseA
+				}
+			}
+		>>
+	}
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentLyrics
+		composer = \markup \large {
+		  	\column \right-align {
+			  $(if (not (string=? "" composerLyrics)) #{ \markup { \line { \composerLyrics } } #} )
+			  $(if (not (string=? "" composerPipes)) #{ \markup { \line { \composerPipes  ":" } } #} )
+		  	}
+			\column \right-align {
+			  $(if (not (string=? "" composerLyrics)) #{ \markup { \line { } } #} )
+
+			    $(if (not (string=? "" composerPipes)) #{ \markup { \line { \instrumentPipes  } } #} )
+			}
+		}
+
+	}
+}
+\markup {
+  \fill-line{
+	\column {
+	  \verseAblock
+	  \combine \null \vspace #0.5
+	  \verseBblock
+	  \combine \null \vspace #0.5
+	  \verseCblock
+	}
+  }
+}

3-4_marches/ballad_of_the_green_berets/notes.lyrics.ily

@@ -0,0 +1,77 @@
+% 3/4 The Ballad of the Green Berets
+% Lyrics
+\version "2.18.2"
+composerLyrics  = ""
+lyricsglobal = {}
+% Music
+lyricsAA = {
+	c8 [ c8 ] c4. a8 |
+	b8 [ b8 ] a2 |
+	e8 [ e8 ] e4.  e8 |
+	f8 e8 e2 | 
+
+	A8 [ A8 ] A4. f8 |
+	d8 [ f8 ] e2 |
+	c8 [ c8 ] b4. c16 [ c16 ] |
+	b8. a16 a2 |
+}
+lyricsAB = {
+	c8 [ c8 ] c4. a8 |
+	b8 [ b8 ] a2 |
+	e8 [ e8 ] e4. e8 |
+	\tuplet 3/2 { f8 f8 e8 } e2 | 
+
+	A8 [ A8 ] A4. f8 |
+	d8 [ f8 ] e2 |
+	c8 [ c8 ] b4. c16 [ c16 ] |
+	b8. a16 a2 |
+}
+
+verseA = \lyricmode {
+	\set stanza = #"1."
+	Fight- ing sol- diers from the sky
+	Fear- less men who jump and die
+	Men who mean just what they say
+	The brave men of the Green Ber- et
+
+	Sil- ver wings  u- pon their chest
+	These are men, the Neth- er- lands' best
+	One hun- dred men will test today
+	But only three win the Green Ber- et
+}
+verseAblock = \markup \column {
+  	\line{ \bold "1." }
+	\line{Fighting soldiers from the sky}
+	\line{Fearless men who jump and die}
+	\line{Men who mean just what they say}
+	\line{The brave men of the Green Beret}
+
+	\line{Silver wings upon their chest}
+	\line{These are men, the Netherlands' best}
+	\line{One hundred men will test today}
+	\line{But only three win the Green Beret}
+}
+verseBblock = \markup \column {
+  	\line{ \bold "2." }
+	\line{Trained to live off nature's land}
+	\line{Trained in combat, hand-to-hand}
+	\line{Men who fight by night and day}
+	\line{Courage peak from the Green Berets}
+	
+	\line{Silver wings upon their chest}
+	\line{These are men, the Netherlands' best}
+	\line{One hundred men will test today}
+	\line{But only three win the Green Beret}
+}
+verseCblock = \markup \column {
+  	\line{ \bold "3." }
+	\line{Back at home a young wife waits}
+	\line{Her Green Beret has met his fate}
+	\line{He has died for those oppressed}
+	\line{Leaving her his last request}
+	
+	\line{Put silver wings on my son's chest}
+	\line{Make him one of the Netherlands' best}
+	\line{He'll be a man they'll test one day}
+	\line{Have him win the Green Beret.}
+}

3-4_marches/ballad_of_the_green_berets/notes.pipes.ily

@@ -6,7 +6,7 @@ pipeglobal = {
 	\bagpipeKey
 	}
 pipesA = {
-	\grg c8 [ \grG c8 ] \grg c4 c8 a8 |
+	\grg c8 [ \grG c8 ] \grg c4. a8 |
 	\grg b8 [ \grG b8 ] a2 |
 	e8 [ \gra e8 ] \grg e4. \grg e8 |
 	\grg f8 e8 \grg e2 | 
@@ -31,7 +31,7 @@ pipesB = {
 }
 
 pipesC = {
-	\grg c8 [ \grG c8 ] \grg c4 c8 a8 |
+	\grg c8 [ \grG c8 ] \grg c4. a8 |
 	\grg b8 [ \grG b8 ] a2 |
 	e8 [ \gra e8 ] \grg e4 \grg e4 |
 	\grg f8 e8 \gra e2 | 

other/band_of_brothers/snaredrum.ly

@@ -124,5 +124,3 @@
 	}
 
 }
-
-

template/bass.ly

@@ -8,8 +8,13 @@
         \global
 		\bassglobal
 		<<
-			{ }%Format
+			\new NullVoice = "format"
-			{ }
+			{
+				
+			}%Format
+			\new DrumVoice { 
+				
+			}
 		>>
 	}
 	\header {

template/drums.ly

@@ -14,8 +14,12 @@
 			\set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide}
 
 			<<
-				{ }%Format
+				\new NullVoice = "format" {
-				{ }%Music
+					
+				}%End of Format
+				\new DrumVoice = "side" {
+					
+				}%End of side
 			>>
 		}
 		\new PipeBandDrumStaff = "tenor" {

template/full.ly

@@ -16,17 +16,20 @@
 			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentPipes }
 			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentPipes }
 			<<
-				\new Voice = "format"
+				\new NullVoice = "format" {
-			  	{}%Format
 					
-				\new Voice = "pipes"
+				}%Format
-				{}%Pipes
+
+				\new Voice = "pipes" {
+					
+				}%Pipes
 			>>
 		}
 %		\new Staff = "song" {
 %  			\lyricsglobal
-%			\new Voice = "lyrics"
+%			\new Voice = "lyrics" {
-%			{}
+%				
+%			}
 %		}
 %		\new Lyrics = "verse1" {
 %		  \lyricsglobal

template/lyrics.ly

@@ -9,10 +9,14 @@
 		\global
 		\lyricsglobal
 		<<
-%		  	\new Voice = "format"
+%		  	\new NullVoice = "format"{
-%			{ }%Format
+%				
-			\new Voice = "tune"
+%			}%Format
-			{ }
+
+			\new Voice = "tune" {
+				
+			}
+
 			\new Lyrics = "lyrics" {
 				\lyricsto "tune" { 
 					
@@ -31,7 +35,6 @@
 		  	}
 			\column \right-align {
 				$(if (not (string=? "" composerLyrics)) #{ \markup { \line { } } #} )
-
 			    $(if (not (string=? "" composerPipes)) #{ \markup { \line { \instrumentPipes  } } #} )
 			}
 		}

template/pipes.full.ly

@@ -13,10 +13,12 @@
 			\set Staff.instrumentName = \markup{ \instrumentPipes }
 			\set Staff.shortInstrumentName = \markup{ \shortInstrumentPipes }
 			<<
-			  	\new Voice = "format"
+			  	\new NullVoice = "format" {
-				{ }%Format
+					
-				\new Voice = "pipes"
+				}%Format
-				{ }%Pipes
+				\new Voice = "pipes" {
+					
+				}%Pipes
 			>>
 		}
 		\new Staff = "seconds" {

template/pipes.ly

@@ -8,8 +8,13 @@
 		\global
 		\pipeglobal
 		<<
-			{ }%Format
+			\new NullVoice = "format" {
-			{ }
+			
+			}%Format
+			
+			\new Voice = "pipes" {
+			
+			}
 		>>
 	}
 	\header {

template/pipes.seconds.ly

@@ -8,8 +8,13 @@
 		\global
 		\pipessecndglobal
 		<<
-			{ }%Format
+			\new NullVoice = "format" {
-			{ }
+			
+			}%Format
+			
+			\new Voice = "seconds" {
+			
+			}
 		>>
 	}
 	\header {

template/pipes.thirds.ly

@@ -8,8 +8,13 @@
 		\global
 		\pipesthrdglobal
 		<<
-			{ }%Format
+			\new NullVoice = "format" {
-			{ }
+			
+			}%Format
+			
+			\new Voice = "thirds" {
+			
+			}
 		>>
 	}
 	\header {

template/side.ly

@@ -8,8 +8,13 @@
         \global
 		\sideglobal
 		<<
-			{ }%Format
+			\new NullVoice = "format" {
-			{ }
+			
+			}%Format
+			
+			\new DrumVoice = "side" {
+			
+			}
 		>>
 	}
 	\header {

template/tenor.ly

@@ -8,8 +8,13 @@
 	\global
 	\tenorglobal
 	<<
-			{}%Format
+			\new NullVoice = "format" {
-			{}
+			
+			}%Format
+			
+			\new DrumVoice = "tenor" {
+			
+			}
 	>>
 	}
 	\header {