[typesetting] restructure for segnoMarking in Caller Herrin'

2-4_marches/caller_herrin/full.ly

@@ -18,6 +18,29 @@
 
 #(set-global-staff-size 18)
 
+mbreak = {\break}
+
+timing = \new NullVoice = "format" {
+			\repeat segno 2 {
+				\repeat volta 2 {
+					\part
+					\halfline
+					\volta 2 { \segnoMark \default }
+					\halfline
+					\volta 2 { \fine }
+				}
+
+				\volta 1 {
+					\allowBreak
+					\mbreak
+					\part
+					\halfline
+					\halfline
+					\bar "||"
+				}
+			}
+		} % Format
+
 \score {
 	\new StaffGroup <<
 		\new Staff \with {
@@ -27,28 +50,7 @@
 			\global
 			\pipeglobal
 			<<
-				\new NullVoice = "format" {
-					\repeat volta 2 {
-						\part
-						\halfline
-						\mark \markup { \musicglyph "scripts.segno"}
-						\inStaffSegno
-						\halfline
-						\fine
-					}
-					\break
-
-					\part
-					\halfline
-					\halfline
-					\dsalfine
-					\bar "||"
-					%\break
-					%\halfline
-					%\break
-					%\halfline
-					%\bar "|."
-				} % Format
+				\timing
 				\new Voice = "pipes" {
 				  \pipesA s8
 				  \removeWithTag #'fine \pipesB
@@ -82,27 +84,33 @@
 			shortInstrumentName = \markup{ \shortInstrumentSide }
 		} {
 			\sideglobal
-
-			\sideA s8
-			\removeWithTag #'fine \sideB
+			<< \timing
+			{
+				\sideA s8
+				\removeWithTag #'fine \sideB
+			} >>
 		}
 		\new PipeBandDrumStaff = "tenor" \with {
 			instrumentName = \markup{ \instrumentTenor }
 			shortInstrumentName = \markup{ \shortInstrumentTenor }
 		} {
 			\tenorglobal
-
-			\tenorA s8
-			\removeWithTag #'fine \tenorB
+			<< \timing
+			{
+				\tenorA s8
+				\removeWithTag #'fine \tenorB
+			} >>
 		}
 		  \new PipeBandDrumStaff = "bass" \with {
 			instrumentName = \markup{ \instrumentBass }
 			shortInstrumentName = \markup{ \shortInstrumentBass }
 		} {
 			\bassglobal
-
-			s8 \bassA
-			s8 \removeWithTag #'fine \bassB
+			<< \timing
+			{
+				s8 \bassA
+				s8 \removeWithTag #'fine \bassB
+			} >>
 		}
 	>>
 	\header {