diff --git a/2-4_marches/caller_herrin/.callerherrin.ly.swp b/2-4_marches/caller_herrin/.callerherrin.ly.swp deleted file mode 100644 index 192a51e..0000000 Binary files a/2-4_marches/caller_herrin/.callerherrin.ly.swp and /dev/null differ diff --git a/3-4_marches/ballad_of_the_green_berets/lyrics.ly b/3-4_marches/ballad_of_the_green_berets/lyrics.ly new file mode 100644 index 0000000..adc033c --- /dev/null +++ b/3-4_marches/ballad_of_the_green_berets/lyrics.ly @@ -0,0 +1,65 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.pipes.ily" +\include "notes.lyrics.ily" + +\score { + \new Staff { + \global + \lyricsglobal + << + \new NullVoice = "format" + { + \line + \bar "||" + \break + \line + \bar "|." + }%Format + \new Voice = "tune" + { + \pipeglobal + \pipesA + \pipesA + } + \new NullVoice = "song" { + \lyricsAA + \lyricsAB + } + \new Lyrics = "lyrics" { + \lyricsto "song" { + \verseA + } + } + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentLyrics + composer = \markup \large { + \column \right-align { + $(if (not (string=? "" composerLyrics)) #{ \markup { \line { \composerLyrics } } #} ) + $(if (not (string=? "" composerPipes)) #{ \markup { \line { \composerPipes ":" } } #} ) + } + \column \right-align { + $(if (not (string=? "" composerLyrics)) #{ \markup { \line { } } #} ) + + $(if (not (string=? "" composerPipes)) #{ \markup { \line { \instrumentPipes } } #} ) + } + } + + } +} +\markup { + \fill-line{ + \column { + \verseAblock + \combine \null \vspace #0.5 + \verseBblock + \combine \null \vspace #0.5 + \verseCblock + } + } +} diff --git a/3-4_marches/ballad_of_the_green_berets/notes.lyrics.ily b/3-4_marches/ballad_of_the_green_berets/notes.lyrics.ily new file mode 100644 index 0000000..766f783 --- /dev/null +++ b/3-4_marches/ballad_of_the_green_berets/notes.lyrics.ily @@ -0,0 +1,77 @@ +% 3/4 The Ballad of the Green Berets +% Lyrics +\version "2.18.2" +composerLyrics = "" +lyricsglobal = {} +% Music +lyricsAA = { + c8 [ c8 ] c4. a8 | + b8 [ b8 ] a2 | + e8 [ e8 ] e4. e8 | + f8 e8 e2 | + + A8 [ A8 ] A4. f8 | + d8 [ f8 ] e2 | + c8 [ c8 ] b4. c16 [ c16 ] | + b8. a16 a2 | +} +lyricsAB = { + c8 [ c8 ] c4. a8 | + b8 [ b8 ] a2 | + e8 [ e8 ] e4. e8 | + \tuplet 3/2 { f8 f8 e8 } e2 | + + A8 [ A8 ] A4. f8 | + d8 [ f8 ] e2 | + c8 [ c8 ] b4. c16 [ c16 ] | + b8. a16 a2 | +} + +verseA = \lyricmode { + \set stanza = #"1." + Fight- ing sol- diers from the sky + Fear- less men who jump and die + Men who mean just what they say + The brave men of the Green Ber- et + + Sil- ver wings u- pon their chest + These are men, the Neth- er- lands' best + One hun- dred men will test today + But only three win the Green Ber- et +} +verseAblock = \markup \column { + \line{ \bold "1." } + \line{Fighting soldiers from the sky} + \line{Fearless men who jump and die} + \line{Men who mean just what they say} + \line{The brave men of the Green Beret} + + \line{Silver wings upon their chest} + \line{These are men, the Netherlands' best} + \line{One hundred men will test today} + \line{But only three win the Green Beret} +} +verseBblock = \markup \column { + \line{ \bold "2." } + \line{Trained to live off nature's land} + \line{Trained in combat, hand-to-hand} + \line{Men who fight by night and day} + \line{Courage peak from the Green Berets} + + \line{Silver wings upon their chest} + \line{These are men, the Netherlands' best} + \line{One hundred men will test today} + \line{But only three win the Green Beret} +} +verseCblock = \markup \column { + \line{ \bold "3." } + \line{Back at home a young wife waits} + \line{Her Green Beret has met his fate} + \line{He has died for those oppressed} + \line{Leaving her his last request} + + \line{Put silver wings on my son's chest} + \line{Make him one of the Netherlands' best} + \line{He'll be a man they'll test one day} + \line{Have him win the Green Beret.} +} diff --git a/3-4_marches/ballad_of_the_green_berets/notes.pipes.ily b/3-4_marches/ballad_of_the_green_berets/notes.pipes.ily index cd4be48..8d95ab4 100644 --- a/3-4_marches/ballad_of_the_green_berets/notes.pipes.ily +++ b/3-4_marches/ballad_of_the_green_berets/notes.pipes.ily @@ -6,7 +6,7 @@ pipeglobal = { \bagpipeKey } pipesA = { - \grg c8 [ \grG c8 ] \grg c4 c8 a8 | + \grg c8 [ \grG c8 ] \grg c4. a8 | \grg b8 [ \grG b8 ] a2 | e8 [ \gra e8 ] \grg e4. \grg e8 | \grg f8 e8 \grg e2 | @@ -31,7 +31,7 @@ pipesB = { } pipesC = { - \grg c8 [ \grG c8 ] \grg c4 c8 a8 | + \grg c8 [ \grG c8 ] \grg c4. a8 | \grg b8 [ \grG b8 ] a2 | e8 [ \gra e8 ] \grg e4 \grg e4 | \grg f8 e8 \gra e2 | diff --git a/6-8_marches/the_steamboat/.config.ily.swp b/6-8_marches/the_steamboat/.config.ily.swp deleted file mode 100644 index 335381e..0000000 Binary files a/6-8_marches/the_steamboat/.config.ily.swp and /dev/null differ diff --git a/other/band_of_brothers.snare.ly b/other/band_of_brothers/snaredrum.ly similarity index 99% rename from other/band_of_brothers.snare.ly rename to other/band_of_brothers/snaredrum.ly index f465711..cf561a9 100644 --- a/other/band_of_brothers.snare.ly +++ b/other/band_of_brothers/snaredrum.ly @@ -124,5 +124,3 @@ } } - - diff --git a/reels/jock_wilsons_ball/.side.ly.swp b/reels/jock_wilsons_ball/.side.ly.swp deleted file mode 100644 index 44587f2..0000000 Binary files a/reels/jock_wilsons_ball/.side.ly.swp and /dev/null differ diff --git a/template/bass.ly b/template/bass.ly index c56c8d0..39bfcb9 100644 --- a/template/bass.ly +++ b/template/bass.ly @@ -6,10 +6,15 @@ \score { \new PipeBandDrumStaff { \global - \bassglobal + \bassglobal << - { }%Format - { } + \new NullVoice = "format" + { + + }%Format + \new DrumVoice { + + } >> } \header { diff --git a/template/drums.ly b/template/drums.ly index dbfe2f0..77a537f 100644 --- a/template/drums.ly +++ b/template/drums.ly @@ -14,8 +14,12 @@ \set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide} << - { }%Format - { }%Music + \new NullVoice = "format" { + + }%End of Format + \new DrumVoice = "side" { + + }%End of side >> } \new PipeBandDrumStaff = "tenor" { diff --git a/template/full.ly b/template/full.ly index 64ebd55..f4ead7a 100644 --- a/template/full.ly +++ b/template/full.ly @@ -16,17 +16,20 @@ \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentPipes } \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentPipes } << - \new Voice = "format" - {}%Format + \new NullVoice = "format" { + + }%Format - \new Voice = "pipes" - {}%Pipes + \new Voice = "pipes" { + + }%Pipes >> } % \new Staff = "song" { % \lyricsglobal -% \new Voice = "lyrics" -% {} +% \new Voice = "lyrics" { +% +% } % } % \new Lyrics = "verse1" { % \lyricsglobal diff --git a/template/lyrics.ly b/template/lyrics.ly index e4f0740..17cb8cb 100644 --- a/template/lyrics.ly +++ b/template/lyrics.ly @@ -9,13 +9,17 @@ \global \lyricsglobal << -% \new Voice = "format" -% { }%Format - \new Voice = "tune" - { } +% \new NullVoice = "format"{ +% +% }%Format + + \new Voice = "tune" { + + } + \new Lyrics = "lyrics" { \lyricsto "tune" { - + } } >> @@ -26,12 +30,11 @@ instrument = \instrumentLyrics composer = \markup \large { \column \right-align { - $(if (not (string=? "" composerLyrics)) #{ \markup { \line { \composerLyrics } } #} ) - $(if (not (string=? "" composerPipes)) #{ \markup { \line { \composerPipes ":" } } #} ) + $(if (not (string=? "" composerLyrics)) #{ \markup { \line { \composerLyrics } } #} ) + $(if (not (string=? "" composerPipes)) #{ \markup { \line { \composerPipes ":" } } #} ) } \column \right-align { - $(if (not (string=? "" composerLyrics)) #{ \markup { \line { } } #} ) - + $(if (not (string=? "" composerLyrics)) #{ \markup { \line { } } #} ) $(if (not (string=? "" composerPipes)) #{ \markup { \line { \instrumentPipes } } #} ) } } diff --git a/template/pipes.full.ly b/template/pipes.full.ly index b57a44e..9078544 100644 --- a/template/pipes.full.ly +++ b/template/pipes.full.ly @@ -13,10 +13,12 @@ \set Staff.instrumentName = \markup{ \instrumentPipes } \set Staff.shortInstrumentName = \markup{ \shortInstrumentPipes } << - \new Voice = "format" - { }%Format - \new Voice = "pipes" - { }%Pipes + \new NullVoice = "format" { + + }%Format + \new Voice = "pipes" { + + }%Pipes >> } \new Staff = "seconds" { diff --git a/template/pipes.ly b/template/pipes.ly index 6461266..c6e74d6 100644 --- a/template/pipes.ly +++ b/template/pipes.ly @@ -8,8 +8,13 @@ \global \pipeglobal << - { }%Format - { } + \new NullVoice = "format" { + + }%Format + + \new Voice = "pipes" { + + } >> } \header { diff --git a/template/pipes.seconds.ly b/template/pipes.seconds.ly index 78abdef..9d454e7 100644 --- a/template/pipes.seconds.ly +++ b/template/pipes.seconds.ly @@ -8,8 +8,13 @@ \global \pipessecndglobal << - { }%Format - { } + \new NullVoice = "format" { + + }%Format + + \new Voice = "seconds" { + + } >> } \header { diff --git a/template/pipes.thirds.ly b/template/pipes.thirds.ly index 11623df..3f4a220 100644 --- a/template/pipes.thirds.ly +++ b/template/pipes.thirds.ly @@ -8,8 +8,13 @@ \global \pipesthrdglobal << - { }%Format - { } + \new NullVoice = "format" { + + }%Format + + \new Voice = "thirds" { + + } >> } \header { diff --git a/template/side.ly b/template/side.ly index 8d8fafd..b23c0b7 100644 --- a/template/side.ly +++ b/template/side.ly @@ -6,10 +6,15 @@ \score { \new PipeBandDrumStaff { \global - \sideglobal + \sideglobal << - { }%Format - { } + \new NullVoice = "format" { + + }%Format + + \new DrumVoice = "side" { + + } >> } \header { diff --git a/template/tenor.ly b/template/tenor.ly index babb955..b798898 100644 --- a/template/tenor.ly +++ b/template/tenor.ly @@ -8,8 +8,13 @@ \global \tenorglobal << - {}%Format - {} + \new NullVoice = "format" { + + }%Format + + \new DrumVoice = "tenor" { + + } >> } \header {