From ddadefe2d9a028082686e1de8bc694680aecf4ae Mon Sep 17 00:00:00 2001 From: Eric Teunis de Boone Date: Sat, 12 Mar 2016 00:03:10 +0100 Subject: [PATCH 1/3] New version of bass for lmof --- .../lady_mackenzie_of_fairburn/notes.bass.ily | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/strathspeys/lady_mackenzie_of_fairburn/notes.bass.ily b/strathspeys/lady_mackenzie_of_fairburn/notes.bass.ily index 635f277..cf2e71d 100644 --- a/strathspeys/lady_mackenzie_of_fairburn/notes.bass.ily +++ b/strathspeys/lady_mackenzie_of_fairburn/notes.bass.ily @@ -1,25 +1,25 @@ % 4/4 Lady MacKenzie of Fairburn % Bass \version "2.18.2" -composerBass = "E.T. de Boone, v0.8, 2015" +composerBass = "E.T. de Boone, v0.9, 2015" bassA = \drummode { - bd4 bd4-> r4 bd4 + bd4 bd4-> \parenthesize bd4 bd4 | - bd4-> r4 bd4 r4 + bd4-> \parenthesize bd4 bd8. bd16 bd4-> | - bd4-> bd4 r4 bd4 + bd4-\v bd4 r4 bd4 | bd4 r4 bd4-> bd4 } bassBA = \drummode { - bd4 r4 bd4 bd | - bd4 r4 bd4 r4 | - bd4 bd4 bd4 bd | - bd8 bd8 r8 bd8 r8 bd8 bd4 | + bd4-\v r4 bd4 \< bd | + bd4->\! r4 bd4 r4 | + bd4-> bd4 bd4 bd | + bd8 bd8-> r8 bd8-> r8 bd8 bd4 | } bassBB = \drummode { - bd4 r4 bd4 bd | - bd4 r4 bd4 r4 | + bd4-\v r4 bd4 \< bd | + bd4-> \! r4 bd8. bd16 bd4 | bd4 bd4 bd8 bd8 r4 | - bd8 bd8 r8 bd8 r8 bd8 bd4 | -} \ No newline at end of file + bd8 bd8-> r8 bd8-> r8 bd8 bd4 | +} From 2bafd742025bf3d0b6ccfe41093a0d4cf9bc5bd3 Mon Sep 17 00:00:00 2001 From: Eric Teunis de Boone Date: Tue, 15 Mar 2016 15:46:32 +0100 Subject: [PATCH 2/3] Tenor scores for Black Bear and MacKenzie Highlanders Funny part added for the walrus --- 2-4_marches/black_bear/full.ly | 35 ++++++--- 2-4_marches/black_bear/notes.pipes.ily | 6 +- 2-4_marches/black_bear/notes.tenor.ily | 65 ++++++++++++++++ 2-4_marches/black_bear/tenor.ly | 37 +++++++++ 2-4_marches/mackenzie_highlanders/full.ly | 24 ++++-- .../mackenzie_highlanders/notes.tenor.ily | 77 +++++++++++++++++++ 2-4_marches/mackenzie_highlanders/tenor.ly | 36 +++++++++ hornpipes/the_walrus/full.ly | 7 +- hornpipes/the_walrus/notes.side.ily | 29 ++++++- hornpipes/the_walrus/side.ly | 4 + template/drums.ly | 12 +-- template/full.ly | 12 +-- template/pipes.ly | 2 +- 13 files changed, 309 insertions(+), 37 deletions(-) create mode 100644 2-4_marches/black_bear/notes.tenor.ily create mode 100644 2-4_marches/black_bear/tenor.ly create mode 100644 2-4_marches/mackenzie_highlanders/notes.tenor.ily create mode 100644 2-4_marches/mackenzie_highlanders/tenor.ly diff --git a/2-4_marches/black_bear/full.ly b/2-4_marches/black_bear/full.ly index 529a3ff..f93640d 100644 --- a/2-4_marches/black_bear/full.ly +++ b/2-4_marches/black_bear/full.ly @@ -2,7 +2,7 @@ \include "config.ily" %\include "notes.bass.ily" -%\include "notes.tenor.ily" +\include "notes.tenor.ily" \include "notes.side.ily" \include "notes.pipes.ily" @@ -36,16 +36,29 @@ \snareBA \snareBB } -% \new PipeBandDrumStaff = "bass" { -% \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass } -% \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass} -% -% } -% \new PipeBandDrumStaff = "tenor" { -% \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor } -% \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor } -% -% } + \new PipeBandDrumStaff = "tenor" { + \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor } + \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor } + + \tenorglobal + + \tenorA s8 + + \tenorBA + \tenorBB s8 + } + \new PipeBandDrumStaff = "bass" { + \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass } + \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass} + s8 + s2*7 + s4 s4 + + s8 + s2*8 + s2*7 + s4 s4 + } >> \header { title = \title diff --git a/2-4_marches/black_bear/notes.pipes.ily b/2-4_marches/black_bear/notes.pipes.ily index 8b7dc84..8a4e36a 100644 --- a/2-4_marches/black_bear/notes.pipes.ily +++ b/2-4_marches/black_bear/notes.pipes.ily @@ -7,7 +7,7 @@ pipesA = { \thrwd d8 [ \dbld d8 ] \grg f16.[ d32 A16. f32 ]| \thrwd d8 [ \dbld d8 ] \grg f16.[ d32 A16. f32 ]| \dble e8 [ \grg b8 ] \grip b8 [ \grg e16 d16 ] | - \grg c32 [ d16. ] \grg b32 [ \grd c16. ] \grg a16. [ b32 \grg c32 \grd a16. ] + \grg c32 [ d16. \grg b32 \grd c16. ] \grg a16. [ b32 \grg c32 \grd a16. ] \thrwd d8 [ \dbld d8 ] \grg f16. [ d32 A16. f32 ] | \thrwd d8 [ \dbld d8 ] \grg f16. [ d32 A16. f32 ] | @@ -16,7 +16,7 @@ pipesA = { } pipesB = { e8 | - \grg a16. [ \grd a32 a16 ] \grd b16 ] \thrwd d8 [ \grg d16 e16 ] | + \grg a16. [ \grd a32 a16 \grd b16 ] \thrwd d8 [ \grg d16 e16 ] | \dblg g8 [ \grA f16 e16 ] \grg f32 [ A16. f16. d32 ] | \grg a16. [ \grd a32 a16 ] \grd b16 ] \thrwd d8 [ \grg d16 e16 ] | \dblg g8 [ \grA f16 e16 ] \grg f32 [ A16. f16. d32 ] | @@ -30,7 +30,7 @@ pipesCA = { \thrwd d8 [ \dbld d8 ] \grg f16. [ d32 A16. f32 ] | \thrwd d8 [ \dbld d8 ] \grg f16. [ d32 A16. f32 ] | \dble e8 [ \grg b8 ] \grip b8 [ \grg e16 d16 ] | - \grg c32 [ d16. ] \grg b32 [ \grd c16. ] \grg a16. [ b32 \grg c32 \grd a16. ] + \grg c32 [ d16. \grg b32 \grd c16. ] \grg a16. [ b32 \grg c32 \grd a16. ] \thrwd d8 [ \dbld d8 ] \grg f16. [ d32 A16. f32 ] | \thrwd d8 [ \dbld d8 ] \grg f16. [ d32 A16. f32 ] | diff --git a/2-4_marches/black_bear/notes.tenor.ily b/2-4_marches/black_bear/notes.tenor.ily new file mode 100644 index 0000000..b657fc5 --- /dev/null +++ b/2-4_marches/black_bear/notes.tenor.ily @@ -0,0 +1,65 @@ +% 2/4 Black Bear +% Tenor +\version "2.18.2" +composerTenor = "F.J. de Boone, v0.5, 2016" +tenorglobal = {} +% Music +tenorApiece = \drummode { + r4 + d16. g32 d16. g32 + | + r4 + d16. g32 d16. g32 + | + r2 + | + d32 g16. d32 g16. + r4 + | + + r4 + d16. g32 d16. g32 + | + r4 + d16. g32 d16. g32 + | + r4 + d16. g32 d16. g32 + | + r4 r8 +} +tenorA = \drummode { + r8 | + \tenorApiece +} + +tenorBA = \drummode { + d8 | + g16. g32 d16. d32 + r4 + | + r4 + d32 g16. g32 d16. + | + d16. g32 d16. d32 + r4 + | + r4 + d32 g16. g32 d16. + | + + d32 g16. d32 g16. + g32 d16. g32 d16. + | + d32 g16. d32 g16. + g32 d16. g32 d16. + | + d16. g32 d16. d32 + g16. d32 g16. g32 + | + r4 + d16. g32 g16. d32 +} +tenorBB = \drummode { + \tenorApiece +} diff --git a/2-4_marches/black_bear/tenor.ly b/2-4_marches/black_bear/tenor.ly new file mode 100644 index 0000000..edf6af8 --- /dev/null +++ b/2-4_marches/black_bear/tenor.ly @@ -0,0 +1,37 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.tenor.ily" + +\score { + \new PipeBandDrumStaff { + \global + \tenorglobal + << + { + \repeat volta 2 { + \part \line + } + + \break + \part \line + \bar "||" \break + \line \bar "|." + + }%Format + { + \tenorA s8 + + \tenorBA + \tenorBB + + } + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentTenor + composer = \composerTenor + } +} diff --git a/2-4_marches/mackenzie_highlanders/full.ly b/2-4_marches/mackenzie_highlanders/full.ly index abeea5f..bdadcac 100644 --- a/2-4_marches/mackenzie_highlanders/full.ly +++ b/2-4_marches/mackenzie_highlanders/full.ly @@ -2,7 +2,7 @@ \include "config.ily" \include "notes.bass.ily" -%\include "notes.tenor.ily" +\include "notes.tenor.ily" \include "notes.side.alt.ily" \include "notes.pipes.ily" @@ -27,34 +27,46 @@ \pipesB \pipesBA + \pipesB \pipesBB }%Pipes >> } \new PipeBandDrumStaff = "side" { + \sideglobal \set PipeBandDrumStaff.instrumentName = \markup \column {\instrumentSide} \set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide} \snareA s8 + \snareBA + \snareBB } + \new PipeBandDrumStaff = "tenor" { + \tenorglobal + \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor } + \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor } + + r8 \tenorA s8 + + \tenorBA + + \tenorBB s8 + } \new PipeBandDrumStaff = "bass" { + \bassglobal \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass } \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass} s8 \bassA s8 \bassBA + \bassBB } -% \new PipeBandDrumStaff = "tenor" { -% \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor } -% \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor } -% -% } >> \header { title = \title diff --git a/2-4_marches/mackenzie_highlanders/notes.tenor.ily b/2-4_marches/mackenzie_highlanders/notes.tenor.ily new file mode 100644 index 0000000..61e43d2 --- /dev/null +++ b/2-4_marches/mackenzie_highlanders/notes.tenor.ily @@ -0,0 +1,77 @@ +% 2/4 MacKenzie Highlanders +% Tenor +\version "2.18.2" +composerTenor = "F.J. de Boone, v0.5, 2016" +tenorglobal = {} +% Music + +tenorA = \drummode { + r8 d16. g32 + r8 d16. g32 + | + d4 r8 g8 + | + r8 d16. g32 + r8 d16. g32 + | + r4 d4 + | + + r8 d16. g32 + r8 d16. g32 + | + d4 r8 g8 + | + r8 d32 g16. + r8 d32 g16. + | + r4 r8 +} +tenorBA = \drummode { + g8 | + r8 d32 g16. + r8 d32 g16. + | + d4 + r8 g8 + | + r8 d32 g16. + r8 d32 g16. + | + r4 + d8 g8 + | + + r8 d32 g16. + r8 d32 g16. + | + d4 r8 g8 + | + r8 d32 g16. + r8 d32 g16. + | + r4 r8 +} +tenorBB = \drummode { + g8 | + r8 d32 g16. + r8 d32 g16. + | + d4 + r8 g8 + | + r8 d32 g16. + r8 d32 g16. + | + r4 + d8 g8 + | + + \repeat unfold 3 + { + r8 d32 g16. + r8 d32 g16. + | + } + r4 r8 +} diff --git a/2-4_marches/mackenzie_highlanders/tenor.ly b/2-4_marches/mackenzie_highlanders/tenor.ly new file mode 100644 index 0000000..e6f2ba6 --- /dev/null +++ b/2-4_marches/mackenzie_highlanders/tenor.ly @@ -0,0 +1,36 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.tenor.ily" + +\score { + \new PipeBandDrumStaff { + \global + \tenorglobal + << + { + \repeat volta 2 { + \line + } + + \part \line + \bar "||" + \break + + \part \line \bar "|." + }%Format + { + \tenorA + + \tenorBA + \tenorBB + } + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentTenor + composer = \composerTenor + } +} diff --git a/hornpipes/the_walrus/full.ly b/hornpipes/the_walrus/full.ly index a0e058f..36cdd0d 100644 --- a/hornpipes/the_walrus/full.ly +++ b/hornpipes/the_walrus/full.ly @@ -54,6 +54,10 @@ \snareBA \snareBBA s8 \snareAB s8 + + \snareCA + \snareCBA s8 + \snareBBA s8 } \new PipeBandDrumStaff = "bass" { \bassglobal @@ -74,9 +78,6 @@ % \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor } % } >> - \midi { - \tempo 4 = 90 - } \header { title = \title meter = \meter diff --git a/hornpipes/the_walrus/notes.side.ily b/hornpipes/the_walrus/notes.side.ily index e7a7942..a05cd99 100644 --- a/hornpipes/the_walrus/notes.side.ily +++ b/hornpipes/the_walrus/notes.side.ily @@ -1,7 +1,7 @@ % 2/4 The Walrus % Side \version "2.18.2" -composerSide = "E.T. de Boone, v0.2, 2016" +composerSide = "E.T. de Boone, v0.2.9, 2016" sideglobal = { \eighthBeaming } @@ -59,3 +59,30 @@ snareBBA = \drummode { d16 d:64( d) g \flam d8 } +snareCA = \drummode { + d16 g | + \flam d16 \< \flam g8 \! g16 + d8:32( g16) \flam g16 + | + r16 \flam d8 g16 + d32 g d g d16. g32 + | + \flam d16 g32 g d16 \flam g16 + d32 g d g d16 g-> + | + d16:64( g8:32)(-> d16:64)(-> + g16:64 g16:64)(-> d)-> g16 | +} +snareCBA = \drummode { + \flam d16 \< \flam g8 \! g16 + d8:32( g16) \flam g16 + | + r16 \flam d8 g16 + \triplet { d16 g16 d16 } \flam g16. g32 + | + d16 g32 g d16 \flam g + d32 g d g d16 g16 + | + d16 d:64( d) g + \flam d8 +} diff --git a/hornpipes/the_walrus/side.ly b/hornpipes/the_walrus/side.ly index c15db1a..3c66f04 100644 --- a/hornpipes/the_walrus/side.ly +++ b/hornpipes/the_walrus/side.ly @@ -27,6 +27,10 @@ \snareBA \snareBBA s8 \snareAB s8 + + \snareCA + \snareCBA s8 + \snareBBA s8 } >> } diff --git a/template/drums.ly b/template/drums.ly index 4ad9532..dbfe2f0 100644 --- a/template/drums.ly +++ b/template/drums.ly @@ -18,18 +18,18 @@ { }%Music >> } - \new PipeBandDrumStaff = "bass" { - \bassglobal - \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass } - \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass} - - } \new PipeBandDrumStaff = "tenor" { \tenorglobal \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor } \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor } } + \new PipeBandDrumStaff = "bass" { + \bassglobal + \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass } + \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass} + + } >> \header { title = \title diff --git a/template/full.ly b/template/full.ly index 8728cdf..333ac3c 100644 --- a/template/full.ly +++ b/template/full.ly @@ -23,12 +23,6 @@ \set PipeBandDrumStaff.instrumentName = \markup \column {\instrumentSide} \set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide} - } - \new PipeBandDrumStaff = "bass" { - \bassglobal - \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass } - \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass} - } \new PipeBandDrumStaff = "tenor" { \tenorglobal @@ -36,6 +30,12 @@ \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor } } + \new PipeBandDrumStaff = "bass" { + \bassglobal + \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass } + \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass} + + } >> \header { title = \title diff --git a/template/pipes.ly b/template/pipes.ly index 594c956..1b28246 100644 --- a/template/pipes.ly +++ b/template/pipes.ly @@ -20,7 +20,7 @@ } } \score { - \new Staff { \global \pipeglobal \pipeKey + \new Staff { \global \pipeglobal \set Staff.midiInstrument = #"bagpipe" %%Tune } From d8ef790ade2b230a555b31cdc7cd63bc468caf52 Mon Sep 17 00:00:00 2001 From: Eric Teunis de Boone Date: Tue, 15 Mar 2016 16:33:09 +0100 Subject: [PATCH 3/3] Added quite a few sets Small update to make_set script --- 2-4_marches/mackenzie_highlanders/tenor.ly | 12 ++--- init-sets | 57 ++++++++++++++++++++-- make-set | 10 ++-- 3 files changed, 62 insertions(+), 17 deletions(-) diff --git a/2-4_marches/mackenzie_highlanders/tenor.ly b/2-4_marches/mackenzie_highlanders/tenor.ly index e6f2ba6..abb1e08 100644 --- a/2-4_marches/mackenzie_highlanders/tenor.ly +++ b/2-4_marches/mackenzie_highlanders/tenor.ly @@ -10,20 +10,18 @@ << { \repeat volta 2 { - \line + \part \line } - - \part \line - \bar "||" \break - \part \line \bar "|." + \part \line \bar "||" \break + \line \bar "|." }%Format { - \tenorA + r8 \tenorA s8 \tenorBA - \tenorBB + \tenorBB s8 } >> } diff --git a/init-sets b/init-sets index 4b2a1c0..40551bf 100644 --- a/init-sets +++ b/init-sets @@ -6,7 +6,12 @@ trap "echo Aborted!; exit;" SIGINT SIGTERM for f in full drums side pipes tenor bass; do -$COM $D/mackenzie_set.$f.ly \ +$COM $D/mackenzie_bear.$f.ly \ +2-4_marches/mackenzie_highlanders/$f.ly \ +2-4_marches/black_bear/$f.ly \ +; + +$COM $D/mackenzie_msr.$f.ly \ 2-4_marches/mackenzie_highlanders/$f.ly \ strathspeys/lady_mackenzie_of_fairburn/$f.ly \ reels/the_mackenzies_reel/$f.ly \ @@ -23,6 +28,12 @@ $COM $D/set_2.$f.ly \ 2-4_marches/mairis_wedding/$f.ly \ ; +$COM $D/set_4.$f.ly \ +3-4_marches/collins_cattle/$f.ly \ +3-4_marches/my_land/$f.ly \ +3-4_marches/shoals_of_herring/$f.ly \ +; + $COM $D/set_5.$f.ly \ 4-4_marches/scotland_the_brave/$f.ly \ 4-4_marches/wings/$f.ly \ @@ -30,10 +41,25 @@ $COM $D/set_5.$f.ly \ 4-4_marches/scotland_the_brave/$f.ly \ ; -$COM $D/set_11.$f.ly \ -4-4_marches/flett_from_flotta/$f.ly \ -4-4_marches/crusaders_march/$f.ly \ -4-4_marches/the_pikemans_march/$f.ly \ +$COM $D/set_6.$f.ly \ +4-4_marches/bonnie_lass_o_fyvie/$f.ly \ +4-4_marches/cockney_jocks/$f.ly \ +; + +$COM $D/set_7.$f.ly \ +4-4_marches/51st_highlanders/$f.ly \ +4-4_marches/scotland_the_brave/$f.ly \ +; + +$COM $D/set_8.$f.ly \ +6-8_marches/10th_hli_crossing_the_rhine/$f.ly \ +6-8_marches/farewell_to_the_creeks/$f.ly \ +6-8_marches/cock_o_the_north/$f.ly \ +; + +$COM $D/set_9.$f.ly \ +airs/the_mist_covered_mountains/$f.ly \ +airs/my_home/$f.ly \ ; $COM $D/set_10.$f.ly \ @@ -42,6 +68,27 @@ airs/morag_of_dunvegan/$f.ly \ 4-4_marches/were_no_awa_tae_bide_awa/$f.ly \ ; +$COM $D/set_11.$f.ly \ +4-4_marches/flett_from_flotta/$f.ly \ +4-4_marches/crusaders_march/$f.ly \ +4-4_marches/the_pikemans_march/$f.ly \ +; + +$COM $D/set_12.$f.ly \ +4-4_marches/the_leaving_of_liverpool/$f.ly \ +4-4_marches/the_old_rustic_bridge/$f.ly \ +; + +$COM $D/set_14.$f.ly \ +4-4_marches/minstrel_boy/$f.ly \ +2-4_marches/pipers_cave/$f.ly \ +; + +$COM $D/set_15.$f.ly \ +3-4_marches/on_the_road_to_passchendaele/$f.ly \ +4-4_marches/hills_of_argyll/$f.ly \ +; + $COM $D/alexander_mackenzie_cullen_bay.$f.ly \ airs/alexander_mackenzie/$f.ly \ 5-4_marches/cullen_bay/$f.ly \ diff --git a/make-set b/make-set index 431d406..a846468 100644 --- a/make-set +++ b/make-set @@ -1,8 +1,7 @@ #!/bin/python3 - ## Script to easily generate a set (concatenated scores) -import codecs, os +import codecs, os, sys from argparse import ArgumentParser parser = ArgumentParser(__file__) @@ -12,6 +11,10 @@ parser.add_argument('scores',nargs='+') args = parser.parse_args() +if os.path.isdir(args.setfile): + print("First argument cannot be a directory ") + sys.exit() + os.makedirs(os.path.dirname(args.setfile), exist_ok=True) fpoint = codecs.open(args.setfile, 'w+', 'utf8') fpoint.write(u'\ufeff') @@ -40,6 +43,3 @@ for f in args.scores: fpoint.write('\\include \"' + os.path.join( os.path.abspath( os.curdir ) ,f) + '\"\n') fpoint.close() - - -