From 3ceb5ef3c3dbd98d93f5ca83f127e640314b8d42 Mon Sep 17 00:00:00 2001 From: Eric Teunis de Boone Date: Sat, 2 Mar 2019 00:18:36 +0100 Subject: [PATCH] Various fixes for piping scores for CMPD --- .../bloody_fields_of_flanders/notes.pipes.ily | 4 +- 4-4_marches/auld_lang_syne/.side.cmpd.ly.swp | Bin 12288 -> 0 bytes 4-4_marches/auld_lang_syne/side.cmpd.ly | 1 + 4-4_marches/cockney_jocks/pipes.ly | 2 +- 4-4_marches/hills_of_argyll/config.ily | 4 +- 4-4_marches/hills_of_argyll/notes.pipes.ily | 44 +++++++++--------- 4-4_marches/hills_of_argyll/pipes.ly | 3 +- .../scotland_the_brave/high-side.cmpd.ly | 36 ++++++++++++++ 4-4_marches/scotland_the_brave/side.cmpd.ly | 36 ++++++++++++++ .../{pipes.cmpd.ly => pipes.48th.ly} | 1 + airs/abide_with_me/full.ly | 19 +++++--- airs/rose_of_kelvingrove/full.ly | 2 +- airs/rose_of_kelvingrove/notes.pipes.ily | 5 +- airs/rose_of_kelvingrove/pipes.ly | 4 +- airs/sands_of_kuwait/notes.pipes.ily | 9 ++-- airs/sands_of_kuwait/pipes.ly | 8 ++-- standards/98_standards.side.ly | 1 - 17 files changed, 131 insertions(+), 48 deletions(-) delete mode 100644 4-4_marches/auld_lang_syne/.side.cmpd.ly.swp create mode 100644 4-4_marches/scotland_the_brave/high-side.cmpd.ly create mode 100644 4-4_marches/scotland_the_brave/side.cmpd.ly rename 6-8_marches/the_steamboat/{pipes.cmpd.ly => pipes.48th.ly} (96%) diff --git a/3-4_marches/bloody_fields_of_flanders/notes.pipes.ily b/3-4_marches/bloody_fields_of_flanders/notes.pipes.ily index 9731026..29f39cd 100644 --- a/3-4_marches/bloody_fields_of_flanders/notes.pipes.ily +++ b/3-4_marches/bloody_fields_of_flanders/notes.pipes.ily @@ -16,7 +16,7 @@ pipesAA = { pipesAB = { \dble e8. [ c16 ] \grg a4 \taor a8. [ b16 ] | \grip c8 [ e8 ] \dblf f4 \grg e4 | - \grg \tuplet 3/2 { f8 [ g8 A8 ] } \hdble e4 \gra e16. [ f32 ] \grg a16. [ b32 ] | + \grg \tuplet 3/2 { f8 [ g8 A8 ] } \hdble e4 \gra e16. [ f32 \grg a16. b32 ] | \grip c8. [ b16 ] \grG a4 \wbirl a4 | } @@ -29,6 +29,6 @@ pipesBA = { pipesBBA = { \grg f8. [ g16 ] \dblA A4 \grg A8 [ e8 ] | \grg f8 [ A8 ] \hdble e4 \dblc c4 | - \grg \tuplet 3/2 { f8 [ g8 A8 ] } \hdble e4 \gra e16. [ f32 ] \grg a16. [ b32 ] | + \grg \tuplet 3/2 { f8 [ g8 A8 ] } \hdble e4 \gra e16. [ f32 \grg a16. b32 ] | \grip c8. [ b16 ] \grG a4 \wbirl a4 | } diff --git a/4-4_marches/auld_lang_syne/.side.cmpd.ly.swp b/4-4_marches/auld_lang_syne/.side.cmpd.ly.swp deleted file mode 100644 index cb23fa6a7f31f5ab3c658c179dc2706544d763f0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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} diff --git a/4-4_marches/auld_lang_syne/side.cmpd.ly b/4-4_marches/auld_lang_syne/side.cmpd.ly index 952c263..ee2e6d6 100644 --- a/4-4_marches/auld_lang_syne/side.cmpd.ly +++ b/4-4_marches/auld_lang_syne/side.cmpd.ly @@ -24,6 +24,7 @@ \header { title = \title meter = \meter + band = "Canadian Memorial Pipes and Drums" instrument = \instrumentSide composer = \composerSide arranger = \arrangerSide diff --git a/4-4_marches/cockney_jocks/pipes.ly b/4-4_marches/cockney_jocks/pipes.ly index 0ce1ca2..3311927 100644 --- a/4-4_marches/cockney_jocks/pipes.ly +++ b/4-4_marches/cockney_jocks/pipes.ly @@ -18,7 +18,7 @@ \line \bar "||" \break \part \line \break - \line \break + \line \bar "|." } { \pipesA s8 diff --git a/4-4_marches/hills_of_argyll/config.ily b/4-4_marches/hills_of_argyll/config.ily index 36797df..f2147cc 100644 --- a/4-4_marches/hills_of_argyll/config.ily +++ b/4-4_marches/hills_of_argyll/config.ily @@ -7,9 +7,9 @@ confTempo = { \tempo 4 = 80 } %% Format -part = { \partial 4 s4 } +part = { \partial 4 \grace { s4 } s4 } measure = { \grace { s4 } s1 | } -halfline = { \repeat unfold 2 { \measure } } +halfline = { \repeat unfold 4 { \measure } } line = { \repeat unfold 2 { \halfline } } %% Headers diff --git a/4-4_marches/hills_of_argyll/notes.pipes.ily b/4-4_marches/hills_of_argyll/notes.pipes.ily index 1717fb4..fbdc91d 100644 --- a/4-4_marches/hills_of_argyll/notes.pipes.ily +++ b/4-4_marches/hills_of_argyll/notes.pipes.ily @@ -1,46 +1,48 @@ % 4/4 Hills of Argyll % Pipes \version "2.18.2" -composerPipes = "G. McIntyre, arr. S. Cassells" +composerPipes = "G. McIntyre" +arrangerPipes = "S. Cassells" pipeglobal = { \bagpipeKey } % Music pipesAA = { \grg a8. [ b16 ] | - \grip c4 \dblc c4 \grip a4 a8 [ \grg a16 b16 ] | - \dblc c8 [ \gre a8 ] \dblA A8. [ g16 ] \grA f4 \dblA A8 [ f8 ] | - \dble e4 \grg a4 \dbld d8 [ \gre c8 ] c8 [ \gre a8 ] | - \grip b4 \grg e4 \dblf f8 [ e8 ] \grg a8. [ b16 ] | + \grip c4 \dblc c4 \grip a4~ a8 [ \grg a16 b16 ] | + \dblc c8 [ \gre a8 ] \dblA A8. [ g16 ] \grA f4 \dblA A8 [ f8 ] | + \dble e4 \grg a4 \dbld d8 [ \gre c8~ ] c8 [ \gre a8 ] | + \grip b4 \grg e4 \dblf f8 [ e8 ] } pipesAB = { - \grip c4 \dblc c4 \grip a4 a8 [ \grg a16 b16 ] | - \dblc c8 [ \gre a8 ] \dblA A8. [ \grf g16 ] \grA f4 \dblA A8 [ f8 ] | - \dble e4 \grg a4 \dbld d8 [ \gre c8 ] c8 [ \gre b8 ] | - \gra a2 \wbirl a4 + \grg a8. [ b16 ] | + \grip c4 \dblc c4 \grip a4~ a8 [ \grg a16 b16 ] | + \dblc c8 [ \gre a8 ] \dblA A8. [ \grf g16 ] \grA f4 \dblA A8 [ f8 ] | + \dble e4 \grg a4 \dbld d8 [ \gre c8~ ] c8 [ \gre b8 ] | + \gra a2 \wbirl a4 } pipesBA = { \dblc c8 [ e8 ] | - \grg f8 [ \thrwd d8 ] d8 [ f8 ] \dblA A4 \grf g8 [ f8 ] | - \grg e8 [ a8 ] a8 [ \grd c8 ] \dble e4 \grg f8 [ e8 ] | - \thrwd d8 [ \gre b8 ] b8 [ \grd c8 ] \thrwd d4 \dble e8 [ d8 ] | - \dblc c8 [ \gre a8 ] a8 [ \dblc c8 ] \gre b4 + \grg f8 [ \thrwd d8~ ] d8 [ f8 ] \dblA A4 \grf g8 [ f8 ] | + \grg e8 [ a8~ ] a8 [ \grd c8 ] \dble e4 \grg f8 [ e8 ] | + \thrwd d8 [ \gre b8~ ] b8 [ \grd c8 ] \thrwd d4 \dble e8 [ d8 ] | + \dblc c8 [ \gre a8~ ] a8 [ \dblc c8 ] \gre b4 } pipesBBA = { \dblc c8 [ e8 ] | - \grg f8 [ \thrwd d8 ] d8 [ f8 ] \dblA A4 \grf g8 [ f8 ] | - \grg e8 [ a8 ] a8 [ \grd c8 ] \dble e4 \gra e8 [ d8 ] | - \dblc c4 \grd a4 \thrwd d8 [ \gre c8 ] c8 [ \gre b8 ] | - \gra a2 \wbirl a8 [ b8 ] + \grg f8 [ \thrwd d8~ ] d8 [ f8 ] \dblA A4 \grf g8 [ f8 ] | + \grg e8 [ a8~ ] a8 [ \grd c8 ] \dble e4 \gra e8 [ d8 ] | + \dblc c4 \grd a4 \thrwd d8 [ \gre c8~ ] c8 [ \gre b8 ] | + \gra a2 \wbirl a8 [ b8 ] } pipesBBB = { \grg a8. [ b16 ] | - \grip c4 \dblc c4 \grip a4 a8 [ \grg a16 b16 ] | - \dblc c8 [ \gre a8 ] \dblA A8. [ g16 ] \grA f4 \dblA A8 [ f8 ] | - \dble e4 \grg a4 \dbld d8 [ \gre c8 ] c8 [ \gre b8 ] | - \gra a2 \wbirl a4 + \grip c4 \dblc c4 \grip a4~ a8 [ \grg a16 b16 ] | + \dblc c8 [ \gre a8 ] \dblA A8. [ g16 ] \grA f4 \dblA A8 [ f8 ] | + \dble e4 \grg a4 \dbld d8 [ \gre c8~ ] c8 [ \gre b8 ] | + \gra a2 \wbirl a4 } diff --git a/4-4_marches/hills_of_argyll/pipes.ly b/4-4_marches/hills_of_argyll/pipes.ly index 921daa4..4e8fc46 100644 --- a/4-4_marches/hills_of_argyll/pipes.ly +++ b/4-4_marches/hills_of_argyll/pipes.ly @@ -30,7 +30,7 @@ \part \halfline \break } } - + \bar "|." }%Format { \pipesAA @@ -47,6 +47,7 @@ meter = \meter instrument = \instrumentPipes composer = \composerPipes + arranger = \arrangerPipes } } \score { diff --git a/4-4_marches/scotland_the_brave/high-side.cmpd.ly b/4-4_marches/scotland_the_brave/high-side.cmpd.ly new file mode 100644 index 0000000..7fb5d20 --- /dev/null +++ b/4-4_marches/scotland_the_brave/high-side.cmpd.ly @@ -0,0 +1,36 @@ +\version "2.18.2" + +\include "lilydrum.ly" + +\include "./config.ily" +\include "./notes.side.ily" + +markTextEol = #(define-music-function (parser location text) (string?) #{ + \once \override Score.RehearsalMark #'break-visibility = #end-of-line-visible + \once \override Score.RehearsalMark #'self-alignment-X = #RIGHT + \mark \markup $text +#}) + +\score { + \new PipeBandDrumStaff { + \global + \sideglobal + << + { + \repeat volta 2 {\part \line \markTextEol "Fine" \break } + \part \line \markTextEol "D.C. al Fine" \bar "||" + } + { + \removeWithTag #'tutti { \snareA s8 } + + \removeWithTag #'tutti { \snareBAhigh } + } + >> + } + \header { + title = #(string-append title " (high)" ) + meter = \meter + instrument = \instrumentSide + composer = \composerSide + } +} diff --git a/4-4_marches/scotland_the_brave/side.cmpd.ly b/4-4_marches/scotland_the_brave/side.cmpd.ly new file mode 100644 index 0000000..52a3a0e --- /dev/null +++ b/4-4_marches/scotland_the_brave/side.cmpd.ly @@ -0,0 +1,36 @@ +\version "2.18.2" + +\include "lilydrum.ly" + +\include "./config.ily" +\include "./notes.side.ily" + +markTextEol = #(define-music-function (parser location text) (string?) #{ + \once \override Score.RehearsalMark #'break-visibility = #end-of-line-visible + \once \override Score.RehearsalMark #'self-alignment-X = #RIGHT + \mark \markup $text +#}) + +\score { + \new PipeBandDrumStaff { + \global + \sideglobal + << + { + \repeat volta 2 {\part \line \markTextEol "Fine" \break } + \part \line \markTextEol "D.C. al Fine" \bar "||" + } + { + \removeWithTag #'tutti { \snareA s8 } + + \removeWithTag #'tutti { \snareBA } + } + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentSide + composer = \composerSide + } +} diff --git a/6-8_marches/the_steamboat/pipes.cmpd.ly b/6-8_marches/the_steamboat/pipes.48th.ly similarity index 96% rename from 6-8_marches/the_steamboat/pipes.cmpd.ly rename to 6-8_marches/the_steamboat/pipes.48th.ly index 28dbf2e..20996f1 100644 --- a/6-8_marches/the_steamboat/pipes.cmpd.ly +++ b/6-8_marches/the_steamboat/pipes.48th.ly @@ -28,6 +28,7 @@ \header { title = \title meter = \meter + band = "48th HIGHRS" instrument = \instrumentPipes composer = \composerPipes } diff --git a/airs/abide_with_me/full.ly b/airs/abide_with_me/full.ly index d5a5f4a..30dda14 100644 --- a/airs/abide_with_me/full.ly +++ b/airs/abide_with_me/full.ly @@ -10,13 +10,19 @@ \include "./notes.pipes.ily" \include "./notes.lyrics.ily" +\layout { + indent = 5.0 + short-indent = 2.0 +} + \score { \new StaffGroup << - \new Staff { + \new Staff \with { + instrumentName = \markup{ \instrumentPipes } + shortInstrumentName = \markup{ \shortInstrumentPipes } + } { \global \pipeglobal - \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentPipes } - \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentPipes } << \new Voice = "format" { \line \line \break @@ -34,10 +40,11 @@ \verseA } } - \new PipeBandDrumStaff = "side" { + \new PipeBandDrumStaff = "side" \with { + instrumentName = \markup \column {\instrumentSide} + shortInstrumentName = \markup{\shortInstrumentSide} + } { \sideglobal - \set PipeBandDrumStaff.instrumentName = \markup \column {\instrumentSide} - \set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide} \repeat unfold 3 { \snareAA } \snareAB diff --git a/airs/rose_of_kelvingrove/full.ly b/airs/rose_of_kelvingrove/full.ly index d9e2147..87b0d20 100644 --- a/airs/rose_of_kelvingrove/full.ly +++ b/airs/rose_of_kelvingrove/full.ly @@ -43,7 +43,7 @@ \quartline } \alternative { \quartline - { \halfline \quartline } + {\quartline \measure} } \bar "|." }%Format diff --git a/airs/rose_of_kelvingrove/notes.pipes.ily b/airs/rose_of_kelvingrove/notes.pipes.ily index 003394e..002f460 100644 --- a/airs/rose_of_kelvingrove/notes.pipes.ily +++ b/airs/rose_of_kelvingrove/notes.pipes.ily @@ -47,8 +47,5 @@ pipesBA = { pipesBEnding = { \grA f2~ f4 \birl a4 | \grg f4 e4 \grg d4 c4 | - \thrwd d1~ | - d1~ | - d1~ | - d1~ + \thrwd d1\fermata | } diff --git a/airs/rose_of_kelvingrove/pipes.ly b/airs/rose_of_kelvingrove/pipes.ly index 5a088a4..2e25a28 100644 --- a/airs/rose_of_kelvingrove/pipes.ly +++ b/airs/rose_of_kelvingrove/pipes.ly @@ -6,7 +6,7 @@ \include "./config.ily" \include "./notes.pipes.ily" -\pbreak = \break +pbreak = \break \score { \new Staff { \global @@ -29,7 +29,7 @@ \quartline } \alternative { {\quartline \pbreak} - { \halfline \quartline } + { \quartline \measure } } \bar "|." }%Format diff --git a/airs/sands_of_kuwait/notes.pipes.ily b/airs/sands_of_kuwait/notes.pipes.ily index 0bc9933..a699d9d 100644 --- a/airs/sands_of_kuwait/notes.pipes.ily +++ b/airs/sands_of_kuwait/notes.pipes.ily @@ -7,12 +7,13 @@ pipeglobal = { \bagpipeKey } % Music -pipesA = { +pipesAA = { a4~ a8 [ \wbirl a8 ] \grg a8 [ A8 ] e16 [ f8. ]~ f4 \grg e8 [ d8 ] | \grg G4~ G8 [ \grd G8 ] ~ G8 [ d8 ] \grG a4 ~ a4 \grg \tuplet 3/2 { f8. [ e16 d8 ] } | \grg a4~ a8 [ \wbirl a8 ] \grg a8 [ A8 ] e16 [ f8. ] ~ f4 \grg e8 [ d8 ] | \slurd d4~ d8 [ b8 ] \grg \tuplet 3/2 { d8. [ e16 f8 ] } \dble e4 ~ e8 [ f8 ] \grg \tuplet 3/2 { f8. [ e16 d8 ] } | - +} +pipesAB = { \grg a4~ a8 [ \wbirl a8 ] \grg a8 [ A8 ] e16 [ f8. ]~ f4 \grg e8 [ d8 ] | \grg G4~ G8 [ \grd G8 ]~ G8 [ d8 ] \grG a4~ a4 \grg \tuplet 3/2 { a8. [ b16 c8 ] } | \thrwd d4~ d8 [ b8 ] \grg \tuplet 3/2 { d8. [ e16 f8 ] } \dble e4~ e8 [ a8 ] \grg \tuplet 3/2 { f8. [ e16 d8 ] } | @@ -32,8 +33,8 @@ pipesBBA = { \thrwd d4~ d8 [ b8 ] \grg \tuplet 3/2 { d8. [ e16 f8 ] } \dble e4~ e8 [ a8 ] \grg \tuplet 3/2 { f8. [ e16 d8 ] } | \grg d4~ d4~ d4 \slurd d4~ d4 \grg \tuplet 3/2 { f8. [ e16 d8 ] } } -pipesBBB = { - a4~ a8 [ \wbirl a8 ] \grg a8 [ A8 ] e16 [ f8. ]~ f4 \grg e8 [ d8 ] | +pipesBBB = { % pipesAB + \grg a4~ a8 [ \wbirl a8 ] \grg a8 [ A8 ] e16 [ f8. ]~ f4 \grg e8 [ d8 ] | \grg G4~ G8 [ \grd G8 ]~ G8 [ d8 ] \grG a4~ a4 \grg \tuplet 3/2 { a8. [ b16 c8 ] } | \thrwd d4~ d8 [ b8 ] \grg \tuplet 3/2 { d8. [ e16 f8 ] } \dble e4~ e8 [ a8 ] \grg \tuplet 3/2 { f8. [ e16 d8 ] } | \grg d4~ d4~ d4 \slurd d4~ d4~ d4 diff --git a/airs/sands_of_kuwait/pipes.ly b/airs/sands_of_kuwait/pipes.ly index 67ddbff..2c35458 100644 --- a/airs/sands_of_kuwait/pipes.ly +++ b/airs/sands_of_kuwait/pipes.ly @@ -11,7 +11,8 @@ \pipeglobal \repeat volta 2 { - \pipesA + \pipesAA + \pipesAB } \break \repeat volta 2 { @@ -38,7 +39,8 @@ %%Tune \unfoldRepeats { \repeat volta 2 { - \pipesA + \pipesAA + \pipesAB } \break \repeat volta 2 { @@ -60,4 +62,4 @@ composer = \composerPipes arranger = \arrangerPipes } -} \ No newline at end of file +} diff --git a/standards/98_standards.side.ly b/standards/98_standards.side.ly index 13883b2..9f5ed28 100644 --- a/standards/98_standards.side.ly +++ b/standards/98_standards.side.ly @@ -19,7 +19,6 @@ } \header { title = "9/8 Standards" - band = "Canadian Memorial Pipes and Drums" meter = "Quick March" composer = "" instrument = "Side"