diff --git a/strathspeys/orange_and_blue/drums.ly b/strathspeys/orange_and_blue/drums.ly new file mode 100644 index 0000000..6863a4c --- /dev/null +++ b/strathspeys/orange_and_blue/drums.ly @@ -0,0 +1,77 @@ +\version "2.19.0" + +\include "lilydrum.ly" + +\include "./config.ily" +%\include "./notes.bass.ily" +\include "./notes.tenor.ily" +\include "./notes.side.ily" + + +\layout { + indent = 5.0 + short-indent = 2.0 +} + +\score { + \new StaffGroup << + \new PipeBandDrumStaff = "side" \with { + instrumentName = \markup{ \instrumentSide } + shortInstrumentName = \markup{ \shortInstrumentSide } + } { + \global + << + \new NullVoice = "format" { + \halfline + %\break + \halfline + \bar "||" \break + + \halfline + %\break + \halfline + \bar "|." + }%End of Format + \new DrumVoice = "side" { + \sideglobal + \snareA + \snareB + }%End of side + >> + } + \new PipeBandDrumStaff = "tenor" \with { + instrumentName = \markup{ \instrumentTenor } + shortInstrumentName = \markup{ \shortInstrumentTenor } + } { + \tenorglobal + \tenorA + \tenorB + } +%{ + \new PipeBandDrumStaff = "bass" \with { + instrumentName = \markup{ \instrumentBass } + shortInstrumentName = \markup{ \shortInstrumentBass } + } { + \bassglobal + \repeat unfold 4 { \bassA } + } +%} + >> + \header { + title = \title + subtitle = \subtitle + meter = \meter + composer = \markup { + \column \right-align { + $(if (not (string=? "" composerSide)) #{ \markup {\line { \composerSide ":" }} #} ) + $(if (not (string=? "" composerTenor)) #{ \markup {\line { \composerTenor ":" }} #} ) + $(if (not (string=? "" composerBass)) #{ \markup {\line { \composerBass ":" }} #} ) + } + \column \right-align { + $(if (not (string=? "" composerSide)) #{ \markup {\line { \instrumentSide }}#} ) + $(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} ) + $(if (not (string=? "" composerBass)) #{ \markup {\line { \instrumentBass }}#} ) + } + } + } +} diff --git a/strathspeys/orange_and_blue/full.ly b/strathspeys/orange_and_blue/full.ly index 81b8e1c..1c699c2 100644 --- a/strathspeys/orange_and_blue/full.ly +++ b/strathspeys/orange_and_blue/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" @@ -27,10 +27,15 @@ << \new NullVoice = "format" { \part | - \line + \halfline + \break + \halfline \bar "||" \break + \pageBreak - \line + \halfline + %\break + \halfline \bar "|." } \new Voice = "pipes" { @@ -73,15 +78,16 @@ \snareB } -%{ \new PipeBandDrumStaff = "tenor" \with { instrumentName = \markup{ \instrumentTenor } shortInstrumentName = \markup{ \shortInstrumentTenor } } { \tenorglobal + s16 | + \tenorA + \tenorB } -%} %{ \new PipeBandDrumStaff = "bass" \with { instrumentName = \markup{ \instrumentBass } diff --git a/strathspeys/orange_and_blue/notes.tenor.ily b/strathspeys/orange_and_blue/notes.tenor.ily new file mode 100644 index 0000000..d1e8073 --- /dev/null +++ b/strathspeys/orange_and_blue/notes.tenor.ily @@ -0,0 +1,35 @@ +% 4/4 Orange and Blue +% Tenor +\version "2.18.2" +composerTenor = "E.T. de Boone, v0.1, Oct 2022" +arrangerTenor = "" +tenorglobal = {} +% Music +tenorAA = \drummode { + d4 g4 d8. d16 g4 | + \flourish { d4 g } r8.^\rpush g16 d4 | + d4 g8. g16 d4 g4 | + d8. g16 d8. d16 g4 g4 | +} +tenorAB = \drummode { + d4 g4 d8. d16 g4 | + \flourish { d4 g } r8.^\rpush g16 d4 | + d8. g16 d4 \triplet { d8 g d } g4 | + d4^\up g4^\up \stf d2 +} + +tenorBA = \drummode { + \flourish { d4 g4 d4 g4 } | + \triplet { d8 g d } g8. g16 d2 | + d4^\up g4^\up d4^\up g4^\up | + d8. g16 d8. d16 g4 g4 | +} +tenorBB = \drummode { + \flourish { d4 g4 d4 g4 } | + \triplet { d8 g d } g8. g16 d2 | + d8. g16 d4 \triplet { d8 g d } g4 | + d4^\up g4^\up \stf d2 +} + +tenorA = \drummode { \tenorAA \tenorAB } +tenorB = \drummode { \tenorBA \tenorBB } diff --git a/strathspeys/orange_and_blue/tenor.ly b/strathspeys/orange_and_blue/tenor.ly new file mode 100644 index 0000000..bb51037 --- /dev/null +++ b/strathspeys/orange_and_blue/tenor.ly @@ -0,0 +1,36 @@ +\version "2.18.2" + +\include "lilydrum.ly" + +\include "./config.ily" +\include "./notes.tenor.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + \new NullVoice = "format" { + \repeat volta 2 { + \line + } + \break + \repeat volta 2 { + \line + } + }%Format + \new DrumVoice = "tenor" { + \tenorglobal + \tenorA + \tenorB + }%Tenor + >> + } + \header { + title = \title + subtitle = \subtitle + meter = \meter + instrument = \instrumentTenor + composer = \composerTenor + arranger = \arrangerTenor + } +}