From 1973fa2c44a8b88d2ca56a237b9180a7812cb9c5 Mon Sep 17 00:00:00 2001 From: Eric Teunis de Boone Date: Mon, 4 Mar 2019 02:38:56 +0100 Subject: [PATCH] Updated Composers from QoHldrs Settings Book --- 2-4_marches/barren_rocks_of_aden/notes.pipes.ily | 2 +- 2-4_marches/pipers_cave/notes.pipes.ily | 2 +- 3-4_marches/green_hills_of_tyrol/notes.pipes.ily | 2 +- 3-4_marches/torosay_castle/notes.pipes.ily | 2 +- 6-8_marches/glendaruel_highlanders/notes.pipes.ily | 4 +++- airs/abide_with_me/config.ily | 2 +- airs/abide_with_me/full.ly | 2 +- airs/abide_with_me/lyrics.pipes.ly | 2 +- airs/abide_with_me/notes.pipes.ily | 3 ++- airs/abide_with_me/pipes.ly | 2 ++ 10 files changed, 14 insertions(+), 9 deletions(-) diff --git a/2-4_marches/barren_rocks_of_aden/notes.pipes.ily b/2-4_marches/barren_rocks_of_aden/notes.pipes.ily index 4860aee..56cff3b 100644 --- a/2-4_marches/barren_rocks_of_aden/notes.pipes.ily +++ b/2-4_marches/barren_rocks_of_aden/notes.pipes.ily @@ -1,7 +1,7 @@ % 2/4 The Barren Rocks of Aden % Pipes \version "2.18.2" -composerPipes = "" +composerPipes = "A. MacKellar, 78th Seaforth Highlanders" arrangerPipes = "" pipeglobal = { \bagpipeKey diff --git a/2-4_marches/pipers_cave/notes.pipes.ily b/2-4_marches/pipers_cave/notes.pipes.ily index 51708d5..d1b3070 100644 --- a/2-4_marches/pipers_cave/notes.pipes.ily +++ b/2-4_marches/pipers_cave/notes.pipes.ily @@ -1,7 +1,7 @@ % 2/4 Pipers Cave % Pipes \version "2.18.2" -composerPipes = "PM J. Sutherland, 1936" +composerPipes = "PM J. Sutherland, Seaforth Higlanders (1936)" arrangerPipes = "" pipeglobal = { \bagpipeKey diff --git a/3-4_marches/green_hills_of_tyrol/notes.pipes.ily b/3-4_marches/green_hills_of_tyrol/notes.pipes.ily index 9f7303a..0ce8fc7 100644 --- a/3-4_marches/green_hills_of_tyrol/notes.pipes.ily +++ b/3-4_marches/green_hills_of_tyrol/notes.pipes.ily @@ -1,7 +1,7 @@ % 3/4 Green Hills of Tyrol % Pipes \version "2.18.2" -composerPipes = "PM J. MacLeod" +composerPipes = "PM J. MacLeod"% 93rd Sutherland Highlanders arrangerPipes = "1936" pipeglobal = { \bagpipeKey diff --git a/3-4_marches/torosay_castle/notes.pipes.ily b/3-4_marches/torosay_castle/notes.pipes.ily index 403d88f..aaee431 100644 --- a/3-4_marches/torosay_castle/notes.pipes.ily +++ b/3-4_marches/torosay_castle/notes.pipes.ily @@ -1,7 +1,7 @@ % 3/4 Torosay Castle % Pipes \version "2.18.2" -composerPipes = "PM J. Laurie" +composerPipes = "PM J. Laurie"% Argyll and Sutherland Highlanders pipeglobal = { \bagpipeKey } diff --git a/6-8_marches/glendaruel_highlanders/notes.pipes.ily b/6-8_marches/glendaruel_highlanders/notes.pipes.ily index d63b7b5..120437c 100644 --- a/6-8_marches/glendaruel_highlanders/notes.pipes.ily +++ b/6-8_marches/glendaruel_highlanders/notes.pipes.ily @@ -1,7 +1,9 @@ % 6/8 Glendaruel Highlendars % Pipes \version "2.18.2" -composerPipes = "PM A. Fettes" +composerPipes = "PM A. Fettes"% Gordon Highlanders +composerPipesAdd = ", pts 3 & 4 PM D. R. MacLennan" % Seaforth Highlanders +composerPipes = \markup { \composerPipes \composerPipesAdd } arrangerPipes = "" pipeglobal = { \bagpipeKey diff --git a/airs/abide_with_me/config.ily b/airs/abide_with_me/config.ily index f3411a1..208d204 100644 --- a/airs/abide_with_me/config.ily +++ b/airs/abide_with_me/config.ily @@ -13,5 +13,5 @@ halfline = { \repeat unfold 2 { \measure } } line = { \repeat unfold 2 { \halfline } } %% Headers -title = "Abide with Me" +title = "Abide with Me (Eventide)" meter = "Hymn" diff --git a/airs/abide_with_me/full.ly b/airs/abide_with_me/full.ly index d5a5f4a..eab2eba 100644 --- a/airs/abide_with_me/full.ly +++ b/airs/abide_with_me/full.ly @@ -61,7 +61,7 @@ composer = \markup \large { \column \right-align { $(if (not (string=? "" composerLyrics)) #{ \markup { \line { \composerLyrics ":" } } #} ) - $(if (not (string=? "" composerPipes)) #{ \markup {\line { \composerPipes ":" }} #} ) + $(if (not (string=? "" composerPipes)) #{ \markup {\line { \composerPipes \arrangerPipes ":" }} #} ) $(if (not (string=? "" composerSide)) #{ \markup {\line { \composerSide ":" }} #} ) $(if (not (string=? "" composerTenor)) #{ \markup {\line { \composerTenor ":" }} #} ) $(if (not (string=? "" composerBass)) #{ \markup {\line { \composerBass ":" }} #} ) diff --git a/airs/abide_with_me/lyrics.pipes.ly b/airs/abide_with_me/lyrics.pipes.ly index d3b462c..8d1ea72 100644 --- a/airs/abide_with_me/lyrics.pipes.ly +++ b/airs/abide_with_me/lyrics.pipes.ly @@ -32,7 +32,7 @@ meter = \meter composer = \markup \large { \column \right-align { - $(if (not (string=? "" composerPipes)) #{ \markup { \line { \composerPipes ":" } } #} ) + $(if (not (string=? "" composerPipes)) #{ \markup { \line { \composerPipes \arrangerPipes ":" } } #} ) $(if (not (string=? "" composerLyrics)) #{ \markup { \line { \composerLyrics ":" } } #} ) } \column \right-align { diff --git a/airs/abide_with_me/notes.pipes.ily b/airs/abide_with_me/notes.pipes.ily index 9f0ce2c..c6ec0b3 100644 --- a/airs/abide_with_me/notes.pipes.ily +++ b/airs/abide_with_me/notes.pipes.ily @@ -1,7 +1,8 @@ % 4/4 Abide with Me % Pipes \version "2.18.2" -composerPipes = "J.J. van Ommen Kloeke" +composerPipes = "W. H. Monk" +arrangerPipes = "J.J. van Ommen Kloeke" pipeglobal = { \bagpipeKey } diff --git a/airs/abide_with_me/pipes.ly b/airs/abide_with_me/pipes.ly index 68a8a55..4329711 100644 --- a/airs/abide_with_me/pipes.ly +++ b/airs/abide_with_me/pipes.ly @@ -28,6 +28,7 @@ meter = \meter instrument = \instrumentPipes composer = \composerPipes + arranger = \arrangerPipes } } \score { @@ -42,5 +43,6 @@ meter = \meter instrument = \instrumentPipes composer = \composerPipes + arranger = \arrangerPipes } }