diff --git a/reels/piper_of_drummond/notes.side.ily b/reels/piper_of_drummond/notes.side.ily index eeaeee5..c4c0f66 100644 --- a/reels/piper_of_drummond/notes.side.ily +++ b/reels/piper_of_drummond/notes.side.ily @@ -16,22 +16,22 @@ snareABA = \drummode { g8.[ \drag d16 d16\< g d g] | d8.\!\v\fr g16 d8. \flamdr g16 \fr - d8.[ \drag d16 d8. g16] + d8.[ \drag d16] d4 | - \flamdr d8.->\fr g16 \triplet { d8 d g } + \flamdr d8.-> g16 \triplet { d8\fr d g } d8. d16\dr \< \triplet { g8 g d\! } } snareAAB = \drummode {% only different for unisons - \flam d4->\fr d8. g16 - d4:32( g8.) d16:64( + \flam d4-> d8. g16 + d4:32( g8.)\fr d16:64( | \triplet { d8) g d } \flam g8. d16->\dr } snareABB = \drummode { g8. g16 \flam d4\fr | - d4:32( d8.) g16 - \flam d8. g16 d4:32(\<\dr + d4:32( g8.) g16\dr + \flam d4 d4:32(\< | d8.)->\! g16 d8. \flam g16 d4\fr d16 g d g @@ -54,34 +54,35 @@ snareA = \drummode { snareBAA = \drummode { - d4:32(->\dr g8.)\fr g16 - d4:32(\< \triplet { g8)\staccato d\dr g\! } + d4:32(->\dr g8.) g16 + d4:32(\< \triplet { g8)\staccato d g\! } | - d8.->\fr g16 d8. g16:64(->\rn + d8.->\fr g16 d8. g16:64(-> g8.:32 d16) g8. g16\dr | } snareBBA = \drummode { - d8.\fr g16 \p\< \triplet { d8 g d\! } - \flamdr \triplet { g8 d g } \flam d8. g16 + d8. g16 \p\< \triplet { d8 g d\! } + \flam \triplet { g8\fr d g } \flam d4 | - \flam d8.\v\fr g16 d8. \flam g16 - d4 d16\dr g d g + \flamdr d8.\v g16 d8. \flam g16 + d4 d16 g d g | } snareBAB = \drummode {% only different for unisons - d4:32(-> g8.)\fr g16 - d4:32(\<\dr \triplet { g8)\staccato d g\! } + %d4:32(-> g8.)\fr g16 + %d4:32(\<\dr \triplet { g8)\staccato d g\! } + d4:32(->\> g8.:32)\!(\staccato g16:32)(\staccato d2:32)(\< | - d8.->\fr g16 d8. g16:64(->\rn - g8.:32 d16) g8. g16\dr + d8.)->\! g16 d8. \flam g16 + d2 | } snareBBB = \drummode { - \flam d8.[\v\fr g16 d8. \dragdr g16] - g8.\fr g16 \flam d8. g16\dr + \flam d4\v d8.[ \drag g16] + g8.\fr g16 \flam d4 | - \flam d8.\v\fr g16 \triplet { d8 d \flamdr g } + \flamdr d8.\v g16 \triplet { d8 d \flam g } \triplet { d8 g g } d4\staccato \fr } diff --git a/reels/piper_of_drummond/side.ly b/reels/piper_of_drummond/side.ly index 6f86741..2956d49 100644 --- a/reels/piper_of_drummond/side.ly +++ b/reels/piper_of_drummond/side.ly @@ -1,20 +1,26 @@ -\version "2.18.2" +\version "2.24.2" \include "lilydrum.ly" \include "./config.ily" \include "./notes.side.ily" +mbreak = { \break } \score { \new PipeBandDrumStaff { \global \unfoldRepeats \new DrumVoice = "side" { \sideglobal - - \snareA + << + \snareA + { s1*4 \mbreak | \grace{s8} s1} + >> \break \section - \snareB + << + \snareB + { s1*4 \mbreak | \grace{s8} s1 } + >> \fine }%Side }