From 09b58c5c0f3dfa936e21fe8b57fdf994913a71b7 Mon Sep 17 00:00:00 2001
From: Eric Teunis de Boone <ericteunis@deboone.nl>
Date: Wed, 30 Mar 2022 15:29:52 +0200
Subject: [PATCH] Templates: put instrument global into voice

---
 template/bass.ly          | 9 ++++-----
 template/drums.ly         | 2 +-
 template/full.ly          | 3 +--
 template/lyrics.ly        | 3 +--
 template/mid.ly           | 9 ++++-----
 template/pipes.full.ly    | 2 +-
 template/pipes.ly         | 5 ++---
 template/pipes.seconds.ly | 5 ++---
 template/pipes.thirds.ly  | 5 ++---
 template/side.ly          | 5 ++---
 template/tenor.ly         | 5 ++---
 11 files changed, 22 insertions(+), 31 deletions(-)

diff --git a/template/bass.ly b/template/bass.ly
index 6e05cf8..9a6d766 100644
--- a/template/bass.ly
+++ b/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 {
diff --git a/template/drums.ly b/template/drums.ly
index f2552a3..167fbde 100644
--- a/template/drums.ly
+++ b/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
 			>>
diff --git a/template/full.ly b/template/full.ly
index 9bef95d..7dae798 100644
--- a/template/full.ly
+++ b/template/full.ly
@@ -23,13 +23,12 @@
 			shortInstrumentName = \markup{ \shortInstrumentPipes }
 		} {
 			\global
-			\pipeglobal
 			<<
 				\new NullVoice = "format" {
 
 				}%Format
-
 				\new Voice = "pipes" {
+					\pipeglobal
 
 				}%Pipes
 			>>
diff --git a/template/lyrics.ly b/template/lyrics.ly
index bf6bba2..474c925 100644
--- a/template/lyrics.ly
+++ b/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" {
 
 				}
diff --git a/template/mid.ly b/template/mid.ly
index 2929d73..7fabab6 100644
--- a/template/mid.ly
+++ b/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 }
diff --git a/template/pipes.full.ly b/template/pipes.full.ly
index f677d67..9e7b6a6 100644
--- a/template/pipes.full.ly
+++ b/template/pipes.full.ly
@@ -19,12 +19,12 @@
 			shortInstrumentName = \markup{ \shortInstrumentPipes }
 		} {
 			\global
-			\pipeglobal
 			<<
 			  	\new NullVoice = "format" {
 
 				}%Format
 				\new Voice = "pipes" {
+					\pipeglobal
 
 				}%Pipes
 			>>
diff --git a/template/pipes.ly b/template/pipes.ly
index 1d73c73..d05010f 100644
--- a/template/pipes.ly
+++ b/template/pipes.ly
@@ -8,15 +8,14 @@
 \score {
     \new Staff {
 		\global
-		\pipeglobal
 		<<
 			\new NullVoice = "format" {
 
 			}%Format
-
 			\new Voice = "pipes" {
+				\pipeglobal
 
-			}
+			}%Pipes
 		>>
 	}
 	\header {
diff --git a/template/pipes.seconds.ly b/template/pipes.seconds.ly
index 4fd05c1..45e9443 100644
--- a/template/pipes.seconds.ly
+++ b/template/pipes.seconds.ly
@@ -8,15 +8,14 @@
 \score {
     \new Staff {
 		\global
-		\pipessecndglobal
 		<<
 			\new NullVoice = "format" {
 			
 			}%Format
-			
 			\new Voice = "seconds" {
+				\pipessecndglobal
 			
-			}
+			}%Pipes
 		>>
 	}
 	\header {
diff --git a/template/pipes.thirds.ly b/template/pipes.thirds.ly
index a9a66da..62e2a73 100644
--- a/template/pipes.thirds.ly
+++ b/template/pipes.thirds.ly
@@ -8,15 +8,14 @@
 \score {
     \new Staff {
 		\global
-		\pipesthrdglobal
 		<<
 			\new NullVoice = "format" {
 
 			}%Format
-
 			\new Voice = "thirds" {
+				\pipesthrdglobal
 
-			}
+			}%Pipes
 		>>
 	}
 	\header {
diff --git a/template/side.ly b/template/side.ly
index 93cd678..d7d9534 100644
--- a/template/side.ly
+++ b/template/side.ly
@@ -8,15 +8,14 @@
 \score {
     \new PipeBandDrumStaff {
         \global
-		\sideglobal
 		<<
 			\new NullVoice = "format" {
 			
 			}%Format
-			
 			\new DrumVoice = "side" {
+				\sideglobal
 			
-			}
+			}%Side
 		>>
 	}
 	\header {
diff --git a/template/tenor.ly b/template/tenor.ly
index 61df69b..3e73a9f 100644
--- a/template/tenor.ly
+++ b/template/tenor.ly
@@ -8,15 +8,14 @@
 \score {
     \new PipeBandDrumStaff {
 		\global
-		\tenorglobal
 		<<
 			\new NullVoice = "format" {
 			
 			}%Format
-			
 			\new DrumVoice = "tenor" {
+				\tenorglobal
 			
-			}
+			}%Tenor
 		>>
 	}
 	\header {