diff --git a/.gitignore b/.gitignore index 69fd014..295adde 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1 @@ -disk_errors/ -pdf/ -tmp/ +to_process/ diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index e69de29..0000000 diff --git a/2-4_marches/black_bear/full.ly b/2-4_marches/black_bear/full.ly index f61e4b3..83baf3e 100644 --- a/2-4_marches/black_bear/full.ly +++ b/2-4_marches/black_bear/full.ly @@ -34,7 +34,7 @@ \snareA s8 \snareBA - \snareA s8 + \snareBB } % \new PipeBandDrumStaff = "bass" { % \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass } diff --git a/2-4_marches/black_bear/notes.side.ily b/2-4_marches/black_bear/notes.side.ily index 2a4e129..ff6f629 100644 --- a/2-4_marches/black_bear/notes.side.ily +++ b/2-4_marches/black_bear/notes.side.ily @@ -1,31 +1,41 @@ % 2/4 Black Bear % Snare \version "2.18.2" -composerSnare = "E.T. de Boone, 2015" - +composerSide = "C. Ooms, 2016" +sideglobal = { \eighthBeaming } %%music -snareA = \drummode { - d8:32( | - g16.) \parenthesize g32 \flamd d16. g32 d16. \flamg g32 d16. g32 | - \flamd d16. \parenthesize g32 \flamd d16. g32 d16. \flamg g32 d16. g32 | - \flamd d8 d32 g32 d32 g32 d4 | - r4^\markup {\bold HOI} d8:32( g8:32)(-> | - d16.) \parenthesize g32 \flamd d16. g32 d16. \flamg g32 d16. g32 | - \flamd d16. \parenthesize g32 \flamd d16. g32 d16. \flamg g32 d16. g32 | - \flamd d4 d4:32( | - d8) \flamg g8 \flamd d8 +snareAnotmeasone = \drummode { + d8:32(-> g:32)(-> \triplet { d16) g d-> } g16. g32 | + \flam d8 d8:32( g8) d16. g32 | + d16.:64( d32) \triplet { g16 d g } \flam d16. \flam g32 d16. g32 | + + \flam d8 g8:32(-> \triplet { d16) g d-> } g16. g32 | + d8:32(-> g:32)(-> \triplet { d16) g d-> } g16. g32 | + \flam d8 d8:32( \triplet { g16) d g } \flam d16. g32 | + \flam d16. g32-> d32 g d g d8 } -% Part 2 + +snareA = \drummode { + d16. g32 | + d8:32(-> g:32)(-> \triplet { d16) g d-> } g16. g32 | + \snareAnotmeasone +} + snareBA = \drummode { g8 | - d4:32( d4:32)( | - d8) g16. d32-> g16. g32 \flamd d16. g32 | - d4:32( d4:32)( | - d8) g16. d32-> g16. g32 \flamd d16. g32 | + \flam d16. g32 d16. \flam g32 d16. g32-> d32 g d g | + d8-> d16. \pp g32 \triplet { d16 d g } d16.-> g32 \mf | + \flam d16. g32 d16. \flam g32 d16. g32-> d32 g d g | + d16.-> g32 d16. \flam g32 d32 g d g d16. g32 | + + \flam d16. g32 d16. g32:128(-> g16:64 d8:32)(-> g16) | + d8.:32(-> g16:64)(-> g16:64 d8:32)(-> g16) | + \flam d16. g32 d16. \flam d32 d16. \flam g32 d32 g d g | + d8-> \triplet { d16 \< d g } \triplet { d16 d g } d8-> \! +} +snareBB = \drummode { + \flam d8 g8:32(-> \triplet { d16) g d-> } g16. g32 | + \snareAnotmeasone +} - d4:32( d8.:32)( g16:32)( | - d8:32)( g8:32)( d4)( | - g8:32)( d8:32)( g16.) d32-> g16. g32 | - \flamd d8 d8:32( g8) -} \ No newline at end of file diff --git a/2-4_marches/black_bear/notes.side.v1.ily b/2-4_marches/black_bear/notes.side.v1.ily new file mode 100644 index 0000000..2a4e129 --- /dev/null +++ b/2-4_marches/black_bear/notes.side.v1.ily @@ -0,0 +1,31 @@ +% 2/4 Black Bear +% Snare +\version "2.18.2" +composerSnare = "E.T. de Boone, 2015" + +%%music +snareA = \drummode { + d8:32( | + g16.) \parenthesize g32 \flamd d16. g32 d16. \flamg g32 d16. g32 | + \flamd d16. \parenthesize g32 \flamd d16. g32 d16. \flamg g32 d16. g32 | + \flamd d8 d32 g32 d32 g32 d4 | + r4^\markup {\bold HOI} d8:32( g8:32)(-> | + + d16.) \parenthesize g32 \flamd d16. g32 d16. \flamg g32 d16. g32 | + \flamd d16. \parenthesize g32 \flamd d16. g32 d16. \flamg g32 d16. g32 | + \flamd d4 d4:32( | + d8) \flamg g8 \flamd d8 +} +% Part 2 +snareBA = \drummode { + g8 | + d4:32( d4:32)( | + d8) g16. d32-> g16. g32 \flamd d16. g32 | + d4:32( d4:32)( | + d8) g16. d32-> g16. g32 \flamd d16. g32 | + + d4:32( d8.:32)( g16:32)( | + d8:32)( g8:32)( d4)( | + g8:32)( d8:32)( g16.) d32-> g16. g32 | + \flamd d8 d8:32( g8) +} \ No newline at end of file diff --git a/2-4_marches/black_bear/side.ly b/2-4_marches/black_bear/side.ly index 63f7b68..7edf1d3 100644 --- a/2-4_marches/black_bear/side.ly +++ b/2-4_marches/black_bear/side.ly @@ -1,7 +1,7 @@ \version "2.18.2" \include "config.ily" -\include "notes.side.v1.3.ily" +\include "notes.side.ily" \score { \new PipeBandDrumStaff { @@ -9,12 +9,14 @@ << { \repeat volta 2 { \part \halfline \break \halfline } \break - \part \line \bar "|." + \part \line \bar "||" \break + \line } { \snareA s8 \snareBA + \snareBB } >> } @@ -24,4 +26,4 @@ instrument = \instrumentSide composer = \composerSide } -} \ No newline at end of file +} diff --git a/2-4_marches/mackenzie_highlanders/bass.ly b/2-4_marches/mackenzie_highlanders/bass.ly new file mode 100644 index 0000000..61f8ca7 --- /dev/null +++ b/2-4_marches/mackenzie_highlanders/bass.ly @@ -0,0 +1,20 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.tenor.ily" + +\score { + \new PipeBandDrumStaff { + \global + + \repeat volta 2 { \tenorA } \break + \tenorBA \break + \tenorBB + } + \header { + title = \title + meter = \meter + instrument = \instrumentTenor + composer = \composerTenor + } +} diff --git a/2-4_marches/mackenzie_highlanders/config.ily b/2-4_marches/mackenzie_highlanders/config.ily index 158aa55..ca542bd 100644 --- a/2-4_marches/mackenzie_highlanders/config.ily +++ b/2-4_marches/mackenzie_highlanders/config.ily @@ -3,7 +3,7 @@ global = { \time 2/4 } - +configTempo = { \tempo 4 = 90 } %% Format part = { \partial 8 s8 } halfline = { \repeat unfold 4 { s2 | } } diff --git a/2-4_marches/mackenzie_highlanders/drums.ly b/2-4_marches/mackenzie_highlanders/drums.ly new file mode 100644 index 0000000..9c19a3e --- /dev/null +++ b/2-4_marches/mackenzie_highlanders/drums.ly @@ -0,0 +1,63 @@ +\version "2.19.0" + +\include "config.ily" +\include "notes.bass.ily" +%\include "notes.tenor.ily" +\include "notes.side.ily" + +\score { + \new StaffGroup << + \new PipeBandDrumStaff = "side" { + \global + \sideglobal + \set PipeBandDrumStaff.instrumentName = \markup{\instrumentSide} + \set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide} + + << + { + \repeat volta 2 { \part \line } \break + + \part \line \bar "||" \break + \line \bar "|." + }%Format + { + \snareA s8 + \snareB + \snareB + }%Music + >> + } + \new PipeBandDrumStaff = "bass" { + \bassglobal + \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass } + \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass} + + s8 \bassA + + s8 \bassBA + \bassBB + } + % \new PipeBandDrumStaff = "tenor" { + % \tenorglobal + % \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor } + % \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor } + + % } + >> + \header { + title = \title + meter = \meter + composer = \markup { + \column \right-align { + $(if (not (string=? "" composerSide)) #{ \markup {\line { \composerSide ":" }} #} ) + $(if (not (string=? "" composerTenor)) #{ \markup {\line { \composerTenor ":" }} #} ) + $(if (not (string=? "" composerBass)) #{ \markup {\line { \composerBass ":" }} #} ) + } + \column \right-align { + $(if (not (string=? "" composerSide)) #{ \markup {\line { \instrumentSide }}#} ) + $(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} ) + $(if (not (string=? "" composerBass)) #{ \markup {\line { \instrumentBass }}#} ) + } + } + } +} diff --git a/2-4_marches/mackenzie_highlanders/full.ly b/2-4_marches/mackenzie_highlanders/full.ly index bb7dc2a..bde086e 100644 --- a/2-4_marches/mackenzie_highlanders/full.ly +++ b/2-4_marches/mackenzie_highlanders/full.ly @@ -1,9 +1,9 @@ \version "2.19.0" \include "config.ily" -%\include "notes.bass.ily" +\include "notes.bass.ily" %\include "notes.tenor.ily" -\include "notes.side.alt.ily" +\include "notes.side.ily" \include "notes.pipes.ily" \score { @@ -36,16 +36,20 @@ \set PipeBandDrumStaff.instrumentName = \markup \column {\instrumentSide} \set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide} - \snareA s8 - \snareBA - \snareBB + \snareA s8 + \snareB + \snareB } -% \new PipeBandDrumStaff = "bass" { -% \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass } -% \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass} -% -% } + \new PipeBandDrumStaff = "bass" { + \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 } diff --git a/2-4_marches/mackenzie_highlanders/notes.bass.ily b/2-4_marches/mackenzie_highlanders/notes.bass.ily new file mode 100644 index 0000000..9377580 --- /dev/null +++ b/2-4_marches/mackenzie_highlanders/notes.bass.ily @@ -0,0 +1,46 @@ +% 2/4 MacKenzie Highlanders +% Bass +\version "2.18.2" +composerBass = "C. Ooms, 2015" +bassglobal = {} + +bassA = \drummode { +d4 g4 +| +d8 \< g8 d4 \! +| +d8-> g d g +| +d4 g4 +| +d8 \< g d4 \! +| +d8 \< g d4 \! +| +d8-> d16 g16-> r16 g16 d8-> +| +d4 g4 +} +bassBA = \drummode { +d8-> g-> d16 g8-> g16 | +d8 \< g8 d4 \! | +d8. \< g16 r8 d8 \! | +d4 g4 | + +d4 d8 \< g8 | +d8 g8 \! d4 | +d8-> d16 g16-> r16 g16 d8-> | +d4 g4 +} +bassBB = \drummode { +d4-\v r4 | +r8 g8 \< d8 g | +d8.-> \! g16 r8 g8 | +d4 g4 | + +d8 g d8 g | +r16 g8 \< g16 d8 \! g | +d4 r8 g | +d4 d4 +} + diff --git a/2-4_marches/mackenzie_highlanders/notes.side.alt.ily b/2-4_marches/mackenzie_highlanders/notes.side.alt.ily index 75ff26a..32218db 100644 --- a/2-4_marches/mackenzie_highlanders/notes.side.alt.ily +++ b/2-4_marches/mackenzie_highlanders/notes.side.alt.ily @@ -2,7 +2,7 @@ % Snare \version "2.18.2" composerSide = "alternate version" - +sideglobal = { \eighthBeaming } %%music snareA = \drummode { d8:32( | @@ -45,4 +45,4 @@ snareBB = \drummode { d8[-> \drag d16 d32-> g] d[ g \drag d16 d16. g32] | d4:32( d4) -} \ No newline at end of file +} diff --git a/2-4_marches/mackenzie_highlanders/notes.side.ily b/2-4_marches/mackenzie_highlanders/notes.side.ily index e96556f..98615b6 100644 --- a/2-4_marches/mackenzie_highlanders/notes.side.ily +++ b/2-4_marches/mackenzie_highlanders/notes.side.ily @@ -2,7 +2,7 @@ % Snare \version "2.18.2" composerSnare = "" - +sideglobal = { \eighthBeaming } %%music snareA = \drummode { d8:32( | @@ -33,4 +33,4 @@ snareB = \drummode { \flam g8-> \tuplet 3/2 { \flam d16 g d-> } g16. g32 \flam d8 | d4:32( d8) -} \ No newline at end of file +} diff --git a/2-4_marches/mackenzie_highlanders/pipes.ly b/2-4_marches/mackenzie_highlanders/pipes.ly index 0c1feac..e8cd711 100644 --- a/2-4_marches/mackenzie_highlanders/pipes.ly +++ b/2-4_marches/mackenzie_highlanders/pipes.ly @@ -7,6 +7,7 @@ \new Staff { \global \bagpipeKey + \set Staff.midiInstrument = #"bird tweet" << { \repeat volta 2 { @@ -37,4 +38,7 @@ instrument = \instrumentPipes composer = \composerPipes } + \midi { + \tempo 4 = 90 + } } diff --git a/2-4_marches/mackenzie_highlanders/side.alt.ly b/2-4_marches/mackenzie_highlanders/side.alt.ly index c1d5d78..342932d 100644 --- a/2-4_marches/mackenzie_highlanders/side.alt.ly +++ b/2-4_marches/mackenzie_highlanders/side.alt.ly @@ -4,9 +4,10 @@ \include "notes.side.alt.ily" \score { - \new PipeBandDrumStaff { - \global - << + \new PipeBandDrumStaff { + \global + \set Staff.midiInstrument = #"synth drum" + << { \repeat volta 2 { \part \line } \break \part \line \bar "||" \break @@ -25,4 +26,8 @@ instrument = \instrumentSide composer = \composerSide } -} \ No newline at end of file + \midi { + \tempo 4 = 90 + } + \layout {} +} diff --git a/reels/the_mackenzies_reel/full.ly b/reels/the_mackenzies_reel/full.ly new file mode 100644 index 0000000..4656f76 --- /dev/null +++ b/reels/the_mackenzies_reel/full.ly @@ -0,0 +1,72 @@ +\version "2.19.0" + +\include "config.ily" +%\include "notes.bass.ily" +%\include "notes.tenor.ily" +\include "notes.side.ily" +\include "notes.pipes.ily" + +\score { + \new StaffGroup << + \new Staff { + \global + \pipeglobal + \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentPipes } + \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentPipes } + << + { + \repeat volta 2 { \part \line } \break + + \part \line \bar "||" \break + \line \bar "|." + }%Format + { + \pipesA s8 + + \pipesBA + \pipesBB s8 + }%Pipes + >> + } + \new PipeBandDrumStaff = "side" { + \sideglobal + \set PipeBandDrumStaff.instrumentName = \markup \column {\instrumentSide} + \set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide} + + r16. \snareA s16 + + r16. \snareBA + \snareBB + } +% \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 } +% +% } + >> + \header { + title = \title + meter = \meter + composer = \markup \large { + \column \right-align { + $(if (not (string=? "" composerPipes)) #{ \markup {\line { \composerPipes ":" }} #} ) + $(if (not (string=? "" composerSide)) #{ \markup {\line { \composerSide ":" }} #} ) + $(if (not (string=? "" composerTenor)) #{ \markup {\line { \composerTenor ":" }} #} ) + $(if (not (string=? "" composerBass)) #{ \markup {\line { \composerBass ":" }} #} ) + } + \column \right-align { + $(if (not (string=? "" composerPipes)) #{ \markup {\line { \instrumentPipes }}#} ) + $(if (not (string=? "" composerSide)) #{ \markup {\line { \instrumentSide }}#} ) + $(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} ) + $(if (not (string=? "" composerBass)) #{ \markup {\line { \instrumentBass }}#} ) + } + } + } +} diff --git a/reels/the_mackenzies_reel/notes.side.ily b/reels/the_mackenzies_reel/notes.side.ily new file mode 100644 index 0000000..4afb469 --- /dev/null +++ b/reels/the_mackenzies_reel/notes.side.ily @@ -0,0 +1,38 @@ +% 2/2 The MacKenzie's Reel +% Side +\version "2.18.2" +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 + \flam d16. g32 d16. \flam g32 d16. \flam g32 d16. g32 | + + + \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-> +} +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 + \triplet { d16 d g } \triplet { d16 d g } d16. \flam g32 d16. g32 | + + \flam d16. g32 d16. \flam g32 d16. g32 d32 g d g + d16. g32 d16. g32:128(-> g16:64 d8:32)(-> g16) | + d16. g32 d16. g32 \triplet { d16 d g } d16 g32 g +} +snareBA = \drummode { + \snareB + d16.-> g32 d16. g32-> d32 g d g d16. | +} +snareBB = \drummode { + \snareB + d16.-> g32 d16. g32-> d32 g d g d8 +} diff --git a/reels/the_mackenzies_reel/pipes.ly b/reels/the_mackenzies_reel/pipes.ly index 1ddd09d..0501606 100644 --- a/reels/the_mackenzies_reel/pipes.ly +++ b/reels/the_mackenzies_reel/pipes.ly @@ -28,4 +28,7 @@ instrument = \instrumentPipes composer = \composerPipes } + \midi { + \tempo 2 = 70 + } } diff --git a/reels/the_mackenzies_reel/side.ly b/reels/the_mackenzies_reel/side.ly new file mode 100644 index 0000000..e1a39ac --- /dev/null +++ b/reels/the_mackenzies_reel/side.ly @@ -0,0 +1,25 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.side.ily" + +\score { + \new PipeBandDrumStaff { + \global + \sideglobal + << + { \repeat volta 2 { \part \line } \break + \repeat volta 2 { \line } + } + { + s16. \snareA + \snareB} + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentSide + composer = \composerSide + } +}