diff --git a/2-4_marches/barren_rocks_of_aden/notes.pipes.ily b/2-4_marches/barren_rocks_of_aden/notes.pipes.ily index d5a7513..4860aee 100644 --- a/2-4_marches/barren_rocks_of_aden/notes.pipes.ily +++ b/2-4_marches/barren_rocks_of_aden/notes.pipes.ily @@ -2,6 +2,7 @@ % Pipes \version "2.18.2" composerPipes = "" +arrangerPipes = "" pipeglobal = { \bagpipeKey } @@ -11,7 +12,7 @@ pipesA = { \grg f8. [ g16 ] \hdblf f8. [ e16 ] | \thrwd d8 [ \grg f8 ] \birl a8 [ \thrwd d8 ] | \dblc c8 [ e8 ] \birl a8. [ e16 ] | - \grg f8 [ \birl a8 ] \thrwd d8. [ e16 ] | + \grg f8 [ \birl a8 ] \thrwd d8. [ e16 ] | \grg f8. [ g16 ] \hdblf f8. [ e16 ] | \thrwd d8 [ \grg f8 ] \birl a8 [ \thrwd d8 ] | @@ -24,7 +25,7 @@ pipesB = { \dblA A8. [ f16 ] \thrwd d8. [ f16 ] | \dble e8 [ \grg f8 ] \birl a8 [ \grg e16 f16 ] | \dblg g8. [ e16 ] \dblc c8 [ a8 ] | - \thrwd d8 [ f8 ] \wbirl a8 [ \dblg g8 ] | + \thrwd d8 [ f8 ] \wbirl a8 [ \dblg g8 ] | \dblA A8. [ f16 ] \thrwd d8. [ f16 ] | \grg e8 [ \grg f8 ] \birl a8 [ \grg e16 f16 ] | @@ -37,7 +38,7 @@ pipesC = { A16. [ f32 \grg d32 f16. ] \grg f32 [ A16. d32 f16. ] | \dble e8 [ f8 ] \birl a8 [ \grg e16 f16 ] | \grA g16. [ e32 \grg c32 e16. ] \grg e32 [ A16. c32 e16. ] | - \thrwd d8 [ f8 ] \birl a8 [ \dblg g8 ] | + \thrwd d8 [ f8 ] \birl a8 [ \dblg g8 ] | A16. [ f32 \grg d32 f16. ] \grg f32 [ A16. d32 f16. ] | \dble e8 [ f8 ] \birl a8 [ \grg e16 f16 ] | @@ -50,7 +51,7 @@ pipesD = { A16. [ f32 d16. f32 ] \grg a16. [ f32 \grg d32 f16. ] | A16. [ f32 d16. f32 ] \grg a16. [ f32 \grg d32 f16. ] | \grA g16. [ e32 \grg c32 \grd e16. ] \grg a16. [ e32 \grg c32 e16. ] | - \grA g16. [ e32 \grg c32 \grd e16. ] \grg a16. [ e32 \grg c32 e16. ] | + \grA g16. [ e32 \grg c32 \grd e16. ] \grg a16. [ e32 \grg c32 e16. ] | A16. [ f32 d16. f32 ] \grg a16. [ f32 \grg d32 f16. ] | A16. [ f32 d16. f32 ] \grg a16. [ f32 \grg d32 f16. ] | diff --git a/2-4_marches/barren_rocks_of_aden/pipes.ly b/2-4_marches/barren_rocks_of_aden/pipes.ly index 1457dc0..14ace89 100644 --- a/2-4_marches/barren_rocks_of_aden/pipes.ly +++ b/2-4_marches/barren_rocks_of_aden/pipes.ly @@ -19,14 +19,14 @@ \break } }%Format - + \new Voice = "pipes" { \pipesA s8 \pipesB s8 \pipesC s8 - + \pipesD s8 } >> @@ -36,6 +36,7 @@ meter = \meter instrument = \instrumentPipes composer = \composerPipes + arranger = \arrangerPipes } } \score { @@ -43,6 +44,7 @@ \set Staff.midiInstrument = #"bagpipe" %%Tune + \partial 8 \pipesA \pipesA @@ -61,5 +63,6 @@ meter = \meter instrument = \instrumentPipes composer = \composerPipes + arranger = \arrangerPipes } } diff --git a/2-4_marches/black_bear/drums.ly b/2-4_marches/black_bear/drums.ly index 700ad8f..5b92e27 100644 --- a/2-4_marches/black_bear/drums.ly +++ b/2-4_marches/black_bear/drums.ly @@ -7,6 +7,18 @@ \include "./notes.tenor.ily" \include "./notes.side.ily" + +markTextEol = #(define-music-function (parser location text) (string?) #{ + \once \override Score.RehearsalMark #'break-visibility = #end-of-line-visible + \once \override Score.RehearsalMark #'self-alignment-X = #RIGHT + \mark \markup $text +#}) + +\layout { + indent = 5.0 + short-indent = 2.0 +} + \score { \new StaffGroup << \new PipeBandDrumStaff = "side" { @@ -17,9 +29,10 @@ << \new NullVoice = "format" { - \repeat volta 2 { \part \halfline \break \halfline } \break - \part \halfline \break \halfline \bar "||" \break - \line \bar "|." + \repeat volta 2 { + \part \line \markTextEol "Fine" + }\break + \part \line \markTextEol "D.C. al Fine" \bar "||" }%End of Format \new DrumVoice = "side" { \snareA s8 diff --git a/2-4_marches/black_bear/full.ly b/2-4_marches/black_bear/full.ly index 8b2a155..a5e5231 100644 --- a/2-4_marches/black_bear/full.ly +++ b/2-4_marches/black_bear/full.ly @@ -9,35 +9,43 @@ \include "./notes.side.ily" \include "./notes.pipes.ily" +markTextEol = #(define-music-function (parser location text) (string?) #{ + \once \override Score.RehearsalMark #'break-visibility = #end-of-line-visible + \once \override Score.RehearsalMark #'self-alignment-X = #RIGHT + \mark \markup $text +#}) + +\layout { + indent = 5.0 + short-indent = 2.0 +} + \score { \new StaffGroup << \new Staff { \global \bagpipeKey - \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentPipes } - \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentPipes } + \set Staff.instrumentName = \markup{ \instrumentPipes } + \set Staff.shortInstrumentName = \markup{ \shortInstrumentPipes } << { \repeat volta 2 { - \part \line + \part \line \markTextEol "Fine" }\break - \part \line \bar "||" \break - \line \bar "|." + \part \line \markTextEol "D.C. al Fine" \bar "||" }%Format { \pipesA s8 \pipesB - \pipesCA s8 }%Pipes >> } \new PipeBandDrumStaff = "side" { - \set PipeBandDrumStaff.instrumentName = \markup \column {\instrumentSide} + \set PipeBandDrumStaff.instrumentName = \markup \column { \instrumentSide } \set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide} \sideglobal \snareA s8 \snareBA - \snareBB } \new PipeBandDrumStaff = "tenor" { \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor } @@ -48,7 +56,6 @@ r8 \tenorA s8 \tenorB - \tenorA s8 } \new PipeBandDrumStaff = "bass" { \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass } @@ -56,7 +63,6 @@ r8 \bassA s8 \bassB - \bassA s8 } >> \header { diff --git a/2-4_marches/black_bear/mid.ly b/2-4_marches/black_bear/mid.ly index fba3590..767f954 100644 --- a/2-4_marches/black_bear/mid.ly +++ b/2-4_marches/black_bear/mid.ly @@ -6,172 +6,61 @@ \include "./notes.bass.ily" \include "./notes.tenor.ily" +\layout { + indent = 5.0 + short-indent = 2.0 +} + \score { \new StaffGroup << -<<<<<<< Updated upstream:strathspeys/molly_connell/drums.ly - \new PipeBandDrumStaff = "side" { - \global - \sideglobal - \set PipeBandDrumStaff.instrumentName = \markup \column {\instrumentSide} - \set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide} - << - \new NullVoice = "format" { - \mark \markup { \normalsize {Intro } } - \emptyline - \bar "|." - - \mark \markup { \normalsize {Tune } } - \line \break - \line \break - \bar "|." - - \part \line \break - \line \break - \bar "|." - }%Format - - \new DrumVoice = "side" { - \intro - \snareA s8 - \snareA s8 - - \snareBA - \snareBB - - }%Pipes -||||||| merged common ancestors - \new PipeBandDrumStaff = "side" { - \set PipeBandDrumStaff.instrumentName = \markup{\instrumentSide} - \set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide} - + \new PipeBandDrumStaff = "tenor" \with { + instrumentName = \markup{ \instrumentTenor } + shortInstrumentName = \markup{ \shortInstrumentTenor } + } { + \tenorglobal \global << { - \line \break - \line \break - \bar "|." + \repeat volta 2 { + \part \line + } + \break - \part \line \break - \part \line \break - \bar "|." - }%End of Format - { - \snareA - s8 - \snareA - s8 - - \snareBA - \snareBB - } -======= - \new PipeBandDrumStaff = "tenor" { - \global - \tenorglobal - \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor } - \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor } -<< - \new NullVoice = "format" { - \repeat volta 2 { \part \halfline \break \halfline } \break - \part \halfline \break \halfline \bar "||" \break + \part \line \bar "||" + \break \line \bar "|." - }%End of Format - \new DrumVoice = "side" { + + }%Format + { r8 \tenorA s8 \tenorB \tenorA s8 - }%End of side ->>>>>>> Stashed changes:2-4_marches/black_bear/mid.ly + + }%Music >> -<<<<<<< Updated upstream:strathspeys/molly_connell/drums.ly -||||||| merged common ancestors } - \new PipeBandDrumStaff = "bass" { - \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass } - \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass} -======= - - } - \new PipeBandDrumStaff = "bass" { + \new PipeBandDrumStaff = "bass" \with { + instrumentName = \markup{ \instrumentBass } + shortInstrumentName = \markup{ \shortInstrumentBass } + } { \bassglobal - \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass } - \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass} ->>>>>>> Stashed changes:2-4_marches/black_bear/mid.ly -<<<<<<< Updated upstream:strathspeys/molly_connell/drums.ly - } - \new PipeBandDrumStaff = "tenor" { - \tenorglobal - \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor } - \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor } - - \emptyline - - \tenorA - \tenorA - - s8 \tenorBA - \tenorBB -||||||| merged common ancestors - \bassAA - \bassAB - - s8 - \bassAA - s8 - \bassAB - } - \new PipeBandDrumStaff = "tenor" { - \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor } - \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor } - - \tenorA - \tenorA - - s8 - \tenorBA - s8 - \tenorBB -======= r8 \bassA s8 \bassB \bassA s8 ->>>>>>> Stashed changes:2-4_marches/black_bear/mid.ly - } - \new PipeBandDrumStaff = "bass" { - \bassglobal - \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass } - \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass} - - \emptyline - - \bassAA - \bassAB - - s8 \bassAA - \bassAB } >> - \layout { - \context { - \PipeBandDrumStaff - \RemoveEmptyStaves - \override VerticalAxisGroup.remove-first = ##t - } - } \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/2-4_marches/black_bear/notes.pipes.ily b/2-4_marches/black_bear/notes.pipes.ily index b92a724..2033e1e 100644 --- a/2-4_marches/black_bear/notes.pipes.ily +++ b/2-4_marches/black_bear/notes.pipes.ily @@ -6,7 +6,7 @@ pipeglobal = { \bagpipeKey } pipesA = { - \grg a16. [ b32 ] | + \tag #'upbeat { \grg a16. [ b32 ] | } \thrwd d8 [ \dbld d8 ] \grg f16.[ d32 A16. f32 ]| \thrwd d8 [ \dbld d8 ] \grg f16.[ d32 A16. f32 ]| \dble e8 [ \grg b8 ] \grip b8 [ \grg e16 d16 ] | @@ -15,28 +15,17 @@ pipesA = { \thrwd d8 [ \dbld d8 ] \grg f16. [ d32 A16. f32 ] | \thrwd d8 [ \dbld d8 ] \grg f16. [ d32 A16. f32 ] | \dble e8 [ \grip e8 ] \grg e16. [ g32 \grA f32 e16. ] | - \thrwd d8 [ \grg f8 ] \thrwd d8 + \thrwd d8 [ \grg f8 ] \thrwd d8 } pipesB = { e8 | \grg a16. [ \grd a32 a16 \grd b16 ] \thrwd d8 [ \grg d16 e16 ] | \dblg g8 [ \grA f16 e16 ] \grg f32 [ A16. f16. d32 ] | \grg a16. [ \grd a32 a16 ] \grd b16 ] \thrwd d8 [ \grg d16 e16 ] | - \dblg g8 [ \grA f16 e16 ] \grg f32 [ A16. f16. d32 ] | + \dblg g8 [ \grA f16 e16 ] \grg f32 [ A16. f16. d32 ] | A8 [ a16 \dbla a16 ] \grg c8 [ \grd a16 \dbla a16 ] | \grg d8 [ b16 \dblb b16 ] \grg e8 [ c16 \dblc c16 ] | \grg d32 [ f16. \grg d32 f16. ] e16. [ g32 \grA f32 g16. ] | - A8 [ \grip A8 ] \grg A16. [ g32 f16. e32 ] -} -pipesCA = { - \thrwd d8 [ \dbld d8 ] \grg f16. [ d32 A16. f32 ] | - \thrwd d8 [ \dbld d8 ] \grg f16. [ d32 A16. f32 ] | - \dble e8 [ \grg b8 ] \grip b8 [ \grg e16 d16 ] | - \grg c32 [ d16. \grg b32 \grd c16. ] \grg a16. [ b32 \grg c32 \grd a16. ] - - \thrwd d8 [ \dbld d8 ] \grg f16. [ d32 A16. f32 ] | - \thrwd d8 [ \dbld d8 ] \grg f16. [ d32 A16. f32 ] | - \dble e8 [ \grip e8 ] \grg e16. [ g32 \grA f32 e16. ] | - \thrwd d8 [ \grg f8 ] \thrwd d8 - } + A8 [ \grip A8 ] \grg A16. [ g32 f16. e32 ] +} \ No newline at end of file diff --git a/2-4_marches/black_bear/notes.side.ily b/2-4_marches/black_bear/notes.side.ily index b9e0d9f..31bbe87 100644 --- a/2-4_marches/black_bear/notes.side.ily +++ b/2-4_marches/black_bear/notes.side.ily @@ -7,7 +7,7 @@ sideglobal = { \eighthBeaming } snareA = \drummode { \tutti { - d16. g32 | + \tag #'upbeat { d16. g32 | } d8:32(-> g:32)(-> \triplet { d16) g d-> } g16. g32 | d8:32(-> g:32)(-> \triplet { d16) g d-> } g16. g32 | \flam d8 d8:32( g8) @@ -22,6 +22,9 @@ snareA = \drummode { } g32 | \flam d16. g32-> d32 g d g d8 } +snareBB = \drummode { + \removeWithTag #'upbeat \snareA +} snareBA = \drummode { g8 | diff --git a/2-4_marches/black_bear/pipes.ly b/2-4_marches/black_bear/pipes.ly index 9679718..6f0639b 100644 --- a/2-4_marches/black_bear/pipes.ly +++ b/2-4_marches/black_bear/pipes.ly @@ -5,6 +5,12 @@ \include "./config.ily" \include "./notes.pipes.ily" +markTextEol = #(define-music-function (parser location text) (string?) #{ + \once \override Score.RehearsalMark #'break-visibility = #end-of-line-visible + \once \override Score.RehearsalMark #'self-alignment-X = #RIGHT + \mark \markup $text +#}) + \score { \new Staff { \global @@ -12,16 +18,13 @@ << { \repeat volta 2 { - \part \line - }\break - \part \line \bar "||" \break - \line \bar "|." - + \part \line \markTextEol "Fine" + }\break + \part \line \markTextEol "D.C. al Fine" \bar "||" } { \pipesA s8 \pipesB - \pipesCA } >> } @@ -40,7 +43,7 @@ \pipesA \pipesA \pipesB - \pipesCA + \removeWithTag #'upbeat \pipesA } \midi { \confTempo } \header { diff --git a/2-4_marches/black_bear/tenor.ly b/2-4_marches/black_bear/tenor.ly index 1432f4c..33d181b 100644 --- a/2-4_marches/black_bear/tenor.ly +++ b/2-4_marches/black_bear/tenor.ly @@ -37,28 +37,3 @@ composer = \composerTenor } } - -midiTenor = midiDrumPitches -midiTenor.right-hand = \tenorDefault -midiTenor.left-hand = \tenorDefault -\score { - \new PipeBandDrumStaff - \with { - drumPitchTable = #(alist->hash-table midiTenor) - } - { \global \tenorglobal - %%Tune - \tenorA - r8 \tenorA - - \tenorB - \tenorA r8 - } - \midi { \confTempo } - \header { - title = \title - meter = \meter - instrument = \instrumentPipes - composer = \composerPipes - } -} diff --git a/2-4_marches/brown_haired_maiden/config.ily b/2-4_marches/brown_haired_maiden/config.ily index 7a32129..1fc7a89 100644 --- a/2-4_marches/brown_haired_maiden/config.ily +++ b/2-4_marches/brown_haired_maiden/config.ily @@ -7,7 +7,6 @@ confTempo = { \tempo 4 = 80 } %% Format -part = { \partial 8 s8 } measure = { \grace {s4} s2 | } halfline = { \repeat unfold 4 { \measure } } line = { \repeat unfold 2 { \halfline } } diff --git a/2-4_marches/brown_haired_maiden/notes.pipes.ily b/2-4_marches/brown_haired_maiden/notes.pipes.ily index f0e69bd..aefdcac 100644 --- a/2-4_marches/brown_haired_maiden/notes.pipes.ily +++ b/2-4_marches/brown_haired_maiden/notes.pipes.ily @@ -2,35 +2,39 @@ % Pipes \version "2.18.2" composerPipes = "Trad." +arrangerPipes = "" +pipeglobal = { + \bagpipeKey +} pipesA = { \grg G8 [ \grd a8 ] \wbirl a8. [ b16 ] | \thrwd d8. [ e16 ] \dblf f4 | \dble e8 [ d8 ] \dblb b8 [ d8 ] | \dblf f8 [ e8 ] \dblf f8 [ A8 ] | - + \grg G8 [ \grd a8 ] \wbirl a8. [ b16 ] | \thrwd d8. [ e16 ] \dblf f4 | \dble e8 [ d8 ] \dblb b8 [ \gre G8 ] | - \grg a4 \wbirl a4 + \grg a4 \wbirl a4 } pipesB = { \grg f8 [ A8 ] \grg A4 | \grip A8. [ g16 ] \dblf f4 | \dble e8 [ d8 ] \dblb b8 [ d8 ] | - \dblf f8 [ e8 ] \dblf f4 + \dblf f8 [ e8 ] \dblf f4 } pipesBA = { \grg f8 [ A8 ] \grg A4 \grip A8. [ g16 ] \dblf f4 | \dble e8 [ d8 ] \dblb b8 [ \gre G8 ] | - \grg a4 \wbirl a4 + \grg a4 \wbirl a4 } pipesBB = { \grg G8 [ \grd a8 ] \wbirl a8. [ b16 ] | \thrwd d8. [ e16 ] \dblf f4 | \dble e8 [ d8 ] \dblb b8 [ \gre G8 ] | - \grg a4 \wbirl a4 + \grg a4 \wbirl a4 } diff --git a/2-4_marches/brown_haired_maiden/pipes.ly b/2-4_marches/brown_haired_maiden/pipes.ly index 3af4c7d..497e48e 100644 --- a/2-4_marches/brown_haired_maiden/pipes.ly +++ b/2-4_marches/brown_haired_maiden/pipes.ly @@ -8,29 +8,29 @@ \score { \new Staff { \global - \bagpipeKey + \pipeglobal << - { + \new NullVoice = "format" { \repeat volta 2 { \line } \break \repeat volta 2 { \halfline - } - \alternative { - {\halfline} - {\halfline} } - + \alternative { + { \halfline } + { \halfline } + } \bar "|." - } - { - \pipesA + }%Format - \pipesB - \pipesBA - \pipesBB + \new Voice = "pipes" { + \pipesA + + \pipesB + \pipesBA + \pipesBB } >> } @@ -39,5 +39,26 @@ meter = \meter instrument = \instrumentPipes composer = \composerPipes + arranger = \arrangerPipes + } +} +\score { + \new Staff { \global \pipeglobal + \set Staff.midiInstrument = #"bagpipe" + %%Tune + \pipesA + + \pipesB + \pipesBA + \pipesB + \pipesBB + } + \midi { \confTempo } + \header { + title = \title + meter = \meter + instrument = \instrumentPipes + composer = \composerPipes + arranger = \arrangerPipes } } diff --git a/2-4_marches/corriechoillie_welcome_to_the_43rd_northern_meeting/config.ily b/2-4_marches/corriechoillie_welcome_to_the_43rd_northern_meeting/config.ily index f113cc1..02ea183 100644 --- a/2-4_marches/corriechoillie_welcome_to_the_43rd_northern_meeting/config.ily +++ b/2-4_marches/corriechoillie_welcome_to_the_43rd_northern_meeting/config.ily @@ -7,7 +7,7 @@ confTempo = { \tempo 4 = 80 } %% Format -part = { \partial 8 s8 } +part = { \partial 8 \grace {s4} s8 } measure = { \grace { s4 } s2 | } halfline = { \repeat unfold 4 { \measure } } line = { \repeat unfold 2 { \halfline } } diff --git a/2-4_marches/corriechoillie_welcome_to_the_43rd_northern_meeting/notes.pipes.ily b/2-4_marches/corriechoillie_welcome_to_the_43rd_northern_meeting/notes.pipes.ily index e95a4ee..7b0a0d8 100644 --- a/2-4_marches/corriechoillie_welcome_to_the_43rd_northern_meeting/notes.pipes.ily +++ b/2-4_marches/corriechoillie_welcome_to_the_43rd_northern_meeting/notes.pipes.ily @@ -1,7 +1,11 @@ -% 2/4 Teribus +% 2/4 Corriechoillie's 43rd Welcome to the Northern Meeting % Pipes \version "2.18.2" -composerPipes = "PM W. Ross, arr. PM G.J. van Achterbergh" +composerPipes = "PM W. Ross" +arrangerPipes = "PM G.J. van Achterbergh" +pipeglobal = { + \bagpipeKey +} pipesA = { e8 | \grg a8. [ b16 ] \grG a8 [ \thrwd d8 ] | @@ -12,25 +16,25 @@ pipesA = { \grg a8. [ b16 ] \grG a8 [ \thrwd d8 ] | \grg e8. [ d16 ] \dblb b8 [ \gre a8 ] | \thrwd d8. [ e16 ] \grg f8 [ A8 ] | - \hdblf f8 [ d8 ] \dbld d8 + \hdblf f8 [ d8 ] \dbld d8 } pipesB = { - \dblg g8 - \dblA A8. [ f16 ] \thrwd d8 [ f8 ] - \grg e8. [ d16 ] \dblb b8 [ \gre a8 ] - \thrwd d8. [ e16 ] \grg f8 [ A8 ] + \dblg g8 + \dblA A8. [ f16 ] \thrwd d8 [ f8 ] + \grg e8. [ d16 ] \dblb b8 [ \gre a8 ] + \thrwd d8. [ e16 ] \grg f8 [ A8 ] \hdblf f8 [ \grg e8 ] \gra e8 [ \dblg g8 ] } pipesBA = { - \dblA A8. [ f16 ] \thrwd d8 [ f8 ] - \grg e8. [ d16 ] \dblb b8 [ \gre a8 ] - \thrwd d8. [ e16 ] \grg f8 [ A8 ] - \hdblf f8 [ d8 ] \dbld d8 + \dblA A8. [ f16 ] \thrwd d8 [ f8 ] + \grg e8. [ d16 ] \dblb b8 [ \gre a8 ] + \thrwd d8. [ e16 ] \grg f8 [ A8 ] + \hdblf f8 [ d8 ] \dbld d8 } pipesBB = { - \grg a8. [ b16 ] \grG a8 [ \thrwd d8 ] - \grg e8. [ d16 ] \dblb b8 [ \gre a8 ] - \thrwd d8. [ e16 ] \grg f8 [ A8 ] - \hdblf f8 [ d8 ] \dbld d8 + \grg a8. [ b16 ] \grG a8 [ \thrwd d8 ] + \grg e8. [ d16 ] \dblb b8 [ \gre a8 ] + \thrwd d8. [ e16 ] \grg f8 [ A8 ] + \hdblf f8 [ d8 ] \dbld d8 } diff --git a/2-4_marches/corriechoillie_welcome_to_the_43rd_northern_meeting/pipes.ly b/2-4_marches/corriechoillie_welcome_to_the_43rd_northern_meeting/pipes.ly index 12378db..ff38db6 100644 --- a/2-4_marches/corriechoillie_welcome_to_the_43rd_northern_meeting/pipes.ly +++ b/2-4_marches/corriechoillie_welcome_to_the_43rd_northern_meeting/pipes.ly @@ -8,26 +8,26 @@ \score { \new Staff { \global - \bagpipeKey + \pipeglobal << - { + \new NullVoice = "format" { \repeat volta 2 { \part \line } \break \repeat volta 2 { \part \halfline - } - \alternative { - {\halfline} - {\halfline} } - + \alternative { + { \halfline } + { \halfline } + } \bar "|." - } - { + }%Format + + \new Voice = "pipes" { \pipesA s8 - + \pipesB \pipesBA s8 \pipesBB @@ -39,5 +39,26 @@ meter = \meter instrument = \instrumentPipes composer = \composerPipes + arranger = \arrangerPipes + } +} +\score { + \new Staff { \global \pipeglobal + \set Staff.midiInstrument = #"bagpipe" + %%Tune + \partial 8 + \pipesA s8 + + \pipesB + \pipesBA s8 + \pipesBB + } + \midi { \confTempo } + \header { + title = \title + meter = \meter + instrument = \instrumentPipes + composer = \composerPipes + arranger = \arrangerPipes } } diff --git a/2-4_marches/duncan_mcinness/notes.side.ily b/2-4_marches/duncan_mcinness/notes.side.ily index b6bd467..81cab30 100644 --- a/2-4_marches/duncan_mcinness/notes.side.ily +++ b/2-4_marches/duncan_mcinness/notes.side.ily @@ -79,5 +79,4 @@ snareDAC = \drummode { >> \flamd d8 d8:32( g4) - \bar "|." } diff --git a/2-4_marches/high_road_to_gairloch/notes.pipes.ily b/2-4_marches/high_road_to_gairloch/notes.pipes.ily index 9147f1f..0f47199 100644 --- a/2-4_marches/high_road_to_gairloch/notes.pipes.ily +++ b/2-4_marches/high_road_to_gairloch/notes.pipes.ily @@ -2,6 +2,11 @@ % Pipes \version "2.18.2" composerPipes = "Trad." +arrangerPipes = "" +pipeglobal = { + \bagpipeKey +} + pipesA = { \grg e8. [ f16 ] \grg e8 [ a8 ] | \dblc c8 [ \gre a8 ] \dble e4 | @@ -11,14 +16,14 @@ pipesA = { \grg e8. [ f16 ] \grg e8 [ a8 ] | \dblc c8 [ \gre a8 ] \dble e4 | \grg a8. [ b16 ] \dblc c8 [ \gre a8 ] | - \dblb b4 \grG a4 + \dblb b4 \grG a4 } pipesB = { \dblc c8 [ \gre a8 ] \wbirl a8. [ b16 ] | \dblc c8 [ \gre a8 ] \dblc c4 | \thrwd d8. [ c16 ] \grg b8. [ c16 ] | \thrwd d8 [ \gre b8 ] \thrwd d4 | - + \dblc c8 [ \gre a8 ] \wbirl a8. [ b16 ] | \dblc c8 [ \gre b8 ] \dblc c8 [ e8 ] | \grg a8. [ b16 ] \dblc c8 [ \gre a8 ] | diff --git a/2-4_marches/high_road_to_gairloch/pipes.ly b/2-4_marches/high_road_to_gairloch/pipes.ly index 847e8f9..6fba93f 100644 --- a/2-4_marches/high_road_to_gairloch/pipes.ly +++ b/2-4_marches/high_road_to_gairloch/pipes.ly @@ -8,22 +8,21 @@ \score { \new Staff { \global - \bagpipeKey - << - { - \line - \line - } - { + \pipeglobal + \set Staff.midiInstrument = #"bagpipe" + \pipesA + \bar "||" \pipesB - } - >> + \bar "|." } \header { title = \title meter = \meter instrument = \instrumentPipes composer = \composerPipes + arranger = \arrangerPipes } + \layout { } + \midi { \confTempo } } diff --git a/2-4_marches/mairis_wedding/config.ily b/2-4_marches/mairis_wedding/config.ily index 83ba594..798f58b 100644 --- a/2-4_marches/mairis_wedding/config.ily +++ b/2-4_marches/mairis_wedding/config.ily @@ -3,11 +3,10 @@ global = { \time 2/4 } -confTempo = { - \tempo 4 = 80 +confTempo = { + \tempo 4 = 80 } %% Format -part = { \partial 8 s8 } measure = { \grace {s1} s2 | } halfline = { \repeat unfold 4 \measure } line = { \repeat unfold 2 { \halfline } } diff --git a/2-4_marches/mairis_wedding/notes.pipes.ily b/2-4_marches/mairis_wedding/notes.pipes.ily index e8c2611..942ece0 100644 --- a/2-4_marches/mairis_wedding/notes.pipes.ily +++ b/2-4_marches/mairis_wedding/notes.pipes.ily @@ -1,7 +1,8 @@ % 2/4 Maries Wedding % Pipes \version "2.18.2" -composerPipes = "" +composerPipes = "Trad." +arrangerPipes = "" pipeglobal = { \bagpipeKey } @@ -10,7 +11,7 @@ pipesA = { \grg G8 [ \grd a8 ] \wbirl a8. [ b16 ] | \thrwd d8. [ e16 ] \dblf f4 | \dble e8 [ d8 ] \dblb b8 [ d8 ] | - \dblf f8 [ e8 ] \dblf f8 [ A8 ] | + \dblf f8 [ e8 ] \dblf f8 [ A8 ] | \grg G8 [ \grd a8 ] \wbirl a8. [ b16 ] | \thrwd d8. [ e16 ] \dblf f4 | @@ -22,7 +23,7 @@ pipesBA = { \grg f8 [ A8 ] \grg A4 | \grip A8. [ g16 ] \dblf f4 | \dble e8 [ d8 ] \dblb b8 [ d8 ] | - \dblf f8 [ e8 ] \dblf f4 + \dblf f8 [ e8 ] \dblf f4 } pipesBBA = { diff --git a/2-4_marches/mairis_wedding/pipes.ly b/2-4_marches/mairis_wedding/pipes.ly index 83cad56..f0907f9 100644 --- a/2-4_marches/mairis_wedding/pipes.ly +++ b/2-4_marches/mairis_wedding/pipes.ly @@ -22,7 +22,7 @@ \halfline }\bar "|." }%Format - + \new Voice = "pipes" { \pipesA @@ -37,6 +37,7 @@ meter = \meter instrument = \instrumentPipes composer = \composerPipes + arranger = \arrangerPipes } } \score { @@ -56,5 +57,6 @@ meter = \meter instrument = \instrumentPipes composer = \composerPipes + arranger = \arrangerPipes } } diff --git a/2-4_marches/pipers_cave/config.ily b/2-4_marches/pipers_cave/config.ily index 4135cfe..d2d8a44 100644 --- a/2-4_marches/pipers_cave/config.ily +++ b/2-4_marches/pipers_cave/config.ily @@ -7,11 +7,12 @@ confTempo = { \tempo 4 = 90 } %% Format -part = { \partial 8 s8 } +partspacer = { \grace {s4} s8 } +part = { \partial 8 } measure = { \grace { s4 } s2 | } halfline = { \repeat unfold 4 { \measure } } line = { \repeat unfold 2 { \halfline } } %% Headers -title = "Piper's Cave" -meter = "March" +title = "The Piper's Cave" +meter = "March" \ No newline at end of file diff --git a/2-4_marches/pipers_cave/notes.pipes.ily b/2-4_marches/pipers_cave/notes.pipes.ily index 2a5eeca..51708d5 100644 --- a/2-4_marches/pipers_cave/notes.pipes.ily +++ b/2-4_marches/pipers_cave/notes.pipes.ily @@ -2,17 +2,21 @@ % Pipes \version "2.18.2" composerPipes = "PM J. Sutherland, 1936" +arrangerPipes = "" +pipeglobal = { + \bagpipeKey +} pipesA = { \dblc c16. [ b32 ] | \grg a4 \wbirl a8. [ b16 ] | \grip c8 [ f8 ] \slure f8 [ A16 f16 ] | \dble e8 [ c8 ] \dblc c8 [ \grg b16 \grd a16 ] | \dblc c8 [ \grg b8 ] \taor b8 [ \dblc c16. b32 ] | \break - + \grg a4 \wbirl a8. [ b16 ] | \grip c8 [ f8 ] \slure f8 [ A16 f16 ] | \dble e8. [ c16 ] \grg b8 [ \dblc c16 b16 ] | - \grg a4 \wbirl a8 + \grg a4 \wbirl a8 } pipesB = { @@ -20,19 +24,19 @@ pipesB = { \dblA A8 [ f8 ] \dblf f8 [ e16 f16 ] | \dblA A8 [ c8 ] \grip c8 [ A16 f16 ] | \dble e8 [ c8 ] \dblc c8 [ \grg b16 \grd a16 ] | - \dblc c8 [ \grg b8 ] \taor b8 + \dblc c8 [ \grg b8 ] \taor b8 } pipesBA = { \dblg g8 | \dblA A8 [ f8 ] \dblf f8 [ e16 f16 ] | \dblA A8 [ c8 ] \grip c8 [ A16 f16 ] | \dble e8. [ c16 ] \grg b8 [ \dblc c16 b16 ] | - \grg a4 \wbirl a8 + \grg a4 \wbirl a8 } pipesBB = { \dblc c16. [ b32 ] | \grg a4 \wbirl a8. [ b16 ] | \grip c8 [ f8 ] \slure f8 [ A16 f16 ] | \dble e8. [ c16 ] \grg b8 [ \dblc c16 b16 ] | - \grg a4 \wbirl a4 + \grg a4 \wbirl a8 } diff --git a/2-4_marches/pipers_cave/pipes.ly b/2-4_marches/pipers_cave/pipes.ly index bc4955a..1319ae3 100644 --- a/2-4_marches/pipers_cave/pipes.ly +++ b/2-4_marches/pipers_cave/pipes.ly @@ -8,24 +8,25 @@ \score { \new Staff { \global - \bagpipeKey + \pipeglobal << - { + \new NullVoice = "format" { \repeat volta 2 { - \part \line + \part \partspacer \line } \break \repeat volta 2 { - \part s2*3 s4 s8 - } - \alternative { - {s8 \halfline} - {s8 \halfline} + \part \partspacer s2*3 s4 s8 } - + \alternative { + {\partspacer | \halfline} + {\partspacer | \halfline} + } + \bar "|." - } - { + }%Format + + \new Voice = "pipes" { \pipesA s8 \pipesB @@ -39,5 +40,30 @@ meter = \meter instrument = \instrumentPipes composer = \composerPipes + arranger = \arrangerPipes + } +} +\score { + \unfoldRepeats {\new Staff { \global \pipeglobal + \set Staff.midiInstrument = #"bagpipe" + %%Tune + \repeat volta 2 { + \part \pipesA + } + + \repeat volta 2 { + \part \pipesB + } \alternative { + \pipesBA + \pipesBB + } + } } + \midi { \confTempo } + \header { + title = \title + meter = \meter + instrument = \instrumentPipes + composer = \composerPipes + arranger = \arrangerPipes } } diff --git a/2-4_marches/teribus/config.ily b/2-4_marches/teribus/config.ily index eb0fbe3..20ab523 100644 --- a/2-4_marches/teribus/config.ily +++ b/2-4_marches/teribus/config.ily @@ -7,7 +7,7 @@ confTempo = { \tempo 4 = 90 } %% Format -part = { \partial 8 s8 } +part = { \partial 8 \grace {s4} s8 } measure = { \grace { s4 } s2 | } halfline = { \repeat unfold 4 { \measure } } line = { \repeat unfold 2 { \halfline } } diff --git a/2-4_marches/teribus/notes.pipes.ily b/2-4_marches/teribus/notes.pipes.ily index 8f1fb2b..2a226af 100644 --- a/2-4_marches/teribus/notes.pipes.ily +++ b/2-4_marches/teribus/notes.pipes.ily @@ -1,37 +1,41 @@ % 2/4 Teribus % Pipes \version "2.18.2" -composerPipes = "Trad., arr. PM G.J. van Achterbergh" +composerPipes = "Trad." +arrangerPipes = "PM G.J. van Achterbergh" +pipeglobal = { + \bagpipeKey +} pipesA = { a8 | \thrwd d8 [ \gre a8 ] \thrwd d8. [ e16 ] | \grg f8 [ A8 ] \hdblf f8 [ d8 ] | \dblg g8. [ f16 ] \dble e8. [ d16 ] | \dblc c8 [ e8 ] \dblc c8 [ a8 ] | - + \thrwd d8 [ \gre a8 ] \thrwd d8. [ e16 ] | \grg f8 [ A8 ] \hdblf f8 [ d8 ] | \dblg g8. [ f16 ] \dble e8. [ A16 ] | - \hdblf f8 [ d8 ] \dbld d8 | + \hdblf f8 [ d8 ] \dbld d8 } pipesB = { - \dblg g8 - A4 \grip A8. [ g16 ] - \grg f8 [ A8 ] \hdblf f8 [ d8 ] - \dblg g8. [ f16 ] \dble e8. [ d16 ] + \dblg g8 + A4 \grip A8. [ g16 ] + \grg f8 [ A8 ] \hdblf f8 [ d8 ] + \dblg g8. [ f16 ] \dble e8. [ d16 ] \dblc c8 [ e8 ] \dblc c8 [ a8 ] } pipesBA = { - A4 \grip A8. [ g16 ] - \grg f8 [ A8 ] \hdblf f8 [ d8 ] - \dblg g8. [ f16 ] \dble e8. [ A16 ] - \hdblf f8 [ d8 ] \dbld d8 + A4 \grip A8. [ g16 ] + \grg f8 [ A8 ] \hdblf f8 [ d8 ] + \dblg g8. [ f16 ] \dble e8. [ A16 ] + \hdblf f8 [ d8 ] \dbld d8 } pipesBB = { - \thrwd d8 [ \gre a8 ] \thrwd d8. [ e16 ] - \grg f8 [ A8 ] \hdblf f8 [ d8 ] - \dblg g8. [ f16 ] \dble e8. [ A16 ] - \hdblf f8 [ d8 ] \dbld d8 + \thrwd d8 [ \gre a8 ] \thrwd d8. [ e16 ] + \grg f8 [ A8 ] \hdblf f8 [ d8 ] + \dblg g8. [ f16 ] \dble e8. [ A16 ] + \hdblf f8 [ d8 ] \dbld d8 } diff --git a/2-4_marches/teribus/pipes.ly b/2-4_marches/teribus/pipes.ly index 12378db..ff38db6 100644 --- a/2-4_marches/teribus/pipes.ly +++ b/2-4_marches/teribus/pipes.ly @@ -8,26 +8,26 @@ \score { \new Staff { \global - \bagpipeKey + \pipeglobal << - { + \new NullVoice = "format" { \repeat volta 2 { \part \line } \break \repeat volta 2 { \part \halfline - } - \alternative { - {\halfline} - {\halfline} } - + \alternative { + { \halfline } + { \halfline } + } \bar "|." - } - { + }%Format + + \new Voice = "pipes" { \pipesA s8 - + \pipesB \pipesBA s8 \pipesBB @@ -39,5 +39,26 @@ meter = \meter instrument = \instrumentPipes composer = \composerPipes + arranger = \arrangerPipes + } +} +\score { + \new Staff { \global \pipeglobal + \set Staff.midiInstrument = #"bagpipe" + %%Tune + \partial 8 + \pipesA s8 + + \pipesB + \pipesBA s8 + \pipesBB + } + \midi { \confTempo } + \header { + title = \title + meter = \meter + instrument = \instrumentPipes + composer = \composerPipes + arranger = \arrangerPipes } } diff --git a/3-4_marches/ballad_of_the_green_berets/lyrics.ly b/3-4_marches/ballad_of_the_green_berets/lyrics.ly index 393f178..c95a1b0 100644 --- a/3-4_marches/ballad_of_the_green_berets/lyrics.ly +++ b/3-4_marches/ballad_of_the_green_berets/lyrics.ly @@ -12,7 +12,7 @@ \lyricsglobal << \new NullVoice = "format" - { + { \line \bar "||" \break @@ -30,7 +30,7 @@ \lyricsAB } \new Lyrics = "lyrics" { - \lyricsto "song" { + \lyricsto "song" { \verseA } } @@ -58,10 +58,15 @@ \fill-line{ \column { \verseAblock - \combine \null \vspace #0.5 + } + \combine \null \vspace #0.5 + \column { \verseBblock + } \combine \null \vspace #0.5 - \verseCblock + \column { + \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 index 766f783..a5d2370 100644 --- a/3-4_marches/ballad_of_the_green_berets/notes.lyrics.ily +++ b/3-4_marches/ballad_of_the_green_berets/notes.lyrics.ily @@ -8,7 +8,7 @@ lyricsAA = { c8 [ c8 ] c4. a8 | b8 [ b8 ] a2 | e8 [ e8 ] e4. e8 | - f8 e8 e2 | + f8 e8 e2 | A8 [ A8 ] A4. f8 | d8 [ f8 ] e2 | @@ -19,25 +19,25 @@ lyricsAB = { c8 [ c8 ] c4. a8 | b8 [ b8 ] a2 | e8 [ e8 ] e4. e8 | - \tuplet 3/2 { f8 f8 e8 } e2 | + \tuplet 3/2 { f8 f8 e8 } e4. e8 | A8 [ A8 ] A4. f8 | - d8 [ f8 ] e2 | + d8 [ f8 ] e4. e8 | 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 + 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 + 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 + Sil -- ver wings u -- pon their chest + These are men, the Neth -- er -- lands' best + One hun -- dred men will test to -- day + But on -- ly three win the Green Ber- et } verseAblock = \markup \column { \line{ \bold "1." } @@ -57,7 +57,7 @@ verseBblock = \markup \column { \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} @@ -69,7 +69,7 @@ verseCblock = \markup \column { \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} diff --git a/3-4_marches/balmoral/notes.pipes.seconds.ily b/3-4_marches/balmoral/notes.pipes.seconds.ily index a954b3f..df20d3c 100644 --- a/3-4_marches/balmoral/notes.pipes.seconds.ily +++ b/3-4_marches/balmoral/notes.pipes.seconds.ily @@ -1,7 +1,7 @@ % 3/4 Balmoral (seconds) % Pipes \version "2.18.2" -composerPipessecnd = "" +composerPipesSecnd = "" pipessecndglobal = { \bagpipeKey } diff --git a/3-4_marches/balmoral/notes.pipes.thirds.ily b/3-4_marches/balmoral/notes.pipes.thirds.ily index d7bc670..d9790e8 100644 --- a/3-4_marches/balmoral/notes.pipes.thirds.ily +++ b/3-4_marches/balmoral/notes.pipes.thirds.ily @@ -1,7 +1,7 @@ % 3/4 Balmoral (thirds) % Pipes \version "2.18.2" -composerPipesthrd = "" +composerPipesThrd = "" pipesthrdglobal = { \bagpipeKey } diff --git a/3-4_marches/balmoral/pipes.full.ly b/3-4_marches/balmoral/pipes.full.ly index cf5301f..55f171b 100644 --- a/3-4_marches/balmoral/pipes.full.ly +++ b/3-4_marches/balmoral/pipes.full.ly @@ -7,44 +7,54 @@ \include "./notes.pipes.seconds.ily" \include "./notes.pipes.thirds.ily" +\layout { + indent = 8.0 + short-indent = 2.0 +} + \score { \new StaffGroup << - \new Staff = "pipes" { + \new Staff = "pipes" \with{ + instrumentName = \markup{ \instrumentPipes } + shortInstrumentName = \markup{ \shortInstrumentPipes } + } { \global \pipeglobal - \set Staff.instrumentName = \markup{ \instrumentPipes } - \set Staff.shortInstrumentName = \markup{ \shortInstrumentPipes } << - { + \new NullVoice = "format" { \repeat volta 2 { \line } \break \repeat volta 2 { \line } }%Format - { + \new Voice = "pipes" { \pipesA - + \pipesB }%Pipes >> } - \new Staff = "seconds" { + \new Staff = "seconds" \with { + instrumentName = \markup{ \instrumentPipesSecnd } + shortInstrumentName = \markup{ \shortInstrumentPipesSecnd} + } { \pipessecndglobal - \set Staff.instrumentName = \markup{ \instrumentPipes Seconds } - \set Staff.shortInstrumentName = \markup{ \shortInstrumentPipes 2nd} - + \pipessecndA \pipessecndB + } - \new Staff = "thirds" { + \new Staff = "thirds" \with { + instrumentName = \markup{ \instrumentPipesThrd } + shortInstrumentName = \markup{ \shortInstrumentPipesThrd} + } { \pipesthrdglobal - \set Staff.instrumentName = \markup{ \instrumentPipes Thirds } - \set Staff.shortInstrumentName = \markup{ \shortInstrumentPipes 3rd } \pipesthrdA \pipesthrdB } + >> \header { title = \title @@ -63,3 +73,48 @@ } } } +\score { + \new StaffGroup << + \global + \new Staff = "pipes" \with { + midiInstrument = #"bagpipe" + instrumentName = \markup{ \instrumentPipes } + shortInstrumentName = \markup{ \shortInstrumentPipes } + } { + \pipeglobal + %%Tune + \pipesA + \pipesB + + } + \new Staff = "seconds" \with { + midiInstrument = #"bagpipe" + instrumentName = \markup{ \instrumentPipesSecnd } + shortInstrumentName = \markup{ \shortInstrumentPipesSecnd } + } { + \pipessecndglobal + %% Seconds + \pipessecndA + \pipessecndB + + } + \new Staff = "thirds" \with { + midiInstrument = #"bagpipe" + instrumentName = \markup{ \instrumentPipesThrd } + shortInstrumentName = \markup{ \shortInstrumentPipesThrd } + } { + \pipesthrdglobal + %% Thirds + \pipesthrdA + \pipesthrdB + + } + >> + \midi { \confTempo } + \header { + title = \title + meter = \meter + instrument = \instrumentPipes + composer = \composerPipes + } +} diff --git a/3-4_marches/balmoral/pipes.ly b/3-4_marches/balmoral/pipes.ly index 2c2c3ea..4ac5152 100644 --- a/3-4_marches/balmoral/pipes.ly +++ b/3-4_marches/balmoral/pipes.ly @@ -29,3 +29,24 @@ composer = \composerPipes } } + +\score { + \new Staff { \global \pipeglobal + \set Staff.midiInstrument = #"bagpipe" + %%Tune + \repeat unfold 2 { + \pipesA + } + \repeat unfold 2 { + \pipesB + } + } + \midi { \confTempo } + \header { + title = \title + meter = \meter + instrument = \instrumentPipes + composer = \composerPipes + arranger = \arrangerPipes + } +} diff --git a/3-4_marches/balmoral/pipes.seconds.ly b/3-4_marches/balmoral/pipes.seconds.ly index 5c56ca3..649f69e 100644 --- a/3-4_marches/balmoral/pipes.seconds.ly +++ b/3-4_marches/balmoral/pipes.seconds.ly @@ -25,7 +25,28 @@ \header { title = \title meter = \meter - instrument = \instrumentPipessecnd - composer = \composerPipessecnd + instrument = \instrumentPipesSecnd + composer = \composerPipesSecnd } } +\score { + \new Staff { \global \pipessecndglobal + \set Staff.midiInstrument = #"bagpipe" + %%Tune + \repeat unfold 2 { + \pipessecndA + } + \repeat unfold 2 { + \pipessecndB + } + } + \midi { \confTempo } + \header { + title = \title + meter = \meter + instrument = \instrumentSecnd + composer = \composerPipesSecnd + arranger = \arrangerPipesSecnd + } + +} diff --git a/3-4_marches/balmoral/pipes.thirds.ly b/3-4_marches/balmoral/pipes.thirds.ly index 0dfd1ca..57bd157 100644 --- a/3-4_marches/balmoral/pipes.thirds.ly +++ b/3-4_marches/balmoral/pipes.thirds.ly @@ -25,7 +25,28 @@ \header { title = \title meter = \meter - instrument = \instrumentPipesthrd - composer = \composerPipesthrd + instrument = \instrumentPipesThrd + composer = \composerPipesThrd } } +\score { + \new Staff { \global \pipesthrdglobal + \set Staff.midiInstrument = #"bagpipe" + %%Tune + \repeat unfold 2 { + \pipesthrdA + } + \repeat unfold 2 { + \pipesthrdB + } + } + \midi { \confTempo } + \header { + title = \title + meter = \meter + instrument = \instrumentThrd + composer = \composerPipesthrd + arranger = \arrangerPipesthrd + } + +} diff --git a/3-4_marches/collins_cattle/notes.pipes.ily b/3-4_marches/collins_cattle/notes.pipes.ily index f67ec70..03bb2ef 100644 --- a/3-4_marches/collins_cattle/notes.pipes.ily +++ b/3-4_marches/collins_cattle/notes.pipes.ily @@ -2,6 +2,7 @@ % Pipes \version "2.18.2" composerPipes = "" +arrangerPipes = "" pipeglobal = { \bagpipeKey } @@ -14,7 +15,7 @@ pipesA = { \dble e8. [ d16 ] \grg c4 \dble e4 | \dblc c8 [ \gre a8 ] \grg b4 \grip c4 | \dblA A8. [ f16 ] \dble e4 \dblc c8 [ \gre a8 ] | - \dblb b4 \grG a2 + \dblb b4 \grG a2 } pipesB = { \grg c8. [ d16 ] \dble e4 \gra e4 | @@ -25,6 +26,6 @@ pipesB = { a8. [ b16 ] \grip c4 \dblb b4 | \grG a4 \grg b4 \grip c4 | \dblA A8. [ f16 ] \dble e4 \dblc c8 [ \gre a8 ] | - \dblb b4 \grG a2 + \dblb b4 \grG a2 } diff --git a/3-4_marches/collins_cattle/pipes.ly b/3-4_marches/collins_cattle/pipes.ly index fc67720..327b5ee 100644 --- a/3-4_marches/collins_cattle/pipes.ly +++ b/3-4_marches/collins_cattle/pipes.ly @@ -26,5 +26,27 @@ meter = \meter instrument = \instrumentPipes composer = \composerPipes + arranger = \arrangerPipes + } +} +\score { + \new Staff { \global \pipeglobal + \set Staff.midiInstrument = #"bagpipe" + %%Tune + \repeat unfold 2 { + \pipesA + } + \repeat unfold 2 { + \pipesB + } + + } + \midi { \confTempo } + \header { + title = \title + meter = \meter + instrument = \instrumentPipes + composer = \composerPipes + arranger = \arrangerPipes } } diff --git a/3-4_marches/jim_thomson_of_flagstaff/notes.pipes.ily b/3-4_marches/jim_thomson_of_flagstaff/notes.pipes.ily index 4ec2191..011d1a5 100644 --- a/3-4_marches/jim_thomson_of_flagstaff/notes.pipes.ily +++ b/3-4_marches/jim_thomson_of_flagstaff/notes.pipes.ily @@ -2,6 +2,7 @@ % Pipes \version "2.18.2" composerPipes = "R. Watt" +arrangerPipes = "" pipeglobal = { \bagpipeKey } @@ -10,7 +11,7 @@ pipesA = { \grg a8. [ b16 ] \grip c4 \dblc c8 [ a8 ] | \dblb b8 [ a8 ] \grg f4 \gre f4 | \dblA A8. [ f16 ] \grg e4 e8 [ f8 ] | - \dble e8. [ c16 ] \dblb b2 | + \dble e8. [ c16 ] \dblb b2 | \grg a8. [ b16 ] \grip c4 \dblc c8 [ a8 ] | \dblb b8 [ a8 ] \grg f4 \gre f4 | @@ -27,21 +28,21 @@ pipesBA = { \grg \tuplet 3/2 { b8 [ c8 e8 ] } \grg f4 \grg f8 [ e8 ] | \dblA A8. [ e16 ] \grg c4 \grip c4 | \dblA A8. [ f16 ] \grg e4 e8 [ f8 ] | - \dble e8. [ c16 ] \dblb b4. \grG a8 | + \dble e8. [ c16 ] \dblb b4. \grG a8 | } pipesBBA = { - \dble e8. [ c16 ] \dblb b4. \grG a8 | + \dble e8. [ c16 ] \dblb b4. \grG a8 | \grg \tuplet 3/2 { b8 [ c8 e8 ] } \grg f4 \grg f8 [ e8 ] | \dblA A8. [ e16 ] \grg c4 \grip c4 | \dblA A8. [ f16 ] \grg e4 e8 [ c8 ] | - \dblb b8. [ \grG a16 ] a4. \wbirl a8 | + \dblb b8. [ \grG a16 ] a4. \wbirl a8 | } pipesBBB = { - \dble e8. [ c16 ] \dblb b2 | + \dble e8. [ c16 ] \dblb b2 | \grg a8. [ b16 ] \grip c4 \dblc c8 [ a8 ] | \dblb b8 [ a8 ] \grg f4 \gre f4 | \grg e8. [ f16 ] \dble e4 e8 [ c8 ] | - \dblb b8. [ \grG a16. ] a4. \wbirl a8 + \dblb b8. [ \grG a16. ] a4. \wbirl a8 } diff --git a/3-4_marches/lochanside/notes.pipes.ily b/3-4_marches/lochanside/notes.pipes.ily index 7e63597..4ddc831 100644 --- a/3-4_marches/lochanside/notes.pipes.ily +++ b/3-4_marches/lochanside/notes.pipes.ily @@ -2,6 +2,7 @@ % Pipes \version "2.18.2" composerPipes = "PM J. MacLellan, DCM" +arrangerPipes = "" pipeglobal = { \bagpipeKey } @@ -10,8 +11,8 @@ pipesA = { \thrwd d8. [ e16 ] \grg f4 \dblf f8 [ A8 ] | \grf g8 [ \grA e8 ] \dblf f4 \thrwd d4 | A8. [ f16 ] \thrwd d4 \dbld d8. [ e16 ] | - \grg f8 [ \birl a8 ] \grg f4 \dble e4 | - + \grg f8 [ \birl a8 ] \grg f4 \dble e4 | + \grg e8. [ d16 ] \dblc c4 \grip c8 [ A8 ] | \grf g8 [ \grA e8 ] \thrwd d4 \gre a4 | \grg e8. [ f16 ] \dblg g4 \grA g8 [ b8 ] | @@ -22,7 +23,7 @@ pipesB = { \dbld d8. [ f16 ] \dblA A4 \grg A8. [ g16 ] | \grA f8. [ g16 ] \dblA A4 \hdblf f4 | \thrwd d8 [ \gre a8 ] \grip b4 \dblg g8. [ f16 ] | - \grg e8 [ \thrwd d8 ] \grg f4 \dble e4 | + \grg e8 [ \thrwd d8 ] \grg f4 \dble e4 | \grg e8. [ d16 ] \dblc c4 \grip c8 [ A8 ] | \grf g8 [ \grA e8 ] \thrwd d4 \gre a4 | @@ -33,7 +34,7 @@ pipesC = { \dblc c8. [ b16 ] \grb a4 \wbirl a8 [ \grd c8 ] | \grg e8 [ g8 ] \hdblf f4 \thrwd d4 | \dblc c8. [ b16 ] \grb a4 \wbirl a8 [ \grd c8 ] | - \dblA A8. [ g16 ] \hdblf f4 \dble e8 [ a8 ] | + \dblA A8. [ g16 ] \hdblf f4 \dble e8 [ a8 ] | \thrwd d8. [ f16 ] \dblA A4 \hdblf f8 [ A8 ] | g16. [ f32 ] \grg e16. [ d32 ] \dblc c4 \slurb b4 | diff --git a/3-4_marches/lochanside/pipes.ly b/3-4_marches/lochanside/pipes.ly index 3ae6c61..8ad58dc 100644 --- a/3-4_marches/lochanside/pipes.ly +++ b/3-4_marches/lochanside/pipes.ly @@ -23,7 +23,7 @@ \line } }%Format - + \new Voice = "pipes" { \pipesA @@ -38,6 +38,7 @@ meter = \meter instrument = \instrumentPipes composer = \composerPipes + arranger = \arrangerPipes } } \score { @@ -57,5 +58,6 @@ meter = \meter instrument = \instrumentPipes composer = \composerPipes + arranger = \arrangerPipes } } diff --git a/3-4_marches/my_land/pipes.ly b/3-4_marches/my_land/pipes.ly index 45bdc18..d52381c 100644 --- a/3-4_marches/my_land/pipes.ly +++ b/3-4_marches/my_land/pipes.ly @@ -19,7 +19,7 @@ \line } }%Format - + \new Voice = "pipes" { \pipesA @@ -32,6 +32,7 @@ meter = \meter instrument = \instrumentPipes composer = \composerPipes + arranger = \arrangerPipes } } \score { @@ -50,5 +51,6 @@ meter = \meter instrument = \instrumentPipes composer = \composerPipes + arranger = \arrangerPipes } } diff --git a/3-4_marches/on_the_road_to_passchendaele/full.ly b/3-4_marches/on_the_road_to_passchendaele/full.ly index 56e8bbe..771f60e 100644 --- a/3-4_marches/on_the_road_to_passchendaele/full.ly +++ b/3-4_marches/on_the_road_to_passchendaele/full.ly @@ -9,13 +9,19 @@ \include "./notes.side.ily" \include "./notes.pipes.ily" +\layout { + indent = 5.0 + short-indent = 2.0 +} + \score { \new StaffGroup << - \new Staff { + \new Staff \with { + instrumentName = \markup{ \instrumentPipes } + shortInstrumentName = \markup{ \shortInstrumentPipes } + } { \global \pipeglobal - \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentPipes } - \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentPipes } << { \repeat volta 2 { \line } \break @@ -37,10 +43,11 @@ }%Pipes >> } - \new PipeBandDrumStaff = "side" { + \new PipeBandDrumStaff = "side" \with { + instrumentName = \markup { \instrumentSide } + shortInstrumentName = \markup { \shortInstrumentSide } + } { \sideglobal - \set PipeBandDrumStaff.instrumentName = \markup \column {\instrumentSide} - \set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide} \snareAA \snareAB @@ -67,14 +74,14 @@ \column \right-align { $(if (not (string=? "" composerPipes)) #{ \markup {\line { \composerPipes ":" }} #} ) $(if (not (string=? "" composerSide)) #{ \markup {\line { \composerSide ":" }} #} ) - $(if (not (string=? "" composerTenor)) #{ \markup {\line { \composerTenor ":" }} #} ) - $(if (not (string=? "" composerBass)) #{ \markup {\line { \composerBass ":" }} #} ) + %$(if (not (string=? "" composerTenor)) #{ \markup {\line { \composerTenor ":" }} #} ) + %$(if (not (string=? "" composerBass)) #{ \markup {\line { \composerBass ":" }} #} ) } \column \right-align { $(if (not (string=? "" composerPipes)) #{ \markup {\line { \instrumentPipes }}#} ) $(if (not (string=? "" composerSide)) #{ \markup {\line { \instrumentSide }}#} ) - $(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} ) - $(if (not (string=? "" composerBass)) #{ \markup {\line { \instrumentBass }}#} ) + %$(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} ) + %$(if (not (string=? "" composerBass)) #{ \markup {\line { \instrumentBass }}#} ) } } } diff --git a/3-4_marches/on_the_road_to_passchendaele/full.lyrics.ly b/3-4_marches/on_the_road_to_passchendaele/full.lyrics.ly index 18a9641..f13e377 100644 --- a/3-4_marches/on_the_road_to_passchendaele/full.lyrics.ly +++ b/3-4_marches/on_the_road_to_passchendaele/full.lyrics.ly @@ -11,14 +11,21 @@ \include "./notes.lyrics.ily" +\layout { + indent = 7.0 + short-indent = 5.0 +} + #(set-default-paper-size "a4" 'portrait) + \score { \new StaffGroup << - \new Staff { + \new Staff \with { + instrumentName = \markup{ \instrumentPipes } + shortInstrumentName = \markup{ \shortInstrumentPipes } + } { \global \pipeglobal - \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentPipes } - \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentPipes } << { \repeat volta 2 { \line } \break @@ -40,7 +47,7 @@ }%Pipes \new NullVoice = "tune" { \lyricstuneA - + \lyricstuneBA \lyricstuneBBA \lyricstuneBBB @@ -50,11 +57,11 @@ \new Lyrics = "lyrics1" { \lyricsto "tune" { \verseAA - + \verseBAA \verseBAB \verseBBB - + } } \new Lyrics = "lyrics-voltad2" { @@ -63,11 +70,11 @@ \verseBBA } } - \new PipeBandDrumStaff = "side" { + \new PipeBandDrumStaff = "side" \with { + instrumentName = \markup { \instrumentSide } + shortInstrumentName = \markup { \shortInstrumentSide } + } { \sideglobal - \set PipeBandDrumStaff.instrumentName = \markup \column {\instrumentSide} - \set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide} - \snareAA \snareAB diff --git a/3-4_marches/on_the_road_to_passchendaele/pipes.ly b/3-4_marches/on_the_road_to_passchendaele/pipes.ly index 0dbd43e..561da26 100644 --- a/3-4_marches/on_the_road_to_passchendaele/pipes.ly +++ b/3-4_marches/on_the_road_to_passchendaele/pipes.ly @@ -21,7 +21,7 @@ \bar "|." } { - \pipesA + \pipesA \pipesB \pipesBA @@ -36,3 +36,23 @@ composer = \composerPipes } } + +\score { + \new Staff { \global \pipeglobal + \set Staff.midiInstrument = #"bagpipe" + %%Tune + \pipesA \pipesA + + \pipesB \pipesBA + \pipesB \pipesBB + + } + \midi { \confTempo } + \header { + title = \title + meter = \meter + instrument = \instrumentPipes + composer = \composerPipes + arranger = \arrangerPipes + } +} \ No newline at end of file diff --git a/3-4_marches/red_hackle/config.ily b/3-4_marches/red_hackle/config.ily index 58432c8..efce3cd 100644 --- a/3-4_marches/red_hackle/config.ily +++ b/3-4_marches/red_hackle/config.ily @@ -13,5 +13,5 @@ halfline = { \repeat unfold 4 { \measure } } line = { \repeat unfold 2 { \halfline } } %% Headers -title = "Red Hackle" +title = "Red Hackle Pipeband" meter = "Retreat" diff --git a/3-4_marches/red_hackle/notes.pipes.ily b/3-4_marches/red_hackle/notes.pipes.ily index 38a75c8..ad8f771 100644 --- a/3-4_marches/red_hackle/notes.pipes.ily +++ b/3-4_marches/red_hackle/notes.pipes.ily @@ -6,24 +6,24 @@ pipeglobal = { \bagpipeKey } pipesA = { - \grg a8. [ c16 ] \grg e4 \dblc c8 [ \gre a8 ] \bar "|" - \thrwd d8 [ f8 ] \dblf f4 \grg e4 \bar "|" - \grg c8. [ d16 ] \dble e4 \dblc c8 [ e8 ] \bar "|" - \thrwd d8. [ c16 ] \dblb b2 \bar "|" \break + \grg a8. [ c16 ] \grg e4 \dblc c8 [ \gre a8 ] | + \thrwd d8 [ f8 ] \dblf f4 \grg e4 | + \grg c8. [ d16 ] \dble e4 \dblc c8 [ e8 ] | + \thrwd d8. [ c16 ] \dblb b2 | - \grg a8. [ c16 ] \grg e4 \dblc c8 [ \gre a8 ] \bar "|" - \thrwd d8 [ f8 ] \dblf f4 \grg e4 \bar "|" - \grg c8. [ d16 ] \dble e4 \dblc c8 [ e8 ] \bar "|" - \thrwd d8. [ b16 ] \grG a2 + \grg a8. [ c16 ] \grg e4 \dblc c8 [ \gre a8 ] | + \thrwd d8 [ f8 ] \dblf f4 \grg e4 | + \grg c8. [ d16 ] \dble e4 \dblc c8 [ e8 ] | + \thrwd d8. [ b16 ] \grG a2 | } pipesB = { - A8 [ c8 ] \grip c4 \grg a8 [ \grd c8 ] \bar "|" - \thrwd d8 [ f8 ] \dblf f4 \grg e4 \bar "|" - A8 [ c8 ] \grip c4 \grg a8 [ f8 ] \bar "|" - \grg e8. [ d16 ] \dblb b2 \bar "|" \break + A8 [ c8 ] \grip c4 \grg a8 [ \grd c8 ] | + \thrwd d8 [ f8 ] \dblf f4 \grg e4 | + A8 [ c8 ] \grip c4 \grg a8 [ f8 ] | + \grg e8. [ d16 ] \dblb b2 | - A8 [ c8 ] \grip c4 \grg a8 [ \grd c8 ] \bar "|" - \thrwd d8 [ f8 ] \dblf f4 \grg e4 \bar "|" - \grg c8. [ d16 ] \dble e4 \dblc c8 [ e8 ] \bar "|" - \thrwd d8. [ b16 ] \grG a2 + A8 [ c8 ] \grip c4 \grg a8 [ \grd c8 ] | + \thrwd d8 [ f8 ] \dblf f4 \grg e4 | + \grg c8. [ d16 ] \dble e4 \dblc c8 [ e8 ] | + \thrwd d8. [ b16 ] \grG a2 | } diff --git a/3-4_marches/shoals_of_herring/notes.pipes.ily b/3-4_marches/shoals_of_herring/notes.pipes.ily index e12d50d..4dbabc3 100644 --- a/3-4_marches/shoals_of_herring/notes.pipes.ily +++ b/3-4_marches/shoals_of_herring/notes.pipes.ily @@ -1,4 +1,4 @@ -% <> <> +% 3/4 Shoals of Herring % Pipes \version "2.18.2" composerPipes = "" @@ -9,13 +9,13 @@ pipesA = { \grg a8. [ c16 ] \dble e4 \dblc c8 [ e8 ] | \grg f8 [ A8 ] \hdblf f8. [ e16 ] \dblc c4 | \grg a8. [ c16 ] \dble e4 \dblc c8 [ e8 ] | - \dblA A8 [ c8 ] \dblc c4 \gre b4 + \dblA A8 [ c8 ] \dblc c4 \gre b4 } pipesAB = { \grg a8. [ c16 ] \dble e4 \dblc c8 [ e8 ] | \grg f8 [ A8 ] \hdblf f8. [ e16 ] \dblc c4 | \grg a8. [ c16 ] \dble e4 \dblc c8 [ \gre a8 ] | - \thrwd d8. [ c16 ] \dblb b4 \grG a4 + \thrwd d8. [ c16 ] \dblb b4 \grG a4 } pipesB = { @@ -28,5 +28,5 @@ pipesBA = { A8. [ g16 ] \grA f4 A8. [ g16 ] | \grA f8 [ A8 ] \hdblf f8. [ e16 ] \dblc c4 | a8. [ c16 ] \dble e4 \dblc c8 [ \gre a8 ] | - \thrwd d8. [ c16 ] \dblb b4 \grG a4 + \thrwd d8. [ c16 ] \dblb b4 \grG a4 } diff --git a/3-4_marches/torosay_castle/pipes.ly b/3-4_marches/torosay_castle/pipes.ly index a9782d7..26a8f1f 100644 --- a/3-4_marches/torosay_castle/pipes.ly +++ b/3-4_marches/torosay_castle/pipes.ly @@ -27,7 +27,7 @@ \line } }%Format - + \new Voice = "pipes" { \pipesA diff --git a/defs.ily b/defs.ily index da4536f..a359344 100644 --- a/defs.ily +++ b/defs.ily @@ -3,28 +3,50 @@ Not critical if missing. But there is complaining.. %} +% instrumentName instrumentSide = "Side" instrumentTenor = "Tenor" instrumentBass = "Bass" instrumentLyrics = "Lyrics" instrumentPipes = "Pipes" -instrumentPipessecnd = "Seconds" -instrumentPipesthrd = "Thirds" +instrumentPipesSecnd = "Seconds" +instrumentPipessecnd = \instrumentPipesSecnd %TODO: Remove Me +instrumentPipesThrd = "Thirds" +instrumentPipesthrd = \instrumentPipesThrd %TODO: Remove Me instrumentSecnd = "Seconds" instrumentThrd = "Thirds" + +% shortInstrumentName shortInstrumentLyrics = "" shortInstrumentSide = "S.D." shortInstrumentTenor = "T.D." shortInstrumentBass = "B.D." shortInstrumentPipes = "P." -shortInstrumentPipessecnd = "P2" -shortInstrumentPipesthrd = "P3" +shortInstrumentPipesSecnd = "P.2" +shortInstrumentPipessecnd = \shortInstrumentPipesSecnd %TODO: Remove Me +shortInstrumentPipesThrd = "P.3" +shortInstrumentPipesthrd = \shortInstrumentPipesThrd %TODO: Remove Me shortInstrumentSecnd = "2nd" shortInstrumentThrd = "3rd" + +% composer composerLyrics = "" composerSide = "" composerTenor = "" composerBass = "" composerPipes = "" -composerPipessecnd = "" -composerPipesthrd = "" +composerPipesSecnd = "" +composerPipessecnd = \composerPipesSecnd %TODO: Remove Me +composerPipesThrd = "" +composerPipesthrd = \composerPipesThrd %TODO: Remove Me + +% arranger +arrangerLyrics = "" +arrangerSide = "" +arrangerTenor = "" +arrangerBass = "" +arrangerPipes = "" +arrangerPipesSecnd = "" +arrangerPipessecnd = \arrangerPipesSecnd %TODO: Remove Me +arrangerPipesThrd = "" +arrangerPipesthrd = \arrangerPipesThrd %TODO: Remove Me diff --git a/template/pipes.full.ly b/template/pipes.full.ly index 53d95c7..485d488 100644 --- a/template/pipes.full.ly +++ b/template/pipes.full.ly @@ -7,9 +7,14 @@ \include "./notes.pipes.seconds.ily" %\include "./notes.pipes.thirds.ily" +\layout { + indent = 8.0 + short-indent = 2.0 +} + \score { \new StaffGroup << - \new Staff = "pipes" \with{ + \new Staff = "pipes" \with { instrumentName = \markup{ \instrumentPipes } shortInstrumentName = \markup{ \shortInstrumentPipes } } { @@ -25,15 +30,15 @@ >> } \new Staff = "seconds" \with { - instrumentName = \markup{ \instrumentPipes \instrumentSecnd } - shortInstrumentName = \markup{ \shortInstrumentPipes \shortInstrumentSecnd} + instrumentName = \markup{ \instrumentPipesSecnd } + shortInstrumentName = \markup{ \shortInstrumentPipesSecnd } } { \pipessecndglobal } %{ \new Staff = "thirds" \with { - instrumentName = \markup{ \instrumentPipes \instrumentThrd } - shortInstrumentName = \markup{ \shortInstrumentPipes \shortInstrumentThrd} + instrumentName = \markup{ \instrumentPipesThrd } + shortInstrumentName = \markup{ \shortInstrumentPipeTthrd } } { \pipesthrdglobal @@ -60,24 +65,33 @@ \score { \new StaffGroup << \global - \new Staff = "pipes" { + \new Staff = "pipes" \with { + midiInstrument = #"bagpipe" + instrumentName = \markup{ \instrumentPipes } + shortInstrumentName = \markup{ \shortInstrumentPipes } + } { \pipeglobal - \set Staff.midiInstrument = #"bagpipe" %%Tune } - \new Staff = "seconds" { + \new Staff = "seconds" \with { + midiInstrument = #"bagpipe" + instrumentName = \markup{ \instrumentPipesSecnd } + shortInstrumentName = \markup{ \shortInstrumentPipesSecnd } + } { \pipessecndglobal - \set Staff.midiInstrument = #"bagpipe" %% Seconds } -% \new Staff = "thirds" { -% \pipesthrdglobal -% \set Staff.midiInstrument = #"bagpipe" -% %% Thirds -% -% } +%{ \new Staff = "thirds" \with { + midiInstrument = #"bagpipe" + instrumentName = \markup{ \instrumentPipesThrd } + shortInstrumentName = \markup{ \shortInstrumentPipeThrd } + } { + \pipesthrdglobal + %% Thirds + +%} } >> \midi { \confTempo } \header { diff --git a/template/pipes.ly b/template/pipes.ly index 514ff31..d502de1 100644 --- a/template/pipes.ly +++ b/template/pipes.ly @@ -11,11 +11,11 @@ \pipeglobal << \new NullVoice = "format" { - + }%Format - + \new Voice = "pipes" { - + } >> } @@ -31,6 +31,7 @@ \new Staff { \global \pipeglobal \set Staff.midiInstrument = #"bagpipe" %%Tune + } \midi { \confTempo } \header { diff --git a/template/pipes.thirds.ly b/template/pipes.thirds.ly index aef2eab..a595d0c 100644 --- a/template/pipes.thirds.ly +++ b/template/pipes.thirds.ly @@ -11,11 +11,11 @@ \pipesthrdglobal << \new NullVoice = "format" { - + }%Format - + \new Voice = "thirds" { - + } >> } @@ -28,7 +28,7 @@ } } \score { - \new Staff { \global \pipethrdglobal + \new Staff { \global \pipesthrdglobal \set Staff.midiInstrument = #"bagpipe" %%Tune }