diff --git a/5-4_marches/cullen_bay/bass.ly b/5-4_marches/cullen_bay/bass.ly index c6a3c6b..661ebe9 100644 --- a/5-4_marches/cullen_bay/bass.ly +++ b/5-4_marches/cullen_bay/bass.ly @@ -7,8 +7,8 @@ \new PipeBandDrumStaff { \global << - { \repeat volta 2 { \line } } - { \bassA } + { \repeat volta 2 { \line \break \line } } + { \bassAA \bassAB } >> } \header { @@ -17,4 +17,4 @@ instrument = \instrumentBass composer = \composerBass } -} \ No newline at end of file +} diff --git a/5-4_marches/cullen_bay/drums.ly b/5-4_marches/cullen_bay/drums.ly index 30c8d73..8b91693 100644 --- a/5-4_marches/cullen_bay/drums.ly +++ b/5-4_marches/cullen_bay/drums.ly @@ -27,24 +27,25 @@ } >> } - \new PipeBandDrumStaff = "bass" { - \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass } - \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass} - - \repeat unfold 4 { - \repeat unfold 2 { - \bassA - } - } - } \new PipeBandDrumStaff = "tenor" { \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor } \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor } \repeat unfold 4 { - \tenorAA \tenorAB + \tenorAA + \tenorAB } } + \new PipeBandDrumStaff = "bass" { + \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass } + \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass} + + \repeat unfold 4 { + \bassAA + \bassAB + } + } + >> \header { title = \title diff --git a/5-4_marches/cullen_bay/full.ly b/5-4_marches/cullen_bay/full.ly index 31770e5..6a64c92 100644 --- a/5-4_marches/cullen_bay/full.ly +++ b/5-4_marches/cullen_bay/full.ly @@ -8,16 +8,17 @@ \score { \new StaffGroup << + \global \new Staff { - \global \pipeglobal \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentPipes } \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentPipes } << + \global { \repeat unfold 4 { \line \bar "||" \break - \line \bar "|." + \line \bar "|." \break } }%Format { @@ -29,7 +30,6 @@ >> } \new PipeBandDrumStaff = "side" { - \sideglobal \set PipeBandDrumStaff.instrumentName = \markup \column {\instrumentSide} \set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide} \repeat unfold 2 { \snareA } @@ -53,9 +53,8 @@ \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass } \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass} \repeat unfold 4 { - \repeat unfold 2 { - \bassA - } + \bassAA + \bassAB } } diff --git a/5-4_marches/cullen_bay/notes.bass.ily b/5-4_marches/cullen_bay/notes.bass.ily index 2319608..582aa4d 100644 --- a/5-4_marches/cullen_bay/notes.bass.ily +++ b/5-4_marches/cullen_bay/notes.bass.ily @@ -3,6 +3,15 @@ \version "2.18.2" composerBass = "" bassglobal = {} -bassA = \drummode { - \repeat unfold 4 { d4-^ g d-> g d | } +bassAA = \drummode { + d4 g4 d4 g4 r4 | + d4 g4 r8 g8 d4 r4 | + d4 g4 d4 g4 r4 | + d4 g4 d4 r8 g8 d4 | +} +bassAB = \drummode { + d8 g8 d8 g8 d8 g8 d8 g8 d4 | + d4 g4 r8 g8 d4 r4 | + d8 g8 d8 g8 d8 g8 d4 r4 | + d4 g4 d4 r8 g8 d4 | } diff --git a/5-4_marches/cullen_bay/notes.side.ily b/5-4_marches/cullen_bay/notes.side.ily index 7438e99..0b04e8d 100644 --- a/5-4_marches/cullen_bay/notes.side.ily +++ b/5-4_marches/cullen_bay/notes.side.ily @@ -31,7 +31,7 @@ snareA = \drummode { d8[:32( g8]) \flam d8[ d8]:32( \triplet { g16[) d g } \flam d16. g32] - \triplet { g16[ d g } \flam g8] + \triplet { d16[ g d } \flam g8] | \snareEnd } diff --git a/5-4_marches/cullen_bay/notes.tenor.ily b/5-4_marches/cullen_bay/notes.tenor.ily index 979cd86..562021c 100644 --- a/5-4_marches/cullen_bay/notes.tenor.ily +++ b/5-4_marches/cullen_bay/notes.tenor.ily @@ -4,14 +4,14 @@ composerTenor = "" tenorglobal = {} tenorAA = \drummode { - d8-> g d g d-> g d4 d4 | + d8-> g d g d-> g \flourish d4 \flourish d4 | d8. g16 d8-> g8-> r8 g8 d4 d4 | d8-> g d g d-> g d8.-> g16-> r8 d8-> | - d4 d4 d8 g8 d4 d4 | + r4 d4 d8 g8 d4 d4 | } tenorAB = \drummode { \flourish { d4 g4 d4 g4 d4 } | d8. g16 d8-> g8-> r8 g8 d4 d4 | \flourish { d4 g4 } d8-> g8 d8.-> g16-> r8 d8-> - d4 d4 d8 g8 d4 d4 | + r4 d4 d8 \dr g8 d4 \fr d4 | } diff --git a/5-4_marches/cullen_bay/tenor.ly b/5-4_marches/cullen_bay/tenor.ly index 93002b1..260b58e 100644 --- a/5-4_marches/cullen_bay/tenor.ly +++ b/5-4_marches/cullen_bay/tenor.ly @@ -8,7 +8,7 @@ \global \tenorglobal << - { \repeat unfold 1 { \line \line \bar "|."} } + { \repeat volta 4 { \line \break \line } } { \tenorAA \tenorAB } >> }