diff --git a/2-4_marches/mackenzie_highlanders/notes.side.ily b/2-4_marches/mackenzie_highlanders/notes.side.ily index 6b583b7..68d19bb 100644 --- a/2-4_marches/mackenzie_highlanders/notes.side.ily +++ b/2-4_marches/mackenzie_highlanders/notes.side.ily @@ -1,14 +1,14 @@ % 2/4 MacKenzie Highlanders % Snare \version "2.18.2" -composerSide = "v1.4, 2019" +composerSide = "v1.5, 2022" sideglobal = { \eighthBeaming } %%music snareEnd = \drummode { \tutti { d8:32)(-> \tuplet 3/2 { g16) d g } | - d8[-> \drag d8] r16 \drag d16 d16. g32 | + d8[-> \drag d16 d16->] r16 \drag d16 d16. g32 | d4:32( d8) } } diff --git a/2-4_marches/mackenzie_highlanders/side.ly b/2-4_marches/mackenzie_highlanders/side.ly index d3107a2..34aeb6d 100644 --- a/2-4_marches/mackenzie_highlanders/side.ly +++ b/2-4_marches/mackenzie_highlanders/side.ly @@ -5,6 +5,10 @@ \include "./config.ily" \include "./notes.side.ily" +% we need a partial without \grace{} here, otherwise +% the LD part gets a new line after the \break +part = { \partial 8 s8 } + \layout { \context { \Score @@ -13,38 +17,42 @@ } \score { - \new StaffGroup << - \new PipeBandDrumStaff { - \global - \sideglobal + \new PipeBandDrumStaff = "side" \with { + \remove "System_start_delimiter_engraver" + } { + \global + \sideglobal + << + { + \repeat volta 2 { \part \line } \break + \part \line \break + \line \bar "|." + } + { + s8 | s2*5 | s4 << - { - \repeat volta 2 { \part \line } \break - \part \line \bar "||" \break - \line \bar "|." - } - { - \snareA s8 - \snareBA s8 - \snareBB s8 - } - { - s8 | s2*5 | s4 << - { s4 | s2 | s2 } - \new PipeBandDrumStaff = "LD" \with { + { s4 | s2 | s2 } + \context PipeBandDrumStaff = "LD" \with { fontSize = #-3 \override StaffSymbol #'staff-space = #(magstep -3) \override StaffSymbol #'thickness = #(magstep -3) - \remove "Time_signature_engraver" - alignAboveContext = #"main" - } { - \removeWithTag #'tutti {\snareEndLD } s8 - } - >> - } + \omit TimeSignature + + alignAboveContext = "side" + } { + \startStaff + \removeWithTag #'tutti { \snareEndLD } s8 + \stopStaff + } >> } + { + \snareA s8 + \snareBA + \snareBB s8 + } >> + } \header { title = \title meter = \meter