From 14f0332b286acaa5b81ed021cfa2e4333af3076f Mon Sep 17 00:00:00 2001 From: Eric Teunis de Boone Date: Mon, 4 Mar 2019 04:23:31 +0100 Subject: [PATCH] Various Tune Fixes Most are fixing (gracing) alignment by restructuring the Staff. --- 3-4_marches/green_hills_of_tyrol/pipes.ly | 24 ++----- 3-4_marches/lochanside/pipes.ly | 28 ++------ 3-4_marches/my_land/pipes.ly | 24 ++----- .../pipe_major_jk_cairns/notes.pipes.ily | 56 +++++++-------- 3-4_marches/pipe_major_jk_cairns/pipes.ly | 23 ++---- 3-4_marches/red_hackle/notes.pipes.ily | 2 +- 3-4_marches/red_hackle/pipes.ly | 19 ++--- 3-4_marches/shoals_of_herring/pipes.ly | 24 +++---- 3-4_marches/torosay_castle/pipes.ly | 37 +++------- .../when_the_battle_is_over/config.ily | 1 - 3-4_marches/when_the_battle_is_over/pipes.ly | 24 ++----- .../48th_highlanders_of_holland/pipes.ly | 23 ++---- 4-4_marches/auld_lang_syne/pipes.ly | 17 ++--- 4-4_marches/bonnie_galloway/config.ily | 2 +- 4-4_marches/bonnie_galloway/pipes.ly | 6 +- .../cockney_jocks/.notes.pipes.ily.swp | Bin 12288 -> 0 bytes 4-4_marches/dawning_of_the_day/config.ily | 4 +- 4-4_marches/dawning_of_the_day/pipes.ly | 4 +- 4-4_marches/minstrel_boy/config.ily | 2 +- 4-4_marches/the_crusaders_march/pipes.ly | 1 + 4-4_marches/the_old_rustic_bridge/config.ily | 2 +- 4-4_marches/the_pikemans_march/pipes.ly | 2 +- .../were_no_awa_tae_bide_awa/notes.pipes.ily | 20 +++--- 4-4_marches/wings/config.ily | 4 +- 4-4_marches/wings/full.ly | 27 ++++--- 4-4_marches/wings/notes.pipes.ily | 6 +- 4-4_marches/wings/pipes.ly | 1 + 4-4_marches/wings/side.ly | 2 +- .../10th_hli_crossing_the_rhine/pipes.ly | 68 +++++++----------- 6-8_marches/72nd_highlanders/pipes.ly | 37 ++++------ 6-8_marches/cock_o_the_north/config.ily | 2 +- 6-8_marches/cock_o_the_north/pipes.ly | 61 ++++++++-------- 6-8_marches/glendaruel_highlanders/config.ily | 2 +- .../piobaireachd_of_donald_dubh/pipes.ly | 40 +++++------ .../battle_of_the_somme/notes.pipes.ily | 36 +++++----- 9-8_marches/going_to_vancouver_hills/pipes.ly | 26 ++----- airs/abide_with_me/notes.side.ily | 14 ++++ airs/abide_with_me/side.full.ly | 40 +++++++++++ {4-4_marches => airs}/la_baum/config.ily | 2 +- {4-4_marches => airs}/la_baum/full.ly | 0 {4-4_marches => airs}/la_baum/notes.pipes.ily | 0 .../la_baum/notes.pipes.seconds.ily | 0 {4-4_marches => airs}/la_baum/notes.side.ily | 0 {4-4_marches => airs}/la_baum/pipes.full.ly | 0 {4-4_marches => airs}/la_baum/pipes.ly | 0 .../la_baum/pipes.seconds.ly | 0 {4-4_marches => airs}/la_baum/side.ly | 0 hornpipes/cabar_feidh/pipes.ly | 28 ++------ hornpipes/the_jolly_beggarman/pipes.ly | 27 ++----- hornpipes/the_walrus/notes.pipes.ily | 2 +- jigs/the_panda/config.ily | 1 - reels/cabar_feidh/notes.pipes.ily | 22 +++--- reels/cabar_feidh/pipes.ly | 2 +- reels/the_mackenzies_reel/pipes.ly | 9 +-- sinterklaas/00_sets/set_1.ly | 9 +++ sinterklaas/00_sets/set_2.ly | 8 +++ sinterklaas/00_sets/set_3.ly | 8 +++ sinterklaas/00_sets/set_4.ly | 8 +++ sinterklaas/set_1.ly | 9 --- sinterklaas/set_2.ly | 8 --- sinterklaas/set_3.ly | 8 --- sinterklaas/set_4.ly | 8 --- .../pipes.ly | 3 +- .../notes.pipes.ily | 2 +- strathspeys/keel_row/notes.pipes.ily | 4 +- .../notes.pipes.ily | 5 +- 66 files changed, 384 insertions(+), 500 deletions(-) delete mode 100644 4-4_marches/cockney_jocks/.notes.pipes.ily.swp create mode 100644 airs/abide_with_me/side.full.ly rename {4-4_marches => airs}/la_baum/config.ily (94%) rename {4-4_marches => airs}/la_baum/full.ly (100%) rename {4-4_marches => airs}/la_baum/notes.pipes.ily (100%) rename {4-4_marches => airs}/la_baum/notes.pipes.seconds.ily (100%) rename {4-4_marches => airs}/la_baum/notes.side.ily (100%) rename {4-4_marches => airs}/la_baum/pipes.full.ly (100%) rename {4-4_marches => airs}/la_baum/pipes.ly (100%) rename {4-4_marches => airs}/la_baum/pipes.seconds.ly (100%) rename {4-4_marches => airs}/la_baum/side.ly (100%) create mode 100644 sinterklaas/00_sets/set_1.ly create mode 100644 sinterklaas/00_sets/set_2.ly create mode 100644 sinterklaas/00_sets/set_3.ly create mode 100644 sinterklaas/00_sets/set_4.ly delete mode 100644 sinterklaas/set_1.ly delete mode 100644 sinterklaas/set_2.ly delete mode 100644 sinterklaas/set_3.ly delete mode 100644 sinterklaas/set_4.ly diff --git a/3-4_marches/green_hills_of_tyrol/pipes.ly b/3-4_marches/green_hills_of_tyrol/pipes.ly index d52381c..ba5e83b 100644 --- a/3-4_marches/green_hills_of_tyrol/pipes.ly +++ b/3-4_marches/green_hills_of_tyrol/pipes.ly @@ -9,23 +9,13 @@ \new Staff { \global \pipeglobal - << - \new NullVoice = "format" { - \repeat volta 2 { - \line - } - \break - \repeat volta 2 { - \line - } - }%Format - - \new Voice = "pipes" { - \pipesA - - \pipesB - } - >> + \repeat volta 2 { + \pipesA + } + \break + \repeat volta 2 { + \pipesB + } } \header { title = \title diff --git a/3-4_marches/lochanside/pipes.ly b/3-4_marches/lochanside/pipes.ly index 8ad58dc..c9c0db5 100644 --- a/3-4_marches/lochanside/pipes.ly +++ b/3-4_marches/lochanside/pipes.ly @@ -9,29 +9,11 @@ \new Staff { \global \pipeglobal - << - \new NullVoice = "format" { - \repeat volta 2 { - \line - } - \break - \repeat volta 2 { - \line - } - \break - \repeat volta 2 { - \line - } - }%Format - - \new Voice = "pipes" { - \pipesA - - \pipesB - - \pipesC - } - >> + \repeat volta 2 { \pipesA } + \break + \repeat volta 2 { \pipesB } + \break + \repeat volta 2 { \pipesC } } \header { title = \title diff --git a/3-4_marches/my_land/pipes.ly b/3-4_marches/my_land/pipes.ly index d52381c..ba5e83b 100644 --- a/3-4_marches/my_land/pipes.ly +++ b/3-4_marches/my_land/pipes.ly @@ -9,23 +9,13 @@ \new Staff { \global \pipeglobal - << - \new NullVoice = "format" { - \repeat volta 2 { - \line - } - \break - \repeat volta 2 { - \line - } - }%Format - - \new Voice = "pipes" { - \pipesA - - \pipesB - } - >> + \repeat volta 2 { + \pipesA + } + \break + \repeat volta 2 { + \pipesB + } } \header { title = \title diff --git a/3-4_marches/pipe_major_jk_cairns/notes.pipes.ily b/3-4_marches/pipe_major_jk_cairns/notes.pipes.ily index fd40508..c603472 100644 --- a/3-4_marches/pipe_major_jk_cairns/notes.pipes.ily +++ b/3-4_marches/pipe_major_jk_cairns/notes.pipes.ily @@ -7,43 +7,43 @@ pipeglobal = { } % Music pipesAA = { - \grg a8. [ b16 ] \grip c4~ c8 [ e8 ] | - \grg \tuplet 3/2 { d8 c8 b8 } \grG a2 | - \thrwd d8. [ e16 ] \grg f4~ f8 [ A8 ] | - \thrwd d8 [ f8 ] \dblf f8 [ e8~ ] e4 | + \grg a8. [ b16 ] \grip c4~ c8 [ e8 ] | + \grg \tuplet 3/2 { d8 c8 b8 } \grG a2 | + \thrwd d8. [ e16 ] \grg f4~ f8 [ A8 ] | + \thrwd d8 [ f8 ] \dblf f8 [ e8~ ] e4 | } pipesABA = { - \grg c8. [ d16 ] \dble e4~ e8 [ f8 ] | - \dble e8 [ c8 ] \dblb b8 [ \gre a8 ] a4 | - \grg b8 [ c8 ] \dble e8 [ f8 ] A8. [ f16 ] | - \dble e8 [ a8 ] \dble c8 [ \gre b8~ ] b4 + \grg c8. [ d16 ] \dble e4~ e8 [ f8 ] | + \dble e8 [ c8 ] \dblb b8 [ \gre a8 ] a4 | + \grg b8 [ c8 ] \dble e8 [ f8 ] A8. [ f16 ] | + \dble e8 [ a8 ] \dble c8 [ \gre b8~ ] b4 } pipesABB = { - \grg c8 [ e8 ] \dblA A4~ A8 [ g8 ] | - A8. [ f16 ] \dble e8 [ a8 ] a4 | - \grg \tuplet 3/2 { f8 e8 d8 } \dblc c4~ c8 [ e8 ] | - \grg \tuplet 3/2 { d8 c8 b8 } \grG a2 + \grg c8 [ e8 ] \dblA A4~ A8 [ g8 ] | + A8. [ f16 ] \dble e8 [ a8 ] a4 | + \grg \tuplet 3/2 { f8 e8 d8 } \dblc c4~ c8 [ e8 ] | + \grg \tuplet 3/2 { d8 c8 b8 } \grG a2 } pipesBA = { -\grg e8. [ f16 ] \dble e4~ e8 [ c8 ] | - \grg a8 [ c8 ] \dblf f8 [ e8 ] e4 | - A8. [ g16 ] \dblA A4 A8 [ f8 ] | - \thrwd d8 [ f8 ] \dblf f8 [ e8~ ] e4 | + \grg e8. [ f16 ] \dble e4~ e8 [ c8 ] | + \grg a8 [ c8 ] \dblf f8 [ e8 ] e4 | + A8. [ g16 ] \dblA A4 A8 [ f8 ] | + \thrwd d8 [ f8 ] \dblf f8 [ e8~ ] e4 | - \grg c8. [ d16 ] \dble e4~ e8 [ f8 ] | - \dble e8 [ c8 ] \dblb b8 [ \gre a8 ] a4 | - \grg b8 [ c8 ] \dble e8 [ f8 ] A8. [ f16 ] | - \dble e8 [ a8 ] \dble c8 [ \gre b8 ] b4 | + \grg c8. [ d16 ] \dble e4~ e8 [ f8 ] | + \dble e8 [ c8 ] \dblb b8 [ \gre a8 ] a4 | + \grg b8 [ c8 ] \dble e8 [ f8 ] A8. [ f16 ] | + \dble e8 [ a8 ] \dble c8 [ \gre b8 ] b4 | } pipesBB = { - \grg a8. [ b16 ] \grip c4~ c8 [ e8 ] | - \grg \tuplet 3/2 { d8 c8 b8 } \grG a2 | - \thrwd d8. [ e16 ] \grg f4~ f8 [ A8 ] | - \thrwd d8 [ f8 ] \dblf f8 [ e8~ ] e4 | + \grg a8. [ b16 ] \grip c4~ c8 [ e8 ] | + \grg \tuplet 3/2 { d8 c8 b8 } \grG a2 | + \thrwd d8. [ e16 ] \grg f4~ f8 [ A8 ] | + \thrwd d8 [ f8 ] \dblf f8 [ e8~ ] e4 | - \grg c8 [ e8 ] \dblA A4~ A8 [ g8 ] | - A8. [ f16 ] \dble e8 [ a8~ ] a4 | - \grg \tuplet 3/2 { f8 e8 d8 } \dblc c4~ c8 [ e8 ] | - \grg \tuplet 3/2 { d8 c8 b8 } \grG a2 + \grg c8 [ e8 ] \dblA A4~ A8 [ g8 ] | + A8. [ f16 ] \dble e8 [ a8~ ] a4 | + \grg \tuplet 3/2 { f8 e8 d8 } \dblc c4~ c8 [ e8 ] | + \grg \tuplet 3/2 { d8 c8 b8 } \grG a2 } diff --git a/3-4_marches/pipe_major_jk_cairns/pipes.ly b/3-4_marches/pipe_major_jk_cairns/pipes.ly index 222fb4a..0f220aa 100644 --- a/3-4_marches/pipe_major_jk_cairns/pipes.ly +++ b/3-4_marches/pipe_major_jk_cairns/pipes.ly @@ -9,30 +9,19 @@ \new Staff { \global \pipeglobal - << - \new NullVoice = "format" { \repeat volta 2 { - \halfline + \pipesAA } \alternative { - \halfline - \halfline + \pipesABA + \pipesABB }\bar "|." \break - \line \bar "||" - \break - \line \bar "|." - }%Format - - \new Voice = "pipes" { - \pipesAA - \pipesABA - \pipesABB - \pipesBA + \bar "||" + \break \pipesBB - } - >> + \bar "|." } \header { title = \title diff --git a/3-4_marches/red_hackle/notes.pipes.ily b/3-4_marches/red_hackle/notes.pipes.ily index ad8f771..e157f30 100644 --- a/3-4_marches/red_hackle/notes.pipes.ily +++ b/3-4_marches/red_hackle/notes.pipes.ily @@ -1,4 +1,4 @@ -% <> <> +% 3/4 Red Hackle Pipeband % Pipes \version "2.18.2" composerPipes = "" diff --git a/3-4_marches/red_hackle/pipes.ly b/3-4_marches/red_hackle/pipes.ly index 85bc1af..4b886d5 100644 --- a/3-4_marches/red_hackle/pipes.ly +++ b/3-4_marches/red_hackle/pipes.ly @@ -9,18 +9,13 @@ \new Staff { \global \pipeglobal - << - { - \repeat volta 2 {\line } - \break - \repeat volta 2 {\line } - } - { - \pipesA - - \pipesB - } - >> + \repeat volta 2 { + \pipesA + } + \break + \repeat volta 2 { + \pipesB + } } \header { title = \title diff --git a/3-4_marches/shoals_of_herring/pipes.ly b/3-4_marches/shoals_of_herring/pipes.ly index efe850d..8467332 100644 --- a/3-4_marches/shoals_of_herring/pipes.ly +++ b/3-4_marches/shoals_of_herring/pipes.ly @@ -9,26 +9,20 @@ \new Staff { \global \pipeglobal - << - { - \repeat volta 2 {\line} - \break - \repeat volta 2 {\halfline} - \alternative { - {\halfline} - {\halfline} - } - \bar "|." - } - { + + \repeat volta 2 { \pipesA \pipesAB - + } + \break + \repeat volta 2 { \pipesB + } + \alternative { \pipesBA \pipesAB - } - >> + } + \bar "|." } \header { title = \title diff --git a/3-4_marches/torosay_castle/pipes.ly b/3-4_marches/torosay_castle/pipes.ly index 26a8f1f..f000380 100644 --- a/3-4_marches/torosay_castle/pipes.ly +++ b/3-4_marches/torosay_castle/pipes.ly @@ -9,35 +9,14 @@ \new Staff { \global \pipeglobal - << - \new NullVoice = "format" { - \repeat volta 2 { - \line - } - \break - \repeat volta 2 { - \line - } - \break - \repeat volta 2 { - \line - } - \break - \repeat volta 2 { - \line - } - }%Format - - \new Voice = "pipes" { - \pipesA - - \pipesB - - \pipesC - - \pipesD - } - >> + + \repeat volta 2 { \pipesA } + \break + \repeat volta 2 { \pipesB } + \break + \repeat volta 2 { \pipesC } + \break + \repeat volta 2 { \pipesD } } \header { title = \title diff --git a/3-4_marches/when_the_battle_is_over/config.ily b/3-4_marches/when_the_battle_is_over/config.ily index 57bd9fa..c046f75 100644 --- a/3-4_marches/when_the_battle_is_over/config.ily +++ b/3-4_marches/when_the_battle_is_over/config.ily @@ -1,7 +1,6 @@ \version "2.19.0" %% Globals global = { - \key d \major \time 3/4 } confTempo = { diff --git a/3-4_marches/when_the_battle_is_over/pipes.ly b/3-4_marches/when_the_battle_is_over/pipes.ly index d52381c..ba5e83b 100644 --- a/3-4_marches/when_the_battle_is_over/pipes.ly +++ b/3-4_marches/when_the_battle_is_over/pipes.ly @@ -9,23 +9,13 @@ \new Staff { \global \pipeglobal - << - \new NullVoice = "format" { - \repeat volta 2 { - \line - } - \break - \repeat volta 2 { - \line - } - }%Format - - \new Voice = "pipes" { - \pipesA - - \pipesB - } - >> + \repeat volta 2 { + \pipesA + } + \break + \repeat volta 2 { + \pipesB + } } \header { title = \title diff --git a/4-4_marches/48th_highlanders_of_holland/pipes.ly b/4-4_marches/48th_highlanders_of_holland/pipes.ly index cd694e3..7e90e89 100644 --- a/4-4_marches/48th_highlanders_of_holland/pipes.ly +++ b/4-4_marches/48th_highlanders_of_holland/pipes.ly @@ -9,25 +9,10 @@ \new Staff { \global \pipeglobal - << - \new NullVoice = "format" { - \part \line - \bar "||" \break - \part \line - \bar "||" \break - \part \line - \bar "||" \break - \part \line - \bar "|." \break - }%Format - - \new Voice = "pipes" { - \pipesA s4 - \pipesB s4 - \pipesC s4 - \pipesD s4 - } - >> + \partial 4 \pipesA s4 \bar "||" \break + \partial 4 \pipesB s4 \bar "||" \break + \partial 4 \pipesC s4 \bar "||" \break + \partial 4 \pipesD s4 \bar "|." \break } \header { title = \title diff --git a/4-4_marches/auld_lang_syne/pipes.ly b/4-4_marches/auld_lang_syne/pipes.ly index 7965d5c..af754ab 100644 --- a/4-4_marches/auld_lang_syne/pipes.ly +++ b/4-4_marches/auld_lang_syne/pipes.ly @@ -9,18 +9,15 @@ \new Staff { \global \pipeglobal - << - { - \repeat volta 2 { \part \line } - \break - \repeat volta 2 { \part \line } - } - { + \repeat volta 2 { + \partial 4 \pipesA s4 - + } + \break + \repeat volta 2 { + \partial 4 \pipesB s4 - } - >> + } } \header { title = \title diff --git a/4-4_marches/bonnie_galloway/config.ily b/4-4_marches/bonnie_galloway/config.ily index 3fcee7d..41ca1d4 100644 --- a/4-4_marches/bonnie_galloway/config.ily +++ b/4-4_marches/bonnie_galloway/config.ily @@ -9,7 +9,7 @@ confTempo = { %% Format part = { \partial 8 s8 } measure = { \grace { s4 } s1 | } -halfline = { \repeat unfold 2 { \measure } } +halfline = { \repeat unfold 4 { \measure } } line = { \repeat unfold 2 { \halfline } } %% Headers diff --git a/4-4_marches/bonnie_galloway/pipes.ly b/4-4_marches/bonnie_galloway/pipes.ly index 28d5841..af10444 100644 --- a/4-4_marches/bonnie_galloway/pipes.ly +++ b/4-4_marches/bonnie_galloway/pipes.ly @@ -11,8 +11,9 @@ \pipeglobal << { - \line \break - \line \break + \line \bar "||" + \break + \line \bar "|." } { \pipesA @@ -33,6 +34,7 @@ \set Staff.midiInstrument = #"bagpipe" %%Tune \pipesA + \pipesB } \midi { \confTempo } diff --git a/4-4_marches/cockney_jocks/.notes.pipes.ily.swp b/4-4_marches/cockney_jocks/.notes.pipes.ily.swp deleted file mode 100644 index d1283330d5ddafd880b6e327f95f8daaed41c2ac..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI2y=xRf7>D23of;KwEEHZ()0y4exrA*}oGIc5fmkTWT?qRz*=*d~J$Cn$!%JGL z^x6se2eg(THrj}Vjemd<8+!!{{mq<-3Hbn<7{WX7u*}SRGw(bzTio6FWA|=Ovuo7| z<qXl=FKf;F=N)=?fk@?XP^xYk7rJxrl4QYyq8*nDR;c_eOO=%-yG1Ym9nkLN*`f-{ z!Y+a=kJHHR#2w{(X=t~*MI6}9s5960@?b#~c7X9y)tg(?^Vn%ts>0IYg%u~g-6oPY zF(3xE8|aqvqwX+WtJlUZS1<9ovv;@mOHB-j0Wly3#DEwO17bi7h=C(-pzI9MFRbzy zxC(~;fQJ+@AO^&M7!U(uKn#chF(3xSfEW-1V&I4v@Is=_aU$mg7KH!*^=|;*P7|$z zkKi?U0an3t@D!|oC%^*}paRxU5q$=0;2CIvNzee}U<~{mCi(<c!7^9^H^3F}^(4^; z@E*JYuRs^v0T;m!<o6xC1S?<$j02PR5!nk_h8Pe7Vn7Ut0Wly3#K2)Nutb$sxsX2! zIjnPQNtbOcMbgdD=PYyRGJ2vs;=r}I$zg4rXSo&niDKoVA#inF2Y8NthU}Zbzy$WG zGKCqUyup!<p5Kf%AI9jjjF^pNbO?eKdz*3i1ZLf=qGM~-^fm^gm^`Q0t1}v!dOnj_ zLr>b&$zrO1UyP&kJFqoWu)aQ-i@=jS!H;S0eL28wF&i5VJQ~>>`?aH^k8e)c!2iDs zJ2KlR<t@^$A0Fv=Z8l!R!TWUx&-%VOZqeE>T1R+V--D-$KGeP!>0^Fd^~`aPlFauK y6BcCcPFARVMqh_VOSMX^hbk}PEaht5s<~FZN+WE#@pNp5CkMCb`If#-Prm_Y<**e1 diff --git a/4-4_marches/dawning_of_the_day/config.ily b/4-4_marches/dawning_of_the_day/config.ily index 46bb20b..7ee748c 100644 --- a/4-4_marches/dawning_of_the_day/config.ily +++ b/4-4_marches/dawning_of_the_day/config.ily @@ -7,9 +7,9 @@ confTempo = { \tempo 4 = 80 } %% Format -part = { \partial 4 s4 } +part = { \partial 4 \grace { s4 } s4 } measure = { \grace { s4 } s1 | } -halfline = { \repeat unfold 2 { \measure } } +halfline = { \repeat unfold 4 { \measure } } line = { \repeat unfold 2 { \halfline } } %% Headers diff --git a/4-4_marches/dawning_of_the_day/pipes.ly b/4-4_marches/dawning_of_the_day/pipes.ly index 5d688cc..8f0223e 100644 --- a/4-4_marches/dawning_of_the_day/pipes.ly +++ b/4-4_marches/dawning_of_the_day/pipes.ly @@ -11,8 +11,8 @@ \pipeglobal << { - \part \halfline \halfline \bar "|." \break - + \part \halfline \halfline \bar "|." + \break \part \halfline \halfline \bar "|." }%Format { diff --git a/4-4_marches/minstrel_boy/config.ily b/4-4_marches/minstrel_boy/config.ily index 634cefd..718e7ab 100644 --- a/4-4_marches/minstrel_boy/config.ily +++ b/4-4_marches/minstrel_boy/config.ily @@ -8,7 +8,7 @@ confTempo = { \tempo 4 = 90 } %% Format -part = { \grace{s1} \partial 4 s4 } +part = { \grace{s1} \partial 8 s8 } measure = { \grace { s4 } s1 | } halfline = { \repeat unfold 2 { \measure } } line = { \repeat unfold 2 { \halfline } } diff --git a/4-4_marches/the_crusaders_march/pipes.ly b/4-4_marches/the_crusaders_march/pipes.ly index 489a606..a4ae4c2 100644 --- a/4-4_marches/the_crusaders_march/pipes.ly +++ b/4-4_marches/the_crusaders_march/pipes.ly @@ -35,6 +35,7 @@ \new Staff { \global \pipeglobal \set Staff.midiInstrument = #"bagpipe" %%Tune + \partial 4 \pipesA \pipesB diff --git a/4-4_marches/the_old_rustic_bridge/config.ily b/4-4_marches/the_old_rustic_bridge/config.ily index 0ad459c..e084640 100644 --- a/4-4_marches/the_old_rustic_bridge/config.ily +++ b/4-4_marches/the_old_rustic_bridge/config.ily @@ -7,7 +7,7 @@ confTempo = { \tempo 4 = 90 } %% Format -part = { \partial 4 s4 } +part = { \partial 4 \grace { s4 } s4 } measure = { \grace { s4 } s1 | } halfline = { \repeat unfold 2 { \measure } } line = { \repeat unfold 2 { \halfline } } diff --git a/4-4_marches/the_pikemans_march/pipes.ly b/4-4_marches/the_pikemans_march/pipes.ly index 5a6c5f7..49fdfe5 100644 --- a/4-4_marches/the_pikemans_march/pipes.ly +++ b/4-4_marches/the_pikemans_march/pipes.ly @@ -18,7 +18,7 @@ } \part \line \break \line \break - \line \break + \line \bar "|." } { \pipesA s8 diff --git a/4-4_marches/were_no_awa_tae_bide_awa/notes.pipes.ily b/4-4_marches/were_no_awa_tae_bide_awa/notes.pipes.ily index d0476bd..f720bde 100644 --- a/4-4_marches/were_no_awa_tae_bide_awa/notes.pipes.ily +++ b/4-4_marches/were_no_awa_tae_bide_awa/notes.pipes.ily @@ -7,14 +7,14 @@ pipeglobal = { } % Music pipesA = { -\grg a8. [ b16 ] | - \grip c4 c8 [ e8 ] \grg d8 [ c8 ] \grg b8 [ a8 ] | - \dblc c4 \gre a4 \wbirl a4 \dblc c8 [ e8 ] | - \dblA A2 \grip A8 [ g8 ] \hdblf f8 [ e8 ] | - \dblf f2 \dble e4 \grg f8. [ g16 ] | - - \dblA A4. \grg A8 \grg A4. c8 | - \thrwd d4 f4 \dble e4. \gra e8 | - \grg f4 e4 \dblA A4 c4 | - \dblb b2 \grG a4 + \grg a8. [ b16 ] | + \grip c4~ c8 [ e8 ] \grg d8 [ c8 ] \grg b8 [ a8 ] | + \dblc c4 \gre a4 \wbirl a4 \dblc c8 [ e8 ] | + \dblA A2 \grip A8 [ g8 ] \hdblf f8 [ e8 ] | + \dblf f2 \dble e4 \grg f8. [ g16 ] | + + \dblA A4. \grg A8 \grg A4. c8 | + \thrwd d4 f4 \dble e4. \gra e8 | + \grg f4 e4 \dblA A4 c4 | + \dblb b2 \grG a4 } diff --git a/4-4_marches/wings/config.ily b/4-4_marches/wings/config.ily index 0f2d307..e6c11a1 100644 --- a/4-4_marches/wings/config.ily +++ b/4-4_marches/wings/config.ily @@ -7,10 +7,10 @@ confTempo = { \tempo 4 = 90 } %% Format -part = { \partial 4 s4 } +part = { \partial 4 \grace { s4 } s4 } measure = { \grace { s4 } s1 | } quartline = { \repeat unfold 2 { \measure } } -halfline = { \repeat unfold 2 { \measure } } +halfline = { \repeat unfold 2 { \quartline } } line = { \repeat unfold 2 { \halfline } } %% Headers diff --git a/4-4_marches/wings/full.ly b/4-4_marches/wings/full.ly index 0458e24..c097a07 100644 --- a/4-4_marches/wings/full.ly +++ b/4-4_marches/wings/full.ly @@ -11,20 +11,26 @@ %\include "./notes.pipes.seconds.ily" %\include "./notes.lyrics.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 } << \new NullVoice = "format" { - \part \line \bar "||" - \line \bar "|." + \part \halfline + \halfline \bar "||" \break - \part \line \bar "||" - \line \bar "|." + \part \halfline + \halfline \bar "|." }%Format \new Voice = "pipes" { @@ -53,10 +59,11 @@ % % % } - \new PipeBandDrumStaff = "side" { + \new PipeBandDrumStaff = "side" \with { + instrumentName = \markup \column {\instrumentSide} + shortInstrumentName = \markup{\shortInstrumentSide} + } { \sideglobal - \set PipeBandDrumStaff.instrumentName = \markup \column {\instrumentSide} - \set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide} r8 \snareAA \snareABA \snareAAI \snareABB s4 diff --git a/4-4_marches/wings/notes.pipes.ily b/4-4_marches/wings/notes.pipes.ily index 4d605e8..02f9484 100644 --- a/4-4_marches/wings/notes.pipes.ily +++ b/4-4_marches/wings/notes.pipes.ily @@ -8,7 +8,7 @@ pipeglobal = { } % Music pipesAA = { - a8 e8 | + a8) e8 | \grg a4 \taor a8 [ b8 ] \grip c4~ c8 [ e8 ] | \grg f8. [ e16 ] \grg f8 [ A8 ] e4 \dblc c8 [ e8 ] | \grg f8. [ g16 ] A8 [ f8 ] \dble e16 [ c8. ] \grg b8 [ a8 ] | @@ -18,11 +18,11 @@ pipesAB = { \grg a4 \taor a8 [ b8 ] \grip c4~ c8 [ e8 ] | \grg f8. [ e16 ] \grg f8 [ A8 ] e4 \dblc c8 [ e8 ] | \grg f8. [ g16 ] A8 [ f8 ] \dble e16 [ c8. ] \grg b8. [ c16 ] | - \grg a2 \wbirl a4~ + \grg a2 \wbirl a4( } pipesBA = { - a8 [ e8 ] | + a8) [ e8 ] | A4 \grg A4 \grip A8 [ g8 ] \hdblf f8 [ e8 ] | \grg f8. [ e16 ] \grg f8 [ A8 ] \hdblf f8 [ e8 ] \dblc c8 [ e8 ] | \grg f8. [ g16 ] A8 [ f8 ] \dble e16 [ c8. ] \grg b8 [ a8 ] | diff --git a/4-4_marches/wings/pipes.ly b/4-4_marches/wings/pipes.ly index b948f3c..8ea6b47 100644 --- a/4-4_marches/wings/pipes.ly +++ b/4-4_marches/wings/pipes.ly @@ -34,6 +34,7 @@ \new Staff { \global \pipeglobal \set Staff.midiInstrument = #"bagpipe" %%Tune + \partial 4 \pipesAA \pipesAB \pipesBA \pipesAB diff --git a/4-4_marches/wings/side.ly b/4-4_marches/wings/side.ly index 6d0d153..e485a8a 100644 --- a/4-4_marches/wings/side.ly +++ b/4-4_marches/wings/side.ly @@ -29,7 +29,7 @@ markTextEol = #(define-music-function (parser location text) (string?) #{ \break \partial 8 s8 - \line + \halfline \markTextEol "D.C. al Fine" \bar "||" }%Format diff --git a/6-8_marches/10th_hli_crossing_the_rhine/pipes.ly b/6-8_marches/10th_hli_crossing_the_rhine/pipes.ly index f189607..0bfd9ca 100644 --- a/6-8_marches/10th_hli_crossing_the_rhine/pipes.ly +++ b/6-8_marches/10th_hli_crossing_the_rhine/pipes.ly @@ -9,54 +9,38 @@ \new Staff { \global \pipeglobal - << - \new NullVoice = "format" { \repeat volta 2 { - \part - \line + \partial 8 + \pipesAA + \pipesAB s8 } \break + \repeat volta 2 { - \part - \halfline - }\alternative{ - \halfline - \halfline + \partial 8 + \pipesBA + } \alternative { + { \pipesBB s8 } + { \pipesAB s8 } + } + \bar ".|:-||" + \break + + \repeat volta 2 { + \partial 8 + \pipesCA + \pipesCB s8 + } + \break + + \repeat volta 2 { + \partial 8 + \pipesDA + } \alternative { + { \pipesDB s8 } + { \pipesCB s8 } } \bar "|." - \break - \repeat volta 2 { - \part - \line - } - \break - \repeat volta 2 { - \part - \halfline - }\alternative{ - \halfline - \halfline - } - \bar "|." - - }%Format - - \new Voice = "pipes" { - \pipesAA - \pipesAB s8 - - \pipesBA - \pipesBB s8 - \pipesAB s8 - - \pipesCA - \pipesCB s8 - - \pipesDA - \pipesDB s8 - \pipesCB s8 - } - >> } \header { title = \title diff --git a/6-8_marches/72nd_highlanders/pipes.ly b/6-8_marches/72nd_highlanders/pipes.ly index befc53c..8a46e83 100644 --- a/6-8_marches/72nd_highlanders/pipes.ly +++ b/6-8_marches/72nd_highlanders/pipes.ly @@ -9,38 +9,26 @@ \new Staff { \global \pipeglobal - << - \new NullVoice = "format" { \repeat volta 2 { - \part - \line + \partial 4 + \pipesA s4 } \break + \repeat volta 2 { - \part - \halfline - }\alternative{ - \halfline - \halfline + \partial 4 + \pipesBA + } \alternative { + { \pipesBBA s4 } + { \pipesBBB s4 } } - \bar "|." + \bar ".|:-||" \break + \repeat volta 2 { - \part - \line + \partial 4 + \pipesC s4 } - }%Format - - \new Voice = "pipes" { - \pipesA s4 - - \pipesBA - \pipesBBA s4 - \pipesBBB s4 - - \pipesC s4 - } - >> } \header { title = \title @@ -53,6 +41,7 @@ \new Staff { \global \pipeglobal \set Staff.midiInstrument = #"bagpipe" %%Tune + \partial 4 \pipesA \pipesA diff --git a/6-8_marches/cock_o_the_north/config.ily b/6-8_marches/cock_o_the_north/config.ily index 946a9eb..055202f 100644 --- a/6-8_marches/cock_o_the_north/config.ily +++ b/6-8_marches/cock_o_the_north/config.ily @@ -7,7 +7,7 @@ confTempo = { \tempo 2. = 90 } %% Format -part = { \partial 8 s8 } +part = { \partial 8 \grace { s4 } s8 } measure = { \grace { s4 } s1. | } halfline = { \repeat unfold 2 { \measure } } line = { \repeat unfold 2 { \halfline } } diff --git a/6-8_marches/cock_o_the_north/pipes.ly b/6-8_marches/cock_o_the_north/pipes.ly index 45a5aca..0e540b3 100644 --- a/6-8_marches/cock_o_the_north/pipes.ly +++ b/6-8_marches/cock_o_the_north/pipes.ly @@ -9,38 +9,37 @@ \new Staff { \global \pipeglobal - << - { - \repeat volta 2 {\part \line} - \break - - \part \line - \break - \part \line - \break - \repeat volta 2 {\part \line} - \break - \part \line - \break - \part \line - \bar "|." - }%Format - { - \pipesA s8 - - \pipesBA - \pipesBBA s8 - \pipesBA - \pipesBBB s8 - - \pipesC s8 - - \pipesDA - \pipesDBA s8 - \pipesDA - \pipesBBB s8 + \repeat volta 2 { + \partial 8 + \pipesA s8 } - >> + \break + + \repeat volta 2 { + \partial 8 + \pipesBA + } \alternative { + { \pipesBBA s8 } + { \pipesBBB s8 } + } + \bar ".|:-||" + \break + + \repeat volta 2 { + \partial 8 + \pipesC s8 + + } + \break + + \repeat volta 2 { + \partial 8 + \pipesDA + } \alternative { + { \pipesDBA s8 } + { \pipesBBB s8 } + } + \bar "|." } \header { title = \title diff --git a/6-8_marches/glendaruel_highlanders/config.ily b/6-8_marches/glendaruel_highlanders/config.ily index 81dc7b3..3f823eb 100644 --- a/6-8_marches/glendaruel_highlanders/config.ily +++ b/6-8_marches/glendaruel_highlanders/config.ily @@ -7,7 +7,7 @@ confTempo = { \tempo 4. = 80 } %% Format -part = { \partial 8 s8 } +part = { \partial 8 \grace { s4 } s8 } measure = { \grace {s1} s2. | } halfline = { \repeat unfold 4 \measure } line = { \repeat unfold 2 { \halfline } } diff --git a/6-8_marches/piobaireachd_of_donald_dubh/pipes.ly b/6-8_marches/piobaireachd_of_donald_dubh/pipes.ly index 2f5999d..72e054f 100644 --- a/6-8_marches/piobaireachd_of_donald_dubh/pipes.ly +++ b/6-8_marches/piobaireachd_of_donald_dubh/pipes.ly @@ -9,29 +9,25 @@ \new Staff { \global \pipeglobal - << - { - \repeat volta 2 {\line} - \break - \repeat volta 2 {\line} - \break - \repeat volta 2 {\line} - \break - \repeat volta 2 {\halfline} - \alternative{ {\halfline}{\halfline}} - }%Format - { - \pipesA - - \pipesB - - \pipesC - - \pipesDA - \pipesDBA - \pipesDBB + \repeat volta 2 { + \pipesA } - >> + \break + \repeat volta 2 { + \pipesB + } + \break + \repeat volta 2 { + \pipesC + } + \break + \repeat volta 2 { + \pipesDA + } \alternative { + { \pipesDBA } + { \pipesDBB } + } + \bar "|." } \header { title = \title diff --git a/9-8_marches/battle_of_the_somme/notes.pipes.ily b/9-8_marches/battle_of_the_somme/notes.pipes.ily index efad2f2..fd45454 100644 --- a/9-8_marches/battle_of_the_somme/notes.pipes.ily +++ b/9-8_marches/battle_of_the_somme/notes.pipes.ily @@ -7,27 +7,27 @@ pipeglobal = { } % Music pipesA = { -a8 | - \grg f16 [ A8. f8 ] \thrwd d4. \dbld d8. [ c16 d8 ] | - \grg e8. [ d16 \gre G8 ] \dblb b4. \grG a4. | - \grg b16 [ \grd G8. \grd b8 ] \grG a4. \thrwd d4. | - \grg f16 [ A8. f8 ] \dble e4. \gra e4 a8 | + a8 | + \grg f16 [ A8. f8 ] \thrwd d4. \dbld d8. [ c16 d8 ] | + \grg e8. [ d16 \gre G8 ] \dblb b4. \grG a4. | + \grg b16 [ \grd G8. \grd b8 ] \grG a4. \thrwd d4. | + \grg f16 [ A8. f8 ] \dble e4. \gra e4 a8 | - \grg f16 [ A8. f8 ] \thrwd d4. \dbld d8. [ c16 d8 ] | - \grg e8. [ d16 \gre G8 ] \dblb b4. \grG a4. | - \grg b16 [ \grd G8. \grd b8 ] \grG a4. \grip f4. | - \grg e8. [ f16 \grg e8 ] \thrwd d4. \dbld d4 + \grg f16 [ A8. f8 ] \thrwd d4. \dbld d8. [ c16 d8 ] | + \grg e8. [ d16 \gre G8 ] \dblb b4. \grG a4. | + \grg b16 [ \grd G8. \grd b8 ] \grG a4. \grip f4. | + \grg e8. [ f16 \grg e8 ] \thrwd d4. \dbld d4 } pipesB = { - d8 - \dbld d8. [ c16 d8 ] \dble e4. \wbirl a4. | - \grg e8. [ f16 g8 ] \grA f16 [ A8. A8 ] \thrwd d4. | - \dblf f8. [ e16 f8 ] \dblg g4. \wbirl a4. | - \grg f16 [ A8. f8 ] \dble e4. \gra e4 A8 | + d8 + \dbld d8. [ c16 d8 ] \dble e4. \wbirl a4. | + \grg e8. [ f16 g8 ] \grA f16 [ A8. A8 ] \thrwd d4. | + \dblf f8. [ e16 f8 ] \dblg g4. \wbirl a4. | + \grg f16 [ A8. f8 ] \dble e4. \gra e4 A8 | - f16 [ A8. f8 ] \thrwd d4. \dbld d8. [ c16 d8 ] | - \grg e8. [ d16 \gre G8 ] \dblb b4. \grG a4. | - \grg b16 [ \grd G8. \grd b8 ] \grG a4. \grip f4. | - \grg e8. [ f16 \grg e8 ] \thrwd d4. \dbld d4 + \grg f16 [ A8. f8 ] \thrwd d4. \dbld d8. [ c16 d8 ] | + \grg e8. [ d16 \gre G8 ] \dblb b4. \grG a4. | + \grg b16 [ \grd G8. \grd b8 ] \grG a4. \grip f4. | + \grg e8. [ f16 \grg e8 ] \thrwd d4. \dbld d4 } diff --git a/9-8_marches/going_to_vancouver_hills/pipes.ly b/9-8_marches/going_to_vancouver_hills/pipes.ly index fcc8961..efe396a 100644 --- a/9-8_marches/going_to_vancouver_hills/pipes.ly +++ b/9-8_marches/going_to_vancouver_hills/pipes.ly @@ -9,26 +9,14 @@ \new Staff { \global \pipeglobal - << - \new NullVoice = "format" { - \repeat unfold 4 { - \repeat volta 2 { - \line - } - \break - } - }%Format - - \new Voice = "pipes" { - \pipesA - - \pipesB - \pipesC - - \pipesD - } - >> + \repeat volta 2 { \pipesA } + \break + \repeat volta 2 { \pipesB } + \break + \repeat volta 2 { \pipesC } + \break + \repeat volta 2 { \pipesD } } \header { title = \title diff --git a/airs/abide_with_me/notes.side.ily b/airs/abide_with_me/notes.side.ily index dc4ceda..c885af5 100644 --- a/airs/abide_with_me/notes.side.ily +++ b/airs/abide_with_me/notes.side.ily @@ -15,3 +15,17 @@ snareAB = \drummode { d4:32( \> d4:32)( d4:32)( d4:32)( | d4:32)( \< d4:32)( d4:32)( d4:32)\laissezVibrer \! } + +snareRollsAA = \drummode { + d1:32)( \! \p | + d1:32)( | + d1:32)( | + d4:32)( \< d4:32)( d4:32)( d4:32)( \!\mf \> | +} + +snareRollsAB = \drummode { + d1:32)( \!\p | + d1:32)( | + d4:32( \f \> d4:32)( d4:32)( d4:32)(\p | + d4:32)( \< d4:32)( d4:32)( d4:32)\laissezVibrer \! +} diff --git a/airs/abide_with_me/side.full.ly b/airs/abide_with_me/side.full.ly new file mode 100644 index 0000000..435477f --- /dev/null +++ b/airs/abide_with_me/side.full.ly @@ -0,0 +1,40 @@ +\version "2.18.2" + +\include "lilydrum.ly" + +\include "./config.ily" +\include "./notes.side.ily" + +\score { + \new StaffGroup << + \new PipeBandDrumStaff { + \global + << + \new NullVoice = "format" { + \repeat volta 2 {\line \break} + \alternative { + { \line \break } + { \line \bar "|."} + } + + } % End of Format + \new DrumVoice = "side" { + \snareAA + \snareAA + \snareAB + } + >> + } + \new PipeBandDrumStaff { + \snareRollsAA + \snareRollsAA + \snareRollsAB + } + >> + \header { + title = \title + meter = \meter + instrument = \instrumentSide + composer = \composerSide + } +} diff --git a/4-4_marches/la_baum/config.ily b/airs/la_baum/config.ily similarity index 94% rename from 4-4_marches/la_baum/config.ily rename to airs/la_baum/config.ily index 2f1fe7e..8eef3e1 100644 --- a/4-4_marches/la_baum/config.ily +++ b/airs/la_baum/config.ily @@ -14,4 +14,4 @@ line = { \repeat unfold 2 { \halfline } } %% Headers title = "La Baum" -meter = "March" +meter = "Air" diff --git a/4-4_marches/la_baum/full.ly b/airs/la_baum/full.ly similarity index 100% rename from 4-4_marches/la_baum/full.ly rename to airs/la_baum/full.ly diff --git a/4-4_marches/la_baum/notes.pipes.ily b/airs/la_baum/notes.pipes.ily similarity index 100% rename from 4-4_marches/la_baum/notes.pipes.ily rename to airs/la_baum/notes.pipes.ily diff --git a/4-4_marches/la_baum/notes.pipes.seconds.ily b/airs/la_baum/notes.pipes.seconds.ily similarity index 100% rename from 4-4_marches/la_baum/notes.pipes.seconds.ily rename to airs/la_baum/notes.pipes.seconds.ily diff --git a/4-4_marches/la_baum/notes.side.ily b/airs/la_baum/notes.side.ily similarity index 100% rename from 4-4_marches/la_baum/notes.side.ily rename to airs/la_baum/notes.side.ily diff --git a/4-4_marches/la_baum/pipes.full.ly b/airs/la_baum/pipes.full.ly similarity index 100% rename from 4-4_marches/la_baum/pipes.full.ly rename to airs/la_baum/pipes.full.ly diff --git a/4-4_marches/la_baum/pipes.ly b/airs/la_baum/pipes.ly similarity index 100% rename from 4-4_marches/la_baum/pipes.ly rename to airs/la_baum/pipes.ly diff --git a/4-4_marches/la_baum/pipes.seconds.ly b/airs/la_baum/pipes.seconds.ly similarity index 100% rename from 4-4_marches/la_baum/pipes.seconds.ly rename to airs/la_baum/pipes.seconds.ly diff --git a/4-4_marches/la_baum/side.ly b/airs/la_baum/side.ly similarity index 100% rename from 4-4_marches/la_baum/side.ly rename to airs/la_baum/side.ly diff --git a/hornpipes/cabar_feidh/pipes.ly b/hornpipes/cabar_feidh/pipes.ly index 7b380a9..ef08323 100644 --- a/hornpipes/cabar_feidh/pipes.ly +++ b/hornpipes/cabar_feidh/pipes.ly @@ -9,27 +9,13 @@ \new Staff { \global \pipeglobal - << - \new NullVoice = "format" { - \repeat unfold 4 { - \repeat volta 2 { - \part - \line - } - \break - } - }%Format - - \new Voice = "pipes" { - \pipesA s16 - - \pipesB s16 - - \pipesC s16 - - \pipesD s16 - } - >> + \repeat volta 2 { \partial 16 \pipesA } + \break + \repeat volta 2 { \partial 16 \pipesB } + \break + \repeat volta 2 { \partial 16 \pipesC } + \break + \repeat volta 2 { \partial 16 \pipesD } } \header { title = \title diff --git a/hornpipes/the_jolly_beggarman/pipes.ly b/hornpipes/the_jolly_beggarman/pipes.ly index 9827415..f2a81ca 100644 --- a/hornpipes/the_jolly_beggarman/pipes.ly +++ b/hornpipes/the_jolly_beggarman/pipes.ly @@ -9,33 +9,20 @@ \new Staff { \global \pipeglobal - << - \new NullVoice = "format" { \repeat volta 2 { - \part - \line + \partial 8 + \pipesA } \break \repeat volta 2 { - \part - \repeat unfold 3 \measure - \grace{s1} s4 s8 + \partial 8 + \pipesBA } \alternative { - {\part \halfline} - {\part \halfline} + {\partial 8 \pipesBBA } + {\partial 8 \pipesBBB } } \bar "|." - }%Format - - \new Voice = "pipes" { - \pipesA s8 - - \pipesBA - \pipesBBA s8 - \pipesBBB s8 - } - >> - } + }%Forma } \header { title = \title meter = \meter diff --git a/hornpipes/the_walrus/notes.pipes.ily b/hornpipes/the_walrus/notes.pipes.ily index 0de3546..1a7cb40 100644 --- a/hornpipes/the_walrus/notes.pipes.ily +++ b/hornpipes/the_walrus/notes.pipes.ily @@ -1,4 +1,4 @@ -% <<TimeSig>> <<Title>> +% 2/4 The Walrus % Pipes \version "2.18.2" composerPipes = "R. Mathieson" diff --git a/jigs/the_panda/config.ily b/jigs/the_panda/config.ily index adf8813..46ef3c4 100644 --- a/jigs/the_panda/config.ily +++ b/jigs/the_panda/config.ily @@ -1,7 +1,6 @@ \version "2.19.0" %% Globals global = { - \key d \major \time 6/8 } confTempo = { diff --git a/reels/cabar_feidh/notes.pipes.ily b/reels/cabar_feidh/notes.pipes.ily index 83327fd..86aee6e 100644 --- a/reels/cabar_feidh/notes.pipes.ily +++ b/reels/cabar_feidh/notes.pipes.ily @@ -9,12 +9,12 @@ pipeglobal = { pipesA = { f16 | \dblg g4 A8. [ e16 ] \dblg g4 \grA d8. [ e16 ] | - \dblg g4 \grA d8. [ c16 ] \grg b8. [ \grd G16 G8. ] \grd b16 ] | + \dblg g4 \grA d8. [ c16 ] \grg b8. [ \grd G16 G8. \grd b16 ] | \grg a8. [ b16 \grg c16 \grd a8. ] \dblA A4 e8. [ f16 ] | \dblA A4 e8. [ d16 ] \grg c4 \grip e8. [ f16 ] | \dblg g4 A8. [ e16 ] \dblg g4 \grA d8. [ e16 ] | - \dblg g4 \grA d8. [ c16 ] \grg b8. [ \grd G16 G8. ] \grd b16 ] | + \dblg g4 \grA d8. [ c16 ] \grg b8. [ \grd G16 G8. \grd b16 ] | \grg a8. [ b16 ] \grip c8. [ d16 ] \grg e8. [ f16 ] \grA g8. [ e16 ] | \dblA A4 e8. [ d16 ] \grg c4 \taor a8. } @@ -22,12 +22,12 @@ pipesA = { pipesB = { g16 | \grA G16 [ \grd G8. ] \dbld d8. [ G16 ] \grg b16 [ \grd G8. ] \dbld d8. [ b16 ] | - \grg G16 [ g8. d8. ] c16 ] \grg b8. [ \grd G16 G8. ] \grd b16 ] | + \grg G16 [ g8. d8. ] c16 ] \grg b8. [ \grd G16 G8. \grd b16 ] | \grg a16 [ \grd a8. ] \dble e8. [ a16 ] \grg c16 [ \grd a8. ] \dble e8. [ a16 ] | - \grg a16 [ A8. ] e8. [ d16 ] \grg c8. [ \grd a16 a8. ] g16 ] | + \grg a16 [ A8. ] e8. [ d16 ] \grg c8. [ \grd a16 a8. g16 ] | \grA G16 [ \grd G8. ] \dbld d8. [ G16 ] \grg b16 [ \grd G8. ] \dbld d8. [ b16 ] | - \grg G16 [ g8. d8. ] c16 ] \grg b8. [ \grd G16 G8. ] \grd b16 ] | + \grg G16 [ g8. d8. c16 ] \grg b8. [ \grd G16 G8. \grd b16 ] | \grg a8. [ b16 ] \grip c8. [ d16 ] \grg e8. [ f16 ] \grA g8. [ e16 ] | \dblA A4 e8. [ d16 ] \grg c4 \taor a8. } @@ -47,13 +47,13 @@ pipesC = { pipesD = { g16 | - \grA G8. [ \grd G16 G8. ] \grd b16 ] \grg G8. [ \grd G16 G8. ] \grd b16 ] | - \grg G16 [ g8. d8. ] c16 ] \grg b8. [ \grd G16 G8. ] \grd b16 ] | - \grg a8. [ \grd a16 a8. ] \grd c16 ] \grg a8. [ \grd a16 a8. ] \grd c16 ] | - \grg a16 [ A8. ] e8. [ d16 ] \grg c8. [ \grd a16 a8. ] g16 ] | + \grA G8. [ \grd G16 G8. \grd b16 ] \grg G8. [ \grd G16 G8. \grd b16 ] | + \grg G16 [ g8. d8. c16 ] \grg b8. [ \grd G16 G8. \grd b16 ] | + \grg a8. [ \grd a16 a8. \grd c16 ] \grg a8. [ \grd a16 a8. \grd c16 ] | + \grg a16 [ A8. ] e8. [ d16 ] \grg c8. [ \grd a16 a8. g16 ] | - \grA G8. [ \grd G16 G8. ] \grd b16 ] \grg G8. [ \grd G16 G8. ] \grd b16 ] | - \grg G16 [ g8. d8. ] c16 ] \grg b8. [ \grd G16 G8. ] \grd b16 ] | + \grA G8. [ \grd G16 G8. \grd b16 ] \grg G8. [ \grd G16 G8. \grd b16 ] | + \grg G16 [ g8. d8. c16 ] \grg b8. [ \grd G16 G8. \grd b16 ] | \grg a8. [ b16 ] \grip c8. [ d16 ] \grg e8. [ f16 ] \grA g8. [ e16 ] | \dblA A4 e8. [ d16 ] \grg c4 \taor a8. } diff --git a/reels/cabar_feidh/pipes.ly b/reels/cabar_feidh/pipes.ly index 670eb4b..205e12e 100644 --- a/reels/cabar_feidh/pipes.ly +++ b/reels/cabar_feidh/pipes.ly @@ -42,7 +42,7 @@ \new Staff { \global \pipeglobal \set Staff.midiInstrument = #"bagpipe" %%Tune - \partial 8 + \partial 16 \pipesA \pipesB \pipesC diff --git a/reels/the_mackenzies_reel/pipes.ly b/reels/the_mackenzies_reel/pipes.ly index d1353a4..997c2d3 100644 --- a/reels/the_mackenzies_reel/pipes.ly +++ b/reels/the_mackenzies_reel/pipes.ly @@ -11,10 +11,10 @@ \pipeglobal << { - \repeat volta 2 { \part \line } \break + \repeat volta 2 { \part \halfline } \break - \part \line \break - \line \bar "|." + \part \halfline \break + \halfline \bar "|." } { \pipesA s8 @@ -30,7 +30,4 @@ instrument = \instrumentPipes composer = \composerPipes } - \midi { - \tempo 2 = 70 - } } diff --git a/sinterklaas/00_sets/set_1.ly b/sinterklaas/00_sets/set_1.ly new file mode 100644 index 0000000..ec6f0d4 --- /dev/null +++ b/sinterklaas/00_sets/set_1.ly @@ -0,0 +1,9 @@ +\version "2.18.2" + +\paper {#(define page-breaking ly:minimal-breaking)} + + +%Scores +\include "./dag_sinterklaasje/pipes.ly" +\include "./bonne_bonne_bonne/pipes.ly" +\include "./sinterklaas_goedheiligman/pipes.ly" diff --git a/sinterklaas/00_sets/set_2.ly b/sinterklaas/00_sets/set_2.ly new file mode 100644 index 0000000..8e3bc02 --- /dev/null +++ b/sinterklaas/00_sets/set_2.ly @@ -0,0 +1,8 @@ +\version "2.18.2" + +\paper {#(define page-breaking ly:minimal-breaking)} + + +%Scores +\include "./zachtjes_gaan_de_paarden_voetjes/pipes.ly" +\include "./zie_ginds_komt_de_stoomboot/pipes.ly" diff --git a/sinterklaas/00_sets/set_3.ly b/sinterklaas/00_sets/set_3.ly new file mode 100644 index 0000000..88e70d2 --- /dev/null +++ b/sinterklaas/00_sets/set_3.ly @@ -0,0 +1,8 @@ +\version "2.18.2" + +\paper {#(define page-breaking ly:minimal-breaking)} + + +%Scores +\include "./sinterklaasje_kom_maar_binnen_met_je_knecht/pipes.ly" +\include "./de_zak_van_sinterklaas/pipes.ly" diff --git a/sinterklaas/00_sets/set_4.ly b/sinterklaas/00_sets/set_4.ly new file mode 100644 index 0000000..97641d6 --- /dev/null +++ b/sinterklaas/00_sets/set_4.ly @@ -0,0 +1,8 @@ +\version "2.18.2" + +\paper {#(define page-breaking ly:minimal-breaking)} + + +%Scores +\include "./sinterklaas_is_jarig/pipes.ly" +\include "./o_kom_er_eens_kijken/pipes.ly" diff --git a/sinterklaas/set_1.ly b/sinterklaas/set_1.ly deleted file mode 100644 index 524c658..0000000 --- a/sinterklaas/set_1.ly +++ /dev/null @@ -1,9 +0,0 @@ -\version "2.18.2" - -\paper {#(define page-breaking ly:minimal-breaking)} - - -%Scores -\include "/home/ericteunis/public/www/pipeband-drumming/music/sinterklaas/dag_sinterklaasje/pipes.ly" -\include "/home/ericteunis/public/www/pipeband-drumming/music/sinterklaas/bonne_bonne_bonne/pipes.ly" -\include "/home/ericteunis/public/www/pipeband-drumming/music/sinterklaas/sinterklaas_goedheiligman/pipes.ly" diff --git a/sinterklaas/set_2.ly b/sinterklaas/set_2.ly deleted file mode 100644 index ac525e0..0000000 --- a/sinterklaas/set_2.ly +++ /dev/null @@ -1,8 +0,0 @@ -\version "2.18.2" - -\paper {#(define page-breaking ly:minimal-breaking)} - - -%Scores -\include "/home/ericteunis/public/www/pipeband-drumming/music/sinterklaas/zachtjes_gaan_de_paardenvoetjes/pipes.ly" -\include "/home/ericteunis/public/www/pipeband-drumming/music/sinterklaas/zie_ginds_komt_de_stoomboot/pipes.ly" diff --git a/sinterklaas/set_3.ly b/sinterklaas/set_3.ly deleted file mode 100644 index 08a38b3..0000000 --- a/sinterklaas/set_3.ly +++ /dev/null @@ -1,8 +0,0 @@ -\version "2.18.2" - -\paper {#(define page-breaking ly:minimal-breaking)} - - -%Scores -\include "/home/ericteunis/public/www/pipeband-drumming/music/sinterklaas/sinterklaasje_kom_maar_binnen_met_je_knecht/pipes.ly" -\include "/home/ericteunis/public/www/pipeband-drumming/music/sinterklaas/de_zak_van_sinterklaas/pipes.ly" diff --git a/sinterklaas/set_4.ly b/sinterklaas/set_4.ly deleted file mode 100644 index 91eb410..0000000 --- a/sinterklaas/set_4.ly +++ /dev/null @@ -1,8 +0,0 @@ -\version "2.18.2" - -\paper {#(define page-breaking ly:minimal-breaking)} - - -%Scores -\include "/home/ericteunis/public/www/pipeband-drumming/music/sinterklaas/sinterklaas_is_jarig/pipes.ly" -\include "/home/ericteunis/public/www/pipeband-drumming/music/sinterklaas/o_kom_er_eens_kijken/pipes.ly" diff --git a/sinterklaas/sinterklaasje_kom_maar_binnen_met_je_knecht/pipes.ly b/sinterklaas/sinterklaasje_kom_maar_binnen_met_je_knecht/pipes.ly index eb9fd81..572102d 100644 --- a/sinterklaas/sinterklaasje_kom_maar_binnen_met_je_knecht/pipes.ly +++ b/sinterklaas/sinterklaasje_kom_maar_binnen_met_je_knecht/pipes.ly @@ -12,7 +12,8 @@ << \new NullVoice = "format" { \line \bar "|." \break - \halfline + + \halfline \break \repeat volta 2 { \partial 4 \grace{s4} s4 \halfline diff --git a/sinterklaas/zie_de_maan_schijnt_door_de_bomen/notes.pipes.ily b/sinterklaas/zie_de_maan_schijnt_door_de_bomen/notes.pipes.ily index d33f06c..2d093d2 100644 --- a/sinterklaas/zie_de_maan_schijnt_door_de_bomen/notes.pipes.ily +++ b/sinterklaas/zie_de_maan_schijnt_door_de_bomen/notes.pipes.ily @@ -10,7 +10,7 @@ pipeglobal = { pipesA = { \grg a8 \grG a | \thrwd d4 \grc d4 \grg d8[ e] | - \grg f4 \thrwd d4 | % Note this is 2/4 + \grg f4 \thrwd d4 |% Note this is 2/4 \grg e8[ \gra e8] \grg e8[ \gra e] \grg f[ e] | \thrwd d2 } diff --git a/strathspeys/keel_row/notes.pipes.ily b/strathspeys/keel_row/notes.pipes.ily index 81a116c..6065ffa 100644 --- a/strathspeys/keel_row/notes.pipes.ily +++ b/strathspeys/keel_row/notes.pipes.ily @@ -3,8 +3,8 @@ \version "2.18.2" composerPipes = "" pipeglobal = { - \bagpipeKey - } + \key d \major +} % Music pipesA = { \dblf f4 \thrwd d8. [ f16 ] \dblg g4 \hdble e8. [ g16 ] | diff --git a/strathspeys/lady_mackenzie_of_fairburn/notes.pipes.ily b/strathspeys/lady_mackenzie_of_fairburn/notes.pipes.ily index 27f092d..ca4ae66 100644 --- a/strathspeys/lady_mackenzie_of_fairburn/notes.pipes.ily +++ b/strathspeys/lady_mackenzie_of_fairburn/notes.pipes.ily @@ -1,7 +1,10 @@ % 4/4 Lady MacKenzie of Fairburn % Pipes \version "2.18.2" -composerPipes = "J. Wark, arr. R. Stanley" +composerPipes = "" +pipeglobal = { + \key a \major +} pipesA = { d16 | \dblc c8. e16