4-4_marches/green_glens_of_antrim/side.ly

@@ -1,27 +1,29 @@
-\version "2.24.1"
+\version "2.18.2"
 
 \include "lilydrum.ly"
 
 \include "./config.ily"
 \include "./notes.side.ily"
 
+markTextEol = #(define-music-function (parser location text) (string?) #{
+	\once \override Score.RehearsalMark #'break-visibility = #end-of-line-visible
+	\once \override Score.RehearsalMark #'self-alignment-X = #RIGHT
+	\mark \markup $text
+#})
+
 \score {
-	\new PipeBandDrumStaff {
+    \new PipeBandDrumStaff {
-		\global
+        \global
 		<<
 			\new NullVoice = "format" {
-				\repeat segno 2 {
+				\repeat volta 2 {
-					\repeat volta 2 {
+					\part \halfline \markTextEol "Fine"
-						\part \line
-						\volta 2 {
-							\fine
-						}
-					}
-					\break
-					\section
-					\part \line
-					\section
 				}
+				\break
+				\part
+				\halfline
+				\markTextEol "D.C. al Fine"
+				\bar "||"
 			}%Format
 			\new DrumVoice = "side" {
 				\sideglobal

4-4_marches/muss_i_denn/side.ly

@@ -1,30 +1,34 @@
-\version "2.24.1"
+\version "2.18.2"
 
 \include "lilydrum.ly"
 
 \include "./config.ily"
 \include "./notes.side.ily"
 
+markTextEol = #(define-music-function (parser location text) (string?) #{
+	\once \override Score.RehearsalMark #'break-visibility = #end-of-line-visible
+	\once \override Score.RehearsalMark #'self-alignment-X = #RIGHT
+	\mark \markup $text
+#})
+
+
 \score {
-	\new PipeBandDrumStaff {
+    \new PipeBandDrumStaff {
-		\global
+        \global
+		\sideglobal
 		<<
 			\new NullVoice = "format" {
-				\repeat segno 2 {
+				\repeat volta 2 {
-					\repeat volta 2 {
+					\part \halfline
-						\part \halfline
-						\volta 2 {
-							\fine
-						}
-					}
-					\break
-					\section
-					\part \repeat unfold 4 \measure
-					\section
 				}
+				\markTextEol "Fine"
+				\break
+				\part \repeat unfold 4 \measure
+				\markTextEol "D.C. al Fine"
+				\bar "|."
 			}%Format
+			
 			\new DrumVoice = "side" {
-				\sideglobal
 				\snareA s4
 
 				\snareBA s4

4-4_marches/rowan_tree/side.ly

@@ -1,28 +1,35 @@
-\version "2.24.1"
+\version "2.18.2"
 
 \include "lilydrum.ly"
 
 \include "./config.ily"
 \include "./notes.side.ily"
 
-\score {
+markTextEol = #(define-music-function (parser location text) (string?) #{
-	\new PipeBandDrumStaff {
+	\once \override Score.RehearsalMark #'break-visibility = #end-of-line-visible
-		\global
+	\once \override Score.RehearsalMark #'self-alignment-X = #RIGHT
-		\sideglobal
+	\mark \markup $text
-		\repeat segno 2 {
+#})
-			\repeat volta 2 {
-				\partial 4
-				\snareA
-			}
-			\volta 2 \fine
 
-			\volta 1 {
+\score {
-			  \allowBreak
+    \new PipeBandDrumStaff {
-			  \break
+        \global
-			  \snareBA
+		<<
-			  \section
+			\new NullVoice = "format" {
+				\repeat volta 2 {
+					\part \halfline \markTextEol "Fine"
+				}
+				\break
+				\part \halfline \markTextEol "D.C. al Fine"\bar "||"
+			}%Format
+			
+			\new DrumVoice = "side" {
+				\sideglobal
+				\snareA s4
+
+				\snareBA
 			}
-		}
+		>>
 	}
 	\header {
 		title = \title

4-4_marches/scotland_the_brave/high-side.ly

@@ -1,28 +1,31 @@
-\version "2.24.1"
+\version "2.18.2"
 
 \include "lilydrum.ly"
 
 \include "./config.ily"
 \include "./notes.side.ily"
 
+markTextEol = #(define-music-function (parser location text) (string?) #{
+	\once \override Score.RehearsalMark #'break-visibility = #end-of-line-visible
+	\once \override Score.RehearsalMark #'self-alignment-X = #RIGHT
+	\mark \markup $text
+#})
+
 \score {
-	\new PipeBandDrumStaff {
+    \new PipeBandDrumStaff {
-		\global
+        \global
-		\sideglobal
+	\sideglobal
-		%\unfoldRepeats
+        <<
-		\repeat segno 2 {
+			{
-			\repeat volta 2 {
+				\repeat volta 2 {\part \line \markTextEol "Fine" \break }
-				\partial 8 \snareA
+				\part \line \markTextEol "D.C. al Fine" \bar "||"
 			}
-			\volta 2 \fine
+			{
-			\volta 1 {
+			 \snareA s8
-				\allowBreak
+
-				\section
+			 \snareBAhigh
-				\partial 8 \snareBAhigh
-				\section
-				\allowBreak
 			}
-		}
+		>>
 	}
 	\header {
 		title = #(string-append title " (high)" )

4-4_marches/scotland_the_brave/side.ly

@@ -1,30 +1,26 @@
-\version "2.24.1"
+\version "2.18.2"
 
 \include "lilydrum.ly"
 
 \include "./config.ily"
 \include "./notes.side.ily"
 
+markTextEol = #(define-music-function (parser location text) (string?) #{
+	\once \override Score.RehearsalMark #'break-visibility = #end-of-line-visible
+	\once \override Score.RehearsalMark #'self-alignment-X = #RIGHT
+	\mark \markup $text
+#})
+
 \score {
-	\new PipeBandDrumStaff {
+    \new PipeBandDrumStaff {
-		\global
+        \global
-		<<
+	\sideglobal
-			\new NullVoice = "format" {
+        <<
-				\repeat segno 2 {
+			{
-					\repeat volta 2 {
+				\repeat volta 2 {\part \line \markTextEol "Fine" \break }
-						\part \line
+				\part \line \markTextEol "D.C. al Fine" \bar "||"
-						\volta 2 {
-							\fine
-						}
-					}
-					\break
-					\section
-					\part \line
-					\section
-				}
 			}
-			\new DrumVoice = "side" {
+			{
-			\sideglobal
 			 \snareA s8
 
 			 \snareBA

4-4_marches/the_leaving_of_liverpool/side.ly

@@ -6,8 +6,8 @@
 \include "./notes.side.ily"
 
 \score {
-	\new PipeBandDrumStaff {
+    \new PipeBandDrumStaff {
-		\global
+        \global
 		\sideglobal
 		\repeat volta 2 {
 			\partial 4 r8

4-4_marches/the_old_rustic_bridge/drums.ly

@@ -1,4 +1,4 @@
-\version "2.24.1"
+\version "2.19.0"
 
 \include "lilydrum.ly"
 
@@ -11,7 +11,6 @@
 	indent = 5.0
 	short-indent = 2.0
 }
-mBreak = {\break}
 
 \score {
 	\new StaffGroup <<
@@ -20,35 +19,31 @@ mBreak = {\break}
 			shortInstrumentName = \markup{ \shortInstrumentSide }
 		} {
 			\global
+			\sideglobal
 			<<
 				\new NullVoice = "format" {
 					\part
-					\repeat segno 2 {
+					\repeat volta 2 {
-						\repeat volta 2 {
+						\measure
-							\measure
+						s2.
-							s2.
+					} \alternative {
-						} \alternative {
+						{ s4 | \halfline }
-							{ s4 | \halfline }
+						{
-							{
+						  s4 |
-							  s4 |
+						  \halfline
-							  \halfline
+						  \fine
-							  \fine
-							}
-						}
-
-						\volta 2 \fine
-						\volta 1 {
-							\allowBreak
-							\mBreak
-							\section
-							\part
-							\line
-							\section
 						}
 					}
+					\bar "||"
+					\break
+
+					\part
+					\line
+					\dcalfine
+					\bar "||"
+
 				}%End of Format
 				\new DrumVoice = "side" {
-					\sideglobal
 					\snareAupbeatA
 					\snareAA
 					\snareAB r8 \snareAupbeatB
@@ -64,13 +59,12 @@ mBreak = {\break}
 		} {
 			\tenorglobal
 
-			s4 |
+			\drummode { g4 | }
 			\tenorAA
 			\tenorABA r4
 			r8 g8 | \tenorABB s4
 
 			r4 \tenorBA
-			\section
 		}
 %{		\new PipeBandDrumStaff = "bass" \with {
 			instrumentName = \markup{ \instrumentBass }

4-4_marches/the_old_rustic_bridge/side.ly

@@ -1,32 +1,41 @@
-\version "2.24.1"
+\version "2.18.2"
 
 \include "lilydrum.ly"
 
 \include "./config.ily"
 \include "./notes.side.ily"
 
-\score {
+fine = {\mark \markup "Fine" }
-	\new PipeBandDrumStaff {
-		\global
-		\sideglobal
-		\partial 4 \snareAupbeatA
-		\repeat segno 2 {
-			\repeat volta 2 {
-				\snareA
-				\volta 2 \fine
-				\alternative {
-					\volta 1 { r8 \snareAupbeatB }
-				}
-			}
 
-			\volta 1 {
+\score {
-				\allowBreak
+    \new PipeBandDrumStaff {
+        \global
+		\sideglobal
+		<<
+			\new NullVoice = "format" {
+				\part
+				\repeat volta 2 {
+				  \halfline \measure << s2. { s2 \fine } >>
+				} \alternative {
+				  { s4 | }
+				  {
+				  }
+				}
+				%\bar "||"
 				\break
-				\section
+
-				\partial 4
+				\part \line
+				\dcalfine
+				\bar "||"
+			}%Format
+			\new DrumVoice = "side" {
+				\snareAupbeatA
+				\snareA
+				r8 \snareAupbeatB
+
 				r8 \snareBA
 			}
-		}
+		>>
 	}
 	\header {
 		title = \title

4-4_marches/the_old_rustic_bridge/tenor.ly

@@ -1,34 +1,40 @@
-\version "2.24.1"
+\version "2.18.2"
 
 \include "lilydrum.ly"
 
 \include "./config.ily"
 \include "./notes.tenor.ily"
 
-mBreak = {\break}
 \score {
-	\new PipeBandDrumStaff {
+    \new PipeBandDrumStaff {
 		\global
-		\tenorglobal
+        <<
-		\partial 4 \drummode { g4 } |
+			{
-		\repeat segno 2 {
+				\part \repeat volta 2 {
-			\repeat volta 2 {
+					\halfline
-				\tenorAA
+				} \alternative {
-				\alternative {
+					\halfline
-					{ \tenorABA r4 }
+					{
-					{ \tenorABB r4 }
+						\halfline
+						\fine
+					}
 				}
+				\bar "||"
+				\break
+
+				\line
+				\dcalfine
+				\bar "||"
 			}
-			\volta 2 {\fine}
+			{
-			\volta 1 {
+			  \drummode { g4 | } 
-				\allowBreak
+			  \tenorAA
-				\mBreak
+			  \tenorABA r4
-				\section
+			  \tenorABB r4
-				\tenorBA
+
-				\section
+			  \tenorBA
 			}
-		}
+		>>
-		
 	}
 	\header {
 		title = \title

4-4_marches/wings/notes.side.ily

@@ -31,6 +31,6 @@ snareBA = \drummode {
 	g8) d16. g32	\flam d16. d32:128( d8)	\flam d8 d16. g32	d8:32(-> \< g8:32)(-> |
 	d8.)->\fr \! g16	d8:32( g16.) g32	d8:32( g16.) g32	\sextuplet { d16[ g d-> g d g] } |
 
-	\flamdr d8 d16. g32->	d16. d32 \flam g8	\flam d4	\triplet { <> \p d16 g d } \flam g8 |
+	\flamdr d8 d16. g32->	d16. d32 \flam g8	\flam d4\fr	\triplet { <> \p d16 g d } \flam g8 |
-	\flam d4	r4	d8:32( \< g8:32)(->	d8:32)(->  \afterGrace g8:32)(->  {s8)\!\ofr}
+	\flam d4	r4	d8:32(\dr \< g8:32)(->	d8:32)(->  \afterGrace g8:32)(->  {s8)\!\ofr}
 }

4-4_marches/wings/side.ly

@@ -1,38 +1,38 @@
-\version "2.24.1"
+\version "2.18.2"
 
 \include "lilydrum.ly"
 
 \include "./config.ily"
 \include "./notes.side.ily"
 
-mbreak = {\break}
+markTextEol = #(define-music-function (parser location text) (string?) #{
+	\once \override Score.RehearsalMark #'break-visibility = #end-of-line-visible
+	\once \override Score.RehearsalMark #'self-alignment-X = #RIGHT
+	\mark \markup $text
+#})
 
 \score {
-	\new PipeBandDrumStaff {
+    \new PipeBandDrumStaff {
-		\global
+        \global
-		\sideglobal
 		<<
 			\new NullVoice = "format" {
 				\partial 8 s8
-				\repeat segno 2 {
+				\repeat volta 2 {
-					\repeat volta 2 {
+					\quartline
-						\quartline
+				} \alternative {
-					} \alternative {
+				  	\quartline
-						\quartline
+					{	\quartline 
-						{	\quartline
+						\markTextEol "Fine"
-							\fine
-						}
 					}
+				}\bar "|."
+				\break
 
-					\volta 1 {
+				\partial 8 s8
-						\allowBreak
+				\halfline 
-						\mbreak
+				\markTextEol "D.C. al Fine"
-						\partial 8 s8
+				\bar "||"
-						\halfline
-						\bar "||"
-					}
-				}
 			}%Format
+			
 			\new DrumVoice = "side" {
 				\sideglobal
 				\snareAA

reels/jock_wilsons_ball/bass.ly

@@ -5,21 +5,17 @@
 \include "./config.ily"
 \include "./notes.bass.ily"
 
-pBreak = {\break}
 \score {
     \new PipeBandDrumStaff {
         \global
 	\bassglobal
 		<<
 			{
-				\halfline
+				\line 
-				\pBreak
+				\bar "|."
-				\halfline
+				\break
-				\section
+				\line
-				\halfline
+				\bar "|."
-				\pBreak
-				\halfline
-				\fine
 			}%Format
 			{
 			\bassA

reels/jock_wilsons_ball/drums.ly

@@ -7,58 +7,48 @@
 \include "./notes.tenor.ily"
 \include "./notes.side.ily"
 
-\layout {
-	indent = 5.0
-	short-indent = 2.0
-}
-
-pBreak = {\break}
 \score {
 	\new StaffGroup <<
-		\new PipeBandDrumStaff = "side" \with {
+		\new PipeBandDrumStaff = "side" {
-			instrumentName = \markup{ \instrumentSide }
-			shortInstrumentName = \markup{ \shortInstrumentSide }
-		} {
 			\global
+			\sideglobal
+			\set PipeBandDrumStaff.instrumentName = \markup{\instrumentSide}
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide}
+
 			<<
-				\new NullVoice = "format" {
+				{
-					\halfline
+					\partial 16 s16
-					\pBreak
+					\line
-					\halfline
+					\bar "|."
 					\break
-					\section
+					\partial 16 s16
-					\halfline
+					\line
-					\pBreak
+					\bar "|."
-					\halfline
+				}%Format
-					\fine
+				{ 
-				}%End of Format
+					\sideA s16
-				\new DrumVoice = "side" {
+					\sideB
-					\sideglobal
+				}%Music
-					\snareA
-					\snareB
-				}%End of side
 			>>
 		}
-		\new PipeBandDrumStaff = "tenor" \with {
+		\new PipeBandDrumStaff = "tenor" {
-			instrumentName = \markup{ \instrumentTenor }
-			shortInstrumentName = \markup{ \shortInstrumentTenor }
-		} {
 			\tenorglobal
-			\tenorAA \tenorAB
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
-			\tenorBA \tenorBB
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
+			s16 \tenorA
+			s16 \tenorB
 		}
-		\new PipeBandDrumStaff = "bass" \with {
+		\new PipeBandDrumStaff = "bass" {
-			instrumentName = \markup{ \instrumentBass }
-			shortInstrumentName = \markup{ \shortInstrumentBass }
-		} {
 			\bassglobal
-			\bassAA \bassAB
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
-			\bassBA \bassBB
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}
+
+			s16 \bassA
+			s16 \bassB
 		}
 	>>
 	\header {
 		title = \title
-		subtitle = \subtitle
 		meter = \meter
 		composer = \markup {
 			\column \right-align {

reels/jock_wilsons_ball/full.ly

@@ -4,122 +4,75 @@
 \include "lilydrum.ly"
 
 \include "./config.ily"
-%\include "./notes.bass.ily"
+\include "./notes.bass.ily"
-%\include "./notes.tenor.ily"
+\include "./notes.tenor.ily"
 \include "./notes.side.ily"
 \include "./notes.pipes.ily"
-%\include "./notes.pipes.seconds.ily"
-%\include "./notes.lyrics.ily"
-
-\layout {
-	indent = 5.0
-	short-indent = 2.0
-}
 
 \score {
-	\new StaffGroup <<
+	\new StaffGroup  \with { 
-		\new Staff \with {
+		}
-			instrumentName = \markup{ \instrumentPipes }
+		<<
-			shortInstrumentName = \markup{ \shortInstrumentPipes }
+		\new Staff {
-		} {
 			\global
 			\pipeglobal
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentPipes }
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentPipes }
 			<<
-				\new NullVoice = "format" {
+				{
-					%\repeat volta 2 {
+				\partial 16 s16
-					%	\part \line
+				\line
-					%}
+				\bar "|,"
-					\part
-					\halfline
-					\break
-					\halfline
-					\section
-					\break
-					\part
-					\halfline
-					\break
-					\halfline
-					\fine
-				}%Format
-				\new Voice = "pipes" {
 
-					\pipesA \pipesA s16
+				\break
+				\line
+				\bar "|."
+				}%Format
+				{
+					s16 \pipesAA
+					\pipesAB
 
 					\pipesBA
-					\pipesBB s16
+					\pipesBB
-
 				}%Pipes
 			>>
 		}
-%{		\new Staff = "song" {
+		\new PipeBandDrumStaff = "side"{
-  			\lyricsglobal
-			\new Voice = "lyrics" {
-
-			}
-		}
-}%
-%{		\new Lyrics = "verse1" {
-		  \lyricsglobal
-		  \lyricsto "lyrics" {
-			\verseA
-		  }
-		}
-%}
-%{		\new Staff = "seconds" \with {
-			instrumentName = \markup{ \instrumentPipes \instrumentSecnd }
-			shortInstrumentName = \markup{ \shortInstrumentPipes \shortInstrumentSecnd }
-		} {
-			\pipessecndglobal
-
-		}
-%}
-		\new PipeBandDrumStaff = "side" \with {
-			instrumentName = \markup { \instrumentSide }
-			shortInstrumentName = \markup{ \shortInstrumentSide }
-		} {
 			\sideglobal
+			\set PipeBandDrumStaff.instrumentName = \markup \column {\instrumentSide}
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide}
 
-			s16 \snareA |
+				\snareA
-
+				\snareB
-			s16 \snareB |
-			\fine
 		}
-%{
+		\new PipeBandDrumStaff = "tenor" {
-		\new PipeBandDrumStaff = "tenor" \with {
-			instrumentName = \markup{ \instrumentTenor }
-			shortInstrumentName = \markup{ \shortInstrumentTenor }
-		} {
 			\tenorglobal
-
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
+				s16 \tenorA
+				\tenorB
 		}
-%}
+		\new PipeBandDrumStaff = "bass" {
-%{
-		\new PipeBandDrumStaff = "bass" \with {
-			instrumentName = \markup{ \instrumentBass }
-			shortInstrumentName = \markup{ \shortInstrumentBass }
-		} {
 			\bassglobal
-
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}
+				s16 \bassA
+				\bassB
+		
 		}
-%}
 	>>
 	\header {
 		title = \title
-		subtitle = \subtitle
 		meter = \meter
 		composer = \markup \large {
 			\column \right-align {
-				$(if (not (string=? "" composerLyrics)) #{ \markup { \line { \composerLyrics ":" } } #} )
 				$(if (not (string=? "" composerPipes))  #{ \markup {\line { \composerPipes  ":" }} #} )
-				$(if (not (string=? "" composerPipessecnd))  #{ \markup {\line { \composerPipessecnd ":" }} #} )
 				$(if (not (string=? "" composerSide))  #{ \markup {\line { \composerSide  ":" }} #} )
 				$(if (not (string=? "" composerTenor)) #{ \markup {\line { \composerTenor  ":" }} #} )
 				$(if (not (string=? "" composerBass))  #{ \markup {\line { \composerBass  ":" }} #} )
 			}
 			\column \right-align {
-				$(if (not (string=? "" composerLyrics)) #{ \markup { \line { "Lyrics" } } #} )
 				$(if (not (string=? "" composerPipes))  #{ \markup {\line { \instrumentPipes }}#} )
-				$(if (not (string=? "" composerPipessecnd))  #{ \markup {\line { \instrumentPipessecnd }}#} )
 				$(if (not (string=? "" composerSide))  #{ \markup {\line { \instrumentSide }}#} )
 				$(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} )
 				$(if (not (string=? "" composerBass))  #{ \markup {\line { \instrumentBass }}#} )

reels/jock_wilsons_ball/mid.ly

@@ -1,65 +0,0 @@
-\version "2.19.0"
-
-\include "lilydrum.ly"
-
-\include "./config.ily"
-\include "./notes.bass.ily"
-\include "./notes.tenor.ily"
-
-\layout {
-	indent = 5.0
-	short-indent = 2.0
-}
-
-pBreak = {\break}
-\score {
-	\new StaffGroup <<
-		\new PipeBandDrumStaff = "tenor" \with {
-			instrumentName = \markup{ \instrumentTenor }
-			shortInstrumentName = \markup{ \shortInstrumentTenor }
-		} {
-			\global
-			<<
-				\new NullVoice = "format" {
-					\halfline
-					\pBreak
-					\halfline
-					\break
-					\section
-					\halfline
-					\pBreak
-					\halfline
-					\fine
-				}%End of Format
-				\new DrumVoice = "tenor" {
-					\tenorglobal
-					\tenorAA \tenorAB
-					\tenorBA \tenorBB
-				}%End of Tenor
-			>>
-		}
-		\new PipeBandDrumStaff = "bass" \with {
-			instrumentName = \markup{ \instrumentBass }
-			shortInstrumentName = \markup{ \shortInstrumentBass }
-		} {
-			\bassglobal
-			\bassAA \bassAB
-			\bassBA \bassBB
-		}
-	>>
-	\header {
-		title = \title
-		subtitle = \subtitle
-		meter = \meter
-		composer = \markup {
-			\column \right-align {
-				$(if (not (string=? "" composerTenor)) #{ \markup {\line { \composerTenor  ":" }} #} )
-				$(if (not (string=? "" composerBass))  #{ \markup {\line { \composerBass  ":" }} #} )
-			}
-			\column \right-align {
-				$(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} )
-				$(if (not (string=? "" composerBass))  #{ \markup {\line { \instrumentBass }}#} )
-			}
-		}
-	}
-}

reels/jock_wilsons_ball/notes.bass.ily

@@ -1,31 +1,62 @@
 % 2/2 Jock Wilson's Ball
 % Bass
 \version "2.18.2"
-composerBass  = "v0.1"
+composerBass  = ""
-arrangerBass  = ""
 bassglobal = {}
 % Music
-bassAA = \drummode {
+bassA = \drummode {
-	bd2	\triplet{ 8 8 8 } 4 |
+	
-	2	2 |
+	d4 g4
-	2	\triplet{ 8 8 8 } \parenthesize 4 |
+	d2
-	2	2 |
+	|
-}
+	d2 
-bassAB = \drummode {
+	g2
-	bd2	\triplet{ 8 8 8 } 4 |
+	|
-	2	2 |
+	d4 g4
-	2	2 |
+	d2
-	2	2 |
+	|
-}
+	d8. g16 d8. d16
-bassA = \drummode{ \bassAA \bassAB }
+	g4 d4
+	
+	|
+	d4 g4
+	d2
+	|
+	d2 
+	g4.. g16
+	|
+	d2
+	g2
+	|
+	d8. g16 d8. d16
+	d2
 
-bassBA = \drummode {
-	bd2 2 |
-	2	2 |
-	2	2 |
-	2	2 |
 }
-bassBB = \drummode {
+
-	\bassBA
+bassB = \drummode {
+	d4 g4->
+	d4 g8. g16
+	|
+	d4 g4
+	d2
+	|
+	d4 g4->
+	d4 g8. g16
+	|
+	g4.. g16
+	d2
+	|
+
+	d4 g4->
+	d4 g8. g16
+	|
+	d4 g4
+	d2
+	|
+	d8. g16 d4
+	g4 g4
+	|
+	d8. g16 d4
+	g4 d4
+
 }
-bassB = \drummode{ \bassBA \bassBB }

reels/jock_wilsons_ball/notes.side.ily

@@ -6,16 +6,15 @@ arrangerSide = ""
 sideglobal = {
 %	\eighthReelBeaming
 }
-
 % Music
 snareAA = \drummode {
 	\flam d4 g4	d4:32(\staccato\dr g4:32)(->\fr\> |
-	d8.)\! \tutti { g16-> } d16\< g d g\!	d8.[-> \dragdr d16 d8. g16] |
+	d8.)\!\dr g16-> d16\<\fr g d g\!	d8.[->\dr \drag d16 d8. g16] |
 	d4:32(-> g8.)\fr d16:64(	d8.) g16 d4:32(->\>\dr |
-	g8.[) d16\p g8.\fr \drag d16]	d8.[ \dragdr d16->\mf  d8. g16] |
+	g8.[)\p\fr d16 g8. \drag d16]	d8.[ \dragdr d16->\mf  d8. g16] |
 }
 snareAB = \drummode {
-	\flam d4-> g4	d4:32(\staccato g4:32)(->\> |
+	\flam d4 g4	d4:32(\staccato g4:32)(->\> |
 	d8.)\! g16-> d16\< g d g\!	d8.[->\fr \drag d16 d8. g16]\dr |
 	d8.:32(-> g16) d4\fr	r4 \flamdr \triplet { d8\fr g d } |
 	g8 g8 \flamdr d8. g16	d4 d4:32(\< |
@@ -36,7 +35,7 @@ snareBB = \drummode {
 	g4)\! \flam d8.\v d16	g8. d16 \triplet { g8 d g } |
 	d4:32(-> g8.:32)(-> g16)->	\triplet { d8[ g \drag d] } d4\fr |
 	d2:32(	d4:32)(\dr\< d8.)\!-> g16 |
-	d8.:32(-> g16) d8. g16	d4:32(-> d4)->\fr
+	d8.:32(-> g16) d8. g16	d4:32(-> g4)->\fr
 }
 
 snareB = \drummode {

reels/jock_wilsons_ball/notes.tenor.ily

@@ -1,34 +1,61 @@
 % 2/2 Jock Wilson's Ball
 % Tenor
 \version "2.18.2"
-composerTenor = "v0.1"
+composerTenor = ""
-arrangerTenor = ""
 tenorglobal = {}
 % Music
-tenorAA = \drummode {
+tenorA = \drummode {
-	d4 g	d g |
+	d4 g8. g16
-	d8. g16 \parenthesize d4	d2 |
+	d4 g4
-	d4 \triplet{ g8 d g }	d2 |
+	|
-	d8. g16 d8. g16	d8. d16 g8. g16 |
+	d4 g16 g8 d16
-}
+	r8. d16 g4
-tenorAB = \drummode {
+	|
-	d4 g	d g |
+	d4 g8. g16
-	d8. g16 \parenthesize d4	d2 |
+	d2
-	d8. g16	d4	\triplet{ g8 d g } d4 |
+	|
-	d8 g d4	d2 |
+	d2
-}
+	d8. g16 d4
-tenorA = \drummode{ \tenorAA \tenorAB }
 
-tenorBA = \drummode {
+	|
-	d4 g	d2 |
+	d4 g8. g16
-	d4 g8. g16	d2 |
+	d2
-	d4\< g	d2\! |
+	|
-	d8 g d4	d2 |
+	d4 g16 g8 d16
+	r8. d16 g4
+	|
+	d8. g16 d g8.
+	d8. g16 d4
+	|
+	d8. g16 d4
+	g2 
+	|
 }
-tenorBB = \drummode {
+tenorB = \drummode {
-	d4 g	d2 |
+	\flourish g4 \flourish g4
-	d4 g8. g16	d2 |
+	\flourish d4 \flourish d4
-	d4 d8. d16	g4 g4 |
+	|
-	d8. g16 d8.	d16 g4 d4 |
+	d4 d8. g16
+	d8. g16 d4
+	|
+	\flourish g4 \flourish g4
+	\flourish d4 \flourish d4
+	|
+	d4 g4
+	d8. g16 d4
+
+	|
+	\flourish g4 \flourish g4
+	\flourish d4 \flourish d4
+	|
+	d4 d8. g16
+	d8. g16 d4
+	|
+	d8. g16 d8. g16
+	
+	d4^\up g4^\up
+	|
+	
+	d4 \triplet {g8 d g}
+	d2^\splitTheFeather
 }
-tenorB = \drummode{ \tenorBA \tenorBB }

reels/jock_wilsons_ball/pipes.ly

@@ -10,19 +10,19 @@
 		\global
 		\pipeglobal
 		<<
-			{
+			{ 
 				\halfline
 				\break
 				\halfline
 				\bar "|."
 				\break
 
-				\halfline
+				\halfline 
 				\break
 				\halfline
 				\bar "|."
 			}%Format
-			{
+			{ 
 				\pipesAA
 				\pipesAB
 

reels/jock_wilsons_ball/tenor.ly

@@ -5,21 +5,17 @@
 \include "./config.ily"
 \include "./notes.tenor.ily"
 
-pBreak = {\break}
 \score {
     \new PipeBandDrumStaff {
 	\global
 	\tenorglobal
 	<<
 			{
-				\halfline
+				\line 
-				\pBreak
+				\bar "|."
-				\halfline
+				\break
-				\section
+				\line
-				\halfline
+				\bar "|."
-				\pBreak
-				\halfline
-				\fine
 			}%Format
 			{
 			\tenorA

reels/piper_of_drummond/config.ily

@@ -5,12 +5,12 @@ global = {
 	\time 2/2
 	}
 confTempo = { 
-	\tempo 2 = 75
+	\tempo 2 = 70 
 	}
 %% Format
 part = { \partial 16 \grace{s4.} s16 }
 measure = { \grace {s1} s1 | }
-halfline = { \repeat unfold 4 \measure }
+halfline = { \repeat unfold 2 \measure }
 line = { \repeat unfold 2 { \halfline } }
 
 %% Headers

reels/piper_of_drummond/drums.ly

@@ -1,77 +0,0 @@
-\version "2.19.0"
-
-\include "lilydrum.ly"
-
-\include "./config.ily"
-\include "./notes.bass.ily"
-\include "./notes.tenor.ily"
-\include "./notes.side.ily"
-
-
-\layout {
-	indent = 5.0
-	short-indent = 2.0
-}
-
-pBreak = {\break}
-\score {
-	\new StaffGroup <<
-		\new PipeBandDrumStaff = "side" \with {
-			instrumentName = \markup{ \instrumentSide }
-			shortInstrumentName = \markup{ \shortInstrumentSide }
-		} {
-			\global
-			<<
-				\new NullVoice = "format" {
-					\halfline
-					\pBreak
-					\halfline
-					\break
-					\section
-					\halfline
-					\pBreak
-					\halfline
-					\fine
-				}%End of Format
-				\new DrumVoice = "side" {
-					\sideglobal
-					\snareA
-					\snareB
-				}%End of side
-			>>
-		}
-		\new PipeBandDrumStaff = "tenor" \with {
-			instrumentName = \markup{ \instrumentTenor }
-			shortInstrumentName = \markup{ \shortInstrumentTenor }
-		} {
-			\tenorglobal
-			\tenorAA \tenorAB
-			\tenorBA \tenorBB
-		}
-		\new PipeBandDrumStaff = "bass" \with {
-			instrumentName = \markup{ \instrumentBass }
-			shortInstrumentName = \markup{ \shortInstrumentBass }
-		} {
-			\bassglobal
-			\bassAA \bassAB
-			\bassBA \bassBB
-		}
-	>>
-	\header {
-		title = \title
-		subtitle = \subtitle
-		meter = \meter
-		composer = \markup {
-			\column \right-align {
-				$(if (not (string=? "" composerSide))  #{ \markup {\line { \composerSide  ":" }} #} )
-				$(if (not (string=? "" composerTenor)) #{ \markup {\line { \composerTenor  ":" }} #} )
-				$(if (not (string=? "" composerBass))  #{ \markup {\line { \composerBass  ":" }} #} )
-			}
-			\column \right-align {
-				$(if (not (string=? "" composerSide))  #{ \markup {\line { \instrumentSide }}#} )
-				$(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} )
-				$(if (not (string=? "" composerBass))  #{ \markup {\line { \instrumentBass }}#} )
-			}
-		}
-	}
-}

reels/piper_of_drummond/full.ly

@@ -16,7 +16,6 @@
 	short-indent = 2.0
 }
 
-pBreak = {\break}
 \score {
 	\new StaffGroup <<
 		\new Staff \with {
@@ -31,15 +30,17 @@ pBreak = {\break}
 					%	\part \line
 					%}
 					\part
-					\halfline
+					\line
-					\pBreak
+					\break
-					\halfline
+					\line
+					\bar "||"
 					\section
 					\break
 					\part
-					\halfline
+					\line
-					\pBreak
+					\break
-					\halfline
+					\line
+					\bar "|."
 					\fine
 				}%Format
 				\new Voice = "pipes" {

reels/piper_of_drummond/mid.ly

@@ -1,65 +0,0 @@
-\version "2.19.0"
-
-\include "lilydrum.ly"
-
-\include "./config.ily"
-\include "./notes.bass.ily"
-\include "./notes.tenor.ily"
-
-\layout {
-	indent = 5.0
-	short-indent = 2.0
-}
-
-pBreak = {\break}
-\score {
-	\new StaffGroup <<
-		\new PipeBandDrumStaff = "tenor" \with {
-			instrumentName = \markup{ \instrumentTenor }
-			shortInstrumentName = \markup{ \shortInstrumentTenor }
-		} {
-			\global
-			<<
-				\new NullVoice = "format" {
-					\halfline
-					\pBreak
-					\halfline
-					\break
-					\section
-					\halfline
-					\pBreak
-					\halfline
-					\fine
-				}%End of Format
-				\new DrumVoice = "tenor" {
-					\tenorglobal
-					\tenorAA \tenorAB
-					\tenorBA \tenorBB
-				}%End of Tenor
-			>>
-		}
-		\new PipeBandDrumStaff = "bass" \with {
-			instrumentName = \markup{ \instrumentBass }
-			shortInstrumentName = \markup{ \shortInstrumentBass }
-		} {
-			\bassglobal
-			\bassAA \bassAB
-			\bassBA \bassBB
-		}
-	>>
-	\header {
-		title = \title
-		subtitle = \subtitle
-		meter = \meter
-		composer = \markup {
-			\column \right-align {
-				$(if (not (string=? "" composerTenor)) #{ \markup {\line { \composerTenor  ":" }} #} )
-				$(if (not (string=? "" composerBass))  #{ \markup {\line { \composerBass  ":" }} #} )
-			}
-			\column \right-align {
-				$(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} )
-				$(if (not (string=? "" composerBass))  #{ \markup {\line { \instrumentBass }}#} )
-			}
-		}
-	}
-}

reels/piper_of_drummond/notes.bass.ily

@@ -1,28 +0,0 @@
-% 2/2 Piper of Drummond
-% Bass
-\version "2.18.2"
-composerBass  = "v0.1"
-arrangerBass  = ""
-bassglobal = {}
-% Music
-bassAA = \drummode {
-	bd2 4 4 |
-	2 2 |
-	2 2 |
-	4 4 2 |
-}
-bassAB = \drummode {
-	\bassAA
-}
-bassBA = \drummode {
-	bd2 2 |
-	2 2 |
-	2 2 |
-	4 4 2 |
-}
-bassBB = \drummode {
-	bd2 2 |
-	2 r2 |
-	bd2 r2 |
-	bd2 2 |
-}

reels/piper_of_drummond/notes.side.ily

@@ -1,7 +1,7 @@
 % 2/2 Piper of Drummond
 % Side
 \version "2.18.2"
-composerSide = "E.T. de Boone, v0.6, 2023" % 2023-05-05 Wageningen, unisons 2023-07-23 AR, Maastricht
+composerSide = "E.T. de Boone, v0.6, 2023" % 2023-05-05 Wageningen, unisons 202-07-23 AR, Maastricht
 arrangerSide = ""
 sideglobal = {
 }
@@ -30,8 +30,8 @@ snareAAB = \drummode {% only different for unisons
 snareABB = \drummode {
 	g8. g16 \flam d4\fr
 	|
-	d4:32( g4)
+	d4:32( g8.) g16\dr
-	\flamdr d4 d4:32(\<
+	\flam d4 d4:32(\<
 	|
 	d8.)->\! g16 d8. \flam g16
 	d4\fr d16 g d g

reels/piper_of_drummond/notes.tenor.ily

@@ -1,31 +0,0 @@
-% 2/2 Piper of Drummond
-% Tenor
-\version "2.18.2"
-composerTenor = "v0.1"
-arrangerTenor = ""
-tenorglobal = {}
-% Music
-tenorAA = \drummode {
-	d4 g8. 16 d2 |
-	d4.. d16	g8. d16 g4 |
-	d4 g8. 16	d2 |
-	d8. g16 d4	r4 \triplet { g8 d8 g8 } |
-}
-tenorAB = \drummode {
-	d4 g8. 16 d2 |
-	d4.. d16	g8. d16 g4 |
-	d4 g8. 16	d2 |
-	d4.. g16 d2 |
-}
-tenorBA = \drummode {
-	d2	r4 \triplet { d8 g d } |
-	g4.. d16	g2 |
-	d4 g d g |
-	d4.. g16-> d2 |
-}
-tenorBB = \drummode {
-	d4 g8.\< g16	d8. d16 g4 | 
-	d2\!	\triplet { d8 g d } g4 |
-	d2	g2 |
-	d8. g16 d4	g2 |
-}

reels/piper_of_drummond/pipes.ly

@@ -12,13 +12,13 @@
 		<<
 			\new NullVoice = "format" {
 				\repeat volta 2 {
-					\part \halfline
+					\part \line
 				}
 				\break
 				\part
-				\halfline
+				\line
 				\break
-				\halfline
+				\line
 				\fine
 			}%Format
 			\new Voice = "pipes" {