diff --git a/2-4_marches/black_bear/notes.pipes.ily b/2-4_marches/black_bear/notes.pipes.ily index 0eb2d12..2033e1e 100644 --- a/2-4_marches/black_bear/notes.pipes.ily +++ b/2-4_marches/black_bear/notes.pipes.ily @@ -1,52 +1,31 @@ % 2/4 Black Bear % Pipes \version "2.18.2" -composerFacsimilePipes = "1936" -composerPipes = "" -arrangerPipes = "M. Bain" % PM Mike Bain, SHoC +composerPipes = "1936" pipeglobal = { \bagpipeKey } -pipesSourceA = { +pipesA = { \tag #'upbeat { \grg a16. [ b32 ] | } - \repeat unfold 2 { - \thrwd d8 [ \tag #'facsimile {\dbld} \tag #'current {\slurd} d8 ] \grg f16.[ d32 A16. f32 ]| - \thrwd d8 [ \tag #'facsimile {\dbld} \tag #'current {\slurd} d8 ] \grg f16.[ d32 A16. f32 ]| - } \alternative { - { - \dble e8 [ \grg b8 ] \grip b8 [ \tag #'facsimile {\grg e16 d16 ]} \tag #'current {\grg e16. d32]} | - \grg c32 [ d16. \tag #'facsimile {\grg b32 \grd c16. ]} \tag #'current {\grg b16. \grd c32 ]} \grg a16. [ b32 \grg c32 \grd a16. ] - } - { - \dble e8 [ \grip e8 ] \grg e16. [ g32 \tag #'facsimile {\grA f32 e16. ]} \tag #'current {f16. e32 ]} | - \thrwd d8 [ \grg f8 ] \thrwd d8 - } - } + \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 } -pipesSourceB = { +pipesB = { e8 | - \repeat unfold 2 { - \grg a16. [ \grd a32 \tag #'facsimile {a16 \grd b16 ]} \tag #'current {\gre a16. b32 ]} \thrwd d8 [ \tag #'facsimile {\grg d16 e16 ]} \tag #'current {\slurd d16. e32 ]} | - \dblg g8 [ \tag #'facsimile {\grA f16 e16 ]} \tag #'current {f16. e32 ]} \grg f32 [ A16. \tag #'facsimile {f16. d32 ]} \tag #'current {f32 d16. ]} | - } + \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 ] | - \tag #'facsimile { - 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. ] | - } - \tag #'current { - A32 [ a16. \grg a32 \grd a16. ] \grg c32 [ a16. \grg a32 \grd a16. ] | - \grg d32 [ b16. \grg b32 \grd b16. ] \grg e32 [ c16. \grg c32 \grd c16. ] | - \grg d16. [ f32 \grg d16. f32 ] \grg e16. [ g32 \grA f16. g32 ] | - } + 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 ] -} - - -pipesFacsimileA = { \removeWithTag #'current \pipesSourceA } -pipesFacsimileB = { \removeWithTag #'current \pipesSourceB } - -pipesA = { \removeWithTag #'facsimile \pipesSourceA } -pipesB = { \removeWithTag #'facsimile \pipesSourceB } - +} \ No newline at end of file diff --git a/2-4_marches/black_bear/pipes.1936.ly b/2-4_marches/black_bear/pipes.1936.ly deleted file mode 100644 index 785e1a8..0000000 --- a/2-4_marches/black_bear/pipes.1936.ly +++ /dev/null @@ -1,55 +0,0 @@ -\version "2.18.2" - -\include "bagpipe.ly" - -\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 - \pipeglobal - << - { - \repeat volta 2 { - \part \line \markTextEol "Fine" - }\break - \part \line \markTextEol "D.C. al Fine" \bar "||" - } - { - \pipesFacsimileA s8 - \pipesFacsimileB - } - >> - } - \header { - title = \title - meter = \meter - instrument = \instrumentPipes - composer = \composerFacsimilePipes - } -} -\score { - \new Staff { \global \pipeglobal - \set Staff.midiInstrument = #"bagpipe" - %%Tune - \partial 8 - \pipesFacsimileA - \pipesFacsimileA - \pipesFacsimileB - \removeWithTag #'upbeat \pipesFacsimileA - } - \midi { \confTempo } - \header { - title = \title - meter = \meter - instrument = \instrumentPipes - composer = \composerPipes - } -} diff --git a/2-4_marches/black_bear/pipes.ly b/2-4_marches/black_bear/pipes.ly index 5bbd94b..6f0639b 100644 --- a/2-4_marches/black_bear/pipes.ly +++ b/2-4_marches/black_bear/pipes.ly @@ -33,7 +33,6 @@ markTextEol = #(define-music-function (parser location text) (string?) #{ meter = \meter instrument = \instrumentPipes composer = \composerPipes - arranger = \arrangerPipes } } \score { diff --git a/2-4_marches/caller_herrin/notes.pipes.ily b/2-4_marches/caller_herrin/notes.pipes.ily index be2b879..43329ac 100644 --- a/2-4_marches/caller_herrin/notes.pipes.ily +++ b/2-4_marches/caller_herrin/notes.pipes.ily @@ -2,17 +2,14 @@ % Pipes \version "2.18.2" composerPipes = "Trad." -arrangerPipesvI = "A.M. Cairns" -arrangerPipesvII = "M. Bain" % PM Mike Bain, SHoC +arrangerPipes = "A.M. Cairns" pipeglobal = { \key d \major } -pipesAvI = { - \tag #'fineRemove { - \tag #'upbeat {\grg a8 |} - \grg d4 \grg d8 [ \grG e8 ] | - \dblc c4 \thrwd d8. [ e16 ] | - } +pipesA = { + \grg a8 | + \grg d4 \grg d8 [ \grG e8 ] | + \dblc c4 \thrwd d8. [ e16 ] | \dblf f8 [ b8 ] \dble e8. [ d16 ] | \dblc c8 [ \gre a8 ] \dblb b8 [ c8 ] | @@ -21,53 +18,21 @@ pipesAvI = { \dblf f8 [ g8 ] \grA e8. [ f16 ] | \thrwd d4 \slurd d8 } -pipesAvII = { - \tag #'fineRemove { - \tag #'upbeat {\grg a16. b32 |} - \thrwd d4 \slurd d8 [ \grg e16. d32 ] | - \dblc c4 \thrwd d8. [ e16 ] | - } - \grg f8 [ \hdblb b8 ] \dble e8. [ d16 ] | - \dblc c8 [ \gre a8 ] \grg b8 [ c8 ] | - \thrwd d4 \slurd d8 [ \grg e16. d32 ] | - \dblc c4 \thrwd d8. [ e16 ] | - \grg f8 [ g8 ] \grA e8. f16 | - \thrwd d4 \slurd d8 -} - -pipesBvI = { +pipesB = { A8 | \grf g8 [ f8 ] \dble e8 [ d8 ] | \dblc c8 [ b8 ] \grG a8 [ A8 ] | \grf g8 [ f8 ] \dble e8 [ d8 ] | - \dblc c8 [ b8 ] \grG a8 [ + \dblc c8 [ b8 ] \grG a8 [ A8 ] | - A8 ] | \grf g8 [ f8 ] \dble e8 [ d8 ] | \dbld d8 [ c8 ] \grg d8. [ e16 ] | - \tag #'fine { - \removeWithTag #'fineRemove \pipesAvII - } + \dblf f8 [ b8 ] \dble e8. [ d16 ] | + \dblc c8 [ \gre a8 ] \dblb b8 [ c8 ] | + + \grg d4 \grg d8 [ \grG e8 ] | + \dblc c4 \thrwd d8. [ e16 ] | + \dblf f8 [ g8 ] \grA e8. [ f16 ] | + \thrwd d4 \slurd d8 } -pipesBvII = { - A8 | - \grf g8 [ f8 ] \dble e8 [ d8 ] | - \dblc c8 [ b ] \grG a8 [ A8 ] | - \grf g8 [ f8 ] \dble e8 [ d8 ] | - - \tag #'simpleRemove { \dblc c16. [ d32 b16. d32 ] a8 [ } - \tag #'simpleKeep { \dblc c8 [ b8 ] \grG a8 [ } - - A8 ] | - \grf g8 [ f8 ] \dble e8 [ d8 ] | - \grg c4 \thrwd d8. [ e16 ] | - \tag #'fine { - \removeWithTag #'fineRemove \pipesAvII - } -} - - -arrangerPipes = \arrangerPipesvII -pipesA = { \pipesAvII } -pipesB = { \removeWithTag #'simpleRemove \pipesBvII } diff --git a/2-4_marches/caller_herrin/pipes.cairns.ly b/2-4_marches/caller_herrin/pipes.cairns.ly deleted file mode 100644 index f0fc04c..0000000 --- a/2-4_marches/caller_herrin/pipes.cairns.ly +++ /dev/null @@ -1,88 +0,0 @@ -\version "2.18.2" - -\include "bagpipe.ly" - -\include "./config.ily" -\include "./notes.pipes.ily" - -markTextEolDown = #(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 - \once \override Score.RehearsalMark #'direction = #DOWN - \mark \markup $text -#}) - -fine = {\markTextEolDown "Fine" } -dsalfine = {\markTextEolDown "D.S. al Fine" } - - -\score { - \new Staff { - \global - \pipeglobal - << - \new NullVoice = "format" { - \repeat volta 2 { - \part - \measure - \measure - \mark \markup { \musicglyph "scripts.segno"} - %\inStaffSegno - \measure - \measure - \halfline - \fine - } - \break - - \part - \halfline - \measure - \measure - \dsalfine - \bar "||" - %\break - %\halfline - %\break - %\halfline - %\bar "|." - } % Format - \new Voice = "pipes" { - \pipesAvI s8 - - \removeWithTag #'fine \pipesBvI - } % Pipes - >> - } - \header { - title = \title - meter = \meter - instrument = \instrumentPipes - composer = \composerPipes - arranger = \arrangerPipesvI - } -} -\score { - \new Staff { \global \pipeglobal - \set Staff.midiInstrument = #"bagpipe" - %%Tune - \partial 8 - \unfoldRepeats { - \repeat volta 2 { - \pipesAvI - } - \removeWithTag #'fine \pipesBvI - \removeWithTag #'fineRemove \pipesAvI - } - - } - \midi { \confTempo } - \header { - title = \title - subtitle = \subtitle - meter = \meter - instrument = \instrumentPipes - composer = \composerPipes - arranger = \arrangerPipesvI - } -} diff --git a/2-4_marches/caller_herrin/pipes.ly b/2-4_marches/caller_herrin/pipes.ly index faf9829..068999c 100644 --- a/2-4_marches/caller_herrin/pipes.ly +++ b/2-4_marches/caller_herrin/pipes.ly @@ -5,53 +5,28 @@ \include "./config.ily" \include "./notes.pipes.ily" -markTextEolDown = #(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 - \once \override Score.RehearsalMark #'direction = #DOWN - \mark \markup $text -#}) - -fine = {\markTextEolDown "Fine" } -dsalfine = {\markTextEolDown "D.S. al Fine" } - - \score { \new Staff { \global - \pipeglobal << - \new NullVoice = "format" { + { \repeat volta 2 { - \part - \measure - \measure - \mark \markup { \musicglyph "scripts.segno"} - %\inStaffSegno - \measure - \measure + \part \halfline \halfline - \fine } \break - \part - \halfline - \measure - \measure - \dsalfine - \bar "||" - %\break - %\halfline - %\break - %\halfline - %\bar "|." - } % Format - \new Voice = "pipes" { - \pipesA s8 + \part \halfline + \break + \line + \bar "|." + } + { + \pipesA s8 - \removeWithTag #'fine \pipesB - } % Pipes + \pipesB + + } >> } \header { @@ -62,27 +37,3 @@ dsalfine = {\markTextEolDown "D.S. al Fine" } arranger = \arrangerPipes } } -\score { - \new Staff { \global \pipeglobal - \set Staff.midiInstrument = #"bagpipe" - %%Tune - \partial 8 - \unfoldRepeats { - \repeat volta 2 { - \pipesA - } - \removeWithTag #'fine \pipesB - \removeWithTag #'fineRemove \pipesA - } - - } - \midi { \confTempo } - \header { - title = \title - subtitle = \subtitle - meter = \meter - instrument = \instrumentPipes - composer = \composerPipes - arranger = \arrangerPipes - } -} diff --git a/strathspeys/orange_and_blue/drums.ly b/strathspeys/orange_and_blue/drums.ly deleted file mode 100644 index 6863a4c..0000000 --- a/strathspeys/orange_and_blue/drums.ly +++ /dev/null @@ -1,77 +0,0 @@ -\version "2.19.0" - -\include "lilydrum.ly" - -\include "./config.ily" -%\include "./notes.bass.ily" -\include "./notes.tenor.ily" -\include "./notes.side.ily" - - -\layout { - indent = 5.0 - short-indent = 2.0 -} - -\score { - \new StaffGroup << - \new PipeBandDrumStaff = "side" \with { - instrumentName = \markup{ \instrumentSide } - shortInstrumentName = \markup{ \shortInstrumentSide } - } { - \global - << - \new NullVoice = "format" { - \halfline - %\break - \halfline - \bar "||" \break - - \halfline - %\break - \halfline - \bar "|." - }%End of Format - \new DrumVoice = "side" { - \sideglobal - \snareA - \snareB - }%End of side - >> - } - \new PipeBandDrumStaff = "tenor" \with { - instrumentName = \markup{ \instrumentTenor } - shortInstrumentName = \markup{ \shortInstrumentTenor } - } { - \tenorglobal - \tenorA - \tenorB - } -%{ - \new PipeBandDrumStaff = "bass" \with { - instrumentName = \markup{ \instrumentBass } - shortInstrumentName = \markup{ \shortInstrumentBass } - } { - \bassglobal - \repeat unfold 4 { \bassA } - } -%} - >> - \header { - title = \title - subtitle = \subtitle - 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/strathspeys/orange_and_blue/full.ly b/strathspeys/orange_and_blue/full.ly index 1c699c2..81b8e1c 100644 --- a/strathspeys/orange_and_blue/full.ly +++ b/strathspeys/orange_and_blue/full.ly @@ -5,7 +5,7 @@ \include "./config.ily" %\include "./notes.bass.ily" -\include "./notes.tenor.ily" +%\include "./notes.tenor.ily" \include "./notes.side.ily" \include "./notes.pipes.ily" %\include "./notes.pipes.seconds.ily" @@ -27,15 +27,10 @@ << \new NullVoice = "format" { \part | - \halfline - \break - \halfline + \line \bar "||" \break - \pageBreak - \halfline - %\break - \halfline + \line \bar "|." } \new Voice = "pipes" { @@ -78,16 +73,15 @@ \snareB } +%{ \new PipeBandDrumStaff = "tenor" \with { instrumentName = \markup{ \instrumentTenor } shortInstrumentName = \markup{ \shortInstrumentTenor } } { \tenorglobal - s16 | - \tenorA - \tenorB } +%} %{ \new PipeBandDrumStaff = "bass" \with { instrumentName = \markup{ \instrumentBass } diff --git a/strathspeys/orange_and_blue/notes.tenor.ily b/strathspeys/orange_and_blue/notes.tenor.ily deleted file mode 100644 index d1e8073..0000000 --- a/strathspeys/orange_and_blue/notes.tenor.ily +++ /dev/null @@ -1,35 +0,0 @@ -% 4/4 Orange and Blue -% Tenor -\version "2.18.2" -composerTenor = "E.T. de Boone, v0.1, Oct 2022" -arrangerTenor = "" -tenorglobal = {} -% Music -tenorAA = \drummode { - d4 g4 d8. d16 g4 | - \flourish { d4 g } r8.^\rpush g16 d4 | - d4 g8. g16 d4 g4 | - d8. g16 d8. d16 g4 g4 | -} -tenorAB = \drummode { - d4 g4 d8. d16 g4 | - \flourish { d4 g } r8.^\rpush g16 d4 | - d8. g16 d4 \triplet { d8 g d } g4 | - d4^\up g4^\up \stf d2 -} - -tenorBA = \drummode { - \flourish { d4 g4 d4 g4 } | - \triplet { d8 g d } g8. g16 d2 | - d4^\up g4^\up d4^\up g4^\up | - d8. g16 d8. d16 g4 g4 | -} -tenorBB = \drummode { - \flourish { d4 g4 d4 g4 } | - \triplet { d8 g d } g8. g16 d2 | - d8. g16 d4 \triplet { d8 g d } g4 | - d4^\up g4^\up \stf d2 -} - -tenorA = \drummode { \tenorAA \tenorAB } -tenorB = \drummode { \tenorBA \tenorBB } diff --git a/strathspeys/orange_and_blue/tenor.ly b/strathspeys/orange_and_blue/tenor.ly deleted file mode 100644 index bb51037..0000000 --- a/strathspeys/orange_and_blue/tenor.ly +++ /dev/null @@ -1,36 +0,0 @@ -\version "2.18.2" - -\include "lilydrum.ly" - -\include "./config.ily" -\include "./notes.tenor.ily" - -\score { - \new PipeBandDrumStaff { - \global - << - \new NullVoice = "format" { - \repeat volta 2 { - \line - } - \break - \repeat volta 2 { - \line - } - }%Format - \new DrumVoice = "tenor" { - \tenorglobal - \tenorA - \tenorB - }%Tenor - >> - } - \header { - title = \title - subtitle = \subtitle - meter = \meter - instrument = \instrumentTenor - composer = \composerTenor - arranger = \arrangerTenor - } -}