diff --git a/reels/jock_wilsons_ball/full.ly b/reels/jock_wilsons_ball/full.ly index 14b53f6..dca7b02 100644 --- a/reels/jock_wilsons_ball/full.ly +++ b/reels/jock_wilsons_ball/full.ly @@ -42,8 +42,8 @@ \set PipeBandDrumStaff.instrumentName = \markup \column {\instrumentSide} \set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide} - \sideA - \sideB + \snareA + \snareB } \new PipeBandDrumStaff = "tenor" { \tenorglobal diff --git a/reels/jock_wilsons_ball/notes.side.ily b/reels/jock_wilsons_ball/notes.side.ily index c87d3e8..c660bc8 100644 --- a/reels/jock_wilsons_ball/notes.side.ily +++ b/reels/jock_wilsons_ball/notes.side.ily @@ -1,82 +1,63 @@ % 2/2 Jock Wilson's Ball % Side \version "2.18.2" -composerSide = "E.T. de Boone, 2016" +composerSide = "E.T. de Boone, v0.5, 2023"% 2023-07-14 Andre Rieu, Maastricht +arrangerSide = "" sideglobal = { - \eighthReelBeaming +% \eighthReelBeaming } % Music -sideAAmain = \drummode { - \flam g8. g16 - d8.:32( d16)-> g8. g16 - | - \flam d8. [ \drag g16 d32 g d g d8 ] - g8. [ \drag d16 d8. g16 ] - | +snareAA = \drummode { + \flam d4 g4:32( d4:32)(-> g4) | + \flam \triplet { d8-> g \flam d8 } \flam g8. d16\v %g8.[ \drag d16 d4 | } -sideAAA = \drummode { - g16 | - \flam d4 \sideAAmain +snareABA = \drummode { + g8.[ \drag d16] d4 | + \flam g8. d16:64( d8.) g16 d4:32( d4) | + g8.[ d16-> g8. \drag d16] d16 g d g d16-> g d g-> } -sideABA = \drummode { - d4) \sideAAmain -} -sideAAB = \drummode { - \flam d8. [ \drag g16 d32 g d g d8 ] - g8.:32->([ d16) g8. g16 ] - | - \triplet {d8 [ d g } d16 g32 g d8 ] - g32 [ d g d g8-> d8. d16:64( ] - | +snareABB = \drummode { + g8.[ \drag d16 d8. g16] | + %d16 d g d g8.-> g16 d4:32( d8.) d16:64(\> | + %d4)\! \flam d8.\v g16 d8. \flam g16-> \triplet { d8 g8 d8 } | + d16 d g d g8.-> g16 d4:32( d8.) d16:64( | + d4) \flam d8.\v g16 d8. \flam g16-> d4 | % \triplet { d8 g8 d8 } | } -sideABB = \drummode { - \flam d32[ d g8. d16 g8. ] - d4:32( d8.) g16 - | - \triplet {d8[ g d } \flam g8. \drag g16 ] - d32 [ g d g d8 g8. ] -} -sideA = \drummode { - \sideAAA - \sideAAB - \sideABA - \sideABB +snareA = \drummode { + \repeat volta 2 { + \snareAA + \alternative{ + \snareABA + \snareABB + } + } } - - - -sideBA = \drummode { - g16 | - \flam d4 g4:32( - d8.:32)(-> g16) \flam d8. g16 - | - \flamd \triplet { d8[ g \flam d } \flam g8 \triplet { d16 g d ]} - g8.[ \drag d16 d8. g16 ] - | - \flam d4 g4:32( - d8.:32)(-> g16) \flam d8. g16 - | - \triplet { d8 [ d g } d16 g32 g d8] - g32 [ d g d g8-> d8. d16:64( ] - | +snareBA = \drummode { + g4 \flam d8.\v d16 g8. d16 \triplet { g8 d g } | + %\flam \triplet { d8 g \flam d8 } \flam g8 d32 g d16 %g8.[ \drag d16 d4 | + \flam d8.[ d16 \flam g8. \triplet { d32 g d] } %g8.[ \drag d16 d4 | } -sideBB = \drummode { - d4) g4:32( - d8.:32()-> g16) \flam d8. g16 - | - \flam d8.[ \drag g16 d32 g d g d8 ] - g8.[ \drag d16 d8. g16 ] - | - \flam d16[ g8. d8. g16 ] - d4:32( d8.) g16 - | - d8.:32( g16) d8. g16 - d16 g8.:32( d8.) +snareBBA = \drummode { + g8.[-> \drag d16]% d4 | + d4 | + d16->\< g d g d16-> g d g d8.->\! g16 d8. d16:64( | + d4) \flam d8.\v g16 d8. \flam g16-> d8. d16 | %\triplet { d8 g8 d8 } | +} +snareBBB = \drummode { + g8.[-> \drag d16]% d4 | + d4 | + d2.:32(\< d8.)\!\v g16 | + d8.:32(-> g16) \triplet { d8 g d } g16 d8.:32(-> g4)-> } -sideB = \drummode { - \sideBA - \sideBB +snareB = \drummode { + \repeat volta 2 { + \snareBA + \alternative{ + \snareBBA + \snareBBB + } + } } diff --git a/reels/jock_wilsons_ball/notes.side.old.ily b/reels/jock_wilsons_ball/notes.side.old.ily new file mode 100644 index 0000000..802c1a2 --- /dev/null +++ b/reels/jock_wilsons_ball/notes.side.old.ily @@ -0,0 +1,81 @@ +% 2/2 Jock Wilson's Ball +% Side +\version "2.18.2" +composerSide = "E.T. de Boone, 2016" +sideglobal = { + \eighthReelBeaming +} +% Music +sideAAmain = \drummode { + d8. g16 + d8.:32( d16)-> g8. g16 + | + %\flamdr d8.\fr [ g16 d8. \flam g16 ] + \flamdr d8.\fr [ \drag g16 \triplet { d16 g d g d8] } + g8. [ \dragdr d16 d8. g16 ] + | +} +sideAAA = \drummode { + \flam d4 \sideAAmain +} +sideABA = \drummode { + d4) \sideAAmain +} +sideAAB = \drummode { + \flam d8. \fr [ \drag g16 \triplet { d16 g d g d8] } + g8.:32->([ d16) g8. g16 ] + | + \triplet {d8 [ d g } \triplet { d8 g16 g d8 ] } + d16 [ g d g d8. d16:64( ] + | +} + +sideABB = \drummode { + \flam d32[ d g8. d16 g8. ] + d4:32( d8.) g16 + | + \triplet {d8[ g d } \flam g8. \drag g16 ] + \triplet { d16 g d g d8] } g4 +} +sideA = \drummode { + \sideAAA + \sideAAB + \removeWithTag #'tutti \sideABA + \sideABB +} + + + + +sideBA = \drummode { + \flam d4 g4:32( + d8.:32)(-> g16) \flam d8. g16 + | + \flamd \triplet { d8[ g \flam d } \flam g8 \triplet { d16 g d ]} + g8.[ \drag d16 d8. g16 ] + | + \flam d4 g4:32( + d8.:32)(-> g16) \flam d8. g16 + | + \triplet {d8 [ d g } \triplet { d8 g16 g d8 ] } + d16 [ g d g d8. d16:64( ] + | +} +sideBB = \drummode { + d4) g4:32( + d8.:32()-> g16) \flam d8. g16 + | + \flam d8.[ \drag g16 d32 g d g d8 ] + g8.[ \drag d16 d8. g16 ] + | + \flam d16[ g8. d8. g16 ] + d4:32( d8.) g16 + | + d8.:32( g16) \triplet { d8 g d8 } + g16 d8.:32(-> g4) +} + +sideB = \drummode { + \sideBA + \sideBB +} diff --git a/reels/jock_wilsons_ball/side.ly b/reels/jock_wilsons_ball/side.ly index 0105a61..046a46a 100644 --- a/reels/jock_wilsons_ball/side.ly +++ b/reels/jock_wilsons_ball/side.ly @@ -1,4 +1,4 @@ -\version "2.18.2" +\version "2.24.2" \include "lilydrum.ly" @@ -8,33 +8,20 @@ \score { \new PipeBandDrumStaff { \global - \sideglobal - << - { - \partial 16 s16 - \halfline + \unfoldRepeats \new DrumVoice = "side" { + \sideglobal + \snareA \break - \halfline - \bar "|." - - \break - \partial 16 s16 - \halfline - \break - \halfline - \bar "|." - }%Format - { - \sideA s16 - - \sideB + \section + \snareB + \fine } - >> } \header { title = \title meter = \meter instrument = \instrumentSide composer = \composerSide + arranger = \arrangerSide } }