Templates: put instrument global into voice

template/bass.ly

@@ -8,15 +8,14 @@
 \score {
     \new PipeBandDrumStaff {
         \global
-		\bassglobal
 		<<
-			\new NullVoice = "format"
-			{
+			\new NullVoice = "format" {
 
 			}%Format
-			\new DrumVoice {
+			\new DrumVoice = "bass" {
+				\bassglobal
 
-			}
+			}%Bass
 		>>
 	}
 	\header {

template/drums.ly

@@ -20,12 +20,12 @@
 			shortInstrumentName = \markup{ \shortInstrumentSide }
 		} {
 			\global
-			\sideglobal
 			<<
 				\new NullVoice = "format" {
 					
 				}%End of Format
 				\new DrumVoice = "side" {
+					\sideglobal
 					
 				}%End of side
 			>>

template/full.ly

@@ -23,13 +23,12 @@
 			shortInstrumentName = \markup{ \shortInstrumentPipes }
 		} {
 			\global
-			\pipeglobal
 			<<
 				\new NullVoice = "format" {
 
 				}%Format
-
 				\new Voice = "pipes" {
+					\pipeglobal
 
 				}%Pipes
 			>>

template/lyrics.ly

@@ -9,7 +9,6 @@
 \score {
     \new Staff {
 		\global
-		\lyricsglobal
 		<<
 %{		  	\new NullVoice = "format"{
 
@@ -18,8 +17,8 @@
 			\new Voice = "tune" {
 
 			}
-
 			\new Lyrics = "lyrics" {
+				\lyricsglobal
 				\lyricsto "tune" {
 
 				}

template/mid.ly

@@ -17,16 +17,15 @@
 			instrumentName = \markup{ \instrumentTenor }
 			shortInstrumentName = \markup{ \shortInstrumentTenor }
 		} {
-			\tenorglobal
 			\global
 			<<
-				{
+				\new NullVoice = "format" {
 
 				}%Format
-				{
+				\new Voice = "tenor" {
+					\tenorglobal
 
-				}%Music
-			>>
+				}%Tenor
 		}
 		\new PipeBandDrumStaff = "bass" \with {
 			instrumentName = \markup{ \instrumentBass }

template/pipes.full.ly

@@ -19,12 +19,12 @@
 			shortInstrumentName = \markup{ \shortInstrumentPipes }
 		} {
 			\global
-			\pipeglobal
 			<<
 			  	\new NullVoice = "format" {
 
 				}%Format
 				\new Voice = "pipes" {
+					\pipeglobal
 
 				}%Pipes
 			>>

template/pipes.ly

@@ -8,15 +8,14 @@
 \score {
     \new Staff {
 		\global
-		\pipeglobal
 		<<
 			\new NullVoice = "format" {
 
 			}%Format
-
 			\new Voice = "pipes" {
+				\pipeglobal
 
-			}
+			}%Pipes
 		>>
 	}
 	\header {

template/pipes.seconds.ly

@@ -8,15 +8,14 @@
 \score {
     \new Staff {
 		\global
-		\pipessecndglobal
 		<<
 			\new NullVoice = "format" {
 			
 			}%Format
-			
 			\new Voice = "seconds" {
+				\pipessecndglobal
 			
-			}
+			}%Pipes
 		>>
 	}
 	\header {

template/pipes.thirds.ly

@@ -8,15 +8,14 @@
 \score {
     \new Staff {
 		\global
-		\pipesthrdglobal
 		<<
 			\new NullVoice = "format" {
 
 			}%Format
-
 			\new Voice = "thirds" {
+				\pipesthrdglobal
 
-			}
+			}%Pipes
 		>>
 	}
 	\header {

template/side.ly

@@ -8,15 +8,14 @@
 \score {
     \new PipeBandDrumStaff {
         \global
-		\sideglobal
 		<<
 			\new NullVoice = "format" {
 			
 			}%Format
-			
 			\new DrumVoice = "side" {
+				\sideglobal
 			
-			}
+			}%Side
 		>>
 	}
 	\header {

template/tenor.ly

@@ -8,15 +8,14 @@
 \score {
     \new PipeBandDrumStaff {
 		\global
-		\tenorglobal
 		<<
 			\new NullVoice = "format" {
 			
 			}%Format
-			
 			\new DrumVoice = "tenor" {
+				\tenorglobal
 			
-			}
+			}%Tenor
 		>>
 	}
 	\header {