diff --git a/reels/jock_wilsons_ball/bass.ly b/reels/jock_wilsons_ball/bass.ly new file mode 100644 index 0000000..c56c8d0 --- /dev/null +++ b/reels/jock_wilsons_ball/bass.ly @@ -0,0 +1,21 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.bass.ily" + +\score { + \new PipeBandDrumStaff { + \global + \bassglobal + << + { }%Format + { } + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentBass + composer = \composerBass + } +} diff --git a/reels/jock_wilsons_ball/drums.ly b/reels/jock_wilsons_ball/drums.ly new file mode 100644 index 0000000..dbfe2f0 --- /dev/null +++ b/reels/jock_wilsons_ball/drums.ly @@ -0,0 +1,50 @@ +\version "2.19.0" + +\include "config.ily" +\include "notes.bass.ily" +\include "notes.tenor.ily" +\include "notes.side.ily" + +\score { + \new StaffGroup << + \new PipeBandDrumStaff = "side" { + \global + \sideglobal + \set PipeBandDrumStaff.instrumentName = \markup{\instrumentSide} + \set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide} + + << + { }%Format + { }%Music + >> + } + \new PipeBandDrumStaff = "tenor" { + \tenorglobal + \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor } + \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor } + + } + \new PipeBandDrumStaff = "bass" { + \bassglobal + \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass } + \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass} + + } + >> + \header { + title = \title + 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/reels/jock_wilsons_ball/full.ly b/reels/jock_wilsons_ball/full.ly index 2947734..9f29ae6 100644 --- a/reels/jock_wilsons_ball/full.ly +++ b/reels/jock_wilsons_ball/full.ly @@ -7,7 +7,9 @@ \include "notes.pipes.ily" \score { - \new StaffGroup << + \new StaffGroup \with { + } + << \new Staff { \global \pipeglobal @@ -15,15 +17,16 @@ \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentPipes } << { - \bar ".|" - \line - \bar "|.|" - \break - \line - \bar "|." + \partial 16 s16 + \line + \bar "||" + + \break + \line + \bar "|." }%Format { - \pipesAA + s16 \pipesAA \pipesAB \pipesBA @@ -31,30 +34,29 @@ }%Pipes >> } - \new PipeBandDrumStaff = "side" { + \new PipeBandDrumStaff = "side"{ \sideglobal \set PipeBandDrumStaff.instrumentName = \markup \column {\instrumentSide} \set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide} - \sideA - \sideB + \sideA + \sideB } \new PipeBandDrumStaff = "tenor" { \tenorglobal \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor } \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor } - - \tenorA - \tenorB + s16 \tenorA + \tenorB + } + \new PipeBandDrumStaff = "bass" { + \bassglobal + \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass } + \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass} + s16 \bassA + \bassB + } -% \new PipeBandDrumStaff = "bass" { -% \bassglobal -% \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass } -% \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass} -% -% \bassA -% \bassB -% } >> \header { title = \title diff --git a/reels/jock_wilsons_ball/notes.bass.ily b/reels/jock_wilsons_ball/notes.bass.ily index 0a2a170..2fe22d5 100644 --- a/reels/jock_wilsons_ball/notes.bass.ily +++ b/reels/jock_wilsons_ball/notes.bass.ily @@ -6,8 +6,12 @@ bassglobal = {} % Music bassA = \drummode { s1*4 + | + s1*4 } bassB = \drummode { s1*4 + | + s1*4 } diff --git a/reels/jock_wilsons_ball/notes.side.ily b/reels/jock_wilsons_ball/notes.side.ily index 27b1849..3cc538b 100644 --- a/reels/jock_wilsons_ball/notes.side.ily +++ b/reels/jock_wilsons_ball/notes.side.ily @@ -1,59 +1,59 @@ % 2/2 Jock Wilson's Ball % Side \version "2.18.2" -composerSide = "" +composerSide = "E.T. de Boone, 2016" sideglobal = { - \eighthBeaming + \eighthReelBeaming } % Music sideA = \drummode { g16 | \flam d4 \flam g8. g16 - d8.:32( [ d16)-> g8. g16 ] + d8.:32( d16)-> g8. g16 | \flam d8. [ \drag g16 d32 g d g d8 ] g8. [ \drag d16 d8. g16 ] | - \flam d8. [ \drag g16 d32 g d g d8 ] - g8.:32->( [ d16) g8. g16 ] + \flam d8. [ \drag g16 ] d32 g d g d8 ] + g8.:32->([ d16) g8. g16 ] | - \triplet {d8 [ d g } d16 g32 g ] - d8 [ g32 d g d g8-> d8. d16:64( ] + \triplet {d8 [ d g } d16 g32 g ] + d8 [ g32 d g d g8-> d8. d16:64( ] | - d4) \flam g8. g16 - d8.:32( [ d16)-> g8. g16 ] + d4) \flam g8. g16 + d8.:32([ d16)-> g8. g16 ] | - \flam d8. [ \drag g16 d32 g d g d8 ] - g8. [ \drag d16 d8. g16 ] + \flam d8.[ \drag g16 d32 g d g d8 ] + g8.[ \drag d16 d8. g16 ] | - \flam d32 [ d g8. d16 g8. ] - d4:32( d8.) g16 + \flam d32[ d g8. d16 g8. ] + d4:32( d8.) g16 | - \triplet {d8 [ g d } \flam g8. \drag g16 ] - d32 g d g d8 g8. g16 + \triplet {d8[ g d } \flam g8. \drag g16 ] + d32 g d g d8 g8. } sideB = \drummode { - \flam d8 [ d16:64~ d16 d8:32(-> g16) d16 ] - \flam d8 [ d16:64~ d16 \flam d8. g16 ] + g16 | + \flam d8[ d16:64( d16) d8:32(-> g16) d16 ] + \flam d8[ d16:64( d16) \flam d8. g16 ] | - \triplet { \flam d8 [ g8 \flam d8 } \flam g8 \triplet { d16 g d ]} - g8. [ \drag d16 d8. g16 ] + \flamd \triplet { d8[ g8 \flam d8 } \flam g8 \triplet { d16 g d ]} + g8.[ \drag d16 d8. g16 ] | - \flam d8 [ d16:64~ d16 d8:32(-> g16) d16 ] - \flam d8 [ d16:64~ d16 \flam d8. g16 ] + \flam d8[ d16:64~ d16 d8:32(-> g16) d16 ] + \flam d8[ d16:64~ d16 \flam d8. g16 ] | - \triplet { d8 [ d g } d16 g32 g ] - d8 [ g32 d g d g8-> d8. d16:64( ] + \triplet { d8 [ d g } d16 g32 g] + d8[ g32 d g d g8-> d8. d16:64( ] | - d8) [ d16:64~ d16 d8:32(-> g16) d16 ] - \flam d8 [ d16:64~ d16 \flam d8. g16 ] + d8)[ d16:64~ d16 d8:32(-> g16) d16 ] + \flam d8[ d16:64~ d16 \flam d8. g16 ] | - \flam d8. [ \drag g16 d32 g d g d8 ] - g8. [ \drag d16 d8. g16 ] - | - + \flam d8.[ \drag g16 d32 g d g d8 ] + g8.[ \drag d16 d8. g16 ] +| s1*2 } diff --git a/reels/jock_wilsons_ball/notes.tenor.ily b/reels/jock_wilsons_ball/notes.tenor.ily index 6d0e9c1..7c2127b 100644 --- a/reels/jock_wilsons_ball/notes.tenor.ily +++ b/reels/jock_wilsons_ball/notes.tenor.ily @@ -5,12 +5,51 @@ composerTenor = "" tenorglobal = {} % Music tenorA = \drummode { - s1*4 + d4 g8. g16 + d4 g4 + | + d4 g16 g8 d16 + r8. d16 g4 + | + d4 g8. g16 + d4 r4 + | + d4 r4 + d8. g16 d4 + + | + d4 g8. g16 + d4 g4 + | + d4 g16 g8 d16 + r8. d16 g4 + | + d8. g16 d g8. + d8. g16 d4 + | + d8. g16 d4 + g4 r4 | - s1*4 } tenorB = \drummode { - s1*4 + \flourish g4 \flourish g4 + \flourish d4 \flourish d4 | - s1*4 + s1 + | + \flourish g4 \flourish g4 + \flourish d4 \flourish d4 + | + s1 + + | + \flourish g4 \flourish g4 + \flourish d4 \flourish d4 + | + s1 + | + \flourish g4 \flourish g4 + \flourish d4 \flourish d4 + | + s1 } diff --git a/reels/jock_wilsons_ball/side.ly b/reels/jock_wilsons_ball/side.ly index 0543d4d..b751572 100644 --- a/reels/jock_wilsons_ball/side.ly +++ b/reels/jock_wilsons_ball/side.ly @@ -12,13 +12,14 @@ \partial 16 s16 \line \bar "||" - \break + \break + \partial 16 s16 \line \bar "|." }%Format { - \sideA + \sideA s16 \sideB } diff --git a/reels/jock_wilsons_ball/tenor.ly b/reels/jock_wilsons_ball/tenor.ly new file mode 100644 index 0000000..b10ae81 --- /dev/null +++ b/reels/jock_wilsons_ball/tenor.ly @@ -0,0 +1,31 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.tenor.ily" + +\score { + \new PipeBandDrumStaff { + \global + \tenorglobal + << + { + \line + \bar "||" + \break + \line + \bar "|." + }%Format + { + \tenorA + + \tenorB + } + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentTenor + composer = \composerTenor + } +}