diff --git a/.gitignore b/.gitignore index 295adde..967a2b9 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ to_process/ +sets/ diff --git a/3-4_marches/on_the_road_to_passchendaele/full.ly b/3-4_marches/on_the_road_to_passchendaele/full.ly index dc13991..ead296e 100644 --- a/3-4_marches/on_the_road_to_passchendaele/full.ly +++ b/3-4_marches/on_the_road_to_passchendaele/full.ly @@ -15,8 +15,7 @@ \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentPipes } << { - \repeat volta 2 { \line } - \break + \repeat volta 2 { \line } \break \repeat volta 2 { \halfline } \alternative { {\halfline} diff --git a/3-4_marches/on_the_road_to_passchendaele/notes.pipes.ily b/3-4_marches/on_the_road_to_passchendaele/notes.pipes.ily index 9f13b72..7b2a6c6 100644 --- a/3-4_marches/on_the_road_to_passchendaele/notes.pipes.ily +++ b/3-4_marches/on_the_road_to_passchendaele/notes.pipes.ily @@ -9,7 +9,7 @@ pipesA = { \grg a8. [ b16 ] \grip c4~ c8 [ \grG c8 ] | \grg d8 [ f8 ] \dble e4 c4 | \grg a8. [ b16 ] \grip c4~ c8 [ e8 ] | - \grg f8 [ ( e8 c8 ] ) \grg b2 | + \grg \triplet { f8 e8 c8 } \grg b2 | \grg a8. [ b16 ] \grip c4~ c8 [ \grG c8 ] | \grg d8 [ f8 ] \dble e4 c4 | @@ -21,7 +21,7 @@ pipesB = { \grg f8. [ g16 ] \dblA A4~ A8 [ g8 ] | \grA f8 [ A8 ] \hdble e4 \grd c4 | \grg a8. [ b16 ] \grip c4~ c8 [ f8 ] | - \dble e8 [ ( d8 c8 ] ) \grg b2 + \dble \triplet { e8 [ d8 c8 ] } \grg b2 } pipesBA = { diff --git a/4-4_marches/the_leaving_of_liverpool/leav.ly b/4-4_marches/the_leaving_of_liverpool/leav.ly deleted file mode 100644 index 29529fa..0000000 --- a/4-4_marches/the_leaving_of_liverpool/leav.ly +++ /dev/null @@ -1,55 +0,0 @@ -\include "bagpipe.ly" -melody = { - \set Staff.midiInstrument = #"bagpipe" - \hideKeySignature - \cadenzaOn - \once \override Score.BreakAlignment #'break-align-orders = - #(make-vector 3 '(instrument-name - left-edge - ambitus - span-bar - breathing-sign - clef - key-signature - time-signature - staff-bar - custos - span-bar)) - \time 4/4 - \grg a8. [ b16 ] \bar "|" - \grip c4 \dblc c8 [ e8 ] \thrwd d8 [ c8 ] \dblb b8 [ a8 ] \bar "|" - A4 \grg A8. [ f16 ] \grg e4 \grg a8. [ b16 ] \bar "|" - \grip c8 [ e8 ] \dble e8 [ c8 ] \grg f8. [ e16 ] \thrwd d8 [ c8 ] \bar "|" - \dblb b2 \grip b4 \grg a8. [ b16 ] \bar "|" \break - - \grip c4 \dblc c8 [ e8 ] \thrwd d8 [ c8 ] \dblb b8 [ a8 ] \bar "|" - A4 \grg A8. [ f16 ] \grg e4 \grg a8. [ b16 ] \bar "|" - \grip c8 [ e8 ] \dble e8 [ c8 ] \dblb b4~ \grG a8 \bar "|" - \grg a2 \wbirl a4 \bar ".|" \break - \grg f8. [ g16 ] \bar "|" - \dblA A4 A8. [ f16 ] \grg e4. \gra e8 \bar "|" - \grg f8 [ d8 ] A8. [ f16 ] \grg e4 \grg a8. [ b16 ] \bar "|" - \grip c8 [ e8 ] \dble e8 [ c8 ] \grg f8. [ e16 ] \thrwd d8 [ c8 ] \bar "|" - \dblb b2 \grip b4 \grg f8. [ g16 ] \bar "|" \break - - \dblA A4 A8. [ f16 ] \grg e4. \gra e8 \bar "|" - \grg f8 [ d8 ] A8. [ f16 ] \grg e4 \grg a8. [ b16 ] \bar "|" - \grip c8 [ e8 ] \dble e8 [ c8 ] \dblb b4. \grG a8 \bar "|" - \grg a2 \wbirl a4 \bar ".|" \break - - } - -\score { - \melody - \layout { - indent = 0.0\cm - \context { \Score \remove "Bar_number_engraver" } - } - \header { - title = " set 12" - meter = "March" - arranger = "" - } - -} - diff --git a/4-4_marches/the_pikemans_march/notes.tenor.ily b/4-4_marches/the_pikemans_march/notes.tenor.ily index 2f873e1..16976fe 100644 --- a/4-4_marches/the_pikemans_march/notes.tenor.ily +++ b/4-4_marches/the_pikemans_march/notes.tenor.ily @@ -1,7 +1,7 @@ % 4/4 The Pikeman's March % Tenor \version "2.18.2" -composerTenor = "E.T. de Boone, v0.8, 2016" +composerTenor = "E.T. de Boone, v1.0, 2016" tenorglobal = { } %%music @@ -41,7 +41,7 @@ tenorBA = \drummode { d4 r8 d16 g d8[ g] - d4 + r4 | d4 d8^\markup{scoop} g diff --git a/5-4_marches/cullen_bay/notes.side.ily b/5-4_marches/cullen_bay/notes.side.ily index 128fa28..3f63e43 100644 --- a/5-4_marches/cullen_bay/notes.side.ily +++ b/5-4_marches/cullen_bay/notes.side.ily @@ -4,12 +4,12 @@ composerSide = "" snareEnd = \drummode { d8[:32)(-> g16.) g32]-> - d8[:32(-> g8]:32)(-> - d8[:32)( g8]:32)(-> - d4) - d4:32( + d8[:32(->\< g8]:32)(-> + d8[:32)( g8]:32)(->\> + d4)\! + d4:32( \< | - d8) d8:32( + d8) \! d8:32( \triplet { g16)[ d g } \flam d8] g16. d32-> g16. g32 \flam d8 d16. g32 -> diff --git a/init-sets b/init-sets new file mode 100644 index 0000000..4b2a1c0 --- /dev/null +++ b/init-sets @@ -0,0 +1,49 @@ +#!/bin/bash +COM='./make-set -c' +D='./sets' + +trap "echo Aborted!; exit;" SIGINT SIGTERM + +for f in full drums side pipes tenor bass; do + +$COM $D/mackenzie_set.$f.ly \ +2-4_marches/mackenzie_highlanders/$f.ly \ +strathspeys/lady_mackenzie_of_fairburn/$f.ly \ +reels/the_mackenzies_reel/$f.ly \ +; + +$COM $D/set_1.$f.ly \ +4-4_marches/bonnie_galloway.$f.ly \ +4-4_marches/were_no_awa_tae_bide_awa/$f.ly \ +; + +$COM $D/set_2.$f.ly \ +2-4_marches/high_road_to_gairloch/$f.ly \ +2-4_marches/brown_haired_maiden/$f.ly \ +2-4_marches/mairis_wedding/$f.ly \ +; + +$COM $D/set_5.$f.ly \ +4-4_marches/scotland_the_brave/$f.ly \ +4-4_marches/wings/$f.ly \ +4-4_marches/rowan_tree/$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_10.$f.ly \ +airs/morag_of_dunvegan/$f.ly \ +4-4_marches/bonnie_galloway.$f.ly \ +4-4_marches/were_no_awa_tae_bide_awa/$f.ly \ +; + +$COM $D/alexander_mackenzie_cullen_bay.$f.ly \ +airs/alexander_mackenzie/$f.ly \ +5-4_marches/cullen_bay/$f.ly \ +; +done; diff --git a/make-set b/make-set new file mode 100644 index 0000000..431d406 --- /dev/null +++ b/make-set @@ -0,0 +1,45 @@ +#!/bin/python3 + +## Script to easily generate a set (concatenated scores) + +import codecs, os +from argparse import ArgumentParser + +parser = ArgumentParser(__file__) +parser.add_argument('setfile') +parser.add_argument('-c',dest='copy',action='store_true',default=False) +parser.add_argument('scores',nargs='+') + +args = parser.parse_args() + +os.makedirs(os.path.dirname(args.setfile), exist_ok=True) +fpoint = codecs.open(args.setfile, 'w+', 'utf8') +fpoint.write(u'\ufeff') +fpoint.write('\\version \"2.18.2\"\n\n') + +for f in args.scores: + + if not os.path.exists(f): + continue + + if args.copy is True: + text = codecs.open(f, 'r', 'utf8').read() + if text.startswith(u'\ufeff'): text = text[1:] + text = text.split(u'\n') + + for line in text: + if line.startswith(u'\\include'): + incline = line.replace('\\include', '').strip('"\' ') + + if not incline.startswith('\\'): #already absolute + incline = os.path.join(os.path.abspath(os.path.dirname(f)), incline) + + line = "\\include \""+incline+"\"" + fpoint.write(line.replace('\r', '')+'\n') + else: + fpoint.write('\\include \"' + os.path.join( os.path.abspath( os.curdir ) ,f) + '\"\n') + +fpoint.close() + + + diff --git a/reels/the_mackenzies_reel/notes.side.ily b/reels/the_mackenzies_reel/notes.side.ily index 4afb469..847f4e0 100644 --- a/reels/the_mackenzies_reel/notes.side.ily +++ b/reels/the_mackenzies_reel/notes.side.ily @@ -5,7 +5,6 @@ composerSide = "C. Ooms, 2015" sideglobal = { \eighthBeaming} snareA = \drummode { - g32 | \flam d8 d16. g32 d8:32~ g16. g32 \triplet { d16 g d } \flam g16. g32 d16. g32 d16.:64~ d32 | g8 d16. g32 d32 g d g d16. g32 @@ -15,10 +14,9 @@ snareA = \drummode { \flam d8 d16. g32 d8:32~ g16. g32 \triplet { d16 g d } \flam g16. g32 d16. g32 d16.:64~ d32 | g16.-> g32 d16. g32 \triplet { d16 d g } d16 g32 g - d16.-> g32 d16. g32-> d32 g d g d16-> + d16.-> g32 d16. g32-> d32 g d g d16.-> g32 | } snareB = \drummode { - g32 | \flam d16. g32 d16. \flam g32 d16. g32 d32 g d g d16. g32 d16. g32:128(-> g16:64 d8:32)(-> g16) | d8-> d16. g32 d32 g d g d16. g32 diff --git a/reels/the_mackenzies_reel/side.ly b/reels/the_mackenzies_reel/side.ly index e1a39ac..c60c7ce 100644 --- a/reels/the_mackenzies_reel/side.ly +++ b/reels/the_mackenzies_reel/side.ly @@ -8,12 +8,13 @@ \global \sideglobal << - { \repeat volta 2 { \part \line } \break + { \repeat volta 2 { \line } \break \repeat volta 2 { \line } } { - s16. \snareA - \snareB} + \snareA + \snareBB + } >> } \header { diff --git a/template/config.ily b/template/config.ily index 871d3cc..dcafc87 100644 --- a/template/config.ily +++ b/template/config.ily @@ -3,6 +3,9 @@ global = { \time 4/4 } +confTempo = { + \tempo 4 = 80 + } %% Format part = { \partial 8 s8 } halfline = { \repeat unfold 4 { s1 | } } diff --git a/template/pipes.ly b/template/pipes.ly index 5cbcfda..e5f5f8d 100644 --- a/template/pipes.ly +++ b/template/pipes.ly @@ -7,6 +7,7 @@ \new Staff { \global \pipeglobal + \pipeKey << { } { } @@ -19,3 +20,10 @@ composer = \composerPipes } } +\score { + \new Staff { \global \pipeglobal \pipeKey + \set Staff.midiInstrument = #"bagpipe" + %%Tune + } + \midi { \confTempo } +}