diff --git a/4-4_marches/dawning_of_the_day/notes.pipes.ily b/4-4_marches/dawning_of_the_day/notes.pipes.ily index 026f455..15b2743 100644 --- a/4-4_marches/dawning_of_the_day/notes.pipes.ily +++ b/4-4_marches/dawning_of_the_day/notes.pipes.ily @@ -1,7 +1,8 @@ % 4/4 Dawning of the Day % Pipes \version "2.18.2" -composerPipes = "Trad., arr. PM T.F.J. de Boone" +composerPipes = "Trad." +arrangerPipes = "PM T.F.J. de Boone" pipeglobal = { \key a \mixolydian } diff --git a/4-4_marches/dawning_of_the_day/notes.pipes.seconds.ily b/4-4_marches/dawning_of_the_day/notes.pipes.seconds.ily index 7022277..7f0c2ab 100644 --- a/4-4_marches/dawning_of_the_day/notes.pipes.seconds.ily +++ b/4-4_marches/dawning_of_the_day/notes.pipes.seconds.ily @@ -1,7 +1,8 @@ % 4/4 Dawning of the Day % Pipes (Seconds) \version "2.18.2" -composerPipessecnd = "Trad., arr. PM T.F.J. de Boone" +composerPipesSecnd = "Trad." +arrangerPipesSecnd = "PM T.F.J. de Boone" pipessecndglobal = { \key a \mixolydian } diff --git a/4-4_marches/dawning_of_the_day/pipes.full.ly b/4-4_marches/dawning_of_the_day/pipes.full.ly index 9673d52..65c40f7 100644 --- a/4-4_marches/dawning_of_the_day/pipes.full.ly +++ b/4-4_marches/dawning_of_the_day/pipes.full.ly @@ -45,11 +45,11 @@ composer = \markup \large { \column \right-align { $(if (not (string=? "" composerPipes)) #{ \markup {\line { \composerPipes ":" }} #} ) - $(if (not (string=? "" composerPipessecnd)) #{ \markup {\line { \composerPipessecnd ":" }} #} ) + $(if (not (string=? "" composerPipesSecnd)) #{ \markup {\line { \composerPipesSecnd ":" }} #} ) } \column \right-align { $(if (not (string=? "" composerPipes)) #{ \markup {\line { \instrumentPipes }}#} ) - $(if (not (string=? "" composerPipessecnd)) #{ \markup {\line { \instrumentPipessecnd }}#} ) + $(if (not (string=? "" composerPipesSecnd)) #{ \markup {\line { \instrumentPipesSecnd }}#} ) } } } diff --git a/4-4_marches/dawning_of_the_day/pipes.ly b/4-4_marches/dawning_of_the_day/pipes.ly index 5d688cc..38afbda 100644 --- a/4-4_marches/dawning_of_the_day/pipes.ly +++ b/4-4_marches/dawning_of_the_day/pipes.ly @@ -29,6 +29,7 @@ meter = \meter instrument = \instrumentPipes composer = \composerPipes + arranger = \arrangerPipes } } \score { @@ -44,4 +45,11 @@ \pipesBB } \midi { \confTempo } + \header { + title = \title + meter = \meter + instrument = \instrumentPipes + composer = \composerPipes + arranger = \arrangerPipes + } } diff --git a/4-4_marches/dawning_of_the_day/pipes.seconds.ly b/4-4_marches/dawning_of_the_day/pipes.seconds.ly index 348f9be..0871232 100644 --- a/4-4_marches/dawning_of_the_day/pipes.seconds.ly +++ b/4-4_marches/dawning_of_the_day/pipes.seconds.ly @@ -26,10 +26,12 @@ \header { title = \title meter = \meter - instrument = \instrumentPipessecnd - composer = \composerPipessecnd + instrument = \instrumentPipesSecnd + composer = \composerPipesSecnd + arranger = \arrangerPipesSecnd } -}\score { +} +\score { \new Staff { \global \pipessecndglobal \set Staff.midiInstrument = #"bagpipe" %%Tune @@ -42,4 +44,11 @@ \pipessecndBB } \midi { \confTempo } + \header { + title = \title + meter = \meter + instrument = \instrumentPipesSecnd + composer = \composerPipesSecnd + arranger = \arrangerPipesSecnd + } } diff --git a/5-4_marches/cullen_bay/bass.hmpd.ly b/5-4_marches/cullen_bay/bass.hmpd.ly index 7cb7f24..e9319aa 100644 --- a/5-4_marches/cullen_bay/bass.hmpd.ly +++ b/5-4_marches/cullen_bay/bass.hmpd.ly @@ -16,7 +16,8 @@ } } \header { - title = \markup \column { \title \smaller "Holland Massed P&D" } + title = \title + band = "Holland Massed Pipes and Drums" meter = \meter instrument = \instrumentBass composer = \composerBass diff --git a/5-4_marches/cullen_bay/drums.hmpd.ly b/5-4_marches/cullen_bay/drums.hmpd.ly index fe184df..cdf7312 100644 --- a/5-4_marches/cullen_bay/drums.hmpd.ly +++ b/5-4_marches/cullen_bay/drums.hmpd.ly @@ -9,7 +9,6 @@ #(set-global-staff-size 14) date = \markup { 16-02-2016 } -title = \markup { \title \normalsize "(HMPD)" } \score { \new StaffGroup << @@ -60,7 +59,8 @@ title = \markup { \title \normalsize "(HMPD)" } >> \header { date = \date - title = \markup \column { \title \smaller "Holland Massed P&D" } + title = \title + band = "Holland Massed P&D" meter = \meter composer = \markup \tiny { \composerSide ":" "Drums" } diff --git a/5-4_marches/cullen_bay/mid.hmpd.ly b/5-4_marches/cullen_bay/mid.hmpd.ly index 1006e8a..9670605 100644 --- a/5-4_marches/cullen_bay/mid.hmpd.ly +++ b/5-4_marches/cullen_bay/mid.hmpd.ly @@ -45,7 +45,8 @@ title = \markup { \title \normalsize "(HMPD)" } } >> \header { - title = \markup \column { \title \smaller "Holland Massed P&D" } + title = \title + band = "Holland Massed P&D" meter = \meter composer = \markup { \column \right-align { diff --git a/5-4_marches/cullen_bay/side.48th.ly b/5-4_marches/cullen_bay/side.48th.ly index e47caef..e53cbff 100644 --- a/5-4_marches/cullen_bay/side.48th.ly +++ b/5-4_marches/cullen_bay/side.48th.ly @@ -23,7 +23,7 @@ } \header { title = \title - band = "48th HLDRS" + band = "48th HIGHRS" meter = \meter instrument = \instrumentSide composer = \composerSide diff --git a/5-4_marches/cullen_bay/side.hmpd.ly b/5-4_marches/cullen_bay/side.hmpd.ly index 4f71a19..01dd28b 100644 --- a/5-4_marches/cullen_bay/side.hmpd.ly +++ b/5-4_marches/cullen_bay/side.hmpd.ly @@ -25,7 +25,8 @@ >> } \header { - title = \markup \column { \title \smaller "Holland Massed P&D" } + title = \title + band = "Holland Massed P&D" meter = \meter instrument = \instrumentSide composer = \composerSide diff --git a/5-4_marches/cullen_bay/tenor.hmpd.ly b/5-4_marches/cullen_bay/tenor.hmpd.ly index bb2f6dc..d0bbe0b 100644 --- a/5-4_marches/cullen_bay/tenor.hmpd.ly +++ b/5-4_marches/cullen_bay/tenor.hmpd.ly @@ -17,7 +17,8 @@ title = \markup { \title \normalsize "(HMPD)" } >> } \header { - title = \markup \column { \title \smaller "Holland Massed P&D" } + title = \title + band = "Holland Massed Pipes and Drums" meter = \meter instrument = \instrumentTenor composer = \composerTenor diff --git a/6-8_marches/kilaloe/full.48th.ly b/6-8_marches/kilaloe/full.48th.ly index 68f141f..5738312 100644 --- a/6-8_marches/kilaloe/full.48th.ly +++ b/6-8_marches/kilaloe/full.48th.ly @@ -27,10 +27,13 @@ part = { \partial 4. \grace {s4} s4. } \break \line \bar "||" \break + \part \line \break - \line \bar ".|:-||" + \line + \bar ".|:-||" + \break \repeat volta 2 { \part @@ -77,11 +80,11 @@ part = { \partial 4. \grace {s4} s4. } } { \sideglobal + \repeat unfold 2 { \snareA \snareA s4. + } - \snareB \snareB s4. - - \snareC + \snareC s4. } \new PipeBandDrumStaff = "tenor" \with { @@ -90,14 +93,13 @@ part = { \partial 4. \grace {s4} s4. } } { \tenorglobal - r4. \tenorAA - \tenorAB + \repeat unfold 2 { + r4. \tenorAA r4. | + \tenorAB s4. | + } - r4. \tenorAA - \tenorAB - - r4. \tenorBA - \tenorBB + r4. \tenorBA r4. | + \tenorBB s4. | | % Volta bracket for pipes } % \new PipeBandDrumStaff = "bass" \with { @@ -110,6 +112,7 @@ part = { \partial 4. \grace {s4} s4. } >> \header { title = \title + band = "48th HIGHRS" meter = \meter composer = \markup \large { \column \right-align { diff --git a/6-8_marches/kilaloe/notes.side.48th.ily b/6-8_marches/kilaloe/notes.side.48th.ily index e105897..7695287 100644 --- a/6-8_marches/kilaloe/notes.side.48th.ily +++ b/6-8_marches/kilaloe/notes.side.48th.ily @@ -2,20 +2,20 @@ % Side \version "2.18.2" composerSide = "" -arrangerSide = "48th HIGHRS, 2018" +arrangerSide = "2018" sideglobal = {} % Music snareA = \drummode { - d4.:32(\< | - d4)\! g8 \flam d4 g8 | - d4.:32( d4.:32)(\<| - d4) \!g8 \flam d8 g d | - g4.:32( d4.:32)(\<| - d4)\! g8 \flam d4 g8:32( | - d8) g d \flam g8 d g | - \flam d4. d4.:32( | - d4.) + d4.:32(\< | + d4)\! g8 \flam d4 g8 | + d4.:32( d4.:32)(\<| + d4) \!g8 \flam d8 g d | + g4.:32( d4.:32)(\<| + d4)\! g8 \flam d4 d8:32( | + d8) g d \flam g8 d g | + \flam d4. d4.:32( | + d4.) } snareB = \drummode { \snareA } @@ -35,12 +35,9 @@ snareC = \drummode { d2.:32( | d4.) \flam d8 g d | g2.:32( | - d4) g8:32( d4) g8:32( | + d4) g8:32( g4) d8:32( | d8) g d \flam d4. | - r4. r4 g8:32( | + r4. r4 d8:32( | d8) g d \flam d4 g8 | - d4.:32( d4) + d4.:32( } - - - diff --git a/6-8_marches/kilaloe/notes.tenor.ily b/6-8_marches/kilaloe/notes.tenor.ily index ba1e2ec..5930fd4 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 @@ -30,5 +30,5 @@ tenorBB = \drummode { d4. d4. | g4. g4. | } r4. r4. | - d4.\up g4.\up | d4.\up r4. | + d4.\up g4.\up | d4.\up } diff --git a/6-8_marches/kilaloe/side.48th.ly b/6-8_marches/kilaloe/side.48th.ly index 62012da..47ea817 100644 --- a/6-8_marches/kilaloe/side.48th.ly +++ b/6-8_marches/kilaloe/side.48th.ly @@ -44,7 +44,8 @@ part = {\partial 4. \grace{ s4 } s4. } >> } \header { - title = \markup \column { \title \normalsize "48th HIGHRS" } + title = \title + band = "48th HIGHRS" meter = \meter instrument = \instrumentSide composer = \composerSide diff --git a/6-8_marches/kilaloe/tenor.ly b/6-8_marches/kilaloe/tenor.ly index 783962c..61165d7 100644 --- a/6-8_marches/kilaloe/tenor.ly +++ b/6-8_marches/kilaloe/tenor.ly @@ -17,11 +17,11 @@ }%Format \new DrumVoice = "tenor" { - \tenorAA - \tenorAB + \tenorAA r4. | + \tenorAB r4. | - \tenorBA - \tenorBB + \tenorBA r4. | + \tenorBB r4. | } >> } diff --git a/airs/highland_cathedral/config.ily b/airs/highland_cathedral/config.ily index 4625518..7705b60 100644 --- a/airs/highland_cathedral/config.ily +++ b/airs/highland_cathedral/config.ily @@ -2,6 +2,7 @@ %% Globals global = { \time 4/4 + \key d \major } confTempo = { \tempo 4 = 40 diff --git a/airs/highland_cathedral/notes.pipes.ily b/airs/highland_cathedral/notes.pipes.ily index 89ca031..2b1de7f 100644 --- a/airs/highland_cathedral/notes.pipes.ily +++ b/airs/highland_cathedral/notes.pipes.ily @@ -1,10 +1,11 @@ % 4/4 Highland Cathedral % Pipes \version "2.18.2" -composerPipes = "arr. Marc Gouswaart" +composerPipes = "M. Korb, U. Roever, 1982" +arrangerPipes = "Marc Gouswaart" pipeglobal = { - \bagpipeKey - } + \key d \major +} % Music pipesA = { d4. e16 [ f16 ] \dble e8 [ d8 ] \grg a8 [ d8 ] | diff --git a/airs/highland_cathedral/pipes.ly b/airs/highland_cathedral/pipes.ly index 57002f7..c6f7346 100644 --- a/airs/highland_cathedral/pipes.ly +++ b/airs/highland_cathedral/pipes.ly @@ -42,6 +42,7 @@ meter = \meter instrument = \instrumentPipes composer = \composerPipes + arranger = \arrangerPipes } } \score { @@ -59,5 +60,6 @@ meter = \meter instrument = \instrumentPipes composer = \composerPipes + arranger = \arrangerPipes } }