diff --git a/2-4_marches/road_to_the_isles/notes.pipes.ily b/2-4_marches/road_to_the_isles/notes.pipes.ily index ac40c46..0eb67e5 100644 --- a/2-4_marches/road_to_the_isles/notes.pipes.ily +++ b/2-4_marches/road_to_the_isles/notes.pipes.ily @@ -10,7 +10,7 @@ pipeglobal = { pipesAA = { \grg a16. d32 | \dblf f4 A16. f32 \grg e16. f32 | - \thrwd d16. e32 \grg d16. c32 \dblb b8 \grg d16 c16 | + \thrwd d16. e32 \grg d16. c32 \dblb b8 \grg d16. c32 | \grg b32 \grd G16. \grg b16. c32 \thrwd d16. e32 \grg f32 A16. | \hdble e4 \gra e8 } @@ -21,10 +21,11 @@ pipesAB = { \grA f32 [ A16. \hdblf f16. d32 ] \grg a16. [ \grd c32 \dble e16. c32 ] | \thrwd d4 \dbld d8 } + pipesBA = { \grg f16. g32 | \dblA A16. [ a32 \wbirl a8 ] \dblf f16. [ a32 \wbirl a8 ] | - \thrwd d16. e32 \grg d16. c32 \dblb b8 \grg d16 c16 | + \thrwd d16. e32 \grg d16. c32 \dblb b8 \grg d16. c32 | \grg b32 \grd G16. \grg b16. c32 \thrwd d16. e32 \grg f32 A16. | \hdble e4 \gra e8 @@ -39,3 +40,37 @@ pipesBBA = { pipesBBB = { \pipesAB } + +pipesCA = { + \grg a16. d32 | + \grg f16. a32 A16. f32 \grg d16. a32 b16. c32 | + \thrwd d16. e32 \grg d16. c32 \dblb b8 \grg d16. c32 | + \grg b32 \grd G16. \grg b16. c32 \thrwd d16. e32 \grg f32 A16. | + \hdble e4 \gra e8 +} +pipesCBA = { + \grg a16. d32 | + \grg f16. a32 A16. f32 \grg d16. a32 b16. c32 | + \thrwd d16. e32 \grg d16. c32 \dblb b8 [ \dblg g8 ] | + \grA f32 [ A16. \hdblf f16. d32 ] \grg a16. [ \grd c32 \dble e16. c32 ] | + \thrwd d4 \dbld d8 +} +pipesCBB = { + \pipesBBA +} + +pipesDA = { + \grg f16. g32 | + A16. a32 \grg f16. e32 \grg d16. [ a32 \grg b16. c32 ] | + \thrwd d16. e32 \grg d16. c32 \grg b32 [ \grd a16. b16. c32 ] | + \grg d16. c32 \grg d16. e32 \grg f16. [ d32 \grg f32 A16. ] | + \hdble e4 \gra e8 + +} +pipesDB = { + \grg f16. g32 | + A16. a32 \grg f16. e32 \grg d16. [ a32 \grg b16. c32 ] | + \thrwd d16. e32 \grg d16. c32 \dblb b8 [ \dblg g8 ] | + \grA f32 [ A16. \hdblf f16. d32 ] \grg a16. [ \grd c32 \dble e16. c32 ] | + \thrwd d4 \gra d8 +} diff --git a/2-4_marches/road_to_the_isles/pipes.ly b/2-4_marches/road_to_the_isles/pipes.ly index 9576a2c..5fed7d9 100644 --- a/2-4_marches/road_to_the_isles/pipes.ly +++ b/2-4_marches/road_to_the_isles/pipes.ly @@ -5,37 +5,58 @@ \include "./config.ily" \include "./notes.pipes.ily" +% Force a Break between the Voltas +mbreak = { \break } + \score { \new Staff { \global \pipeglobal - << - \new NullVoice = "format" { - \repeat volta 2 { - \part - \line - } - \break - \repeat volta 2 { - \part - \halfline - } \alternative { - { \part \halfline } - { \part \halfline } - } - \bar "|." - }%Format - \new Voice = "pipes" { - \pipesAA - \pipesAB s8 - - \pipesBA s8 - \pipesBBA s8 - \pipesBBB s8 + \repeat volta 2 { + \partial 8 + \pipesAA + \pipesAB + } + \break + \repeat volta 2 { + \partial 8 + \pipesBA + } \alternative { + { + \mbreak + \pipesBBA } - >> + { + \mbreak + \pipesBBB + } + } + \bar "||" + \break + + \repeat volta 2 { + \partial 8 + \pipesCA + } \alternative { + { + \mbreak + \pipesCBA + } + { + \mbreak + \pipesCBB + } + } + \bar "||" + \break + + \repeat volta 2 { + \partial 8 + \pipesDA + \pipesDB s8 + } } \header { title = \title @@ -55,6 +76,12 @@ \pipesBA \pipesBBA \pipesBA \pipesBBB + + \pipesCA \pipesCBA + \pipesCA \pipesCBB + + \pipesDA \pipesDB + \pipesDA \pipesDB } \midi { \confTempo } \header {