From ac4c9758fc0cea4c41f7799d7d181363ca4b5f76 Mon Sep 17 00:00:00 2001 From: Eric Teunis de Boone Date: Tue, 23 Feb 2016 17:34:00 +0100 Subject: [PATCH 1/3] Quick fix for Pikeman's March Tenor --- 4-4_marches/the_pikemans_march/tenor.ly | 10 +++++++-- .../lady_mackenzie_of_fairburn/config.ily | 4 ++-- .../lady_mackenzie_of_fairburn/pipes.ly | 21 ++++++++++++++++++- 3 files changed, 30 insertions(+), 5 deletions(-) diff --git a/4-4_marches/the_pikemans_march/tenor.ly b/4-4_marches/the_pikemans_march/tenor.ly index dfb1415..e7ee66c 100644 --- a/4-4_marches/the_pikemans_march/tenor.ly +++ b/4-4_marches/the_pikemans_march/tenor.ly @@ -7,14 +7,20 @@ \new PipeBandDrumStaff { \global << - {\repeat volta 2 { \part \line \break \line} \break + { + \repeat volta 2 { + \part \line + \break + \line + } + \break \part \line \break \line \break \line \bar "|." } { \tenorAA - \tenorAB + \tenorAB s8 \tenorBA \tenorBB diff --git a/strathspeys/lady_mackenzie_of_fairburn/config.ily b/strathspeys/lady_mackenzie_of_fairburn/config.ily index 685b8f8..7e6cbd3 100644 --- a/strathspeys/lady_mackenzie_of_fairburn/config.ily +++ b/strathspeys/lady_mackenzie_of_fairburn/config.ily @@ -3,11 +3,11 @@ global = { \time 4/4 } - +confTempo = { \tempo 4 = 108 } %% Format part = { \partial 16 s16 } line = { \repeat unfold 4 { s1 | } } %% Headers title = "Lady MacKenzie of Fairburn" -meter = "Strathspey" \ No newline at end of file +meter = "Strathspey" diff --git a/strathspeys/lady_mackenzie_of_fairburn/pipes.ly b/strathspeys/lady_mackenzie_of_fairburn/pipes.ly index 711e24c..21e27a6 100644 --- a/strathspeys/lady_mackenzie_of_fairburn/pipes.ly +++ b/strathspeys/lady_mackenzie_of_fairburn/pipes.ly @@ -18,4 +18,23 @@ instrument = \instrumentPipes composer = \composerPipes } -} \ No newline at end of file +} +\score { + \midi { \confTempo } + \new Staff { + \global + \bagpipeKey + \partial 8 + \pipesA + \pipesA + + \pipesBA + \pipesBB + } + \header { + title = \title + meter = \meter + instrument = \instrumentPipes + composer = \composerPipes + } +} From 4c8e28ac13bd76532e54d718430e54c494ec5ae4 Mon Sep 17 00:00:00 2001 From: Eric Teunis de Boone Date: Tue, 1 Mar 2016 18:48:48 +0100 Subject: [PATCH 2/3] Fixed little error in Pipes of Lady MK of F Added scores by C. Ooms --- 2-4_marches/black_bear/full.ly | 2 +- 2-4_marches/black_bear/side.ly | 1 + 2-4_marches/mackenzie_highlanders/bass.ly | 2 +- 2-4_marches/mackenzie_highlanders/full.ly | 6 +++--- 2-4_marches/mackenzie_highlanders/notes.bass.ily | 2 +- reels/the_mackenzies_reel/notes.side.ily | 2 +- reels/the_mackenzies_reel/side.ly | 4 +++- .../lady_mackenzie_of_fairburn/notes.side.ily | 8 ++++---- .../lady_mackenzie_of_fairburn/notes.tenor.ily | 14 +++++++------- strathspeys/lady_mackenzie_of_fairburn/pipes.ly | 2 +- 10 files changed, 23 insertions(+), 20 deletions(-) diff --git a/2-4_marches/black_bear/full.ly b/2-4_marches/black_bear/full.ly index 83baf3e..529a3ff 100644 --- a/2-4_marches/black_bear/full.ly +++ b/2-4_marches/black_bear/full.ly @@ -31,7 +31,7 @@ \new PipeBandDrumStaff = "side" { \set PipeBandDrumStaff.instrumentName = \markup \column {\instrumentSide} \set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide} - + \sideglobal \snareA s8 \snareBA \snareBB diff --git a/2-4_marches/black_bear/side.ly b/2-4_marches/black_bear/side.ly index 7edf1d3..fea687d 100644 --- a/2-4_marches/black_bear/side.ly +++ b/2-4_marches/black_bear/side.ly @@ -6,6 +6,7 @@ \score { \new PipeBandDrumStaff { \global + \sideglobal << { \repeat volta 2 { \part \halfline \break \halfline } \break diff --git a/2-4_marches/mackenzie_highlanders/bass.ly b/2-4_marches/mackenzie_highlanders/bass.ly index 9f7daa9..dd6a308 100644 --- a/2-4_marches/mackenzie_highlanders/bass.ly +++ b/2-4_marches/mackenzie_highlanders/bass.ly @@ -9,7 +9,7 @@ \repeat volta 2 { \bassA } \break \bassBA \break - \bassBB + \bassBB \bar "|." } \header { title = \title diff --git a/2-4_marches/mackenzie_highlanders/full.ly b/2-4_marches/mackenzie_highlanders/full.ly index bde086e..abeea5f 100644 --- a/2-4_marches/mackenzie_highlanders/full.ly +++ b/2-4_marches/mackenzie_highlanders/full.ly @@ -3,7 +3,7 @@ \include "config.ily" \include "notes.bass.ily" %\include "notes.tenor.ily" -\include "notes.side.ily" +\include "notes.side.alt.ily" \include "notes.pipes.ily" \score { @@ -37,8 +37,8 @@ \set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide} \snareA s8 - \snareB - \snareB + \snareBA + \snareBB } \new PipeBandDrumStaff = "bass" { diff --git a/2-4_marches/mackenzie_highlanders/notes.bass.ily b/2-4_marches/mackenzie_highlanders/notes.bass.ily index 9377580..c998f2c 100644 --- a/2-4_marches/mackenzie_highlanders/notes.bass.ily +++ b/2-4_marches/mackenzie_highlanders/notes.bass.ily @@ -1,7 +1,7 @@ % 2/4 MacKenzie Highlanders % Bass \version "2.18.2" -composerBass = "C. Ooms, 2015" +composerBass = "C. Ooms, 2016" bassglobal = {} bassA = \drummode { diff --git a/reels/the_mackenzies_reel/notes.side.ily b/reels/the_mackenzies_reel/notes.side.ily index 847f4e0..1eb1afc 100644 --- a/reels/the_mackenzies_reel/notes.side.ily +++ b/reels/the_mackenzies_reel/notes.side.ily @@ -1,7 +1,7 @@ % 2/2 The MacKenzie's Reel % Side \version "2.18.2" -composerSide = "C. Ooms, 2015" +composerSide = "C. Ooms, 2016" sideglobal = { \eighthBeaming} snareA = \drummode { diff --git a/reels/the_mackenzies_reel/side.ly b/reels/the_mackenzies_reel/side.ly index c60c7ce..8dd9e15 100644 --- a/reels/the_mackenzies_reel/side.ly +++ b/reels/the_mackenzies_reel/side.ly @@ -8,11 +8,13 @@ \global \sideglobal << - { \repeat volta 2 { \line } \break + { + \repeat volta 2 {\line } \break \repeat volta 2 { \line } } { \snareA + \snareBB } >> diff --git a/strathspeys/lady_mackenzie_of_fairburn/notes.side.ily b/strathspeys/lady_mackenzie_of_fairburn/notes.side.ily index 95e0700..1dad7a2 100644 --- a/strathspeys/lady_mackenzie_of_fairburn/notes.side.ily +++ b/strathspeys/lady_mackenzie_of_fairburn/notes.side.ily @@ -1,7 +1,7 @@ % 4/4 Lady MacKenzie of Fairburn % Side \version "2.18.2" -composerSide = "E.T. de Boone, v0.9, 2015" +composerSide = "E.T. de Boone, v0.9, 2016" snareA = \drummode { \flam d8. g16 d8.:32( g16) @@ -13,7 +13,7 @@ snareA = \drummode { d8.:32(-> \dr g16:64)(-> d4) | - \triplet { d8 d g } + \triplet { \drag d8 d g } \flam d8. \fr g16 -> \triplet { d16\< g d g d8 } g16\! d8. @@ -27,8 +27,8 @@ snareBA = \drummode{ g16 | \triplet {d8 g \flam d } \triplet {g d \flam g } - \triplet {d8 g \flam d \dr } - \flam g8. g16 + \triplet {d8 g \flam d } + \flam g8. \dr g16 | \flam d16. d32 \flam g8 \fr d8.:32( g16:32)(-> diff --git a/strathspeys/lady_mackenzie_of_fairburn/notes.tenor.ily b/strathspeys/lady_mackenzie_of_fairburn/notes.tenor.ily index 6e93fb8..03a4baa 100644 --- a/strathspeys/lady_mackenzie_of_fairburn/notes.tenor.ily +++ b/strathspeys/lady_mackenzie_of_fairburn/notes.tenor.ily @@ -1,22 +1,22 @@ % 4/4 Lady MacKenzie of Fairburn % Tenor \version "2.18.2" -composerTenor = "E.T. de Boone, v0.8, 2015" +composerTenor = "E.T. de Boone, v0.9, 2016" tenorA = \drummode { d8.[ g16] d4^\splitTheFeather r4 << d4 g4 >> | \flourish { d4 g4 d4 g4 } | - d4 r16 g d-> r r8. g16 d4 + d4 \triplet { d8 \< g d-> \> } \triplet { g8 d g } d4 \! | d4 g4 d4 r4 | } tenorBA = \drummode { - \triplet { d8 \< g d } + \triplet { d8 \pppp \< g d } \triplet { g8 d g } \triplet { d8 g d } - g8. \! g16 + g8. \! \mf g16 | d8. g16-> r8. g16 @@ -34,10 +34,10 @@ tenorBA = \drummode { d4 } tenorBB = \drummode { - \triplet { d8 \< g d } + \triplet { d8 \pppp \< g d } \triplet { g8 d g } \triplet { d8 g d } - g8. \! g16 + g8. \! \mf g16 | d8.^"begin scoop" \dr g16-> r8. g16 @@ -53,4 +53,4 @@ tenorBB = \drummode { g4 d8. g16 d4 -} \ No newline at end of file +} diff --git a/strathspeys/lady_mackenzie_of_fairburn/pipes.ly b/strathspeys/lady_mackenzie_of_fairburn/pipes.ly index 21e27a6..9ebb77a 100644 --- a/strathspeys/lady_mackenzie_of_fairburn/pipes.ly +++ b/strathspeys/lady_mackenzie_of_fairburn/pipes.ly @@ -24,7 +24,7 @@ \new Staff { \global \bagpipeKey - \partial 8 + \partial 16 \pipesA \pipesA From 5741dc692472e560ba4d8c72e7a431e6c4d2ccc0 Mon Sep 17 00:00:00 2001 From: Eric Teunis de Boone Date: Fri, 11 Mar 2016 23:06:25 +0100 Subject: [PATCH 3/3] Little error correction in template files --- template/bass.ly | 2 +- template/notes.bass.ily | 1 + template/notes.pipes.ily | 1 + template/notes.side.ily | 1 + template/notes.tenor.ily | 1 + template/pipes.ly | 3 +-- template/side.ly | 2 +- template/tenor.ly | 4 ++-- 8 files changed, 9 insertions(+), 6 deletions(-) diff --git a/template/bass.ly b/template/bass.ly index fbc76f0..c56c8d0 100644 --- a/template/bass.ly +++ b/template/bass.ly @@ -8,7 +8,7 @@ \global \bassglobal << - { } + { }%Format { } >> } diff --git a/template/notes.bass.ily b/template/notes.bass.ily index ff89caf..7df7f7d 100644 --- a/template/notes.bass.ily +++ b/template/notes.bass.ily @@ -3,5 +3,6 @@ \version "2.18.2" composerBass = "" bassglobal = {} +% Music bassA = \drummode { } diff --git a/template/notes.pipes.ily b/template/notes.pipes.ily index 11d2f93..8cda2d2 100644 --- a/template/notes.pipes.ily +++ b/template/notes.pipes.ily @@ -5,5 +5,6 @@ composerPipes = "" pipeglobal = { \bagpipeKey } +% Music pipesA = { } diff --git a/template/notes.side.ily b/template/notes.side.ily index 4a9e3e6..b86afdd 100644 --- a/template/notes.side.ily +++ b/template/notes.side.ily @@ -3,5 +3,6 @@ \version "2.18.2" composerSide = "" sideglobal = {} +% Music \snareA = \drummode { } diff --git a/template/notes.tenor.ily b/template/notes.tenor.ily index 1bb54ac..b6cc64c 100644 --- a/template/notes.tenor.ily +++ b/template/notes.tenor.ily @@ -3,5 +3,6 @@ \version "2.18.2" composerTenor = "" tenorglobal = {} +% Music tenorA = \drummode { } diff --git a/template/pipes.ly b/template/pipes.ly index e5f5f8d..594c956 100644 --- a/template/pipes.ly +++ b/template/pipes.ly @@ -7,9 +7,8 @@ \new Staff { \global \pipeglobal - \pipeKey << - { } + { }%Format { } >> } diff --git a/template/side.ly b/template/side.ly index 500fd3c..8d8fafd 100644 --- a/template/side.ly +++ b/template/side.ly @@ -8,7 +8,7 @@ \global \sideglobal << - { } + { }%Format { } >> } diff --git a/template/tenor.ly b/template/tenor.ly index 18571d7..babb955 100644 --- a/template/tenor.ly +++ b/template/tenor.ly @@ -7,8 +7,8 @@ \new PipeBandDrumStaff { \global \tenorglobal - << - {} + << + {}%Format {} >> }