diff --git a/6-8_marches/kilaloe/config.ily b/6-8_marches/kilaloe/config.ily index 1c8829a..3b1bde9 100644 --- a/6-8_marches/kilaloe/config.ily +++ b/6-8_marches/kilaloe/config.ily @@ -14,4 +14,5 @@ line = { \repeat unfold 2 { \halfline } } %% Headers title = "Kilaloe" -meter = "Regimental March Past of The Royal Irish Rangers" +info = "Regimental March Past of The Royal Irish Rangers" +meter = "March" diff --git a/6-8_marches/kilaloe/notes.side.48th.ily b/6-8_marches/kilaloe/notes.side.48th.ily deleted file mode 100644 index 7695287..0000000 --- a/6-8_marches/kilaloe/notes.side.48th.ily +++ /dev/null @@ -1,43 +0,0 @@ -% 6/8 Kilaloe -% Side -\version "2.18.2" -composerSide = "" -arrangerSide = "2018" -sideglobal = {} - -% Music -snareA = \drummode { - d4.:32(\< | - d4)\! g8 \flam d4 g8 | - d4.:32( d4.:32)(\<| - d4) \!g8 \flam d8 g d | - g4.:32( d4.:32)(\<| - d4)\! g8 \flam d4 d8:32( | - d8) g d \flam g8 d g | - \flam d4. d4.:32( | - d4.) -} -snareB = \drummode { \snareA } - -snareC = \drummode { - \flam d8\< g d | - \flam g4\! g8 \flam d4 g8 | - d4.:32( d8)\< g d | - \flam g4\! g8 \flam d4 g8 | - d4.:32( d8)\< g d | - \flam g4\! g8-> d8 g d-> | - g8 d g-> d g d-> | - \flam g4-> g8 d4.:32( | - d4.) - - d4.:32( | - d4) g8 \flam d4 g8 | - d2.:32( | - d4.) \flam d8 g d | - g2.:32( | - d4) g8:32( g4) d8:32( | - d8) g d \flam d4. | - r4. r4 d8:32( | - d8) g d \flam d4 g8 | - d4.:32( -} diff --git a/6-8_marches/kilaloe/notes.side.ily b/6-8_marches/kilaloe/notes.side.ily index dd125fa..48dcd56 100644 --- a/6-8_marches/kilaloe/notes.side.ily +++ b/6-8_marches/kilaloe/notes.side.ily @@ -2,44 +2,42 @@ % Side \version "2.18.2" composerSide = "" -arrangerSide = "" +arrangerSide = "2018" sideglobal = {} -\include "../../standards/68_standards.side.ily" % Music -endfour = \drummode { - \flam d4. d4.:32( - | +snareA = \drummode { + d4.:32(\< | + d4)\! g8 \flam d4 g8 | + d4.:32( d4.:32)(\<| + d4) \!g8 \flam d8 g d | + g4.:32( d4.:32)(\<| + d4)\! g8 \flam d4 d8:32( | + d8) g d \flam g8 d g | + \flam d4. d4.:32( | d4.) } -pone = \drummode {\pempty} -ptwo = \drummode {\pone} -pthree = \drummode { \pempty } -pthreeb = \drummode {s8 | s2. | s4. \flam d4. |} -pfour = \drummode { \pthree } -pfourb = \drummode {\pthreeb} +snareB = \drummode { \snareA } +snareC = \drummode { + \flam d8\< g d | + \flam g4\! g8 \flam d4 g8 | + d4.:32( d8)\< g d | + \flam g4\! g8 \flam d4 g8 | + d4.:32( d8)\< g d | + \flam g4\! g8-> d8 g d-> | + g8 d g-> d g d-> | + \flam g4-> g8 d4.:32( | + d4.) -snareA = \drummode { - \pone \midone \pone \endfour + d4.:32( | + d4) g8 \flam d4 g8 | + d2.:32( | + d4.) \flam d8 g d | + g2.:32( | + d4) d8:32( g4) d8:32( | + g8) d g \flam d4. | + r4.^\markup{Yell} r4 d8:32( | + g8) d g \flam d4 g8 | + d4.:32( } - -snareB = \drummode { - \ptwo \midone \ptwo \endfour -} - -snareCA = \drummode { - \pthree \midone \pthree \endfour -} -snareCB = \drummode { - \pthree \midone \pthreeb | r2.^\markup{Yell} \endfour -} - -snareDA = \drummode { - \pfour \midone \pfour \endfour -} -snareDB = \drummode { - \pfour \midone \pfourb | r2.^\markup{Yell} \endfour -} - - diff --git a/6-8_marches/kilaloe/side.48th.ly b/6-8_marches/kilaloe/side.48th.ly deleted file mode 100644 index 47ea817..0000000 --- a/6-8_marches/kilaloe/side.48th.ly +++ /dev/null @@ -1,54 +0,0 @@ -\version "2.18.2" - -\include "lilydrum.ly" - -\include "./config.ily" -\include "./notes.side.48th.ily" - -part = {\partial 4. \grace{ s4 } s4. } -\score { - \new PipeBandDrumStaff { - \global - \sideglobal - << - \new NullVoice = "format" { - \repeat volta 2 { - \part - \line - } - \break - \repeat volta 2 { - \part - \line - } - \break - - \repeat volta 2 { - \part - \line - \break - \line - \measure - } - - }%Format - - \new DrumVoice = "side" { - \snareA s4. - - \snareB s4. - - \snareC - - } - >> - } - \header { - title = \title - band = "48th HIGHRS" - meter = \meter - instrument = \instrumentSide - composer = \composerSide - arranger = \arrangerSide - } -} diff --git a/6-8_marches/kilaloe/side.ly b/6-8_marches/kilaloe/side.ly index f0d7167..333653e 100644 --- a/6-8_marches/kilaloe/side.ly +++ b/6-8_marches/kilaloe/side.ly @@ -5,6 +5,7 @@ \include "./config.ily" \include "./notes.side.ily" +part = {\partial 4. \grace{ s4 } s4. } \score { \new PipeBandDrumStaff { \global @@ -21,40 +22,31 @@ \line } \break - - \part - \line - \break - \line - \measure - - \break - \part - \line - \break - \line - \measure - + + \repeat volta 2 { + \part + \line + \break + \line + \measure + } }%Format - + \new DrumVoice = "side" { - \snareA r4 s8 + \snareA s4. - \snareB r4 s8 + \snareB s4. - \snareCA r4 - \snareCB r4 s8 + \snareC - \snareDA r4 - \snareDB r4 s8 - } >> } \header { title = \title meter = \meter + info = \info instrument = \instrumentSide composer = \composerSide arranger = \arrangerSide diff --git a/airs/bells_of_dunblane/notes.side.ily b/airs/bells_of_dunblane/notes.side.ily index b8208ba..447b9ac 100644 --- a/airs/bells_of_dunblane/notes.side.ily +++ b/airs/bells_of_dunblane/notes.side.ily @@ -34,7 +34,8 @@ snarePIV = \drummode { | } snarePV = \drummode { - \flamg \backstick g1 + \mark \markup "Fine" + \flamg \backstick g1 } snareA = \drummode { diff --git a/airs/highland_cathedral/notes.tenor.cmpd.ily b/airs/highland_cathedral/notes.tenor.cmpd.ily index 97fa87e..ae5adf9 100644 --- a/airs/highland_cathedral/notes.tenor.cmpd.ily +++ b/airs/highland_cathedral/notes.tenor.cmpd.ily @@ -6,11 +6,11 @@ arrangerTenor = "" tenorglobal = {} % Music stfe = \drummode { - \stf 2 + \stf d2 } tenorAA = \drummode { - \flourish { g8[ g] d8[ d] } \stfe | + \flourish { d8[ d] g8[ g] } \stfe | } tenorA = \drummode { \repeat percent 8 { @@ -24,8 +24,8 @@ tenorB = \drummode { d4\< g\! d4 r4 | } d2 g2 | - g8 d g8 d g8 d g8 d | - g8 d g8 d g8 d g8 d | + d8 g d8 g d8 g d8 g | + d8 g d8 g d8 g d8 g | } tenorC = \drummode { diff --git a/airs/highland_cathedral/tenor.cmpd.ly b/airs/highland_cathedral/tenor.cmpd.ly index 1f3d543..625aed9 100644 --- a/airs/highland_cathedral/tenor.cmpd.ly +++ b/airs/highland_cathedral/tenor.cmpd.ly @@ -20,11 +20,14 @@ \bar "||" \break - \line + \line + \break \bar "||" \line \measure \bar "|." + \break + \line }%Format \new DrumVoice = "tenor" { \repeat percent 8 { diff --git a/airs/morag_of_dunvegan/notes.side.ily b/airs/morag_of_dunvegan/notes.side.ily index b5ad264..2588a79 100644 --- a/airs/morag_of_dunvegan/notes.side.ily +++ b/airs/morag_of_dunvegan/notes.side.ily @@ -3,6 +3,7 @@ \version "2.18.2" sideglobal={} composerSide="2018, v1.1" +arrangerSide = "E.T. de Boone" snareA = \drummode { \flam d8 d8:32( g8) \flam d8 r8 \flam d8 | g8 d8:32( g8) \flam d8 \tuplet 3/2 { d16 g d } g8 | diff --git a/airs/rose_of_kelvingrove/notes.tenor.ily b/airs/rose_of_kelvingrove/notes.tenor.ily index e1f4cd3..c7eaf6a 100644 --- a/airs/rose_of_kelvingrove/notes.tenor.ily +++ b/airs/rose_of_kelvingrove/notes.tenor.ily @@ -1,53 +1,53 @@ % 4/4 Rose of Kelvingrove % Tenor \version "2.18.2" -composerTenor = "" +composerTenor = "v0.5, 2019" arrangerTenor = "" tenorglobal = {} % Music stfe = \drummode { - \stfd2 + \stf d2 } -xg = \drummode { - g8^\markup{ "x" } +pianomotion = \drummode { + d8\startGroup^\markup{"piano"} g d g8\stopGroup } tenorA = \drummode { \repeat percent 3 { - g4 d4 \stfe | + d4 g4 \stf d2 | } - g4 d4 d8 g d \xg | + d4 g4 \pianomotion| \repeat percent 2 { - g4 d4 \stfe | + d4 g4 \stf d2 | } - g4 d4 d8 g d \xg | - g4 d4 \stfe | + d4 g4 \pianomotion| + d4 g4 \stf d2 | } tenorB = \drummode { \repeat percent 2 { - g4 d4 \stfe | - g4 d4 d8 g d \xg | + d4 g4 \stf d2 | + d4 g4 \pianomotion| } \repeat percent 2 { - g4 d4 \stfe | + d4 g4 \stf d2 | } - g4 d4 d8 g d \xg | - g4 d4 \stfe | + d4 g4 \pianomotion| + d4 g4 \stf d2 | } tenorC = \drummode { \tenorA } tenorD = \drummode { \repeat percent 2 { - g4 d4 \stfe | - g4 d4 d8 g d \xg | + d4 g4 \stf d2 | + d4 g4 \pianomotion| } \repeat percent 3 { - g4 d4 \stfe | + d4 g4 \stf d2 | } - \stfe \stfe \stfe + \stf d2 \stf d2 \stf d2 } diff --git a/standards/standards.bass.ily b/standards/standards.bass.ily index 0e8cdb4..707488c 100644 --- a/standards/standards.bass.ily +++ b/standards/standards.bass.ily @@ -15,7 +15,15 @@ bassFourfoursOne = \drummode { } bassSixeightsOne = \drummode { - \repeat unfold 8 { d4. g4. } + d4. g4. | + d4. r4. | + d4. g4 g8 | + d4 d8 g4. | + + d4. g4. | + d4. r4. | + d4. g4. | + d4. d4. | } bassNineeightsOne = \drummode { diff --git a/standards/standards.mid.cmpd.ly b/standards/standards.mid.cmpd.ly index a8f967b..6955079 100644 --- a/standards/standards.mid.cmpd.ly +++ b/standards/standards.mid.cmpd.ly @@ -18,6 +18,7 @@ % ---------------------- % Standard 2/4 % ---------------------- +#(set-global-staff-size 18) \score { \new StaffGroup << \time 2/4 @@ -25,21 +26,21 @@ \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor } \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor } - \repeat volta 2 { - \tenorTwoFoursFII - } + \tenorTwoFoursPI + \bar "||" \break - \repeat volta 2 { - \tenorTwoFoursFIII - } + \tenorTwoFoursFII + \bar "||" \break - \repeat volta 2 { - \tenorTwoFoursFIV - } + \tenorTwoFoursFIII + \bar "||" \break - \repeat volta 2 { - \tenorTwoFoursFV - } + \tenorTwoFoursFIV + \bar "||" + \break + \tenorTwoFoursFV + \bar "||" + } \new PipeBandDrumStaff = "bass" { \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass } @@ -53,7 +54,6 @@ band = "" % Make Sure the band is not displayed } } - % ---------------------- % Standard 3/4 % ---------------------- @@ -76,7 +76,6 @@ \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass} \bassThreefoursOne - \bassThreefoursOne } >> \header { @@ -108,7 +107,6 @@ \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass} \bassSixeightsOne - \bassSixeightsOne } >> \header { @@ -137,8 +135,7 @@ \new PipeBandDrumStaff = "bass" { \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass } \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass} - - \bassNineeightsOne + \bassNineeightsOne } >> diff --git a/standards/standards.tenor.cmpd.ly b/standards/standards.tenor.cmpd.ly index f1cf6e6..30b67bd 100644 --- a/standards/standards.tenor.cmpd.ly +++ b/standards/standards.tenor.cmpd.ly @@ -12,21 +12,20 @@ \time 2/4 \drummode { - \repeat volta 2 { - \tenorTwoFoursFII - } + \tenorTwoFoursPI + \bar "||" \break - \repeat volta 2 { - \tenorTwoFoursFIII - } + \tenorTwoFoursFII + \bar "||" \break - \repeat volta 2 { - \tenorTwoFoursFIV - } + \tenorTwoFoursFIII + \bar "||" \break - \repeat volta 2 { - \tenorTwoFoursFV - } + \tenorTwoFoursFIV + \bar "||" + \break + \tenorTwoFoursFV + \bar "||" } } diff --git a/standards/standards.tenor.ily b/standards/standards.tenor.ily index 740ac99..34a3395 100644 --- a/standards/standards.tenor.ily +++ b/standards/standards.tenor.ily @@ -29,8 +29,15 @@ tenorTwofoursOneB = \drummode { d4\splitTheFeather r | } +tenorTwoFoursPI = \drummode { + \repeat unfold 2 { + d4^\markup{"Swing"} \flourish { d4 g d } | + } + d4^\markup{"Swing"} \flourish { d4 g d } | + d4^\markup{"Swing"} d4 g4 \stf d4 | +} -tenorTwoFoursII = \drummode { +tenorTwoFoursPII = \drummode { d8-> g d8 g | d8-> g d8 g | d8^\markup{"M"} g^\markup{"L"} \triplet { d8 g^\markup{"H"} d } g^\markup{"H"} |