From 81255889cf73e4dc820136675352ddc340da91f9 Mon Sep 17 00:00:00 2001 From: Eric Teunis de Boone Date: Mon, 9 Nov 2015 05:59:05 +0100 Subject: [PATCH] Changed setup for five scores Morag of Dunvegan Farewell to Camraw The Mist Covered Mountains Molly Connell Lady MacKenzie of Fairburn Note that Fairburn also has the tune itself. Fullscore prints nicely! --- .lilydrum/embellishments.ily | 4 +- .lilydrum/layout_tweaks.ily | 6 +- airs/farewell_to_camraw.side.ly | 31 --- airs/farewell_to_camraw.tenor.ly | 27 -- airs/farewell_to_camraw/config.ily | 9 + airs/farewell_to_camraw/drums.ly | 38 +++ airs/farewell_to_camraw/notes.side.ily | 13 + airs/farewell_to_camraw/notes.tenor.ily | 14 + airs/farewell_to_camraw/side.ly | 19 ++ airs/farewell_to_camraw/tenor.ly | 19 ++ airs/morag_of_dunvegan.side.ly | 41 --- .../{morag_of_dunvegan.bass.ly => bass.ly} | 7 +- airs/morag_of_dunvegan/config.ily | 9 + .../{morag_of_dunvegan.drums.ly => drums.ly} | 10 +- .../morag_of_dunvegan.format.ly | 4 - ..._dunvegan.notes.bass.ly => notes.bass.ily} | 0 ..._dunvegan.notes.side.ly => notes.side.ily} | 0 ...unvegan.notes.tenor.ly => notes.tenor.ily} | 0 .../{morag_of_dunvegan.side.ly => side.ly} | 7 +- .../{morag_of_dunvegan.tenor.ly => tenor.ly} | 7 +- airs/the_mist_covered_mountains/config.ily | 10 + airs/the_mist_covered_mountains/drums.ly | 39 +++ .../the_mist_covered_mountains/notes.side.ily | 23 ++ .../notes.tenor.ily | 25 ++ airs/the_mist_covered_mountains/side.ly | 19 ++ airs/the_mist_covered_mountains/tenor.ly | 19 ++ .../the_mist_covered_mountains.side.ly | 0 .../the_mist_covered_mountains.tenor.ly | 0 header_default.ily | 1 - makedrum | 6 +- .../lady_mackenzie_of_fairburn.drums.ly | 169 ------------ .../lady_mackenzie_of_fairburn.full.ly | 244 ------------------ .../lady_mackenzie_of_fairburn/bass.ly | 19 ++ .../lady_mackenzie_of_fairburn/config.ily | 9 + .../lady_mackenzie_of_fairburn/drums.ly | 43 +++ .../lady_mackenzie_of_fairburn/full.ly | 53 ++++ .../lady_mackenzie_of_fairburn/notes.bass.ily | 18 ++ .../notes.pipes.ily | 69 +++++ .../lady_mackenzie_of_fairburn/notes.side.ily | 68 +++++ .../notes.tenor.ily | 20 ++ .../lady_mackenzie_of_fairburn/pipes.ly | 20 ++ .../lady_mackenzie_of_fairburn/side.ly | 19 ++ .../lady_mackenzie_of_fairburn/tenor.ly | 19 ++ strathspeys/molly_connell.bass.ly | 30 --- strathspeys/molly_connell.side.ly | 42 --- strathspeys/molly_connell.tenor.ly | 37 --- strathspeys/molly_connell/bass.ly | 19 ++ strathspeys/molly_connell/config.ily | 8 + strathspeys/molly_connell/drums.ly | 66 +++++ strathspeys/molly_connell/notes.bass.ily | 15 ++ strathspeys/molly_connell/notes.side.ily | 27 ++ strathspeys/molly_connell/notes.tenor.ily | 21 ++ strathspeys/molly_connell/side.ly | 19 ++ strathspeys/molly_connell/tenor.ly | 19 ++ 54 files changed, 829 insertions(+), 651 deletions(-) delete mode 100755 airs/farewell_to_camraw.side.ly delete mode 100755 airs/farewell_to_camraw.tenor.ly create mode 100755 airs/farewell_to_camraw/config.ily create mode 100755 airs/farewell_to_camraw/drums.ly create mode 100755 airs/farewell_to_camraw/notes.side.ily create mode 100755 airs/farewell_to_camraw/notes.tenor.ily create mode 100755 airs/farewell_to_camraw/side.ly create mode 100755 airs/farewell_to_camraw/tenor.ly delete mode 100755 airs/morag_of_dunvegan.side.ly rename airs/morag_of_dunvegan/{morag_of_dunvegan.bass.ly => bass.ly} (63%) create mode 100755 airs/morag_of_dunvegan/config.ily rename airs/morag_of_dunvegan/{morag_of_dunvegan.drums.ly => drums.ly} (78%) delete mode 100755 airs/morag_of_dunvegan/morag_of_dunvegan.format.ly rename airs/morag_of_dunvegan/{morag_of_dunvegan.notes.bass.ly => notes.bass.ily} (100%) rename airs/morag_of_dunvegan/{morag_of_dunvegan.notes.side.ly => notes.side.ily} (100%) rename airs/morag_of_dunvegan/{morag_of_dunvegan.notes.tenor.ly => notes.tenor.ily} (100%) rename airs/morag_of_dunvegan/{morag_of_dunvegan.side.ly => side.ly} (64%) rename airs/morag_of_dunvegan/{morag_of_dunvegan.tenor.ly => tenor.ly} (63%) create mode 100755 airs/the_mist_covered_mountains/config.ily create mode 100755 airs/the_mist_covered_mountains/drums.ly create mode 100755 airs/the_mist_covered_mountains/notes.side.ily create mode 100755 airs/the_mist_covered_mountains/notes.tenor.ily create mode 100755 airs/the_mist_covered_mountains/side.ly create mode 100755 airs/the_mist_covered_mountains/tenor.ly rename airs/{ => the_mist_covered_mountains}/the_mist_covered_mountains.side.ly (100%) rename airs/{ => the_mist_covered_mountains}/the_mist_covered_mountains.tenor.ly (100%) delete mode 100755 strathspeys/lady_mackenzie_of_fairburn.drums.ly delete mode 100755 strathspeys/lady_mackenzie_of_fairburn.full.ly create mode 100755 strathspeys/lady_mackenzie_of_fairburn/bass.ly create mode 100755 strathspeys/lady_mackenzie_of_fairburn/config.ily create mode 100755 strathspeys/lady_mackenzie_of_fairburn/drums.ly create mode 100755 strathspeys/lady_mackenzie_of_fairburn/full.ly create mode 100755 strathspeys/lady_mackenzie_of_fairburn/notes.bass.ily create mode 100755 strathspeys/lady_mackenzie_of_fairburn/notes.pipes.ily create mode 100755 strathspeys/lady_mackenzie_of_fairburn/notes.side.ily create mode 100755 strathspeys/lady_mackenzie_of_fairburn/notes.tenor.ily create mode 100755 strathspeys/lady_mackenzie_of_fairburn/pipes.ly create mode 100755 strathspeys/lady_mackenzie_of_fairburn/side.ly create mode 100755 strathspeys/lady_mackenzie_of_fairburn/tenor.ly delete mode 100755 strathspeys/molly_connell.bass.ly delete mode 100755 strathspeys/molly_connell.side.ly delete mode 100755 strathspeys/molly_connell.tenor.ly create mode 100755 strathspeys/molly_connell/bass.ly create mode 100755 strathspeys/molly_connell/config.ily create mode 100755 strathspeys/molly_connell/drums.ly create mode 100755 strathspeys/molly_connell/notes.bass.ily create mode 100755 strathspeys/molly_connell/notes.side.ily create mode 100755 strathspeys/molly_connell/notes.tenor.ily create mode 100755 strathspeys/molly_connell/side.ly create mode 100755 strathspeys/molly_connell/tenor.ly diff --git a/.lilydrum/embellishments.ily b/.lilydrum/embellishments.ily index 73d4060..00fcdb6 100755 --- a/.lilydrum/embellishments.ily +++ b/.lilydrum/embellishments.ily @@ -4,10 +4,10 @@ drumgrace = #(define-music-function (parser location notes) (ly:music?) #{ % Set settings \stemUp - \once \override Beam.positions = #'(1.8 . 1.8) + \once \override Beam.positions = #'(2 . 2) \once \override DrumStaff.Stem.length = #5 \override Flag.stroke-style = #"grace" - \override Score.GraceSpacing #'spacing-increment = #1 + \override Score.GraceSpacing #'spacing-increment = #0 \override Score.Stem #'beamlet-max-length-proportion = #'(0.5 . 0.5) % Print notes diff --git a/.lilydrum/layout_tweaks.ily b/.lilydrum/layout_tweaks.ily index b596672..769841c 100755 --- a/.lilydrum/layout_tweaks.ily +++ b/.lilydrum/layout_tweaks.ily @@ -41,8 +41,8 @@ drumPitchNames = % stems \override Stem.direction = #DOWN % stems down - \override Stem.length = #9 % unbeamed stems length - \override Stem.stemlet-length = #1.5 % short stem length + \override Stem.length = #8.5 % unbeamed stems length + \override Stem.stemlet-length = #1 % short stem length % beams \override Beam.beam-thickness = #0.4 % beam-thickness @@ -59,7 +59,7 @@ drumPitchNames = %\override TextScript.outside-staff-priority = ##f %\override TextScript.side-axis = #0 %\override TextScript.staff-padding = #3 - %\override TextScript.X-offset = #2 % padding to stems + %\override TextScript.X-offset = #1 % padding to stems %\override TextScript.extra-offset = #'(-0.3 . 0) % tremolos (rolls) diff --git a/airs/farewell_to_camraw.side.ly b/airs/farewell_to_camraw.side.ly deleted file mode 100755 index f5e65bf..0000000 --- a/airs/farewell_to_camraw.side.ly +++ /dev/null @@ -1,31 +0,0 @@ -\version "2.18.2" - -\include "lilydrum.ly" - -\score { - \new PipeBandDrumStaff = "staff_side" { - \set Staff.instrumentName = #"Side" - \set Staff.shortInstrumentName = #"S.D." - - \time 4/4 - \eighthBeaming - \drummode { - \repeat volta 2{ - r1 | - r1 | - \flamd d8 g8 \flamd d32 g d g d g d g d16.-> g32 d32 g d g d16 g d g | - \flamd d4 r4 r8 \flamd d32 g d g d16-> g d g | - \flamd d4 d32 g d g d g d g d4 r4 | - \flamd d4 \flamd d8 \flamg g8 d4 d32 g d g d g d g | - d16 g \flamd d32 g d g \flamd d16 g d32 g d g d8 d32 g d g d16 g d g | - \flamd d8 \flamg g8 r4 r2 - } - } - } - -} - - \header { - title = "Farewell to Camraw" - meter = "Slow Air" - } \ No newline at end of file diff --git a/airs/farewell_to_camraw.tenor.ly b/airs/farewell_to_camraw.tenor.ly deleted file mode 100755 index 9a5db2d..0000000 --- a/airs/farewell_to_camraw.tenor.ly +++ /dev/null @@ -1,27 +0,0 @@ -\version "2.18.2" - -\include "lilydrum.ly" - -\score { - \new PipeBandDrumStaff { - \drummode { - \time 4/4 - \repeat volta 2 { - R1 - r8 g d16 g d g d8 g d16 g d g | - d8 g d16 g d g d4 d16 g d g | - d4 g16 d g d d4 r4 | - d4 d8 g d4 r4 | - d4 d8 g d4 r4 | - d8 g d g d4 d8 g | - d8 g r4 r2 | - } - } - } - - \header { - title = "Farewell to Camraw" - meter = "Slow Air" - instrument = "Tenor" - } -} \ No newline at end of file diff --git a/airs/farewell_to_camraw/config.ily b/airs/farewell_to_camraw/config.ily new file mode 100755 index 0000000..b6df39f --- /dev/null +++ b/airs/farewell_to_camraw/config.ily @@ -0,0 +1,9 @@ +\version "2.19.0" +%% Globals +global = { + \time 4/4 + \eighthBeaming + } + +%% Format +formatA = { \repeat volta 2 { \repeat unfold 8 { s1 } } \break } \ No newline at end of file diff --git a/airs/farewell_to_camraw/drums.ly b/airs/farewell_to_camraw/drums.ly new file mode 100755 index 0000000..92f2d83 --- /dev/null +++ b/airs/farewell_to_camraw/drums.ly @@ -0,0 +1,38 @@ +\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" { + \set PipeBandDrumStaff.instrumentName = #"Side " + \set PipeBandDrumStaff.shortInstrumentName = #"S.D. " + + \global + << + \formatA + \snareA + >> + } + %\new PipeBandDrumStaff = "bass" { + % \set PipeBandDrumStaff.instrumentName = #"Bass " + % \set PipeBandDrumStaff.shortInstrumentName = #"B.D. " + % + % \bassA + % \bassB + %} + \new PipeBandDrumStaff = "tenor" { + \set PipeBandDrumStaff.instrumentName = #"Tenor" + \set PipeBandDrumStaff.shortInstrumentName = #"T.D. " + + \tenorA + } + >> + \header { + title = "Farewell to Camraw" + meter = "Slow Air" + } +} \ No newline at end of file diff --git a/airs/farewell_to_camraw/notes.side.ily b/airs/farewell_to_camraw/notes.side.ily new file mode 100755 index 0000000..e2bb443 --- /dev/null +++ b/airs/farewell_to_camraw/notes.side.ily @@ -0,0 +1,13 @@ +% 4/4 Farewell to Camraw +% Side +\version "2.18.2" +snareA = \drummode { + r1 | + r1 | + \flamd d8 g8 \flamd d32 g d g d g d g d16.-> g32 d32 g d g d16 g d g | + \flamd d4 r4 r8 \flamd d32 g d g d16-> g d g | + \flamd d4 d32 g d g d g d g d4 r4 | + \flamd d4 \flamd d8 \flamg g8 d4 d32 g d g d g d g | + d16 g \flamd d32 g d g \flamd d16 g d32 g d g d8 d32 g d g d16 g d g | + \flamd d8 \flamg g8 r4 r2 +} \ No newline at end of file diff --git a/airs/farewell_to_camraw/notes.tenor.ily b/airs/farewell_to_camraw/notes.tenor.ily new file mode 100755 index 0000000..5fa2cd2 --- /dev/null +++ b/airs/farewell_to_camraw/notes.tenor.ily @@ -0,0 +1,14 @@ +% 4/4 Farewell to Camraw +% Tenor +\version "2.18.2" +tenorA = \drummode { + R1 + r8 g d16 g d g d8 g d16 g d g | + d8 g d16 g d g d4 d16 g d g | + d4 g16 d g d d4 r4 | + d4 d8 g d4 r4 | + d4 d8 g d4 r4 | + d8 g d g d4 d8 g | + d8 g r4 r2 | + +} \ No newline at end of file diff --git a/airs/farewell_to_camraw/side.ly b/airs/farewell_to_camraw/side.ly new file mode 100755 index 0000000..5bc5872 --- /dev/null +++ b/airs/farewell_to_camraw/side.ly @@ -0,0 +1,19 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.side.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + \formatA + \snareA + >> + } + \header { + title = "Farewell to Camraw" + meter = "Slow Air" + instrument = "Side" + } +} \ No newline at end of file diff --git a/airs/farewell_to_camraw/tenor.ly b/airs/farewell_to_camraw/tenor.ly new file mode 100755 index 0000000..bf21971 --- /dev/null +++ b/airs/farewell_to_camraw/tenor.ly @@ -0,0 +1,19 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.tenor.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + \formatA + \tenorA + >> + } + \header { + title = "Farewell to Camraw" + meter = "Slow Air" + instrument = "Tenor" + } +} \ No newline at end of file diff --git a/airs/morag_of_dunvegan.side.ly b/airs/morag_of_dunvegan.side.ly deleted file mode 100755 index 4d8a6f6..0000000 --- a/airs/morag_of_dunvegan.side.ly +++ /dev/null @@ -1,41 +0,0 @@ -\version "2.18.2" - -\include "lilydrum.ly" - -\score { - \new PipeBandDrumStaff { - \time 6/8 - - \drummode { - \repeat volta 2 { - \flamd d8 d8:32( g8) \flamd d8 r8 \flamd d8 | - g8 d8:32( g8) g8 \tuplet 3/2 { d16 g d } g8 | - \flamd d8 d8:32( g8) \flamd d8 r8 d8 | - \tuplet 3/2 { d16 g d } g8 \flamd d8 d4.:32(\< | - - d8)\! d8:32( g8) \flamd d8 r8 \flamd d8 | - g8 d8:32( g8) \flamd d8 \tuplet 3/2 { d16 g d } g8 | - \flamd d8 d8:32( g8) \flamd d8 g16. d32-> g16. g32 | - d4.:32( d4.) - } - \break - \repeat volta 2 { - d16.-> g32 d16. d32 g8 d8:32(-> g8) \flamd d8 | - d16.-> g32 d16. d32 g8 \flamd d8-> \tuplet 3/2 { d16 g d } g8 | - d16.-> g32 d16. d32 g8 d8:32(-> g8) \flamd d8 | - \tuplet 3/2 { d16 g d } g8 \flamd d8 d4.:32(\< | - - d16.)->\! g32 d16. d32 g8 d8:32(-> g8) \flamd d8 | - d16. g32 d16. d32 g8 \flamd d8-> \tuplet 3/2 { d16 g d } g8 | - \flamd d8 d8:32( g8) \flamd d8 g16. d32-> g16. g32 | - d4.:32( d4.) - } - }% End of drums % - } - \header { - title = "Morag of Dunvegan" - meter = "Slow Air" - composer = "" - instrument = "Side" - } -} \ No newline at end of file diff --git a/airs/morag_of_dunvegan/morag_of_dunvegan.bass.ly b/airs/morag_of_dunvegan/bass.ly similarity index 63% rename from airs/morag_of_dunvegan/morag_of_dunvegan.bass.ly rename to airs/morag_of_dunvegan/bass.ly index 2d1d63c..15447aa 100755 --- a/airs/morag_of_dunvegan/morag_of_dunvegan.bass.ly +++ b/airs/morag_of_dunvegan/bass.ly @@ -1,11 +1,11 @@ \version "2.18.2" -\include "morag_of_dunvegan.format.ly" -\include "morag_of_dunvegan.notes.bass.ly" +\include "config.ily" +\include "notes.bass.ily" \score { \new PipeBandDrumStaff { - \time 6/8 + \global << {\formatA \formatB} {\bassA \bassB} @@ -14,7 +14,6 @@ \header { title = "Morag of Dunvegan" meter = "Slow Air" - composer = "" instrument = "Bass" } } \ No newline at end of file diff --git a/airs/morag_of_dunvegan/config.ily b/airs/morag_of_dunvegan/config.ily new file mode 100755 index 0000000..5c596f9 --- /dev/null +++ b/airs/morag_of_dunvegan/config.ily @@ -0,0 +1,9 @@ +\version "2.19.0" +%% Globals +global = { + \time 6/8 + } + +%% Format +formatA = { \repeat volta 2 { \repeat unfold 8 { s4. s4. } } \break } +formatB = { \repeat volta 2 { \repeat unfold 8 { s4. s4. } } \break } \ No newline at end of file diff --git a/airs/morag_of_dunvegan/morag_of_dunvegan.drums.ly b/airs/morag_of_dunvegan/drums.ly similarity index 78% rename from airs/morag_of_dunvegan/morag_of_dunvegan.drums.ly rename to airs/morag_of_dunvegan/drums.ly index 117f76b..76d2545 100755 --- a/airs/morag_of_dunvegan/morag_of_dunvegan.drums.ly +++ b/airs/morag_of_dunvegan/drums.ly @@ -1,9 +1,9 @@ \version "2.19.0" -\include "morag_of_dunvegan.format.ly" -\include "morag_of_dunvegan.notes.bass.ly" -\include "morag_of_dunvegan.notes.tenor.ly" -\include "morag_of_dunvegan.notes.side.ly" +\include "config.ily" +\include "notes.bass.ily" +\include "notes.tenor.ily" +\include "notes.side.ily" \score { \new StaffGroup << @@ -11,7 +11,7 @@ \set PipeBandDrumStaff.instrumentName = #"Side " \set PipeBandDrumStaff.shortInstrumentName = #"S.D. " - \time 6/8 + \global << { \formatA \formatB } { \snareA \snareB } diff --git a/airs/morag_of_dunvegan/morag_of_dunvegan.format.ly b/airs/morag_of_dunvegan/morag_of_dunvegan.format.ly deleted file mode 100755 index 85ddf11..0000000 --- a/airs/morag_of_dunvegan/morag_of_dunvegan.format.ly +++ /dev/null @@ -1,4 +0,0 @@ -\version "2.19.0" - -formatA = { \repeat volta 2 { \repeat unfold 8 { s4. s4. } } } -formatB = { \repeat volta 2 { \repeat unfold 8 { s4. s4. } } } \ No newline at end of file diff --git a/airs/morag_of_dunvegan/morag_of_dunvegan.notes.bass.ly b/airs/morag_of_dunvegan/notes.bass.ily similarity index 100% rename from airs/morag_of_dunvegan/morag_of_dunvegan.notes.bass.ly rename to airs/morag_of_dunvegan/notes.bass.ily diff --git a/airs/morag_of_dunvegan/morag_of_dunvegan.notes.side.ly b/airs/morag_of_dunvegan/notes.side.ily similarity index 100% rename from airs/morag_of_dunvegan/morag_of_dunvegan.notes.side.ly rename to airs/morag_of_dunvegan/notes.side.ily diff --git a/airs/morag_of_dunvegan/morag_of_dunvegan.notes.tenor.ly b/airs/morag_of_dunvegan/notes.tenor.ily similarity index 100% rename from airs/morag_of_dunvegan/morag_of_dunvegan.notes.tenor.ly rename to airs/morag_of_dunvegan/notes.tenor.ily diff --git a/airs/morag_of_dunvegan/morag_of_dunvegan.side.ly b/airs/morag_of_dunvegan/side.ly similarity index 64% rename from airs/morag_of_dunvegan/morag_of_dunvegan.side.ly rename to airs/morag_of_dunvegan/side.ly index ee55619..013d4f7 100755 --- a/airs/morag_of_dunvegan/morag_of_dunvegan.side.ly +++ b/airs/morag_of_dunvegan/side.ly @@ -1,11 +1,11 @@ \version "2.18.2" -\include "morag_of_dunvegan.format.ly" -\include "morag_of_dunvegan.notes.side.ly" +\include "config.ily" +\include "notes.side.ily" \score { \new PipeBandDrumStaff { - \time 6/8 + \global << {\formatA \formatB} {\snareA \snareB} @@ -14,7 +14,6 @@ \header { title = "Morag of Dunvegan" meter = "Slow Air" - composer = "" instrument = "Side" } } \ No newline at end of file diff --git a/airs/morag_of_dunvegan/morag_of_dunvegan.tenor.ly b/airs/morag_of_dunvegan/tenor.ly similarity index 63% rename from airs/morag_of_dunvegan/morag_of_dunvegan.tenor.ly rename to airs/morag_of_dunvegan/tenor.ly index 84cdf99..79f8985 100755 --- a/airs/morag_of_dunvegan/morag_of_dunvegan.tenor.ly +++ b/airs/morag_of_dunvegan/tenor.ly @@ -1,11 +1,11 @@ \version "2.18.2" -\include "morag_of_dunvegan.format.ly" -\include "morag_of_dunvegan.notes.tenor.ly" +\include "config.ily" +\include "notes.tenor.ily" \score { \new PipeBandDrumStaff { - \time 6/8 + \global << {\formatA \formatB} {\tenorA \tenorB} @@ -14,7 +14,6 @@ \header { title = "Morag of Dunvegan" meter = "Slow Air" - composer = "" instrument = "Tenor" } } \ No newline at end of file diff --git a/airs/the_mist_covered_mountains/config.ily b/airs/the_mist_covered_mountains/config.ily new file mode 100755 index 0000000..8b3fc9d --- /dev/null +++ b/airs/the_mist_covered_mountains/config.ily @@ -0,0 +1,10 @@ +\version "2.19.0" +%% Globals +global = { + \time 6/8 + } + +part = {\partial 8 s8 } +%% Format +formatA = { \repeat volta 2 { \part \repeat unfold 8 { s4. s4. } } \break } +formatB = { \repeat volta 2 { \part \repeat unfold 8 { s4. s4. } } \break } \ No newline at end of file diff --git a/airs/the_mist_covered_mountains/drums.ly b/airs/the_mist_covered_mountains/drums.ly new file mode 100755 index 0000000..4ef51dc --- /dev/null +++ b/airs/the_mist_covered_mountains/drums.ly @@ -0,0 +1,39 @@ +\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" { + \set PipeBandDrumStaff.instrumentName = #"Side " + \set PipeBandDrumStaff.shortInstrumentName = #"S.D. " + + \global + << + {\formatA \formatB } + {\snareA \snareB } + >> + } + %\new PipeBandDrumStaff = "bass" { + % \set PipeBandDrumStaff.instrumentName = #"Bass " + % \set PipeBandDrumStaff.shortInstrumentName = #"B.D. " + % + % \bassA + % \bassB + %} + \new PipeBandDrumStaff = "tenor" { + \set PipeBandDrumStaff.instrumentName = #"Tenor" + \set PipeBandDrumStaff.shortInstrumentName = #"T.D. " + + \tenorA + \tenorB + } + >> + \header { + title = "The Mist Covered Mountains" + meter = "Slow Air" + } +} \ No newline at end of file diff --git a/airs/the_mist_covered_mountains/notes.side.ily b/airs/the_mist_covered_mountains/notes.side.ily new file mode 100755 index 0000000..bd59aa5 --- /dev/null +++ b/airs/the_mist_covered_mountains/notes.side.ily @@ -0,0 +1,23 @@ +\version "2.18.2" +snareA = \drummode { + \partial 8 d8:32( | + g8.) d16 g8 d8[ r8 d8:32(] | + g8.) d16 g8 d8[ r8 d8:32(] | + g8.) d16 g8 d8. g16 d8 | + d4.:32( d8)[ r8 d8:32(] | + g8.) d16 g8 d8 r8 d8:32( | + g8.) d16 g8 d8 r8 d8:32( | + g8.) d16 g8 d8. g16 d8 | + d4.:32( d4.) | +} +snareB = \drummode { + \partial 8 d8 | + d2.:32( | + d8.)-> g16 d8 g8. d16 g8 | + d2.:32( | + d8.)-> g16 d8 g8 r8 g8 | + d2.:32( | + d8.)-> g16 d8 g8. d16 g8 | + r8 g8 d8 r8 d8 g8 | + d4.:32( d4.) | +} \ No newline at end of file diff --git a/airs/the_mist_covered_mountains/notes.tenor.ily b/airs/the_mist_covered_mountains/notes.tenor.ily new file mode 100755 index 0000000..fe1b048 --- /dev/null +++ b/airs/the_mist_covered_mountains/notes.tenor.ily @@ -0,0 +1,25 @@ +% 6/8 The Mist Covered Mountains +% Tenor +\version "2.18.2" +tenorA = \drummode { + \partial 8 s8 + d4. g | + d4. g8 r8 g8 | + d4. g8. d16 g8 | + d8. g16 d8 g8 r8 g8 | + d4. g | + d4. g8 r8 g8 | + d4. g8. d16 g8 | + d8 g8 d8 g8 r4 +} +tenorB = \drummode { + \partial 8 s8 + d4. g | + d4. g8 r8 g8 | + d4. g | + d4. g8 r8 g8 | + d4. g | + d4. g8 r8 g8 | + r8. g16 d8 r8. d16 g8 | + d8 g8 d8 g8 r4 +} \ No newline at end of file diff --git a/airs/the_mist_covered_mountains/side.ly b/airs/the_mist_covered_mountains/side.ly new file mode 100755 index 0000000..e9a3db1 --- /dev/null +++ b/airs/the_mist_covered_mountains/side.ly @@ -0,0 +1,19 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.side.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + {\formatA \formatB} + {\snareA \snareB} + >> + } + \header { + title = "The Mist Covered Mountains" + meter = "Slow Air" + instrument = "Side" + } +} \ No newline at end of file diff --git a/airs/the_mist_covered_mountains/tenor.ly b/airs/the_mist_covered_mountains/tenor.ly new file mode 100755 index 0000000..c1c8324 --- /dev/null +++ b/airs/the_mist_covered_mountains/tenor.ly @@ -0,0 +1,19 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.tenor.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + {\formatA \formatB} + {\tenorA \tenorB} + >> + } + \header { + title = "The Mist Covered Mountains" + meter = "Slow Air" + instrument = "Tenor" + } +} \ No newline at end of file diff --git a/airs/the_mist_covered_mountains.side.ly b/airs/the_mist_covered_mountains/the_mist_covered_mountains.side.ly similarity index 100% rename from airs/the_mist_covered_mountains.side.ly rename to airs/the_mist_covered_mountains/the_mist_covered_mountains.side.ly diff --git a/airs/the_mist_covered_mountains.tenor.ly b/airs/the_mist_covered_mountains/the_mist_covered_mountains.tenor.ly similarity index 100% rename from airs/the_mist_covered_mountains.tenor.ly rename to airs/the_mist_covered_mountains/the_mist_covered_mountains.tenor.ly diff --git a/header_default.ily b/header_default.ily index 5359785..6d61f1c 100755 --- a/header_default.ily +++ b/header_default.ily @@ -7,7 +7,6 @@ today = #(strftime "%B %e, %Y" (localtime (current-time))) \paper { - raggedbottom = ##t tagline = \markup { \line { "Cpl ET de Boone, Seaforths of Holland," diff --git a/makedrum b/makedrum index 50e836b..1e58d77 100755 --- a/makedrum +++ b/makedrum @@ -10,7 +10,7 @@ from argparse import ArgumentParser class MakeDrum: LILYPOND = 'lilypond' - VERSION = '0.7' + VERSION = '0.9' TMP_DIR = './tmp' TMP_PREFIX = 'tmp_' MASTER_DIR = os.path.dirname(os.path.abspath(__file__)) @@ -154,11 +154,11 @@ class MakeDrum: include_drum_file = False include_pipe_file = False # find out whether drum, pipes, or full score - for ext in ['.full', '.side', '.tenor', '.bass', '.drum', '.snare']: + for ext in ['full', 'side', 'tenor', 'bass', 'drum', 'snare']: if ext in file: include_drum_file = True - for ext in ['.full', '.pipes']: + for ext in ['full', 'pipes']: if ext in file: include_pipe_file = True diff --git a/strathspeys/lady_mackenzie_of_fairburn.drums.ly b/strathspeys/lady_mackenzie_of_fairburn.drums.ly deleted file mode 100755 index f04b139..0000000 --- a/strathspeys/lady_mackenzie_of_fairburn.drums.ly +++ /dev/null @@ -1,169 +0,0 @@ -%%%% SNARE DRUM %%%% -snareA = \drummode { - {\flam d8.} g16 - d8.:32( g16) - \flam d8 \< \triplet {d16 g d } - \flam g4-> \! - | - \triplet { d16 g d g d8 } - \triplet { g8-> d g-> } - d8.:32(-> g16:64)(-> - d4) - | - \triplet { d8 d g } - \flam d8. g16 - \triplet { d16 g d g d8 } - g8 g8 - | - d8[:32( g8]:32)(-> - d8[:32)( g8]:32)(-> - d8[:32)( g8]:32)(-> - d8.) s16 - } -snareBA = \drummode{ - g16 | - \triplet {d8 g \flam d} - \triplet {g d \flam g} - \triplet {d8 g \flam d} - \flam g8. g16 - | - \flam d16. d32 \flam g8 - d8:32( g8:32)(-> - d16.) g32 d8 - \flam d8. g16 - | - \drag d16 d8. - d4:32( - \triplet { d16) g d g d8} - g8. g16 - | - d8[:32( g8]:32)(-> - d8[:32)( g8]:32)(-> - d8[:32)( g8]:32)(-> - d8.) s16 - } -snareBB = \drummode{ - g16 | - \triplet {d8 g \flam d} - \triplet {g d \flam g} - \triplet {d8 g \flam d} - \flam g8. g16 - | - \flam d16. d32 \flam g8 - d8:32( g8:32)(-> - d16.) g32 d8 - \flam d8. g16 - | - {\flam d8.} g16 - d8.:32( g16) - \flam d8 \< \triplet {d16 g d } - \flam g4-> \! - | - d8[:32( g8]:32)(-> - d8:32)( g8]:32)(-> - d4:32)(-> - d4) - - } -%%%% BASS DRUM %%%% -bassA = \drummode { - bd4 bd4-> r4 bd4 - | - bd4-> r4 bd4 r4 - | - bd4-> bd4 r4 bd4 - | - bd4 r4 bd4-> bd4 - } -bassBA = \drummode { - s16 | - s1*4 - } -bassBB = \drummode { - s16 | - s1*4 - } -%%%% TENOR DRUM %%%% -tenorA = \drummode { - d8.[ g16] - d4^\splitTheFeather - r4 - << d4 g4 >> - | \flourish{ - d4 - g4 - d4 - g4 - } | - d4 - r16 g d-> r - r8. g16 - d4 - | - d4 - g4 - d4 - r4 - } -tenorBA = \drummode { - s16 | - s1^\bfly s1 - s1*2 - } -tenorBB = \drummode { - s16 | - s1*4 - } - -formatA = { % Part 1 - \repeat volta 2 { - \repeat unfold 4 { s1 | } - } - \break - } -formatBA = { % Part 2.1 - \partial 16 s16 | - \repeat unfold 4 { s1 | } - \break - } - -formatBB = { % Part 2.2 - \partial 16 s16 | - \repeat unfold 4 { s1 | } - \bar "|." -} - -\score { - \new StaffGroup << - \new PipeBandDrumStaff { - \set PipeBandDrumStaff.instrumentName = #"Side " - \set PipeBandDrumStaff.shortInstrumentName = #"S.D. " - << - {\formatA \formatBA \formatBB} - { - \snareA - \snareBA \snareBB - } - >> - } - \new DrumStaff { - \set DrumStaff.instrumentName = #"Bass " - \set DrumStaff.shortInstrumentName = #"B.D. " - - \bassA - \bassBA \bassBB - } - \new DrumStaff { - \set DrumStaff.instrumentName = #"Tenor " - \set DrumStaff.shortInstrumentName = #"T.D. " - - \tenorA - \tenorBA \tenorBB - } - >> - \header { - title = "Lady MacKenzie of Fairburn" - meter = "Strathspey" - composer = "E.T. de Boone" - } -} diff --git a/strathspeys/lady_mackenzie_of_fairburn.full.ly b/strathspeys/lady_mackenzie_of_fairburn.full.ly deleted file mode 100755 index 1db4691..0000000 --- a/strathspeys/lady_mackenzie_of_fairburn.full.ly +++ /dev/null @@ -1,244 +0,0 @@ -pipesA = { - d16 | - \dblc c8. e16 - \dblA A4 - g16 f16 e8 - \dblA A4 - | - \hdblc c8. e16 - \dblA A8. d16 - \dblc c8. b16 - \grg a8. d16 - | - \dblc c8. e16 - \dblA A4 - g16 f e8 - \dblg g4 - | - \thrwd d8. e16 - \dblg g8. d16 - \dblb b8. a16 - \grg a8. s16 - } -pipesBA = { - d16 | - a8. \grd c16 - \dble e8. a16 - \grg f8. a16 - \dble e4 - | - \grg a8. \grd c16 - \dble e8. d16 - \dblc c8. b16 - \grg a8. A16 - | - a8. \grd c16 - \dble e8. a16 - \grg f8. a16 - \dble e8. c16 - | - \thrwd d8. e16 - \dblg g8. d16 - \dblb b8. a16 - \grg G8. s16 -} -pipesBB = { - A16 | - a8. \grd c16 - \dble e8. a16 - \grg f8. a16 - \dble e4 - | - \grg a8. \grd c16 - \dble d8. d16 - \dblc c8. b16 - \grg a8. A16 - | - a8. \grd c16 - \grg e8. A16 - \hdblf g8. d16 - \dble e8. c16 - | - \thrwd d8. e16 - \dblg g8. d16 - \dblb b8. a16 - \grg G8. s16 - -} -snareA = \drummode { - s16 | - {\flam d8.} g16 - d8.:32( g16) - \flam d8 \< \triplet {d16 g d } - \flam g4-> \! - | - \triplet { d16 g d g d8 } - \triplet { g8-> d g-> } - d8.:32(-> g16:64)(-> - d4) - | - \triplet { d8 d g } - \flam d8. g16 - \triplet { d16 g d g d8 } - g8 g8 - | - d8[:32( g8]:32)(-> - d8[:32)( g8]:32)(-> - d8[:32)( g8]:32)(-> - d8.) s16 - } -snareBA = \drummode{ - g16 | - \triplet {d8 g \flam d} - \triplet {g d \flam g} - \triplet {d8 g \flam d} - \flam g8. g16 - | - \flam d16. d32 \flam g8 - d8:32( g8:32)(-> - d16.) g32 d8 - \flam d8. g16 - | - \drag d16 d8. - d4:32( - \triplet { d16) g d g d8} - g8. g16 - | - d8[:32( g8]:32)(-> - d8[:32)( g8]:32)(-> - d8[:32)( g8]:32)(-> - d8.) s16 - } -snareBB = \drummode{ - g16 | - \triplet {d8 g \flam d} - \triplet {g d \flam g} - \triplet {d8 g \flam d} - \flam g8. g16 - | - \flam d16. d32 \flam g8 - d8:32( g8:32)(-> - d16.) g32 d8 - \flam d8. g16 - | - {\flam d8.} g16 - d8.:32( g16) - \flam d8 \< \triplet {d16 g d } - \flam g4-> \! - | - d8[:32( g8]:32)(-> - d8:32)( g8]:32)(-> - d4:32)(-> - d4) - - } -bassA = \drummode { - s16 | - bd4 bd4-> r4 bd4 - | - bd4-> r4 bd4 r4 - | - bd4-> bd4 r4 bd4 - | - bd4 r4 bd4-> bd4 - } -bassBA = \drummode { - s16 | - s1*4 - } -bassBB = \drummode { - s16 | - s1*4 - } -tenorA = \drummode { - s16 | - d8.[ g16] - d4^\splitTheFeather - r4 - << d4 g4 >> - | \flourish{ - d4 - g4 - d4 - g4 - } | - d4 - r16 g d-> r - r8. g16 - d4 - | - d4 - g4 - d4 - r4 - } -tenorBA = \drummode { - s16 | - s1*2 - s1*2 - } -tenorBB = \drummode { - s16 | - s1*4 - } -formatA = { % Part 1 - \repeat volta 2 { - \partial 16 s16 | - \repeat unfold 4 { s1 | } - } - \break - } -formatBA = { % Part 2.1 - \partial 16 s16 | - \repeat unfold 4 { s1 | } - \break - } - -formatBB = { % Part 2.2 - \partial 16 s16 | - \repeat unfold 4 { s1 | } - \bar "|." -} - -\score { - \new StaffGroup << - \new Staff { - \bagpipeKey - \set Staff.instrumentName = #"Pipes " - \set Staff.shortInstrumentName = #"P. " - - \override KeySignature.stencil = ##f - - << - {\formatA \formatBA \formatBB} - {\pipesA \pipesBA \pipesBB} - >> - } - \new PipeBandDrumStaff { - \set DrumStaff.instrumentName = #"Side " - \set DrumStaff.shortInstrumentName = #"S.D. " - - \snareA - \snareBA \snareBB - } - \new DrumStaff { - \set DrumStaff.instrumentName = #"Bass " - \set DrumStaff.shortInstrumentName = #"B.D. " - - \bassA - \bassBA \bassBB - } - \new DrumStaff { - \set DrumStaff.instrumentName = #"Tenor " - \set DrumStaff.shortInstrumentName = #"T.D. " - - \tenorA - \tenorBA \tenorBB - } - >> - \header { - title = "Lady MacKenzie of Fairburn" - meter = "Strathspey" - composer = "E.T. de Boone" - } -} diff --git a/strathspeys/lady_mackenzie_of_fairburn/bass.ly b/strathspeys/lady_mackenzie_of_fairburn/bass.ly new file mode 100755 index 0000000..25189f7 --- /dev/null +++ b/strathspeys/lady_mackenzie_of_fairburn/bass.ly @@ -0,0 +1,19 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.bass.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + {\repeat volta 2 { \line } \break \line \break \line \bar "|."} + {\bassA \bassBA \bassBB} + >> + } + \header { + title = "Lady MacKenzie of Fairburn" + meter = "Strathspey" + instrument = "Bass" + } +} \ No newline at end of file diff --git a/strathspeys/lady_mackenzie_of_fairburn/config.ily b/strathspeys/lady_mackenzie_of_fairburn/config.ily new file mode 100755 index 0000000..2c24775 --- /dev/null +++ b/strathspeys/lady_mackenzie_of_fairburn/config.ily @@ -0,0 +1,9 @@ +\version "2.19.0" +%% Globals +global = { + \time 4/4 + } + +%% Format +part = {\partial 16 s16 } +line = { \repeat unfold 4 { s1 | } } diff --git a/strathspeys/lady_mackenzie_of_fairburn/drums.ly b/strathspeys/lady_mackenzie_of_fairburn/drums.ly new file mode 100755 index 0000000..16d48ed --- /dev/null +++ b/strathspeys/lady_mackenzie_of_fairburn/drums.ly @@ -0,0 +1,43 @@ +\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 + \set PipeBandDrumStaff.instrumentName = #"Side " + \set PipeBandDrumStaff.shortInstrumentName = #"S.D. " + + << + { \repeat volta 2 {\line } \break \part \line \break \line \bar "|."} + { \snareA s16 \snareBA \snareBB } + >> + } + \new PipeBandDrumStaff = "bass" { + \set PipeBandDrumStaff.instrumentName = #"Bass " + \set PipeBandDrumStaff.shortInstrumentName = #"B.D. " + + \bassA + s16 + \bassBA + \bassBB + } + \new PipeBandDrumStaff = "tenor" { + \set PipeBandDrumStaff.instrumentName = #"Tenor" + \set PipeBandDrumStaff.shortInstrumentName = #"T.D. " + + \tenorA + s16 + \tenorBA + \tenorBB + } + >> + \header { + title = "Lady MacKenzie of Fairburn" + meter = "Strathspey" + } +} \ No newline at end of file diff --git a/strathspeys/lady_mackenzie_of_fairburn/full.ly b/strathspeys/lady_mackenzie_of_fairburn/full.ly new file mode 100755 index 0000000..8f9d2e5 --- /dev/null +++ b/strathspeys/lady_mackenzie_of_fairburn/full.ly @@ -0,0 +1,53 @@ +\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 + \bagpipeKey + \set PipeBandDrumStaff.instrumentName = #"Pipes " + \set PipeBandDrumStaff.shortInstrumentName = #"P." + << + {\repeat volta 2 { \part \line } \break \part \line \break \line \bar "|."} + {\pipesA s16 \pipesBA \pipesBB} + >> + } + \new PipeBandDrumStaff = "side" { + \set PipeBandDrumStaff.instrumentName = #"Side " + \set PipeBandDrumStaff.shortInstrumentName = #"S.D. " + + s16 \snareA s16 + \snareBA \snareBB + } + \new PipeBandDrumStaff = "bass" { + \set PipeBandDrumStaff.instrumentName = #"Bass " + \set PipeBandDrumStaff.shortInstrumentName = #"B.D. " + + s16 + \bassA + s16 + \bassBA + \bassBB + } + \new PipeBandDrumStaff = "tenor" { + \set PipeBandDrumStaff.instrumentName = #"Tenor" + \set PipeBandDrumStaff.shortInstrumentName = #"T.D. " + + s16 + \tenorA + s16 + \tenorBA + \tenorBB + } + >> + \header { + title = "Lady MacKenzie of Fairburn" + meter = "Strathspey" + } +} \ No newline at end of file diff --git a/strathspeys/lady_mackenzie_of_fairburn/notes.bass.ily b/strathspeys/lady_mackenzie_of_fairburn/notes.bass.ily new file mode 100755 index 0000000..017ffb8 --- /dev/null +++ b/strathspeys/lady_mackenzie_of_fairburn/notes.bass.ily @@ -0,0 +1,18 @@ +% 4/4 Lady MacKenzie of Fairburn +% Bass +\version "2.18.2" +bassA = \drummode { + bd4 bd4-> r4 bd4 + | + bd4-> r4 bd4 r4 + | + bd4-> bd4 r4 bd4 + | + bd4 r4 bd4-> bd4 +} +bassBA = \drummode { + s1*4 +} +bassBB = \drummode { + s1*4 +} \ No newline at end of file diff --git a/strathspeys/lady_mackenzie_of_fairburn/notes.pipes.ily b/strathspeys/lady_mackenzie_of_fairburn/notes.pipes.ily new file mode 100755 index 0000000..469157a --- /dev/null +++ b/strathspeys/lady_mackenzie_of_fairburn/notes.pipes.ily @@ -0,0 +1,69 @@ +% 4/4 Lady MacKenzie of Fairburn +% Pipes +\version "2.18.2" +pipesA = { + d16 | + \dblc c8. e16 + \dblA A4 + g16 f16 e8 + \dblA A4 + | + \hdblc c8. e16 + \dblA A8. d16 + \dblc c8. b16 + \grg a8. d16 + | + \dblc c8. e16 + \dblA A4 + g16 f e8 + \dblg g4 + | + \thrwd d8. e16 + \dblg g8. d16 + \dblb b8. a16 + \grg a8. +} +pipesBA = { + d16 | + a8. \grd c16 + \dble e8. a16 + \grg f8. a16 + \dble e4 + | + \grg a8. \grd c16 + \dble e8. d16 + \dblc c8. b16 + \grg a8. A16 + | + a8. \grd c16 + \dble e8. a16 + \grg f8. a16 + \dble e8. c16 + | + \thrwd d8. e16 + \dblg g8. d16 + \dblb b8. a16 + \grg G8. +} +pipesBB = { + A16 | + a8. \grd c16 + \dble e8. a16 + \grg f8. a16 + \dble e4 + | + \grg a8. \grd c16 + \dble d8. d16 + \dblc c8. b16 + \grg a8. A16 + | + a8. \grd c16 + \grg e8. A16 + \hdblf g8. d16 + \dble e8. c16 + | + \thrwd d8. e16 + \dblg g8. d16 + \dblb b8. a16 + \grg G8. +} \ No newline at end of file diff --git a/strathspeys/lady_mackenzie_of_fairburn/notes.side.ily b/strathspeys/lady_mackenzie_of_fairburn/notes.side.ily new file mode 100755 index 0000000..3623901 --- /dev/null +++ b/strathspeys/lady_mackenzie_of_fairburn/notes.side.ily @@ -0,0 +1,68 @@ +% 4/4 Lady MacKenzie of Fairburn +% Side +\version "2.18.2" +snareA = \drummode { + \flam d8. g16 + d8.:32( g16) + \flam d8 \< \triplet {d16 g d } + \flam g4-> \! + | + \triplet { d16 g d g d8 } + \triplet { g8-> d g-> } + d8.:32(-> g16:64)(-> + d4) + | + \triplet { d8 d g } + \flam d8. g16 + \triplet { d16 g d g d8 } + g8 g8 + | + d8.[:32( g16]:32)(-> + d8.[:32)( g16]:32)(-> + d8.[:32)( g16]:32)(-> + d8.) +} +snareBA = \drummode{ + g16 | + \triplet {d8 g \flam d} + \triplet {g d \flam g} + \triplet {d8 g \flam d} + \flam g8. g16 + | + \flam d16. d32 \flam g8 + d8.:32( g16:32)(-> + d16.) g32 d8 + \flam d8. g16 + | + \drag d16 d8. + d4:32( + \triplet { d16) g d g d8} + g8. g16 + | + d8.[:32( g16]:32)(-> + d8.[:32)( g16]:32)(-> + d8.[:32)( g16]:32)(-> + d8.) +} +snareBB = \drummode{ + g16 | + \triplet {d8 g \flam d} + \triplet {g d \flam g} + \triplet {d8 g \flam d} + \flam g8. g16 + | + \flam d16. d32 \flam g8 + d8.:32( g16:32)(-> + d16.) g32 d8 + \flam d8. g16 + | + {\flam d8.} g16 + d8.:32( g16) + \flam d8 \< \triplet {d16 g d } + \flam g4-> \! + | + d8.[:32( g16]:32)(-> + d8.:32)( g16]:32)(-> + d4:32)(-> + d8.) +} \ No newline at end of file diff --git a/strathspeys/lady_mackenzie_of_fairburn/notes.tenor.ily b/strathspeys/lady_mackenzie_of_fairburn/notes.tenor.ily new file mode 100755 index 0000000..149d21f --- /dev/null +++ b/strathspeys/lady_mackenzie_of_fairburn/notes.tenor.ily @@ -0,0 +1,20 @@ +% 4/4 Lady MacKenzie of Fairburn +% Tenor +\version "2.18.2" +tenorA = \drummode { + d8.[ g16] d4^\splitTheFeather r4 << d4 g4 >> + | + \flourish { d4 g4 d4 g4 } + | + d4 r16 g d-> r r8. g16 d4 + | + d4 g4 d4 r4 + | +} +tenorBA = \drummode { + s1*2 + s1*2 +} +tenorBB = \drummode { + s1*4 +} \ No newline at end of file diff --git a/strathspeys/lady_mackenzie_of_fairburn/pipes.ly b/strathspeys/lady_mackenzie_of_fairburn/pipes.ly new file mode 100755 index 0000000..b08c1c2 --- /dev/null +++ b/strathspeys/lady_mackenzie_of_fairburn/pipes.ly @@ -0,0 +1,20 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.pipes.ily" + +\score { + \new Staff { + \global + \bagpipeKey + << + {\repeat volta 2 { \part \line } \break \part \line \break \line \bar "|."} + {\pipesA s16 \pipesBA \pipesBB} + >> + } + \header { + title = "Lady MacKenzie of Fairburn" + meter = "Strathspey" + instrument = "Pipes" + } +} \ No newline at end of file diff --git a/strathspeys/lady_mackenzie_of_fairburn/side.ly b/strathspeys/lady_mackenzie_of_fairburn/side.ly new file mode 100755 index 0000000..e5d3d4d --- /dev/null +++ b/strathspeys/lady_mackenzie_of_fairburn/side.ly @@ -0,0 +1,19 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.side.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + {\repeat volta 2 { \line } \break \part \line \break \line \bar "|."} + {\snareA s16 \snareBA \snareBB} + >> + } + \header { + title = "Lady MacKenzie of Fairburn" + meter = "Strathspey" + instrument = "Side" + } +} \ No newline at end of file diff --git a/strathspeys/lady_mackenzie_of_fairburn/tenor.ly b/strathspeys/lady_mackenzie_of_fairburn/tenor.ly new file mode 100755 index 0000000..f302af2 --- /dev/null +++ b/strathspeys/lady_mackenzie_of_fairburn/tenor.ly @@ -0,0 +1,19 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.tenor.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + {\repeat volta 2 { \line } \break \line \break \line \bar "|."} + {\tenorA \tenorBA \tenorBB} + >> + } + \header { + title = "Lady MacKenzie of Fairburn" + meter = "Strathspey" + instrument = "Tenor" + } +} \ No newline at end of file diff --git a/strathspeys/molly_connell.bass.ly b/strathspeys/molly_connell.bass.ly deleted file mode 100755 index 51e0d0f..0000000 --- a/strathspeys/molly_connell.bass.ly +++ /dev/null @@ -1,30 +0,0 @@ -\score { - \new PipeBandDrumStaff = "staff_bass"{ - \set Staff.instrumentName = #"Bass" - \set Staff.shortInstrumentName = #"B.D." - - \time 4/4 - - \drummode { - \repeat volta 2 { - d4-> g4-> d4 g4 | - d4 g4 d4 g4 | - d4-> g4 d4 g4 | - d4-> g4 d8.-> g16 d4 | - - \break - d4-> g4-> d4 g4 | - r8 d8 r8 g8 r8 d8 r8 g8 | - d4-> g4 d4 g4 | - d4-> g4 r8. g16 d4 | - - } - } - } - \header { - title = "Molly Connell" - composer = "W.H. de Boone / E.T. de Boone, 2014" - instrument = "Bass Drum" - meter = "STRATHSPEY" - } -} diff --git a/strathspeys/molly_connell.side.ly b/strathspeys/molly_connell.side.ly deleted file mode 100755 index 7b20bb3..0000000 --- a/strathspeys/molly_connell.side.ly +++ /dev/null @@ -1,42 +0,0 @@ -\version "2.18.2" - -\include "lilydrum.ly" - -\score { - \new PipeBandDrumStaff { - \time 4/4 - - \drummode { - \repeat volta 2 { - \partial 8 r8 - \flamd d4 \flamg g8.[ d16:64(] d8.[) \dragg g16] d8.[ g16] | - d8.:64[( g16]) \tuplet 3/2 { d16[ g d g d8]} \tuplet 3/2 { g8[ d8 \flamg g8] } \flamd d8.[ g16] | - - d16:64[( d8.]) g8.[ \dragd d16] \tuplet 3/2 { d16[ g d g d8] } g8.[ g16] | - \tuplet 3/2 { \flamd d8[ g d] } \flamg g8.[ \flamg g16] \tuplet 3/2 { d16[ g d g d8] } g8 - } - \break - \partial 8 g8 | - d4:32( d8.[) \dragd d16] \tuplet 3/2 { d16[ g d g d g8] } g8.[ g16] | - \dragd d16[ d8.] \flamd d8.[ \flamg g16] \tuplet 3/2 { d16[ g d g d8] } \tuplet 3/2 { g8[ d g] } | - - \tuplet 3/2 { \flamd d8[ g16 g16 d8] } g8.[ g16] \tuplet 3/2 { d8[ g16 g16 d8] } g8.[ g16] | - \tuplet 3/2 { \flamd d8[ g d] } \flamg g8.[ \flamg g16] \tuplet 3/2 { d16[ g d g d8] } g8 | - \break - \partial 8 g8 | - d4:32( d8.[) \dragd d16] \tuplet 3/2 { d16[ g d g d g8] } g8.[ g16] | - \dragd d16[ d8.] \flamd d8.[ \flamg g16] \tuplet 3/2 { d16[ g d g d8] } \tuplet 3/2 { g8[ d g] } | - - \flamd d4 \flamg g8.[ d16:64]( d8.[) \dragg g16] d8.[ g16] | - \tuplet 3/2 { \flamd d8[ g d] } \flamg g8.[ \flamg g16] \tuplet 3/2 { d16[ g d g d8] } g8 | - - \bar "|." - }% End of drums % - } - \header { - title = "Molly Connell" - meter = "Strathspey" - composer = "" - instrument = "Side" - } -} \ No newline at end of file diff --git a/strathspeys/molly_connell.tenor.ly b/strathspeys/molly_connell.tenor.ly deleted file mode 100755 index bf68e89..0000000 --- a/strathspeys/molly_connell.tenor.ly +++ /dev/null @@ -1,37 +0,0 @@ -\version "2.18.2" - -\include "lilydrum.ly" - -\score { - \new PipeBandDrumStaff { - \time 4/4 - - \drummode { - \repeat volta 2 { - d4 g4 d8. g16 d4 - d4 g4 r8. g16 d4 - \flourish { d4 d4 g4 g4 } - \flourish d4 \flourish g4 d4^\up g4^\up - } - \break - d4^\up g4^\up \flourish { d4 g4 } - d4 \parenthesize d8. g16 r8. g16 d4 - \flourish { d4 d4 g4 g4 } - \flourish d4 \flourish g4 d4^\up g4^\up - - \break - d4^\up g4^\up \flourish { d4 g4 } - d4 \parenthesize d8. g16 r8. g16 d4 - d4 g4 d8. g16 d4 - \flourish d4 \flourish g4 d4^\up g4^\up - \bar "|." - - }% End of drums % - } - \header { - title = "Molly Connell" - meter = "Strathspey" - composer = "B. de Boone/ M. Jansen/ N. Kuijkhoven/ E.T. de Boone, 2014" - instrument = "Tenor" - } -} \ No newline at end of file diff --git a/strathspeys/molly_connell/bass.ly b/strathspeys/molly_connell/bass.ly new file mode 100755 index 0000000..179bf08 --- /dev/null +++ b/strathspeys/molly_connell/bass.ly @@ -0,0 +1,19 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.bass.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + \repeat volta 2 { \line \break \line \break } + {\bassAA \bassAB} + >> + } + \header { + title = "Molly Connell" + meter = "Strathspey" + instrument = "Bass" + } +} \ No newline at end of file diff --git a/strathspeys/molly_connell/config.ily b/strathspeys/molly_connell/config.ily new file mode 100755 index 0000000..cdd114c --- /dev/null +++ b/strathspeys/molly_connell/config.ily @@ -0,0 +1,8 @@ +\version "2.19.0" +%% Globals +global = { + \time 4/4 + } +%% Format +part = {\partial 8 s8 } +line = { \repeat unfold 4 { s1 } } diff --git a/strathspeys/molly_connell/drums.ly b/strathspeys/molly_connell/drums.ly new file mode 100755 index 0000000..e0873ea --- /dev/null +++ b/strathspeys/molly_connell/drums.ly @@ -0,0 +1,66 @@ +\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" { + \set PipeBandDrumStaff.instrumentName = #"Side" + \set PipeBandDrumStaff.shortInstrumentName = #"S.D." + + \global + << + { + \line \break + \line \break + \bar "|." + + \part \line \break + \part \line \break + \bar "|." + }%End of Format + { + \set Score.proportionalNotationDuration = #(ly:make-moment 1/8) + \snareA + s8 + \snareA + s8 + + \snareBA + \snareBB + } + >> + } + \new PipeBandDrumStaff = "bass" { + \set PipeBandDrumStaff.instrumentName = #"Bass " + \set PipeBandDrumStaff.shortInstrumentName = #"B.D. " + + \bassAA + \bassAB + + s8 + \bassAA + s8 + \bassAB + } + \new PipeBandDrumStaff = "tenor" { + \set PipeBandDrumStaff.instrumentName = #"Tenor" + \set PipeBandDrumStaff.shortInstrumentName = #"T.D. " + + \tenorA + \tenorA + + s8 + \tenorBA + s8 + \tenorBB + } + >> + \header { + title = "Molly Connell" + meter = "Slow Air" + } +} \ No newline at end of file diff --git a/strathspeys/molly_connell/notes.bass.ily b/strathspeys/molly_connell/notes.bass.ily new file mode 100755 index 0000000..d489740 --- /dev/null +++ b/strathspeys/molly_connell/notes.bass.ily @@ -0,0 +1,15 @@ +% 4/4 Molly Connell +% Bass +\version "2.18.2" +bassAA = \drummode { + d4-> g4-> d4 g4 | + d4 g4 d4 g4 | + d4-> g4 d4 g4 | + d4-> g4 d8.-> g16 d4 | + } +bassAB = \drummode { + d4-> g4-> d4 g4 | + r8 d8 r8 g8 r8 d8 r8 g8 | + d4-> g4 d4 g4 | + d4-> g4 r8. g16 d4 | +} \ No newline at end of file diff --git a/strathspeys/molly_connell/notes.side.ily b/strathspeys/molly_connell/notes.side.ily new file mode 100755 index 0000000..d4a538d --- /dev/null +++ b/strathspeys/molly_connell/notes.side.ily @@ -0,0 +1,27 @@ +% 4/4 Molly Connell +% Side +\version "2.18.2" +snareA = \drummode { + \flam d4 \flam g8.[ d16:64(] d8.[) \drag d16] d8.[ g16] | + d8.:64[( g16]) \triplet { d16[ g d g d8]} \triplet { g8[ d8 \flam g8] } \flam d8.[ g16] | + + d16:64[( d8.]) g8.[ \drag d16] \triplet { d16[ g d g d8] } g8.[ g16] | + \flamd \triplet { d8 g d } \flam g8.[ \flam g16] \triplet { d16 g d g d8 } g8 +} + +snareBA = \drummode { + \partial 8 g8 | + d4:32( d8.[) \drag d16] \triplet { d16[ g d g d8] } g8.[ g16] | + \drag d16[ d8.] \flam d8.[ \flam g16] \triplet { d16[ g d g d8] } \triplet { g8[ d g] } | + + \flamd \triplet { d8[ g16 g16 d8] } g8.[ g16] \triplet { d8[ g16 g16 d8] } g8.[ g16] | + \flamd \triplet { d8[ g d] } \flam g8.[ \flam g16] \triplet { d16[ g d g d8] } g8 s8| +} +snareBB = \drummode { + \partial 8 g8 | + d4:32( d8.[) \drag d16] \triplet { d16[ g d g d8] } g8.[ g16] | + \drag d16[ d8.] \flam d8.[ \flam g16] \triplet { d16[ g d g d8] } \triplet { g8[ d g] } | + + \flam d4 \flam g8.[ d16:64]( d8.[) \drag g16] d8.[ g16] | + \flamd \triplet { d8[ g d] } \flam g8.[ \flam g16] \triplet { d16[ g d g d8] } g8 s8| +} \ No newline at end of file diff --git a/strathspeys/molly_connell/notes.tenor.ily b/strathspeys/molly_connell/notes.tenor.ily new file mode 100755 index 0000000..4bf45cf --- /dev/null +++ b/strathspeys/molly_connell/notes.tenor.ily @@ -0,0 +1,21 @@ +% 4/4 Molly Connell +% Tenor +\version "2.18.2" +tenorA = \drummode { + d4 g4 d8. g16 d4 + d4 g4 r8. g16 d4 | + \flourish { d4 d4 g4 g4 } | + \flourish d4 \flourish g4 d4^\up g4^\up | +} +tenorBA = \drummode { + d4^\up g4^\up \flourish { d4 g4 } | + d4 \parenthesize d8. g16 r8. g16 d4 | + \flourish { d4 d4 g4 g4 } | + \flourish d4 \flourish g4 d4^\up g4^\up | +} +tenorBB = \drummode { + d4^\up g4^\up \flourish { d4 g4 } | + d4 \parenthesize d8. g16 r8. g16 d4 | + d4 g4 d8. g16 d4 | + \flourish d4 \flourish g4 d4^\up g4^\up | +} \ No newline at end of file diff --git a/strathspeys/molly_connell/side.ly b/strathspeys/molly_connell/side.ly new file mode 100755 index 0000000..44fe070 --- /dev/null +++ b/strathspeys/molly_connell/side.ly @@ -0,0 +1,19 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.side.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + {\repeat volta 2 { \line } \break \part \line \break \part \line \bar "|." } + {\snareA s8 \snareBA \snareBB } + >> + } + \header { + title = "Molly Connell" + meter = "Strathspey" + instrument = "Side" + } +} \ No newline at end of file diff --git a/strathspeys/molly_connell/tenor.ly b/strathspeys/molly_connell/tenor.ly new file mode 100755 index 0000000..c09bfb2 --- /dev/null +++ b/strathspeys/molly_connell/tenor.ly @@ -0,0 +1,19 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.tenor.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + {\repeat volta 2 {\line} \break \line \break \line \bar "|." } + {\tenorA \tenorBA \tenorBB } + >> + } + \header { + title = "Molly Connell" + meter = "Strathspey" + instrument = "Tenor" + } +} \ No newline at end of file