diff --git a/strathspeys/orange_and_blue/notes.side.ily b/strathspeys/orange_and_blue/notes.side.ily index 883bb69..b4dae3c 100644 --- a/strathspeys/orange_and_blue/notes.side.ily +++ b/strathspeys/orange_and_blue/notes.side.ily @@ -1,7 +1,7 @@ % 4/4 Orange and Blue % Side \version "2.18.2" -composerSide = "E.T. de Boone, v0.7, Nov 2021" +composerSide = "E.T. de Boone, v0.7.2, Nov 2021" arrangerSide = "" sideglobal = { \sixteenthBeaming @@ -14,16 +14,17 @@ snareEnding = \drummode { } snareA = \drummode { \flam d16 g8. d4:32(\<\dr d8.)\!\fr g16 d16 d8. | - \triplet { \tutti{ g8-> } d16 d g8 } \triplet { d16 g d g d8 } \dragdr \triplet{ d8\< d \flam g } + \triplet { \tutti{ g8-> } d16 d g8 } \triplet { d16\dr g d g d8 } \drag g8.\fr \flam g16 - d4:32( | - d4)\!\fr \triplet { d16 g d g d8 } g16 d16:64( d8) g8. g16\dr | + \tutti{ d4:32(\< | + d4)\! } \triplet { d16 g d g d8 } \triplet { g8 d8:64( d8)} g8. g16\dr | d4:32( d8.) d16:64( d16)\fr g8.-> d32 g d g d8 % repeat \flamdr d16 g8.\fr d4:32(\< d8.)\! g16\dr d16 d8. | - \triplet { g8-> d16 d g8\fr } \triplet { d16 g d g d8 } \dragdr \triplet{ d8\< d \flam g } d4:32( | + \triplet { g8-> \fr d16 d g8 } \triplet { d16\dr g d g d8 } \drag g8. \flam g16 + d4:32(\< | d8.)\!\fr \snareEnding } @@ -31,9 +32,8 @@ snareB = \drummode { \flamdr d8.\fr d16:64( d8.) g16 d16:64(\dr d8.)\fr \flam d8. \flamdr g16 | \triplet { d8 d8 \flam g8 } \flam d8.\fr g16 \flam d8.[ \dragdr g16] - \triplet { d16\< g d g d8 } | - g4\v\!\fr \triplet { d16 d g g d8 } g4:32(->\< d4:32)(->\>\dr | + g4\v\!\fr \triplet { d16 d g g d8 } g4:32(\< d4:32)(->\>\dr | \triplet { g8)\! d g } \triplet { d16 g d g d8 } g8.\fr g16 \flam d4 | % repeat diff --git a/strathspeys/orange_and_blue/side.ly b/strathspeys/orange_and_blue/side.ly index 232c717..b9aec1e 100644 --- a/strathspeys/orange_and_blue/side.ly +++ b/strathspeys/orange_and_blue/side.ly @@ -8,7 +8,6 @@ \score { \new PipeBandDrumStaff { \global - \sideglobal << \new NullVoice = "format" { \line @@ -19,6 +18,7 @@ }%Format \new DrumVoice = "side" { + \sideglobal \snareA \snareB