[typesetting] restructure for segnoMarking in Caller Herrin'

2-4_marches/caller_herrin/bass.ly

@@ -5,24 +5,31 @@
 \include "./config.ily"
 \include "./notes.bass.ily"
 
+mbreak = {\break}
+
 \score {
     \new PipeBandDrumStaff {
         \global
 		<<
 			\new NullVoice = "format" {
+				\repeat segno 2 {
 					\repeat volta 2 {
+						\part
 						\halfline
-						\mark \markup { \musicglyph "scripts.segno"}
+						\volta 2 { \segnoMark \default }
-						\inStaffSegno
 						\halfline
-						\fine
+						\volta 2 { \fine }
 					}
-					\break
 
+					\volta 1 {
+						\allowBreak
+						\mbreak
+						\part
 						\halfline
 						\halfline
-					\dsalfine
 						\bar "||"
+					}
+				}
 			}%Format
 			\new DrumVoice = "bass" {
 				\bassglobal

2-4_marches/caller_herrin/drums.ly

@@ -13,6 +13,29 @@
 	short-indent = 2.0
 }
 
+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 PipeBandDrumStaff = "side" \with {
@@ -21,28 +44,7 @@
 		} {
 			\global
 			<<
-				\new NullVoice = "format" {
+				\timing
-					\repeat volta 2 {
-						\part
-						\halfline
-						\mark \markup { \musicglyph "scripts.segno"}
-						\inStaffSegno
-						\halfline
-						\fine
-					}
-					\break
-
-					\part
-					\halfline
-					\halfline
-					\dsalfine
-					\bar "||"
-					%\break
-					%\halfline
-					%\break
-					%\halfline
-					%\bar "|."
-				}%End of Format
 				\new DrumVoice = "side" {
 					\sideglobal
 					\sideA s8
@@ -55,16 +57,22 @@
 			shortInstrumentName = \markup{ \shortInstrumentTenor }
 		} {
 			\tenorglobal
+			<< \timing
+			{
 				\tenorA s8
 				\removeWithTag #'fine \tenorB
+			} >>
 		}
 		\new PipeBandDrumStaff = "bass" \with {
 			instrumentName = \markup{ \instrumentBass }
 			shortInstrumentName = \markup{ \shortInstrumentBass }
 		} {
 			\bassglobal
+			<< \timing
+			{
 				s8 \bassA
 				s8 \removeWithTag #'fine \bassB
+			} >>
 		}
 	>>
 	\header {

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" {
+				\timing
-					\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
 				\new Voice = "pipes" {
 				  \pipesA s8
 				  \removeWithTag #'fine \pipesB
@@ -82,27 +84,33 @@
 			shortInstrumentName = \markup{ \shortInstrumentSide }
 		} {
 			\sideglobal
-
+			<< \timing
+			{
 				\sideA s8
 				\removeWithTag #'fine \sideB
+			} >>
 		}
 		\new PipeBandDrumStaff = "tenor" \with {
 			instrumentName = \markup{ \instrumentTenor }
 			shortInstrumentName = \markup{ \shortInstrumentTenor }
 		} {
 			\tenorglobal
-
+			<< \timing
+			{
 				\tenorA s8
 				\removeWithTag #'fine \tenorB
+			} >>
 		}
 		  \new PipeBandDrumStaff = "bass" \with {
 			instrumentName = \markup{ \instrumentBass }
 			shortInstrumentName = \markup{ \shortInstrumentBass }
 		} {
 			\bassglobal
-
+			<< \timing
+			{
 				s8 \bassA
 				s8 \removeWithTag #'fine \bassB
+			} >>
 		}
 	>>
 	\header {

2-4_marches/caller_herrin/mid.ly

@@ -11,6 +11,28 @@
 	short-indent = 2.0
 }
 
+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 "||"
+				}
+			}
+		}%End of Format
+
 \score {
 	\new StaffGroup <<
 		\new PipeBandDrumStaff = "tenor" \with {
@@ -19,23 +41,7 @@
 		} {
 			\global
 			<<
-				\new NullVoice = "format" {
+				\timing
-					\repeat volta 2 {
-						\part
-						\halfline
-						\mark \markup { \musicglyph "scripts.segno"}
-						\inStaffSegno
-						\halfline
-						\fine
-					}
-					\break
-
-					\part
-					\halfline
-					\halfline
-					\dsalfine
-					\bar "||"
-				}%End of Format
 				\new DrumVoice = "tenor" {
 					\tenorglobal
 					\tenorA s8
@@ -48,8 +54,10 @@
 			shortInstrumentName = \markup{ \shortInstrumentBass }
 		} {
 			\bassglobal
-			s8 \bassA
+			<< \timing
+			{ s8 \bassA
 			  s8 \removeWithTag #'fine \bassB
+			} >>
 		}
 	>>
 	\header {

2-4_marches/caller_herrin/notes.tenor.ily

@@ -1,15 +1,28 @@
 % 2/4 Caller Herrin
 % Tenor
 \version "2.18.2"
-composerTenor = "E.T. de Boone, v0.2"
+composerTenor = "E.T. de Boone, v0.3"
 arrangerTenor = ""
 tenorglobal = {}
+
+startRPiano = #(define-event-function (parser location) () #{
+    -\tweak HorizontalBracketText.text "R"
+    \startGroup
+#})
+
+startTPiano = #(define-event-function (parser location) () #{
+    -\tweak HorizontalBracketText.text "T"
+    \startGroup
+#})
+
 % Music
 tenorA = \drummode {
 	\tag #'fineRemove {
 		\tag #'upbeat { d8 | }
-		g4\up	d8 g |
+		g4\up 
-		d8 g	d4 |
+			
+			d8\startRPiano g |
+		d8 g	d4\stopGroup |
 		g4\up d8.\up
 		g16 |
 		d4	g8
@@ -17,8 +30,8 @@ tenorA = \drummode {
 		d8 |
 	}
 
-	g4\up	d8 g |
+	g4\up	d8\startRPiano g |
-	d8 g	d4 |
+	d8 g	d4\stopGroup |
 	g4	\scoop { d8. g16 |
 	d4 } r8
 }

2-4_marches/caller_herrin/pipes.cairns.ly

@@ -5,16 +5,7 @@
 \include "./config.ily"
 \include "./notes.pipes.ily"
 
-markTextEolDown = #(define-music-function (parser location text) (string?) #{
+mbreak = {\break}
-    \once \override Score.RehearsalMark #'break-visibility = #end-of-line-visible
-    \once \override Score.RehearsalMark #'self-alignment-X = #RIGHT
-    \once \override Score.RehearsalMark #'direction = #DOWN
-    \mark \markup $text
-#})
-
-fine = {\markTextEolDown "Fine" }
-dsalfine = {\markTextEolDown "D.S. al Fine" }
-
 
 \score {
     \new Staff {
@@ -22,26 +13,24 @@ dsalfine = {\markTextEolDown "D.S. al Fine" }
 		\pipeglobal
 		<<
 			\new NullVoice = "format" {
+				\repeat segno 2 {
 					\repeat volta 2 {
 						\part
 						\halfline
-					\mark \markup { \musicglyph "scripts.segno"}
+						\volta 2 { \segnoMark \default }
-					%\inStaffSegno
 						\halfline
-					\fine
+						\volta 2 { \fine }
 					}
-				\break
 	
+					\volta 1 {
+						\allowBreak
+						\mbreak
 						\part
 						\halfline
 						\halfline
-				\dsalfine
 						\bar "||"
-				%\break
+					}
-				%\halfline
+				}
-				%\break
-				%\halfline
-				%\bar "|."
 			} % Format
 			\new Voice = "pipes" {
 				\pipesAvI s8

2-4_marches/caller_herrin/pipes.full.ly

@@ -45,7 +45,7 @@
 
 			\pipesSecA s8
 
-			\pipesSecB
+			\pipesSecB s8
 
 		}
 	>>

2-4_marches/caller_herrin/pipes.ly

@@ -5,16 +5,7 @@
 \include "./config.ily"
 \include "./notes.pipes.ily"
 
-markTextEolDown = #(define-music-function (parser location text) (string?) #{
+mbreak = {\break}
-    \once \override Score.RehearsalMark #'break-visibility = #end-of-line-visible
-    \once \override Score.RehearsalMark #'self-alignment-X = #RIGHT
-    \once \override Score.RehearsalMark #'direction = #DOWN
-    \mark \markup $text
-#})
-
-fine = {\markTextEolDown "Fine" }
-dsalfine = {\markTextEolDown "D.S. al Fine" }
-
 
 \score {
     \new Staff {
@@ -22,26 +13,24 @@ dsalfine = {\markTextEolDown "D.S. al Fine" }
 		\pipeglobal
 		<<
 			\new NullVoice = "format" {
+				\repeat segno 2 {
 				\repeat volta 2 {
 					\part
 					\halfline
-					\mark \markup { \musicglyph "scripts.segno"}
+					\volta 2 { \segnoMark \default}
-					%\inStaffSegno
 					\halfline
-					\fine
+					\volta 2 { \fine }
 				}
-				\break
 
+				\volta 1 {
+					\allowBreak
+					\mbreak
 					\part
 					\halfline
 					\halfline
-				\dsalfine
 					\bar "||"
-				%\break
+				}
-				%\halfline
+				}
-				%\break
-				%\halfline
-				%\bar "|."
 			} % Format
 			\new Voice = "pipes" {
 				\pipesA s8

2-4_marches/caller_herrin/side.ly

@@ -5,26 +5,30 @@
 \include "./config.ily"
 \include "./notes.side.ily"
 
+mbreak = {\break}
 \score {
     \new PipeBandDrumStaff {
         \global
 		<<
 			\new NullVoice = "format" {
+				\repeat segno 2 {
 					\repeat volta 2 {
 						\part
 						\halfline
-					\mark \markup { \musicglyph "scripts.segno"}
+						\volta 2 { \segnoMark \default }
-					%\inStaffSegno
 						\halfline
-					\fine
+						\volta 2 { \fine }
 					}
-				\break
 
+					\volta 1 {
+						\allowBreak
+						\mbreak
 						\part
 						\halfline
 						\halfline
-				\dsalfine
 						\bar "||"
+					}
+				}
 			} % Format
 			\new DrumVoice = "side" {
 				\sideglobal

2-4_marches/caller_herrin/tenor.ly

@@ -5,26 +5,31 @@
 \include "./config.ily"
 \include "./notes.tenor.ily"
 
+mbreak = {\break}
+
 \score {
     \new PipeBandDrumStaff {
 		\global
 		<<
 			\new NullVoice = "format" {
+				\repeat segno 2 {
 					\repeat volta 2 {
 						\part
 						\halfline
-					\mark \markup { \musicglyph "scripts.segno"}
+						\volta 2 { \segnoMark \default }
-					%\inStaffSegno
 						\halfline
-					\fine
+						\volta 2 { \fine }
 					}
-				\break
 
+					\volta 1 {
+						\allowBreak
+						\mbreak
 						\part
 						\halfline
 						\halfline
-				\dsalfine
 						\bar "||"
+					}
+				}
 			}%Format
 			\new DrumVoice = "tenor" {
 				\tenorglobal