From d3a4898dbbccc1c3a46181a83cf5f571fe18caa7 Mon Sep 17 00:00:00 2001 From: Eric Teunis de Boone Date: Wed, 13 Nov 2019 15:22:36 +0100 Subject: [PATCH] CMPD: Created Standards for the Mid Section --- 2-4_marches/mairis_wedding/pipes.ly | 33 ++--- airs/highland_cathedral/mid.cmpd.ly | 76 ++++++++++++ airs/morag_of_dunvegan/mid.ly | 60 +++++++++ airs/rose_of_kelvingrove/full.ly | 12 +- airs/rose_of_kelvingrove/notes.tenor.ily | 2 +- standards/standards.mid.cmpd.ly | 149 +++++++++++++++++++++++ standards/standards.mid.ly | 5 + standards/standards.tenor.cmpd.ly | 102 ++++++++++++++++ standards/standards.tenor.ily | 54 +++++++- 9 files changed, 466 insertions(+), 27 deletions(-) create mode 100644 airs/highland_cathedral/mid.cmpd.ly create mode 100644 airs/morag_of_dunvegan/mid.ly create mode 100644 standards/standards.mid.cmpd.ly create mode 100644 standards/standards.tenor.cmpd.ly diff --git a/2-4_marches/mairis_wedding/pipes.ly b/2-4_marches/mairis_wedding/pipes.ly index f0907f9..4e9acfd 100644 --- a/2-4_marches/mairis_wedding/pipes.ly +++ b/2-4_marches/mairis_wedding/pipes.ly @@ -9,28 +9,19 @@ \new Staff { \global \pipeglobal - << - \new NullVoice = "format" { - \repeat volta 2 { - \line - } - \break - \repeat volta 2 { - \halfline - } \alternative { - \halfline - \halfline - }\bar "|." - }%Format - \new Voice = "pipes" { - \pipesA - - \pipesBA - \pipesBBA - \pipesBBB - } - >> + \repeat volta 2 { + \pipesA + } + \break + \repeat volta 2 { + \pipesBA + } + \alternative { + { \pipesBBA } + { \pipesBBB } + } + \bar "|." } \header { title = \title diff --git a/airs/highland_cathedral/mid.cmpd.ly b/airs/highland_cathedral/mid.cmpd.ly new file mode 100644 index 0000000..c0ff5fe --- /dev/null +++ b/airs/highland_cathedral/mid.cmpd.ly @@ -0,0 +1,76 @@ +\version "2.19.0" + +\include "lilydrum.ly" + +\include "./config.ily" +\include "./notes.bass.ily" +\include "./notes.tenor.cmpd.ily" + +\layout { + indent = 5.0 + short-indent = 2.0 +} + +\score { + \new StaffGroup << + \new PipeBandDrumStaff = "tenor" \with { + instrumentName = \markup{ \instrumentTenor } + shortInstrumentName = \markup{ \shortInstrumentTenor } + } { + \tenorglobal + \global + << + { + \line + \bar "||" + \break + + \line + \measure + \measure + \bar "||" + \break + + \line \bar "|." + + }%Format + { + \tenorA + + \tenorB + + \tenorC + + d1^\andrewStop + }%Music + >> + } + \new PipeBandDrumStaff = "bass" \with { + instrumentName = \markup{ \instrumentBass } + shortInstrumentName = \markup{ \shortInstrumentBass } + } { + \bassglobal + \repeat percent 8 \bassAA + \repeat percent 7 \bassAA + \repeat unfold 2 \bassAA + + \repeat percent 4 { \bassAA \bassAA } + d1-> + + } + >> + \header { + title = \title + meter = \meter + composer = \markup { + \column \right-align { + $(if (not (string=? "" composerTenor)) #{ \markup {\line { \composerTenor ":" }} #} ) + $(if (not (string=? "" composerBass)) #{ \markup {\line { \composerBass ":" }} #} ) + } + \column \right-align { + $(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} ) + $(if (not (string=? "" composerBass)) #{ \markup {\line { \instrumentBass }}#} ) + } + } + } +} diff --git a/airs/morag_of_dunvegan/mid.ly b/airs/morag_of_dunvegan/mid.ly new file mode 100644 index 0000000..9da16ed --- /dev/null +++ b/airs/morag_of_dunvegan/mid.ly @@ -0,0 +1,60 @@ +\version "2.19.0" + +\include "lilydrum.ly" + +\include "./config.ily" +\include "./notes.bass.ily" +\include "./notes.tenor.ily" + +\layout { + indent = 5.0 + short-indent = 2.0 +} + +\score { + \new StaffGroup << + \new PipeBandDrumStaff = "tenor" \with { + instrumentName = \markup{ \instrumentTenor } + shortInstrumentName = \markup{ \shortInstrumentTenor } + } { + \tenorglobal + \global + << + { + \repeat volta 2 {\line} + \break + \repeat volta 2 {\line} + \break + }%Format + { + \tenorA + \tenorB + }%Music + >> + } + \new PipeBandDrumStaff = "bass" \with { + instrumentName = \markup{ \instrumentBass } + shortInstrumentName = \markup{ \shortInstrumentBass } + } { + \bassglobal + + \bassA + \bassB + + } + >> + \header { + title = \title + meter = \meter + composer = \markup { + \column \right-align { + $(if (not (string=? "" composerTenor)) #{ \markup {\line { \composerTenor ":" }} #} ) + $(if (not (string=? "" composerBass)) #{ \markup {\line { \composerBass ":" }} #} ) + } + \column \right-align { + $(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} ) + $(if (not (string=? "" composerBass)) #{ \markup {\line { \instrumentBass }}#} ) + } + } + } +} diff --git a/airs/rose_of_kelvingrove/full.ly b/airs/rose_of_kelvingrove/full.ly index 87b0d20..fda2a7d 100644 --- a/airs/rose_of_kelvingrove/full.ly +++ b/airs/rose_of_kelvingrove/full.ly @@ -5,7 +5,7 @@ \include "./config.ily" %\include "./notes.bass.ily" -%\include "./notes.tenor.ily" +\include "./notes.tenor.ily" \include "./notes.side.ily" \include "./notes.pipes.ily" %\include "./notes.pipes.seconds.ily" @@ -103,15 +103,21 @@ } } -%{ \new PipeBandDrumStaff = "tenor" \with { instrumentName = \markup{ \instrumentTenor } shortInstrumentName = \markup{ \shortInstrumentTenor } } { \tenorglobal + \unfoldRepeats { + s4 \tenorA + \tenorA + s4 \tenorB + + s4 \tenorC + } + } -%} %{ \new PipeBandDrumStaff = "bass" \with { instrumentName = \markup{ \instrumentBass } diff --git a/airs/rose_of_kelvingrove/notes.tenor.ily b/airs/rose_of_kelvingrove/notes.tenor.ily index feea436..e1f4cd3 100644 --- a/airs/rose_of_kelvingrove/notes.tenor.ily +++ b/airs/rose_of_kelvingrove/notes.tenor.ily @@ -7,7 +7,7 @@ tenorglobal = {} % Music stfe = \drummode { - \stf2 + \stfd2 } xg = \drummode { g8^\markup{ "x" } diff --git a/standards/standards.mid.cmpd.ly b/standards/standards.mid.cmpd.ly new file mode 100644 index 0000000..a8f967b --- /dev/null +++ b/standards/standards.mid.cmpd.ly @@ -0,0 +1,149 @@ +\version "2.19.0" + +\include "lilydrum.ly" + +\include "./standards.bass.ily" +\include "./standards.tenor.ily" + +\header { + title = "Standards Tenor & Bass" + band = "Canadian Memorial Pipes and Drums" +} + +\layout { + indent = 5.0 + short-indent = 2.0 +} + +% ---------------------- +% Standard 2/4 +% ---------------------- +\score { + \new StaffGroup << + \time 2/4 + \new PipeBandDrumStaff = "tenor" { + \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor } + \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor } + + \repeat volta 2 { + \tenorTwoFoursFII + } + \break + \repeat volta 2 { + \tenorTwoFoursFIII + } + \break + \repeat volta 2 { + \tenorTwoFoursFIV + } + \break + \repeat volta 2 { + \tenorTwoFoursFV + } + } + \new PipeBandDrumStaff = "bass" { + \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass } + \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass} + + \bassTwofoursOne + } + >> + \header { + title = "2/4 & 4/4 Standard" + band = "" % Make Sure the band is not displayed + } +} + +% ---------------------- +% Standard 3/4 +% ---------------------- +\score { + \new StaffGroup << + \time 3/4 + \new PipeBandDrumStaff = "tenor" { + \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor } + \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor } + + \repeat volta 2 { + \tenorThreefoursOneA + \bar "||" + \break + \tenorThreefoursOneB + } + } + \new PipeBandDrumStaff = "bass" { + \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass } + \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass} + + \bassThreefoursOne + \bassThreefoursOne + } + >> + \header { + title = "3/4 Standard" + band = "" % Make Sure the band is not displayed + } +} + +\pageBreak +% ---------------------- +% Standard 6/8 +% ---------------------- +\score { + \new StaffGroup << + \time 6/8 + \new PipeBandDrumStaff = "tenor" { + \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor } + \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor } + + \repeat volta 2 { + \tenorSixeightsOneA + \bar "||" + \break + \tenorSixeightsOneB + } + } + \new PipeBandDrumStaff = "bass" { + \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass } + \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass} + + \bassSixeightsOne + \bassSixeightsOne + } + >> + \header { + title = "6/8 Standard" + band = "" % Make Sure the band is not displayed + } +} + +% ---------------------- +% Standard 9/8 +% ---------------------- +\score { + \new StaffGroup << + \time 9/8 + \new PipeBandDrumStaff = "tenor" { + \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor } + \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor } + + \repeat volta 2 { + \tenorNineeightsOneA + \bar "||" + \break + \tenorNineeightsOneB + } + } + \new PipeBandDrumStaff = "bass" { + \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass } + \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass} + + \bassNineeightsOne + \bassNineeightsOne + } + >> + \header { + title = "9/8 Standard" + band = "" % Make Sure the band is not displayed + } +} diff --git a/standards/standards.mid.ly b/standards/standards.mid.ly index 920bcf6..7880fc9 100644 --- a/standards/standards.mid.ly +++ b/standards/standards.mid.ly @@ -9,6 +9,11 @@ title = \markup \center-column { "Standards" \smaller "Bass & Tenor"} } +\layout { + indent = 5.0 + short-indent = 2.0 +} + % ---------------------- % Standard 2/4 % ---------------------- diff --git a/standards/standards.tenor.cmpd.ly b/standards/standards.tenor.cmpd.ly new file mode 100644 index 0000000..f1cf6e6 --- /dev/null +++ b/standards/standards.tenor.cmpd.ly @@ -0,0 +1,102 @@ +\version "2.18.2" + +\include "./standards.tenor.ily" + +\header { + title = "Standards Tenor" + band = "Canadian Memorial Pipes and Drums" +} + +\score { + \new PipeBandDrumStaff { + \time 2/4 + + \drummode { + \repeat volta 2 { + \tenorTwoFoursFII + } + \break + \repeat volta 2 { + \tenorTwoFoursFIII + } + \break + \repeat volta 2 { + \tenorTwoFoursFIV + } + \break + \repeat volta 2 { + \tenorTwoFoursFV + } + } + } + + \header { + title = "2/4 & 4/4 Standard" + instrument = "Tenor" + band = "" % Make Sure the band is not displayed + } +} + +\score { + \new PipeBandDrumStaff { + \time 3/4 + + \drummode { + \repeat volta 2 { + \tenorThreefoursOneA + \bar "||" + \break + \tenorThreefoursOneB + } + } + } + + \header { + title = "3/4 Standard" + instrument = "Tenor" + band = "" % Make Sure the band is not displayed + } +} + +\pageBreak + +\score { + \new PipeBandDrumStaff { + \time 6/8 + + \drummode { + \repeat volta 2 { + \tenorSixeightsOneA + \bar "||" + \break + \tenorSixeightsOneB + } + } + } + + \header { + title = "6/8 Standard" + instrument = "Tenor" + band = "" % Make Sure the band is not displayed + } +} + +\score { + \new PipeBandDrumStaff { + \time 9/8 + + \drummode { + \repeat volta 2 { + \tenorNineeightsOneA + \bar "||" + \tenorNineeightsOneA + } + } + } + + \header { + title = "9/8 Standard" + instrument = "Tenor" + band = "" % Make Sure the band is not displayed + } +} diff --git a/standards/standards.tenor.ily b/standards/standards.tenor.ily index fc236dd..740ac99 100644 --- a/standards/standards.tenor.ily +++ b/standards/standards.tenor.ily @@ -21,6 +21,7 @@ tenorTwofoursOneB = \drummode { g4 g | d4 d | g4 g | + d4 d | g4 g | d4 g | @@ -29,6 +30,55 @@ tenorTwofoursOneB = \drummode { } +tenorTwoFoursII = \drummode { + d8-> g d8 g | + d8-> g d8 g | + d8^\markup{"M"} g^\markup{"L"} \triplet { d8 g^\markup{"H"} d } g^\markup{"H"} | + d16^\markup{"M"} g8^\markup{"L"} g16^\markup{"L"} d4->^\markup{"H"} | + + d8-> g d8 g | + d8-> g d8 g | + \flourish { d4 g4 } | + d2\splitTheFeather | +} + +tenorTwoFoursFII = \drummode { + \flourish { + d4 d4 | g4 g4 | + d4 g4 | d4 g4 | + + d4 d4 | g4 g4 | + d4 g4 | + } + d2\splitTheFeather | +} +tenorTwoFoursFIII = \drummode { + \flourish { + d4 g4 | d4 g4 | + d4 d4 | g4 g4 | + + d4 g4 | d4 g4 | + d4 g4 | + } + d2\splitTheFeather | +} +tenorTwoFoursFIV = \drummode { + d2\splitTheFeather | d2\splitTheFeather | + \flourish { d4 g4 } | \flourish { d4 g4 } | + + d2\splitTheFeather | \flourish { d4 g4 } | + \flourish { d4 g4 } | d2\splitTheFeather | +} +tenorTwoFoursFV = \drummode { + \flourish { + d4 g4 | d4 d4 | + g4 d4 | g4 g4 | + } + + d4 r4^\markup {"Vertical 8's (Bye-Byes)"}\startGroup | r4 r8 \stopGroup r8 | + \flourish { d4 g4 } | d2\splitTheFeather +} + % -------------------------- % 3/4s @@ -106,7 +156,7 @@ tenorNineeightsOneA = \drummode { | d4 g8 d4 d8 g4. | - d4. 2.^\bfly + d4. d2.^\bfly | d4 g8 d4 d8 g4. @@ -115,7 +165,7 @@ tenorNineeightsOneA = \drummode { | d4 g8 d4. \flourish g4. | - \flourish d4. 2.^\splitTheFeather + \flourish d4. d2.^\splitTheFeather } tenorNineeightsOneB = \drummode {