From 65870e6ff1a32319bea5c2e256aa9e7310ec9dce Mon Sep 17 00:00:00 2001 From: Eric Teunis de Boone Date: Tue, 12 Feb 2019 09:49:30 +0100 Subject: [PATCH] Band names should not be in the title --- 4-4_marches/auld_lang_syne/.side.cmpd.ly.swp | Bin 0 -> 12288 bytes 4-4_marches/auld_lang_syne/side.cmpd.ly | 2 +- 5-4_marches/cullen_bay/side.48th.ly | 3 +- 5-4_marches/cullen_bay/side.cmpd.ly | 3 +- 6-8_marches/the_steamboat/config.ily | 2 +- 6-8_marches/the_steamboat/notes.pipes.ily | 5 +- 6-8_marches/the_steamboat/pipes.cmpd.ly | 55 +++++++++++++++++++ 6-8_marches/the_steamboat/pipes.ly | 2 +- standards/24_44_standards.side.cmpd.ly | 6 +- standards/34_standards.side.cmpd.ly | 3 +- standards/68_standards.side.cmpd.ly | 3 +- standards/98_standards.side.ly | 1 + 12 files changed, 74 insertions(+), 11 deletions(-) create mode 100644 4-4_marches/auld_lang_syne/.side.cmpd.ly.swp create mode 100644 6-8_marches/the_steamboat/pipes.cmpd.ly diff --git a/4-4_marches/auld_lang_syne/.side.cmpd.ly.swp b/4-4_marches/auld_lang_syne/.side.cmpd.ly.swp new file mode 100644 index 0000000000000000000000000000000000000000..cb23fa6a7f31f5ab3c658c179dc2706544d763f0 GIT binary patch literal 12288 zcmeI2ziSjh6vro4Zeje{itCDHc5{~$2PQ`hB3LM5FezL(=62`qMrUW1o!OH^^p6m% zw6^gNu(ABkEx+ds>gsAT3ut)=yw{~pR@k8B~`B+kXq7%gJ07DYchESQv)c_=bx6PuYz>Ty!a zQVhAyldLH7WPN3QQ1B|72%GR)9&a1B(sRZnV-1*jl%< zdL_CXo(j0uzAOmE843Ggb zKnBPF86X2>fDDiUGC&57i2j(G>K7oDk0lWuq!E5jWOu+-N1vY`dLm$u}17v^9Rn zAzYi*Oi;>6r-Tn}CM-xNg69Z%(q5w9M@(~_AV{s|mALK~QY{{bH*n6bk(p1AeD`?d zvx1<>xO&r61$TZvPe*C4MoMb`1}IU9Qg9bejdDEfwy90sJGD}O>W-Q+ZRL#(WTyV4 zu`)xhSU4Z)k>{qwT{OLKqv_pWamVq|2<21X5ic-d(2}V-7hx19+BjijUo-X%^08F2 l=&yjx=#d<^>qj;e0&`SH$9#l}Q&CxIbQpExPA~38>^G33(1HK} literal 0 HcmV?d00001 diff --git a/4-4_marches/auld_lang_syne/side.cmpd.ly b/4-4_marches/auld_lang_syne/side.cmpd.ly index 23ebb58..952c263 100644 --- a/4-4_marches/auld_lang_syne/side.cmpd.ly +++ b/4-4_marches/auld_lang_syne/side.cmpd.ly @@ -12,7 +12,7 @@ << \new NullVoice = "format" { \repeat volta 2 { - \line + \halfline } }%Format diff --git a/5-4_marches/cullen_bay/side.48th.ly b/5-4_marches/cullen_bay/side.48th.ly index 00c5c90..e47caef 100644 --- a/5-4_marches/cullen_bay/side.48th.ly +++ b/5-4_marches/cullen_bay/side.48th.ly @@ -22,7 +22,8 @@ >> } \header { - title = \markup \column { \title \normalsize "48th HIGHRS" } + title = \title + band = "48th HLDRS" meter = \meter instrument = \instrumentSide composer = \composerSide diff --git a/5-4_marches/cullen_bay/side.cmpd.ly b/5-4_marches/cullen_bay/side.cmpd.ly index 4ec5227..43f7227 100644 --- a/5-4_marches/cullen_bay/side.cmpd.ly +++ b/5-4_marches/cullen_bay/side.cmpd.ly @@ -19,7 +19,8 @@ >> } \header { - title = \markup { \title "(Canadian Memorial Pipes and Drums)" } + title = \title + band = "Canadian Memorial Pipes and Drums" meter = \meter instrument = \instrumentSide composer = \composerSide diff --git a/6-8_marches/the_steamboat/config.ily b/6-8_marches/the_steamboat/config.ily index f1ad338..ea9332e 100644 --- a/6-8_marches/the_steamboat/config.ily +++ b/6-8_marches/the_steamboat/config.ily @@ -13,5 +13,5 @@ halfline = { \repeat unfold 2 { \measure } } line = { \repeat unfold 2 { \halfline } } %% Headers -title = "The Steamboat / Hills of Caithness" +title = "The Steamboat (Hills of Caithness)" meter = "March" diff --git a/6-8_marches/the_steamboat/notes.pipes.ily b/6-8_marches/the_steamboat/notes.pipes.ily index 94dd5a5..7f4de6c 100644 --- a/6-8_marches/the_steamboat/notes.pipes.ily +++ b/6-8_marches/the_steamboat/notes.pipes.ily @@ -1,7 +1,8 @@ -% 6/8 the Steamboat / Hills of Caithness +% 6/8 the Steamboat (Hills of Caithness) % Pipes \version "2.18.2" -composerPipes = "Trad., 1936, pts 3 & 4 by R. Petre" %Ruaraith Petre +composerPipes = "Trad., 1936" +composerPipesAdd = ", pts 3 & 4 by R. Petre" %Ruaraith Petre pipeglobal = { \bagpipeKey } diff --git a/6-8_marches/the_steamboat/pipes.cmpd.ly b/6-8_marches/the_steamboat/pipes.cmpd.ly new file mode 100644 index 0000000..28dbf2e --- /dev/null +++ b/6-8_marches/the_steamboat/pipes.cmpd.ly @@ -0,0 +1,55 @@ +\version "2.18.2" + +\include "bagpipe.ly" + +\include "./config.ily" +\include "./notes.pipes.ily" + +\score { + \new Staff { + \global + \pipeglobal + << + { + \repeat volta 2 {\part \line} + \break + \repeat volta 2 {\part \line} + \break + \bar "|." + }%Format + { + \pipesA s8 + + \pipesB s8 + + } + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentPipes + composer = \composerPipes + } +} +\score { + \new Staff { \global \pipeglobal + \set Staff.midiInstrument = #"bagpipe" + %%Tune + + \partial 8 + \pipesA + \pipesA + + \pipesB + \pipesB + + } + \midi { \confTempo } + \header { + title = \title + meter = \meter + instrument = \instrumentPipes + composer = \composerPipes + } +} diff --git a/6-8_marches/the_steamboat/pipes.ly b/6-8_marches/the_steamboat/pipes.ly index 2024bb8..985e8ab 100644 --- a/6-8_marches/the_steamboat/pipes.ly +++ b/6-8_marches/the_steamboat/pipes.ly @@ -38,7 +38,7 @@ title = \title meter = \meter instrument = \instrumentPipes - composer = \composerPipes + composer = \markup { \composerPipes \composerPipesAdd } } } \score { diff --git a/standards/24_44_standards.side.cmpd.ly b/standards/24_44_standards.side.cmpd.ly index 75c3bf8..938f4ec 100644 --- a/standards/24_44_standards.side.cmpd.ly +++ b/standards/24_44_standards.side.cmpd.ly @@ -10,7 +10,8 @@ \drummode { \repeat volta 2 { \partial 8 \pempty \midstd \pempty \endtwo } }% End of drums % } \header { - title = "2/4 Standards (Canadian Memorial Pipes & Drums)" + title = "2/4 Standards" + band = "Canadian Memorial Pipes and Drums" meter = "Quick March" composer = "" instrument = "Side" @@ -38,7 +39,8 @@ } \header { - title = "4/4 Standards (Canadian Memorial Pipes & Drums)" + title = "4/4 Standards" + band = "Canadian Memorial Pipes and Drums" meter = "Quick March" composer = "" instrument = "Side" diff --git a/standards/34_standards.side.cmpd.ly b/standards/34_standards.side.cmpd.ly index 762c680..40e17ec 100644 --- a/standards/34_standards.side.cmpd.ly +++ b/standards/34_standards.side.cmpd.ly @@ -18,7 +18,8 @@ }% End of drums % } \header { - title = "3/4 Standards (Canadian Memorial Pipes & Drums)" + title = "3/4 Standards" + band = "Canadian Memorial Pipes and Drums" meter = "Quick March" composer = "" instrument = "Side" diff --git a/standards/68_standards.side.cmpd.ly b/standards/68_standards.side.cmpd.ly index ad3f2f9..1bb36ff 100644 --- a/standards/68_standards.side.cmpd.ly +++ b/standards/68_standards.side.cmpd.ly @@ -17,7 +17,8 @@ } \header { - title = "6/8 Standards (Canadian Memorial Pipes & Drums)" + title = "6/8 Standards" + band = "Canadian Memorial Pipes and Drums" meter = "Quick March" composer = "" instrument = "Side" diff --git a/standards/98_standards.side.ly b/standards/98_standards.side.ly index 9f5ed28..13883b2 100644 --- a/standards/98_standards.side.ly +++ b/standards/98_standards.side.ly @@ -19,6 +19,7 @@ } \header { title = "9/8 Standards" + band = "Canadian Memorial Pipes and Drums" meter = "Quick March" composer = "" instrument = "Side"