From d5779337b422131a2f4a5aecd84cfdd13ced1ce0 Mon Sep 17 00:00:00 2001 From: Eric Teunis de Boone Date: Sun, 5 Jul 2020 21:26:36 +0200 Subject: [PATCH] Closes #4 Loch Duich formatting --- .../cabar_feidh/notes.pipes.charge.ily | 2 +- airs/loch_duich/full.ly | 97 +++++++++++-------- airs/loch_duich/notes.pipes.ily | 6 +- airs/loch_duich/notes.pipes.seconds.ily | 8 +- airs/loch_duich/notes.side.ily | 7 +- airs/loch_duich/pipes.full.ly | 57 ++++++----- airs/loch_duich/pipes.ly | 2 + airs/loch_duich/side.ly | 29 +++--- 8 files changed, 121 insertions(+), 87 deletions(-) diff --git a/4-4_marches/cabar_feidh/notes.pipes.charge.ily b/4-4_marches/cabar_feidh/notes.pipes.charge.ily index 0329d8d..6a8308e 100644 --- a/4-4_marches/cabar_feidh/notes.pipes.charge.ily +++ b/4-4_marches/cabar_feidh/notes.pipes.charge.ily @@ -31,6 +31,6 @@ pipesChargeB = { \hdblb b8. [ \gre G16 ] \hdbld d8. [ \gre G16 ] \dblb b8. [ \gre G16 ] \hdbld d8. [ \gre G16 ] | \hdblb b8. [ \gre G16 ] \hdbld d8. [ \gre G16 ] \dblb b8. [ a16 ] \grg G8. [ \grd b16 ] | - \grg a8. [ b16 c8. ] d16 ] \grg e8. [ f16 ] \dblg g8. [ f16 ] | + \grg a8. [ b16 ] c8. [ d16 ] \grg e8. [ f16 ] \dblg g8. [ f16 ] | \grg e16 [ A8. ] \hdble e8 [ A8 ] \hdblc c8. [ b16 ] \grg a8 } diff --git a/airs/loch_duich/full.ly b/airs/loch_duich/full.ly index 2dd9262..bc5d42c 100644 --- a/airs/loch_duich/full.ly +++ b/airs/loch_duich/full.ly @@ -11,38 +11,32 @@ \include "./notes.pipes.seconds.ily" %\include "./notes.lyrics.ily" +\layout { + indent = 8.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 { \partial 8 \pipesA s8 } + \break + \repeat volta 2 { \partial 8 \pipesB s8 } + \break + + \partial 8 \pipesC << - \new Voice = "format" - { - \repeat unfold 2 { - \repeat volta 2 { - \part \line - \break - } - } - \part \line \bar "||" - \break - \part \line \bar "|." - - }%Format - - \new Voice = "pipes" - { - \pipesA s8 - \pipesB s8 - - \pipesC s8 - \pipesC s8 - - }%Pipes + { \pipesC } + { s8 \bar "||" \measure } >> + s8 + \bar "|." } % \new Lyrics = "verse1" { % \lyricsglobal @@ -50,34 +44,39 @@ % \verseA % } % } - \new Staff = "seconds" { + \new Staff = "seconds" \with { + instrumentName = \markup{ \instrumentPipes \instrumentSecnd } + shortInstrumentName = \markup{ \shortInstrumentPipes \shortInstrumentSecnd } + } { \pipessecndglobal - \set Staff.instrumentName = \markup{ \instrumentPipes Seconds } - \set Staff.shortInstrumentName = \markup{ \shortInstrumentPipes 2nd} + \pipessecndA s8 + \pipessecndB s8 - \pipessecndC s8 + \pipessecndC \pipessecndC s8 } - \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} - s8 \snareA - s8 \snareB - s8 \snareCA - s8 \snareCBA + s8 \snareA + s8 \snareB - s8 \snareCA - s8 \snareCBB + s8 \snareCA + \snareCBA + + \snareCA + \snareCBB } % \new PipeBandDrumStaff = "tenor" { % \tenorglobal -% \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor } +% \set PipewBandDrumStaff.instrumentName = \markup{ \instrumentTenor } % \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor } % % } @@ -109,5 +108,23 @@ $(if (not (string=? "" composerBass)) #{ \markup {\line { \instrumentBass }}#} ) } } + arranger = \markup \large { + \column \right-align { + $(if (not (string=? "" arrangerLyrics)) #{ \markup { \line { \arrangerLyrics ":" } } #} ) + $(if (not (string=? "" arrangerPipes)) #{ \markup {\line { \arrangerPipes ":" }} #} ) + $(if (not (string=? "" arrangerPipessecnd)) #{ \markup {\line { \arrangerPipessecnd ":" }} #} ) + $(if (not (string=? "" arrangerSide)) #{ \markup {\line { \arrangerSide ":" }} #} ) + $(if (not (string=? "" arrangerTenor)) #{ \markup {\line { \arrangerTenor ":" }} #} ) + $(if (not (string=? "" arrangerBass)) #{ \markup {\line { \arrangerBass ":" }} #} ) + } + \column \right-align { + $(if (not (string=? "" arrangerLyrics)) #{ \markup { \line { "Lyrics" } } #} ) + $(if (not (string=? "" arrangerPipes)) #{ \markup {\line { \instrumentPipes }}#} ) + $(if (not (string=? "" arrangerPipessecnd)) #{ \markup {\line { \instrumentPipessecnd }}#} ) + $(if (not (string=? "" arrangerSide)) #{ \markup {\line { \instrumentSide }}#} ) + $(if (not (string=? "" arrangerTenor)) #{ \markup {\line { \instrumentTenor }}#} ) + $(if (not (string=? "" arrangerBass)) #{ \markup {\line { \instrumentBass }}#} ) + } + } } } diff --git a/airs/loch_duich/notes.pipes.ily b/airs/loch_duich/notes.pipes.ily index 060ea60..f7ca78c 100644 --- a/airs/loch_duich/notes.pipes.ily +++ b/airs/loch_duich/notes.pipes.ily @@ -1,7 +1,8 @@ % 6/8 Loch Section % Pipes \version "2.18.2" -composerPipes = "Ensign Christopher MacRae, arr. Cpl. V.C. Kennedy" +composerPipes = "Ensign Christopher MacRae" +arrangerPipes = "Cpl. V.C. Kennedy" pipeglobal = { \key a \mixolydian } @@ -12,6 +13,7 @@ pipesA = { \dblA A4 f8 \grg e16 [ f16~ ] f4 | \dble e4 c8 \grg b16 [ \grip c16~ ] c4 | \dblA A4 c8 \dblc c16 [ \gre b16~ ] b4 | + \dblc c4 b8 \grg c16 [ e16~ ] e4 | \dblA A4 f8 \grg e16 [ f16~ ] f4 | \grg a4 \taor a8 \dble e4 c8 | @@ -23,6 +25,7 @@ pipesB = { \grip c4 \gre b8 \grd c16 [ f16~ ] f4 | \dblc c4 \gre b8 \whslurd e4 \grg c8 | \dblA A4 c8 \dblc c16 [ \gre b16~ ] b4 | + \dblc c4 b8 \grg c16 [ e16~ ] e4 | \dblA A4 f8 \grg e16 [ f16~ ] f4 | \grg a4 \taor a8 \dble e4 c8 | @@ -34,6 +37,7 @@ pipesC = { \dblc c4 \gre a8 \dble e4 c8 | \grg b4 \taor b8 \dblf f4 b8 | \thrwd d4 \gre b8 \dblf f4 e8 | + \grg a4 \taor a8 \dble e4 a8 | \dblc c4 \gre b8 \grg c16 [ e16~ ] e4 | \dblf f4 e8 \dblA A4 c8 | diff --git a/airs/loch_duich/notes.pipes.seconds.ily b/airs/loch_duich/notes.pipes.seconds.ily index ca60d2f..a576b4c 100644 --- a/airs/loch_duich/notes.pipes.seconds.ily +++ b/airs/loch_duich/notes.pipes.seconds.ily @@ -1,16 +1,18 @@ % 6/8 Loch Duich % Pipes (Seconds) \version "2.18.2" -composerPipesSecnd = "Ensign Christopher MacRae, arr. Cpl. V.C. Kennedy" +composerPipesSecnd = "Ensign Christopher MacRae" +arrangerPipesSecnd = "Cpl. V.C. Kennedy" pipessecndglobal = { \key a \mixolydian } pipessecndA = { -\grg e8 | + \grg e8 | \grg a4 b8 \grg a16 [ \grip c16~ ] c4 | \thrwd d4 \gre d8 c16 [ \thrwd d16~ ] d4 | \grg c4 \grG a8 \dblb b16 [ \grG a16~ ] a4 | \thrwd d4 e8 \dblc c16 [ \gre b16~ ] b4 | + \grg a4 b8 \grg a16 [ c16~ ] c4 | \thrwd d4 \gre d8 \grg c16 [ d16~ ] d4 | \grg c4 \taor a8 \dblc c4 e8 | @@ -23,6 +25,7 @@ pipessecndB = { \grG a4 b8 \grg a16 [ \thrwd d16~ ] d4 | \grg a4 \gre b8 \grG a4 \grd c8 | \thrwd d4 e8 \dblc c16 [ \gre b16~ ] b4 | + \grg a4 b8 \grg a4 c8 | \thrwd d4 \gre d8 \grg c16 [ d16~ ] d4 | \grg c4 \taor a8 \dblc c4 e8 | @@ -35,6 +38,7 @@ pipessecndC = { \wbirl a4 \gre a8 \dblc c4 a8 | \grg G8. [ \grd G16 \gre G8 ] \whslurd d4 G8 | \dblb b4 \gre G8 \whslurd d4 c8 | + \grg a4 \taor a8 \dblc c4 a8 | \grg a4 b8 \grG a16 [ c16 ] c4 | \thrwd d4 c8 \dblf f4 a8 | diff --git a/airs/loch_duich/notes.side.ily b/airs/loch_duich/notes.side.ily index bc27c67..0d2bd37 100644 --- a/airs/loch_duich/notes.side.ily +++ b/airs/loch_duich/notes.side.ily @@ -38,10 +38,13 @@ snareCA = \drummode { d8 \tuplet 3/2 { d16 g d } \flam g8 d8:32( \tuplet 3/2 { d16) g d } \flam g8 | d4:32( d8) \drag d16 d-> g g \flam d8 | + + \flam g8 d8:32( d8) r8 d8:32( d8) | + \drag d16 d-> g g \flam d8 } snareCBA = \drummode { - \drag d16 d-> g g \flam d8 d4.:32(\< | + d4.:32(\< | } snareCBB = \drummode { - \drag d16)\! d-> g g \flam d8 \flam d4. | + \flam d4.) \! | } diff --git a/airs/loch_duich/pipes.full.ly b/airs/loch_duich/pipes.full.ly index fdd698d..55bc9f5 100644 --- a/airs/loch_duich/pipes.full.ly +++ b/airs/loch_duich/pipes.full.ly @@ -7,35 +7,31 @@ \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 \with { + instrumentName = \markup{ \instrumentPipes } + shortInstrumentName = \markup{ \shortInstrumentPipes } + } { \global \pipeglobal - \set Staff.instrumentName = \markup{ \instrumentPipes } - \set Staff.shortInstrumentName = \markup{ \shortInstrumentPipes } - << - \new Voice = "format" - { - \repeat unfold 3 { - \repeat volta 2 { - \part \line - \break - } - } - }%Format - \new Voice = "pipes" - { - \pipesA s8 - \pipesB s8 - \pipesC s8 - }%Pipes - >> + + \repeat volta 2 { \partial 8 \pipesA s8 } + \break + \repeat volta 2 { \partial 8 \pipesB s8 } + \break + \repeat volta 2 { \partial 8 \pipesC s8 } } - \new Staff = "seconds" { + \new Staff = "seconds" \with { + instrumentName = \markup{ \instrumentPipes \instrumentSecnd } + shortInstrumentName = \markup{ \shortInstrumentPipes \shortInstrumentSecnd } + } { \pipessecndglobal - \set Staff.instrumentName = \markup{ \instrumentPipes Seconds } - \set Staff.shortInstrumentName = \markup{ \shortInstrumentPipes 2nd} \pipessecndA s8 \pipessecndB s8 @@ -64,6 +60,18 @@ $(if (not (string=? "" composerPipesthrd)) #{ \markup {\line { \instrumentPipesthrd }}#} ) } } + arranger = \markup \large { + \column \right-align { + $(if (not (string=? "" arrangerPipes)) #{ \markup {\line { \arrangerPipes ":" }} #} ) + $(if (not (string=? "" arrangerPipessecnd)) #{ \markup {\line { \arrangerPipessecnd ":" }} #} ) + $(if (not (string=? "" arrangerPipesthrd)) #{ \markup {\line { \arrangerPipesthrd ":" }} #} ) + } + \column \right-align { + $(if (not (string=? "" arrangerPipes)) #{ \markup {\line { \instrumentPipes }}#} ) + $(if (not (string=? "" arrangerPipessecnd)) #{ \markup {\line { \instrumentPipessecnd }}#} ) + $(if (not (string=? "" arrangerPipesthrd)) #{ \markup {\line { \instrumentPipesthrd }}#} ) + } + } } } \score { @@ -73,6 +81,7 @@ \pipeglobal \set Staff.midiInstrument = #"bagpipe" %%Tune + \partial 8 \pipesA \pipesB \pipesC @@ -82,6 +91,7 @@ \pipessecndglobal \set Staff.midiInstrument = #"bagpipe" %% Seconds + \partial 8 \pipessecndA \pipessecndB \pipessecndC @@ -100,5 +110,6 @@ meter = \meter instrument = \instrumentPipes composer = \composerPipes + arranger = \arrangerPipes } } diff --git a/airs/loch_duich/pipes.ly b/airs/loch_duich/pipes.ly index e618f6c..b6a115f 100644 --- a/airs/loch_duich/pipes.ly +++ b/airs/loch_duich/pipes.ly @@ -32,6 +32,7 @@ meter = \meter instrument = \instrumentPipes composer = \composerPipes + arranger = \arrangerPipes } } \score { @@ -54,5 +55,6 @@ meter = \meter instrument = \instrumentPipes composer = \composerPipes + arranger = \arrangerPipes } } diff --git a/airs/loch_duich/side.ly b/airs/loch_duich/side.ly index 705254e..741f03f 100644 --- a/airs/loch_duich/side.ly +++ b/airs/loch_duich/side.ly @@ -8,24 +8,17 @@ \score { \new PipeBandDrumStaff { \global - << - { - \repeat volta 2 { \line \break} - \repeat volta 2 { \line \break} - \repeat volta 2 { \halfline s2. s2. s2. } - \alternative { - { \grace {s1} s2.} {\grace{s1}s2.} - } - \bar "|." - } - { - \snareA - \snareB - \snareCA - \snareCBA - \snareCBB - } - >> + + \repeat volta 2 { \snareA } + \break + \repeat volta 2 { \snareB } + \break + \repeat volta 2 { \snareCA } + \alternative { + \snareCBA + \snareCBB + } + \bar "|." } \header { title = \title