From c46910bdfc211cb00e9b8ad34d43b40bfefd8331 Mon Sep 17 00:00:00 2001 From: Eric Teunis de Boone Date: Tue, 25 Jun 2019 09:57:27 +0200 Subject: [PATCH] New Tune: The Soldier's Return Changed Side for Cabar Feidh and Mackenzie Highlanders Added Parts to Jolly Beggarman --- .../mackenzie_highlanders/notes.side.ily | 40 +++++++++------ 2-4_marches/mackenzie_highlanders/side.ly | 37 +++++++++++--- 4-4_marches/cabar_feidh/notes.side.ily | 12 +++-- 4-4_marches/soldiers_return/config.ily | 18 +++++++ 4-4_marches/soldiers_return/notes.pipes.ily | 31 ++++++++++++ 4-4_marches/soldiers_return/pipes.ly | 50 +++++++++++++++++++ airs/road_to_the_isles/config.ily | 6 +-- defs.ily | 12 +++-- hornpipes/the_jolly_beggarman/notes.pipes.ily | 24 +++++++-- hornpipes/the_jolly_beggarman/pipes.ly | 17 +++++-- 10 files changed, 208 insertions(+), 39 deletions(-) create mode 100644 4-4_marches/soldiers_return/config.ily create mode 100644 4-4_marches/soldiers_return/notes.pipes.ily create mode 100644 4-4_marches/soldiers_return/pipes.ly diff --git a/2-4_marches/mackenzie_highlanders/notes.side.ily b/2-4_marches/mackenzie_highlanders/notes.side.ily index ce03458..6b583b7 100644 --- a/2-4_marches/mackenzie_highlanders/notes.side.ily +++ b/2-4_marches/mackenzie_highlanders/notes.side.ily @@ -1,9 +1,27 @@ % 2/4 MacKenzie Highlanders % Snare \version "2.18.2" -composerSide = "v1.3, 2016" +composerSide = "v1.4, 2019" sideglobal = { \eighthBeaming } %%music +snareEnd = \drummode { + \tutti { + d8:32)(-> \tuplet 3/2 { g16) d g } | + + d8[-> \drag d8] r16 \drag d16 d16. g32 | + d4:32( d8) + } +} +snareEndLD = \drummode { + \tutti { + d8:32)(-> \tuplet 3/2 { g16) d g } | + + d8[-> \drag d16 d32-> g] d[ g \drag d16 d16. g32] | + d4:32( d8) + } +} + + snareA = \drummode { d8:32( | g8) \tuplet 3/2 { d16 g d } \flam g16. d32-> g16. g32 | @@ -16,13 +34,9 @@ snareA = \drummode { } d8:32( | g8) \tuplet 3/2 { d16 g d } \flam g16. d32-> g16. g32 | - d8-> g8:32(-> - \tutti { - d8:32)(-> \tuplet 3/2 { g16) d g } | + d8-> g8:32(-> - d8[-> \drag d16 d32-> g] d[ g \drag d16 d16. g32] | - d4:32( d8) - } + \snareEnd } % Part 2 snareBA = \drummode { @@ -39,10 +53,9 @@ snareBA = \drummode { } g8-> | d8:32( \tuplet 3/2 { g16) d g-> } d16.-> g32-> d32 g d g-> | - d8-> g8:32(-> d8:32)(\dr-> \tuplet 3/2{ g16) d g } | + d8-> g8:32(-> - d8[-> \drag d16 d32-> g] d[ g \drag d16 d16. g32] | - d4:32( d8)\fr + \snareEnd } snareBB = \drummode { \tutti { g8 | @@ -53,9 +66,8 @@ snareBB = \drummode { \tutti { \flam d4 d8:32(-> \< g8:32)(-> | d8)-> \! \tuplet 3/2 { g16 d g-> } d8:32(-> \tuplet 3/2 { g16) d g-> } - d32 g d g-> d16.-> g32 d8:32(-> \tuplet 3/2 { g16) d g } | - - d8[-> \drag d16 d32-> g] d[ g \drag d16 d16. g32] | - d4:32( d8) + d32 g d g-> d16.-> g32 + \removeWithTag #'tutti \snareEnd + \grace { s4 } } } diff --git a/2-4_marches/mackenzie_highlanders/side.ly b/2-4_marches/mackenzie_highlanders/side.ly index eef48b4..d3107a2 100644 --- a/2-4_marches/mackenzie_highlanders/side.ly +++ b/2-4_marches/mackenzie_highlanders/side.ly @@ -5,23 +5,46 @@ \include "./config.ily" \include "./notes.side.ily" +\layout { + \context { + \Score + \consists "Span_bar_engraver" + } +} + \score { - \new PipeBandDrumStaff { - \global + \new StaffGroup << + \new PipeBandDrumStaff { + \global \sideglobal - << + << { \repeat volta 2 { \part \line } \break \part \line \bar "||" \break \line \bar "|." } { - \snareA s8 - \snareBA - \snareBB + \snareA s8 + \snareBA s8 + \snareBB s8 } + { + s8 | s2*5 | s4 << + { s4 | s2 | s2 } + \new PipeBandDrumStaff = "LD" \with { + fontSize = #-3 + \override StaffSymbol #'staff-space = #(magstep -3) + \override StaffSymbol #'thickness = #(magstep -3) + \remove "Time_signature_engraver" + alignAboveContext = #"main" + } { + \removeWithTag #'tutti {\snareEndLD } s8 + } + >> + } + >> + } >> - } \header { title = \title meter = \meter diff --git a/4-4_marches/cabar_feidh/notes.side.ily b/4-4_marches/cabar_feidh/notes.side.ily index 16595aa..206d4ff 100644 --- a/4-4_marches/cabar_feidh/notes.side.ily +++ b/4-4_marches/cabar_feidh/notes.side.ily @@ -7,6 +7,12 @@ arrangerSideSimple = "E.T. de Boone, 2018" sideglobal = { \eighthBeaming } + +%% Optional Flams in Ending +optflamd = \drummode { \drumgrace { \parenthesize g8 } } +optflamg = \drummode { \drumgrace { \parenthesize d8 } } +optflam = #(autohandFunc optflamg optflamd) + % Music simpleSnarepone = \drummode { g8 | @@ -43,9 +49,9 @@ simpleSnareEndingI = \drummode { \tutti { }} simpleSnareEndingII = \drummode { g8 | - \flam d16 g d \flam g - d16 g \flam d g - d16 \flam g d g + \flam d16 g \optflam d \flam g + d16 \optflam g \flam d g + \optflam d16 \flam g d \optflam g d4:32( | d8) \flam g8 diff --git a/4-4_marches/soldiers_return/config.ily b/4-4_marches/soldiers_return/config.ily new file mode 100644 index 0000000..9037c7d --- /dev/null +++ b/4-4_marches/soldiers_return/config.ily @@ -0,0 +1,18 @@ +\version "2.19.0" +%% Globals +global = { + \key d \major + \time 4/4 + } +confTempo = { + \tempo 4 = 80 + } +%% Format +part = { \partial 4 \grace{s4.} s4 } +measure = { \grace {s1} s1 | } +halfline = { \repeat unfold 2 \measure } +line = { \repeat unfold 2 { \halfline } } + +%% Headers +title = "The Soldier's Return" +meter = "March" diff --git a/4-4_marches/soldiers_return/notes.pipes.ily b/4-4_marches/soldiers_return/notes.pipes.ily new file mode 100644 index 0000000..a6ffbf2 --- /dev/null +++ b/4-4_marches/soldiers_return/notes.pipes.ily @@ -0,0 +1,31 @@ +% 4/4 the Soldier's Return +% Pipes +\version "2.18.2" +composerPipes = "" +arrangerPipes = "" +pipeglobal = { + \bagpipeKey +} +% Music +pipesA = { + \grg d8. [ e16 ] | + \dblf f4 a4 \wbirl a4 \thrwd d8. [ c16 ] | + \dblb b8 [ \gre a8 ] \grg b16 [ d8. ] \dble e4 + + \thrwd d8. [ e16 ] | + \dblf f4 \wbirl a4 \grA g8 [ f8 ] \dble e8 [ d8 ] | + \dblb b4. c8 \thrwd d4 +} +pipesBA = { + a4 | + \thrwd d8. [ e16 ] \grg f8 [ g8 ] \dblA A4. f8 | + \dblg g8. [ f16 ] \grg e8 [ d8 ] \dble e4 \wbirl a4 | + \thrwd d8. [ e16 ] \grg f8 [ g8 ] \dblA A4. g8 | + \grA f4. g8 \dblA A4 \wbirl a4 +} +pipesBB = { + \thrwd d8. [ e16 ] \grg f8 [ g8 ] \dblA A4. f8 | + \dblg g8. [ f16 ] \grg e8 [ d8 ] \dble e4 \thrwd d8. [ e16 ] | + \dblf f4 \wbirl a4 \grA g8 [ f8 ] \dble e8 [ d8 ] | + \dblb b4. c8 \thrwd d4 +} diff --git a/4-4_marches/soldiers_return/pipes.ly b/4-4_marches/soldiers_return/pipes.ly new file mode 100644 index 0000000..46a5656 --- /dev/null +++ b/4-4_marches/soldiers_return/pipes.ly @@ -0,0 +1,50 @@ +\version "2.18.2" + +\include "bagpipe.ly" + +\include "./config.ily" +\include "./notes.pipes.ily" + +\score { + \new Staff { + \global + \pipeglobal + \repeat volta 2 { + \partial 4 + \pipesA s4 + } + \break + \partial 4 + \pipesBA + \break + \pipesBB + \bar "|." + } + \header { + title = \title + meter = \meter + instrument = \instrumentPipes + composer = \composerPipes + arranger = \arrangerPipes + } +} +\score { + \new Staff { \global \pipeglobal + \set Staff.midiInstrument = #"bagpipe" + %%Tune + \partial 4 + \pipesA + \pipesA + + \pipesBA + \pipesBB + } + \midi { \confTempo } + \header { + title = \title + meter = \meter + instrument = \instrumentPipes + composer = \composerPipes + arranger = \arrangerPipes + } +} diff --git a/airs/road_to_the_isles/config.ily b/airs/road_to_the_isles/config.ily index 57b5f1d..9a0e801 100644 --- a/airs/road_to_the_isles/config.ily +++ b/airs/road_to_the_isles/config.ily @@ -3,8 +3,8 @@ global = { \time 2/4 } -confTempo = { - \tempo 4 = 50 +confTempo = { + \tempo 4 = 80 } %% Format part = { \partial 8 \grace{s4.} s8 } @@ -14,4 +14,4 @@ line = { \repeat unfold 2 { \halfline } } %% Headers title = "Road to the Isles" -meter = "Slow March" +meter = "March" diff --git a/defs.ily b/defs.ily index a359344..3edb8dc 100644 --- a/defs.ily +++ b/defs.ily @@ -3,7 +3,11 @@ Not critical if missing. But there is complaining.. %} -% instrumentName + +%$(set-default-paper-size "a4" 'landscape) +%$(set-default-paper-size "a4") + +%% instrumentName instrumentSide = "Side" instrumentTenor = "Tenor" instrumentBass = "Bass" @@ -16,7 +20,7 @@ instrumentPipesthrd = \instrumentPipesThrd %TODO: Remove Me instrumentSecnd = "Seconds" instrumentThrd = "Thirds" -% shortInstrumentName +%% shortInstrumentName shortInstrumentLyrics = "" shortInstrumentSide = "S.D." shortInstrumentTenor = "T.D." @@ -29,7 +33,7 @@ shortInstrumentPipesthrd = \shortInstrumentPipesThrd %TODO: Remove Me shortInstrumentSecnd = "2nd" shortInstrumentThrd = "3rd" -% composer +%% composer composerLyrics = "" composerSide = "" composerTenor = "" @@ -40,7 +44,7 @@ composerPipessecnd = \composerPipesSecnd %TODO: Remove Me composerPipesThrd = "" composerPipesthrd = \composerPipesThrd %TODO: Remove Me -% arranger +%% arranger arrangerLyrics = "" arrangerSide = "" arrangerTenor = "" diff --git a/hornpipes/the_jolly_beggarman/notes.pipes.ily b/hornpipes/the_jolly_beggarman/notes.pipes.ily index e2fc3d5..3e266d6 100644 --- a/hornpipes/the_jolly_beggarman/notes.pipes.ily +++ b/hornpipes/the_jolly_beggarman/notes.pipes.ily @@ -28,11 +28,17 @@ pipesPartB = { \grA g16. [ f32 \grg e16. c32 ] \thrwd d8 } pipesPartC = { + e8 | + \grg a16. e32 e16. a32 \grg e16. a32 a16. a32 | + \grg a16. e32 e16. c32 \thrwd d8 +} +pipesPartD = { \grg e16. f32 | \dblg g16. f32 e16. f32 g8 A16. g32 | \grA f16. d32 f16. e32 \thrwd d8 } +%A pipesAA = { \pipesPartA \pipesMid @@ -41,7 +47,7 @@ pipesAB = { \pipesPartA \pipesEnd } - +% B pipesBA = { \pipesPartB \pipesMid @@ -53,14 +59,24 @@ pipesBBA = { pipesBBB = { \pipesAB } +% C pipesCA = { \pipesPartC \pipesMid } -pipesCBA = { +pipesCB = { \pipesPartC \pipesEnd } -pipesCBB = { +% D +pipesDA = { + \pipesPartD + \pipesMid +} +pipesDBA = { + \pipesPartD + \pipesEnd +} +pipesDBB = { \pipesBBB -} \ No newline at end of file +} diff --git a/hornpipes/the_jolly_beggarman/pipes.ly b/hornpipes/the_jolly_beggarman/pipes.ly index 15b5990..5d41a19 100644 --- a/hornpipes/the_jolly_beggarman/pipes.ly +++ b/hornpipes/the_jolly_beggarman/pipes.ly @@ -27,9 +27,15 @@ \repeat volta 2 { \partial 8 \pipesCA + \pipesCB + } + \break + \repeat volta 2 { + \partial 8 + \pipesDA } \alternative { - {\partial 8 \pipesCBA } - {\partial 8 \pipesCBB } + {\partial 8 \pipesDBA } + {\partial 8 \pipesDBB } } \bar "|." }%Format @@ -52,8 +58,11 @@ \pipesBA \pipesBBA \pipesBA \pipesBBB - \pipesCA \pipesCBA - \pipesCA \pipesCBB + \pipesCA \pipesCB + \pipesCA \pipesCB + + \pipesDA \pipesDBA + \pipesDA \pipesDBB } \midi { \confTempo } \header {