From cdc1921ff1a5b9332884ea87c771c9c345bb19a3 Mon Sep 17 00:00:00 2001 From: Eric Teunis de Boone Date: Fri, 15 Sep 2017 09:55:48 +0200 Subject: [PATCH] Fixed upbeat minstrel boy Tutti replacement for Pikeman's March --- .gitignore | 1 + 4-4_marches/minstrel_boy/config.ily | 2 +- 4-4_marches/minstrel_boy/full.ly | 4 +- 4-4_marches/minstrel_boy/side.ly | 4 +- .../the_crusaders_march/notes.pipes.ily | 2 +- 4-4_marches/the_pikemans_march/notes.side.ily | 194 ++++++++++-------- init-sets | 2 +- 7 files changed, 119 insertions(+), 90 deletions(-) diff --git a/.gitignore b/.gitignore index 8dd944d..c619e73 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ to_process/ piobaireachd/ sets/ +tmp/ diff --git a/4-4_marches/minstrel_boy/config.ily b/4-4_marches/minstrel_boy/config.ily index d6364c3..634cefd 100644 --- a/4-4_marches/minstrel_boy/config.ily +++ b/4-4_marches/minstrel_boy/config.ily @@ -8,7 +8,7 @@ confTempo = { \tempo 4 = 90 } %% Format -part = { \partial 8 s8 } +part = { \grace{s1} \partial 4 s4 } measure = { \grace { s4 } s1 | } halfline = { \repeat unfold 2 { \measure } } line = { \repeat unfold 2 { \halfline } } diff --git a/4-4_marches/minstrel_boy/full.ly b/4-4_marches/minstrel_boy/full.ly index 7357627..740f665 100644 --- a/4-4_marches/minstrel_boy/full.ly +++ b/4-4_marches/minstrel_boy/full.ly @@ -18,11 +18,11 @@ \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentPipes } << { - \partial 4 s4 | + \part | \line \break \line \bar "|." \break - \partial 4 s4 | + \part | \line \break \line \bar "|." }%Format diff --git a/4-4_marches/minstrel_boy/side.ly b/4-4_marches/minstrel_boy/side.ly index 90b84e8..6982ffa 100644 --- a/4-4_marches/minstrel_boy/side.ly +++ b/4-4_marches/minstrel_boy/side.ly @@ -11,11 +11,11 @@ \sideglobal << { - \partial 4 s4 | + \part | \line \break \line \break \bar "|." - \partial 4 s4 | + \part | \line \break \line \break \bar "|." } diff --git a/4-4_marches/the_crusaders_march/notes.pipes.ily b/4-4_marches/the_crusaders_march/notes.pipes.ily index 386ba33..dd5ec00 100644 --- a/4-4_marches/the_crusaders_march/notes.pipes.ily +++ b/4-4_marches/the_crusaders_march/notes.pipes.ily @@ -26,5 +26,5 @@ pipesB = { \grg c4 \grip c4 \dblc c4 \gre a8. [ \grd c16 ] | \dble e4 \grip e8. [ f16 ] \dble e4 \thrwd d8 [ f8 ] | \dble e8 [ c8 ] \dbld d8 [ b8 ] \dblc c8 [ e8 ] \thrwd d8 [ b8 ] | - \dblb b8 [ \gre a8 ] \wbirl a8. [ b16 ] \grG a2 + \dblb b8 [ \gre a8 ] \wbirl a8. [ b16 ] \grG a4 } diff --git a/4-4_marches/the_pikemans_march/notes.side.ily b/4-4_marches/the_pikemans_march/notes.side.ily index 799aa84..fb76270 100644 --- a/4-4_marches/the_pikemans_march/notes.side.ily +++ b/4-4_marches/the_pikemans_march/notes.side.ily @@ -7,49 +7,63 @@ sideglobal = { } %%music snareAA = \drummode { - g16. \dr g32 - | - \flamd d4\v \fr + \tutti { + g16. g32 + | + \flam d4\v + } d32\< g d g d8->\! - \flamddr d8\> \flamg g8\! - r8 d8:32( + \tutti { + \flam d8\> \flam g8\! + r8 d8:32( + | + g16.) d32-> g16. g32 + d16. g32-> d16. d32 + \flam g8 d8:32( + g8..) + } g32 | - g16.) d32-> g16. g32 - d16. g32-> d16. d32 - \flamg g8 d8:32( - g8..) \fr g32 - | - \flamd d4 - \flamd d16 g-> d d - \flamg g16 d-> g g - \flamd d16 g-> d d - | - \flamddr d4 - d8:32( g8:32)(-> - d4) - r8 \tuplet 3/2 { g16\< d g\! } + \flam d4 + \flam d16 g-> d d + \flam g16 d-> g g + \flam d16 g-> d d | + \tutti { + \flam d4 + d8:32( g8:32)(-> + d4) + } + r8 + } snareAB = \drummode { - \flamd d4\v \fr + \tutti { + \tuplet 3/2 { g16\< d g\! } | + \flam d4\v + } d32\< g d g d8->\! - \flamddr d8\> \flamg g8\! - r8 d8:32( - | - \tuplet 3/2 { g16) d g } \flamd d16. g32 - \tuplet 3/2 { d16 g d } \flamg g16.\fr g32 - \flamd d16. g32 d32 g d g - d8-> g16.\dr g32 - | - d8:32( g8:32)(-> - d8:32)( g8:32)(-> - d8)->\fr \tuplet 3/2 { g16 d g} - \flam d8 g32\dr d d g - | - \flam d8. g16 - d8:32(-> g8:32)(-> - d8.)->\fr d16:64( + \tutti { + \flam d8\> \flam g8\! + r8 d8:32( + | + \tuplet 3/2 { g16) d g } \flam d16. g32 + \tuplet 3/2 { d16 g d } \flam g16. + } g32 + \flam d16. g32 d32 g d g + d8-> \tutti { + g16. g32 + | + d8:32( g8:32)(-> + d8:32)( g8:32)(-> + d8)-> + } \tuplet 3/2 { g16 d g} + \flam d8 \tutti { g32 d d g + | + \flam d8. g16 + d8:32(-> g8:32)(-> + d8.)-> + } d16:64( d8) } snareBA = \drummode { @@ -58,65 +72,79 @@ snareBA = \drummode { \flam d8 d16. g32 \flam d16. d32:128( d16.) g32-> r16. \flam d32 g16. g32 - \flamd d8 d8:32(\dr - | - g16.) d32-> g16. g32 - d16. g32-> d16. d32 - \flam g8\fr d8:32( + \flam d8 \tutti { + d8:32( + | + g16.) d32-> g16. g32 + d16. g32-> d16. d32 + \flam g8 + } d8:32( g8) g8 | - d8:32( g8:32)(-> - d8:32)( g8:32)(-> - d8)->\fr d32 g d g - d8-> d16. \dr g32 - | - \flamd d4 - d8:32( g8:32)(-> - d4) \fr + \tutti { + d8:32( g8:32)(-> + d8:32)( g8:32)(-> + d8)-> + } d32 g d g + d8-> \tutti { + d16. g32 + | + \flam d4 + d8:32( g8:32)(-> + d4) + } \tuplet 6/4 {d16 \< g d g16 d g\! } | } snareBB = \drummode { - \flamd d8\f \flamg g8 + \flam d8\f \flam g8 r8 d8:32( g16.) d32-> g16. g32 - \flamd d8 d8:32(\dr + \flam d8 \tutti { + d8:32( + | + g16.) d32-> g16. g32 + d16. g32-> d16. d32 + \flam g8 d8:32( + g8) + } d16. g32 | - g16.) d32-> g16. g32 - d16. g32-> d16. d32 - \flamg g8 d8:32( - g8)\fr d16. g32 - | - d8.:32(->\dr g16:64)(-> - d8:32)(-> g8)->\fr - \flamd d16.\> g32-> d16. d32\! - \flamg g16.\> d32-> g16. g32\! - | - \flamddr d4 - d4:32( - d8) \fr \flam g8 - r8 d16.\dr g32 + \tutti { + d8.:32(-> g16:64)(-> + d8:32)(-> g8)-> + } + \flam d16.\> g32-> d16. d32\! + \flam g16.\> d32-> g16. g32\! | + \tutti { + \flam d4 + d4:32( + d8) + } \flam g8 + r8 } snareBC = \drummode { - \flamd d8\f \flamg g8 - r8 d8:32( - g16.) d32-> g16. g32 - \flamd d8 d8:32(\dr - | - g16.) d32-> g16. g32 - d16. g32-> d16. d32 - \flam g8\fr d8:32( - g8) d16. g32 - | - d8.:32(-> g16:64)(-> - d8:32)(-> g16.)-> g32-> - d32 g d g d16.-> g32-> - d32 g d g d8-> - | - \flamd d4 - d8:32( g8:32)(-> - d4) + d16. g32 | + \tutti { + \flam d8\f \flam g8 + r8 d8:32( + g16.) d32-> g16. g32 + \flam d8 d8:32( + | + g16.) d32-> g16. g32 + d16. g32-> d16. d32 + \flam g8 d8:32( + g8) d16. g32 + | + d8.:32(-> g16:64)(-> + d8:32)(-> g16.)-> g32-> + d32 g d g d16.-> g32-> + d32 g d g d8-> + | + \flam d4 + d8:32( g8:32)(-> + d4) + } r8 } diff --git a/init-sets b/init-sets index 9e729c7..8243de1 100644 --- a/init-sets +++ b/init-sets @@ -13,7 +13,7 @@ reels/the_mackenzies_reel/$f.ly \ ; $COM $D/set_1.$f.ly -t "Set 1: Bonnie Galloway / We're no awa' tae bide awa'" \ -4-4_marches/bonnie_galloway.$f.ly \ +4-4_marches/bonnie_galloway/$f.ly \ 4-4_marches/were_no_awa_tae_bide_awa/$f.ly \ ;