diff --git a/4-4_marches/cabar_feidh/config.ily b/4-4_marches/cabar_feidh/config.ily index 5f3bf1b..8b22632 100644 --- a/4-4_marches/cabar_feidh/config.ily +++ b/4-4_marches/cabar_feidh/config.ily @@ -14,4 +14,4 @@ line = { \repeat unfold 2 { \halfline } } %% Headers title = "Cabar Fèidh" -meter = "March" +meter = "Regimental March of the Seaforth Highlanders" diff --git a/6-8_marches/kilaloe/full.ly b/6-8_marches/kilaloe/full.ly index 195fac4..fd36d00 100644 --- a/6-8_marches/kilaloe/full.ly +++ b/6-8_marches/kilaloe/full.ly @@ -24,11 +24,11 @@ \part \line \break - \line \bar "|." + \line \bar "!" \break \line \break - \line \bar "|." + \line \bar "||" \break \repeat volta 2 { \line @@ -83,14 +83,14 @@ } { \tenorglobal - s8 \tenorAA - \tenorAB + s8 \tenorAA r4. + \tenorAB r4. - \tenorAA - \tenorAB + \tenorAA r4. + \tenorAB r4. - \tenorBA - \tenorBB + \tenorBA r4. + \tenorBB r4. r4. | % Volta bracket for pipes } % \new PipeBandDrumStaff = "bass" \with { diff --git a/6-8_marches/kilaloe/full.n.ly b/6-8_marches/kilaloe/full.n.ly new file mode 100644 index 0000000..5988e06 --- /dev/null +++ b/6-8_marches/kilaloe/full.n.ly @@ -0,0 +1,127 @@ +\version "2.19.0" + +\include "bagpipe.ly" +\include "lilydrum.ly" + +\include "./config.ily" +%\include "./notes.bass.ily" +\include "./notes.tenor.ily" +%\include "./notes.side.ily" +\include "./notes.pipes.ily" +%\include "./notes.pipes.seconds.ily" +%\include "./notes.lyrics.ily" + +part = { \partial 4. \grace {s4} s4. } +\score { + \new StaffGroup << + \new Staff \with { + instrumentName = \markup{ \instrumentPipes } + shortInstrumentName = \markup{ \shortInstrumentPipes } + } { + \global + \pipeglobal + << + \new NullVoice = "format" { + \part + \line + \break + \line \bar "!" + \break + \part + \line + \break + \line \bar ".|:-||" + \break + \repeat volta 2 { + \part + \line + \break + \line + \measure + } + + }%Format + + \new Voice = "pipes" { + r4 \pipesA s4. + + \pipesB s4. + + \pipesC s4. + }%Pipes + >> + } +% \new Staff = "song" { +% \lyricsglobal +% \new Voice = "lyrics" { +% +% } +% } +% \new Lyrics = "verse1" { +% \lyricsglobal +% \lyricsto "lyrics" { +% \verseA +% } +% } +% \new Staff = "seconds" \with { +% instrumentName = \markup{ \instrumentPipes \instrumentSecnd } +% shortInstrumentName = \markup{ \shortInstrumentPipes \shortInstrumentSecnd } +% } { +% \pipessecndglobal +% +% +% } +% \new PipeBandDrumStaff = "side" \with { +% instrumentName = \markup { \instrumentSide } +% shortInstrumentName = \markup{ \shortInstrumentSide } +% } { +% \sideglobal +% +% } + \new PipeBandDrumStaff = "tenor" \with { + instrumentName = \markup{ \instrumentTenor } + shortInstrumentName = \markup{ \shortInstrumentTenor } + } { + \tenorglobal + + r4. \tenorAA r4. + \tenorAB s4. + + r4. \tenorAA r4. + \tenorAB s4. + + r4. \tenorBA r4. + \tenorBB s4. + | % Volta bracket for pipes + } +% \new PipeBandDrumStaff = "bass" \with { +% instrumentName = \markup{ \instrumentBass } +% shortInstrumentName = \markup{ \shortInstrumentBass } +% } { +% \bassglobal +% +% } + >> + \header { + title = \title + meter = \meter + composer = \markup \large { + \column \right-align { + $(if (not (string=? "" composerLyrics)) #{ \markup { \line { \composerLyrics ":" } } #} ) + $(if (not (string=? "" composerPipes)) #{ \markup {\line { \composerPipes ":" }} #} ) + $(if (not (string=? "" composerPipessecnd)) #{ \markup {\line { \composerPipessecnd ":" }} #} ) + $(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=? "" composerLyrics)) #{ \markup { \line { "Lyrics" } } #} ) + $(if (not (string=? "" composerPipes)) #{ \markup {\line { \instrumentPipes }}#} ) + $(if (not (string=? "" composerPipessecnd)) #{ \markup {\line { \instrumentPipessecnd }}#} ) + $(if (not (string=? "" composerSide)) #{ \markup {\line { \instrumentSide }}#} ) + $(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} ) + $(if (not (string=? "" composerBass)) #{ \markup {\line { \instrumentBass }}#} ) + } + } + } +} diff --git a/6-8_marches/kilaloe/notes.side.ily b/6-8_marches/kilaloe/notes.side.ily new file mode 100644 index 0000000..dd125fa --- /dev/null +++ b/6-8_marches/kilaloe/notes.side.ily @@ -0,0 +1,45 @@ +% 6/8 Kilaloe +% Side +\version "2.18.2" +composerSide = "" +arrangerSide = "" +sideglobal = {} +\include "../../standards/68_standards.side.ily" + +% Music +endfour = \drummode { + \flam d4. d4.:32( + | + d4.) +} +pone = \drummode {\pempty} +ptwo = \drummode {\pone} +pthree = \drummode { \pempty } +pthreeb = \drummode {s8 | s2. | s4. \flam d4. |} +pfour = \drummode { \pthree } +pfourb = \drummode {\pthreeb} + + +snareA = \drummode { + \pone \midone \pone \endfour +} + +snareB = \drummode { + \ptwo \midone \ptwo \endfour +} + +snareCA = \drummode { + \pthree \midone \pthree \endfour +} +snareCB = \drummode { + \pthree \midone \pthreeb | r2.^\markup{Yell} \endfour +} + +snareDA = \drummode { + \pfour \midone \pfour \endfour +} +snareDB = \drummode { + \pfour \midone \pfourb | r2.^\markup{Yell} \endfour +} + + diff --git a/6-8_marches/kilaloe/notes.tenor.ily b/6-8_marches/kilaloe/notes.tenor.ily index 02e65db..9b6da4d 100644 --- a/6-8_marches/kilaloe/notes.tenor.ily +++ b/6-8_marches/kilaloe/notes.tenor.ily @@ -10,7 +10,7 @@ tenorAA = \drummode { d4. g4. | d4. r4.\rswipe | d4. g4. | d4. r4.\rswipe | d4. g4. | d4. g4. | - d4.\up g4.\up | d4.\up r4. | + d4.\up g4.\up | d4.\up } tenorAB = \drummode { \flourish{ @@ -18,7 +18,7 @@ tenorAB = \drummode { d4. d4. | g4. g4. | d4. d4. | g4. g4. | } - d4.\up g4.\up | d4. \up r4. | + d4.\up g4.\up | d4.\up } tenorBA = \drummode { \tenorAA @@ -29,6 +29,6 @@ tenorBB = \drummode { d4. d4. | g4. g4. | d4. d4. | g4. g4. | } - r4. r4. | - d4.\up g4.\up | d4. \up r4. | + r4.^\markup{Yell} r4. | + d4.\up g4.\up | d4.\up } diff --git a/6-8_marches/kilaloe/pipes.n.ly b/6-8_marches/kilaloe/pipes.n.ly index 9caf048..c6d1f2b 100644 --- a/6-8_marches/kilaloe/pipes.n.ly +++ b/6-8_marches/kilaloe/pipes.n.ly @@ -16,12 +16,12 @@ part = { \partial 4. \grace {s4} s4. } \part \line \break - \line \bar "|." + \line \bar "!" \break \part \line \break - \line \bar "|." + \line \bar ".|:-||" \break \repeat volta 2 { \part diff --git a/6-8_marches/kilaloe/side.ly b/6-8_marches/kilaloe/side.ly new file mode 100644 index 0000000..f0d7167 --- /dev/null +++ b/6-8_marches/kilaloe/side.ly @@ -0,0 +1,62 @@ +\version "2.18.2" + +\include "lilydrum.ly" + +\include "./config.ily" +\include "./notes.side.ily" + +\score { + \new PipeBandDrumStaff { + \global + \sideglobal + << + \new NullVoice = "format" { + \repeat volta 2 { + \part + \line + } + \break + \repeat volta 2 { + \part + \line + } + \break + + \part + \line + \break + \line + \measure + + \break + \part + \line + \break + \line + \measure + + + }%Format + + \new DrumVoice = "side" { + \snareA r4 s8 + + \snareB r4 s8 + + \snareCA r4 + \snareCB r4 s8 + + \snareDA r4 + \snareDB r4 s8 + + } + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentSide + composer = \composerSide + arranger = \arrangerSide + } +} diff --git a/6-8_marches/kilaloe/tenor.ly b/6-8_marches/kilaloe/tenor.ly index 783962c..d38a8a3 100644 --- a/6-8_marches/kilaloe/tenor.ly +++ b/6-8_marches/kilaloe/tenor.ly @@ -11,17 +11,17 @@ \tenorglobal << \new NullVoice = "format" { - \repeat volta 2 { \line \line } + \repeat volta 2 { \line \break \line } \break - \repeat volta 2 { \line \line s2. } + \repeat volta 2 { \line \break \line \measure } }%Format \new DrumVoice = "tenor" { - \tenorAA - \tenorAB + \tenorAA r4. + \tenorAB r4. - \tenorBA - \tenorBB + \tenorBA r4. + \tenorBB r4. } >> }