From abfee7a7852ed5145a198c07a52a6578cc31b788 Mon Sep 17 00:00:00 2001 From: Eric Teunis de Boone Date: Tue, 21 Mar 2023 23:55:16 +0100 Subject: [PATCH] Update unisons for Rowan Tree and Wings --- 4-4_marches/rowan_tree/notes.side.ily | 32 ++++++++++--------- 4-4_marches/rowan_tree/side.ly | 2 +- 4-4_marches/scotland_the_brave/notes.side.ily | 2 +- 4-4_marches/wings/notes.side.ily | 22 ++++++------- 4-4_marches/wings/side.ly | 2 +- 4-4_marches/wings/side.nofine.ly | 14 ++++---- 6 files changed, 38 insertions(+), 36 deletions(-) diff --git a/4-4_marches/rowan_tree/notes.side.ily b/4-4_marches/rowan_tree/notes.side.ily index 5129739..93ca63d 100644 --- a/4-4_marches/rowan_tree/notes.side.ily +++ b/4-4_marches/rowan_tree/notes.side.ily @@ -1,32 +1,33 @@ % 4/4 Rowan Tree % Snare \version "2.18.2" -composerSide = "" +composerSide = "v1.1" sideglobal = { \eighthBeaming } %%music snareEnding = \drummode { - \tutti { - \flam d8[ d8]:32( - g8[) d8]:32( - \tuplet 3/2 { g16) d g } \flam d16. g32 - d16.} g32-> d g d g + % r8 missing + d8:32( + g8[) d8]:32( + \tuplet 3/2 { g16) d g } \flam d16. g32 + d16.\fr g32-> d g d g | - \tutti {\flam d4 d4:32( d4) } + \flamdr d4 d4:32( d4) \fr } snareA = \drummode { r8 \tutti { - d8 | + g8 | d4:32( d8) g8 d4:32( d8) g8 | - \flam d16 - } g8 d16-> - g16. g32 \flam d16. g32 + \flam d16 g8 + } d16-> + g16. g32 \flam d16. g32 \tutti { - \flam d16. d32:128( d16.) - } g32-> + \flam d16.-> d32:128( d16.) + } g32 \triplet {d16 g d } \flam g8 | + \flamdr d8 \snareEnding } % Part 2 @@ -35,7 +36,8 @@ snareBA = \drummode { \tutti { d8[:32(-> g8]:32)(-> d8[:32)( g8]:32)(-> d8[:32)( g8]:32)(-> d8[)-> - } d8]:32( | - g8.)\pp g16 d8:32( g8) \flam d8 d8:32( g8.) g16\f | + } d8]:32( \pp | + g8.) g16 d8:32( g8) \flam d8 d8:32( g8.) g16\mf\dr | + \flam d8\v \snareEnding } diff --git a/4-4_marches/rowan_tree/side.ly b/4-4_marches/rowan_tree/side.ly index 9654034..dfe6c3f 100644 --- a/4-4_marches/rowan_tree/side.ly +++ b/4-4_marches/rowan_tree/side.ly @@ -14,7 +14,6 @@ markTextEol = #(define-music-function (parser location text) (string?) #{ \score { \new PipeBandDrumStaff { \global - \sideglobal << \new NullVoice = "format" { \repeat volta 2 { @@ -25,6 +24,7 @@ markTextEol = #(define-music-function (parser location text) (string?) #{ }%Format \new DrumVoice = "side" { + \sideglobal \snareA s4 \snareBA diff --git a/4-4_marches/scotland_the_brave/notes.side.ily b/4-4_marches/scotland_the_brave/notes.side.ily index c02fe89..f0256a1 100644 --- a/4-4_marches/scotland_the_brave/notes.side.ily +++ b/4-4_marches/scotland_the_brave/notes.side.ily @@ -1,7 +1,7 @@ % 4/4 Scotland the Brave % Snare \version "2.18.2" -composerSide = "" +composerSide = "v1.0" sideglobal = { \eighthBeaming } diff --git a/4-4_marches/wings/notes.side.ily b/4-4_marches/wings/notes.side.ily index d5d32da..ae3820d 100644 --- a/4-4_marches/wings/notes.side.ily +++ b/4-4_marches/wings/notes.side.ily @@ -1,15 +1,15 @@ % 4/4 Wings % Snare \version "2.18.2" -composerSide = "v1.1" +composerSide = "v1.2" sideglobal = { \eighthBeaming } %%music snareAAI = \drummode { - g8.)\fr g16 d8:32( g8) r8 d8:32(\dr \> g:32)([\< d8)] \!| - \flamd d16\fr \f g8 d16-> g16. g32 \flamd d8 d4:32(\dr \< d8)\fr \! d16. g32 | + sn8.)\fr g16 d8:32( g8) r8 d8:32(\dr \> g[:32)(-\staccato\< d8]) \!| + \flam d16 \f g8\fr d16-> g16. g32 \flam d8 d4:32(\dr \< d8)\fr \! d16. g32 | } @@ -18,19 +18,19 @@ snareAA = \drummode { \snareAAI } snareABA = \drummode { - d4:32(\dr \< d8) \! \flamg g8 d16 \flamg g8 g16 \flamd d8\fr d8:32( | - \tuplet 3/2 { g16) d g } \flamd d8 d16.[ g32 \dragd d8] d32 g d g d8 d8[:32~\dr \afterGrace g8]:32( {s8)\ofr} + d4:32(\dr \< d8) \! \flam g8 d16 \flam g8 g16 \flam d8\fr d8:32( | + \triplet { g16) d g } \flam d8 d16.[ g32 \drag d8] d32 g d g d8 d8-> :32~\dr \afterGrace g8->:32( {s8)\ofr} } snareABB = \drummode { - d4:32)( \< d8) \! \flamg g8 d32 g d g d8 d16.[ g32 \dragd d8] | + d4:32)( \< d8) \! \flam g8 d32 g d g d8 d16.[ g32 \drag d8] | d32 g d g d8 d4:32( d4) } % Part 2 snareBA = \drummode { d8:32(\dr | - g8) d16. g32 \flam d16. d32:128( d8) \flamd d8 d16. g32 d8:32(-> \< g8:32)(-> | - d8.)->\fr \! g16 d8:32( g16.) g32 d8:32( g16.) g32 \tuplet 3/2 { d16 g d-> } \tuplet 3/2 { g d g } | + g8) d16. g32 \flam d16. d32:128( d8) \flam d8 d16. g32 d8:32(-> \< g8:32)(-> | + d8.)->\fr \! g16 d8:32( g16.) g32 d8:32( g16.) g32 \sextuplet { d16[ g d-> g d g] } | - \flamdr d8 d16. g32-> d16. d32 \flamg g8 \flamd d4\fr \tuplet 3/2 { d16 \p g d } \flamg g8 | - \flamd d4 r4 d8[:32(->\dr \< g8]:32)(-> d8[:32)(-> \afterGrace g8]:32)(-> {s8)\!\ofr} -} \ No newline at end of file + \flamdr d8 d16. g32-> d16. d32 \flam g8 \flam d4\fr \triplet { <> \p d16 g d } \flam g8 | + \flam d4 r4 d8:32(\dr \< g8:32)(-> d8:32)(-> \afterGrace g8:32)(-> {s8)\!\ofr} +} diff --git a/4-4_marches/wings/side.ly b/4-4_marches/wings/side.ly index e485a8a..b403589 100644 --- a/4-4_marches/wings/side.ly +++ b/4-4_marches/wings/side.ly @@ -14,7 +14,6 @@ markTextEol = #(define-music-function (parser location text) (string?) #{ \score { \new PipeBandDrumStaff { \global - \sideglobal << \new NullVoice = "format" { \partial 8 s8 @@ -35,6 +34,7 @@ markTextEol = #(define-music-function (parser location text) (string?) #{ }%Format \new DrumVoice = "side" { + \sideglobal \snareAA \snareABA \snareABB r8 s8 diff --git a/4-4_marches/wings/side.nofine.ly b/4-4_marches/wings/side.nofine.ly index 67b879e..51fa633 100644 --- a/4-4_marches/wings/side.nofine.ly +++ b/4-4_marches/wings/side.nofine.ly @@ -8,21 +8,21 @@ \score { \new PipeBandDrumStaff { \global - \sideglobal << \new NullVoice = "format" { \partial 8 s8 \line \bar "||" - \line \bar "||" \break - \partial 8 s8 \line \bar "||" - \line \bar "|." + \partial 8 s8 \halfline \bar "||" + \halfline \bar "|." }%Format \new DrumVoice = "side" { \snareAA \snareABA - \removeWithTag #'tutti { \snareAAI \snareABB r8 s8 } - \snareBA - \removeWithTag #'tutti { \snareAAI \snareABB r8 s8 } + <>\dr + \removeWithTag #'tutti { \snareAAI \snareABB r8 s8 } \fr + \snareBA + <>\dr \mf + \removeWithTag #'tutti { \snareAAI \snareABB r8 s8 } \fr } >> }