From c222ebaea3083628471da579ad65d786b6275640 Mon Sep 17 00:00:00 2001 From: Eric Teunis de Boone Date: Fri, 2 Dec 2016 08:41:40 +0100 Subject: [PATCH] Tune fixes --- .../on_the_road_to_passchendaele/notes.pipes.ily | 4 ++-- 4-4_marches/51st_highland_division/notes.pipes.ily | 4 ++++ 4-4_marches/51st_highland_division/pipes.ly | 11 +++++------ 4-4_marches/flett_from_flotta/config.ily | 13 +++---------- 4-4_marches/flett_from_flotta/pipes.ly | 2 -- 4-4_marches/scotland_the_brave/config.ily | 7 +++---- 4-4_marches/scotland_the_brave/high-full.ly | 5 ++++- 4-4_marches/scotland_the_brave/high-pipes.ly | 4 +++- 4-4_marches/scotland_the_brave/notes.pipes.ily | 2 +- 4-4_marches/the_old_rustic_bridge/config.ily | 5 ++--- 4-4_marches/were_no_awa_tae_bide_awa/config.ily | 3 +-- sets/set_5.full.ly | 10 ++++++++++ sets/set_5.pipes.ly | 10 ++++++++++ standards/24_44_standards.side.ly | 2 ++ standards/34_standards.side.ly | 1 + standards/68_standards.side.ly | 1 + standards/standards.bass.ly | 1 + standards/standards.tenor.ly | 1 + template/bass.ly | 1 + template/pipes.ly | 2 ++ template/pipes.seconds.ly | 2 ++ template/pipes.thirds.ly | 2 ++ template/side.ly | 1 + template/tenor.ly | 1 + 24 files changed, 63 insertions(+), 32 deletions(-) create mode 100644 sets/set_5.full.ly create mode 100644 sets/set_5.pipes.ly diff --git a/3-4_marches/on_the_road_to_passchendaele/notes.pipes.ily b/3-4_marches/on_the_road_to_passchendaele/notes.pipes.ily index f39dc33..2278a5c 100644 --- a/3-4_marches/on_the_road_to_passchendaele/notes.pipes.ily +++ b/3-4_marches/on_the_road_to_passchendaele/notes.pipes.ily @@ -12,7 +12,7 @@ pipesA = { \grg a8. [ b16 ] \grip c4~ c8 [ \grG c8 ] | \grg d8 [ f8 ] \dble e4 c4 | \grg a8. [ b16 ] \grip c4~ c8 [ e8 ] | - \grg \triplet { f8 e8 c8 } \grg b2 | + \grg \tuplet 3/2 { f8 e8 c8 } \grg b2 | \grg a8. [ b16 ] \grip c4~ c8 [ \grG c8 ] | \grg d8 [ f8 ] \dble e4 c4 | @@ -24,7 +24,7 @@ pipesB = { \grg f8. [ g16 ] \dblA A4~ A8 [ g8 ] | \grA f8 [ A8 ] \hdble e4 \grd c4 | \grg a8. [ b16 ] \grip c4~ c8 [ f8 ] | - \dble \triplet { e8 [ d8 c8 ] } \grg b2 + \dble \tuplet 3/2 { e8 [ d8 c8 ] } \grg b2 } pipesBA = { diff --git a/4-4_marches/51st_highland_division/notes.pipes.ily b/4-4_marches/51st_highland_division/notes.pipes.ily index 5418185..d83b15b 100644 --- a/4-4_marches/51st_highland_division/notes.pipes.ily +++ b/4-4_marches/51st_highland_division/notes.pipes.ily @@ -26,6 +26,10 @@ pipesAA = { \pipesAAA \pipesAAB } +pipesAB = { + \pipesABA + \pipesABB +} pipesBA = { \dblc c8 [ e8 ] | diff --git a/4-4_marches/51st_highland_division/pipes.ly b/4-4_marches/51st_highland_division/pipes.ly index 6338713..45a4baa 100644 --- a/4-4_marches/51st_highland_division/pipes.ly +++ b/4-4_marches/51st_highland_division/pipes.ly @@ -2,8 +2,6 @@ \include "bagpipe.ly" -\include "bagpipe.ly" - \include "./config.ily" \include "./notes.pipes.ily" @@ -15,12 +13,13 @@ { \repeat volta 2 { \part \line \break - \line \bar "|." \break - } + \line + } + \break \repeat volta 2 { \part \line \break - \line \bar "|." \break - } + \line + } } { \pipesAA diff --git a/4-4_marches/flett_from_flotta/config.ily b/4-4_marches/flett_from_flotta/config.ily index 3e4dca2..ae97a93 100644 --- a/4-4_marches/flett_from_flotta/config.ily +++ b/4-4_marches/flett_from_flotta/config.ily @@ -2,13 +2,12 @@ %% Globals global = { \time 4/4 - \eighthBeaming - } +} 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 } } @@ -16,9 +15,3 @@ line = { \repeat unfold 2 { \halfline } } %% Headers title = "Flett from Flotta" meter = "March" - - -composerSide = "" -composerTenor = "" -composerBass = "" -composerPipes = "" diff --git a/4-4_marches/flett_from_flotta/pipes.ly b/4-4_marches/flett_from_flotta/pipes.ly index 23f5547..1826fb1 100644 --- a/4-4_marches/flett_from_flotta/pipes.ly +++ b/4-4_marches/flett_from_flotta/pipes.ly @@ -2,8 +2,6 @@ \include "bagpipe.ly" -\include "bagpipe.ly" - \include "./config.ily" \include "./notes.pipes.ily" diff --git a/4-4_marches/scotland_the_brave/config.ily b/4-4_marches/scotland_the_brave/config.ily index 91d10a7..ececcbf 100644 --- a/4-4_marches/scotland_the_brave/config.ily +++ b/4-4_marches/scotland_the_brave/config.ily @@ -2,14 +2,13 @@ %% Globals global = { \time 4/4 - \eighthBeaming - } +} confTempo = { \tempo 4 = 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/4-4_marches/scotland_the_brave/high-full.ly b/4-4_marches/scotland_the_brave/high-full.ly index 7103d56..51650d7 100644 --- a/4-4_marches/scotland_the_brave/high-full.ly +++ b/4-4_marches/scotland_the_brave/high-full.ly @@ -1,5 +1,8 @@ \version "2.19.0" +\include "bagpipe.ly" +\include "lilydrum.ly" + \include "./config.ily" %\include "./notes.bass.ily" %\include "./notes.tenor.ily" @@ -55,7 +58,7 @@ % } >> \header { - title = {\title " (high)"} + title = #(string-append title " (high)" ) meter = \meter composer = \markup \large { \column \right-align { diff --git a/4-4_marches/scotland_the_brave/high-pipes.ly b/4-4_marches/scotland_the_brave/high-pipes.ly index d1c9eb0..a7fe1db 100644 --- a/4-4_marches/scotland_the_brave/high-pipes.ly +++ b/4-4_marches/scotland_the_brave/high-pipes.ly @@ -1,5 +1,7 @@ \version "2.18.2" +\include "bagpipe.ly" + \include "./config.ily" \include "./notes.pipes.ily" @@ -24,7 +26,7 @@ >> } \header { - title = \title + title = #(string-append title " (high)" ) meter = \meter instrument = \instrumentPipes composer = \composerPipes diff --git a/4-4_marches/scotland_the_brave/notes.pipes.ily b/4-4_marches/scotland_the_brave/notes.pipes.ily index b368639..8716443 100644 --- a/4-4_marches/scotland_the_brave/notes.pipes.ily +++ b/4-4_marches/scotland_the_brave/notes.pipes.ily @@ -33,7 +33,7 @@ pipesBA = { \dblA A4 \grg A4 \grip A8 [ e8 ] \dblc c8 [ \gre a8 ] | \dblA A4 \grg A4 \grip A8 [ e8 ] \dblc c8 [ e8 ] | \thrwd d4 \grg f8. [ d16 ] \dblc c4 \grg e8. [ c16 ] | - \dblb b4 \grg e4 \gra e8. [ f16 ] \grg e16. [ d32 ] c16. [ b32 ] | + \dblb b4 \grg e4 \gra e8. [ f16 ] \grg e16. [ d32 c16. b32 ] | } pipesBB = { diff --git a/4-4_marches/the_old_rustic_bridge/config.ily b/4-4_marches/the_old_rustic_bridge/config.ily index 6355bf5..0ad459c 100644 --- a/4-4_marches/the_old_rustic_bridge/config.ily +++ b/4-4_marches/the_old_rustic_bridge/config.ily @@ -2,11 +2,10 @@ %% Globals global = { \time 4/4 - \eighthBeaming - } +} confTempo = { \tempo 4 = 90 - } +} %% Format part = { \partial 4 s4 } measure = { \grace { s4 } s1 | } diff --git a/4-4_marches/were_no_awa_tae_bide_awa/config.ily b/4-4_marches/were_no_awa_tae_bide_awa/config.ily index fae3465..6da4756 100644 --- a/4-4_marches/were_no_awa_tae_bide_awa/config.ily +++ b/4-4_marches/were_no_awa_tae_bide_awa/config.ily @@ -2,8 +2,7 @@ %% Globals global = { \time 4/4 - \eighthBeaming - } +} confTempo = { \tempo 4 = 90 diff --git a/sets/set_5.full.ly b/sets/set_5.full.ly new file mode 100644 index 0000000..7656fb3 --- /dev/null +++ b/sets/set_5.full.ly @@ -0,0 +1,10 @@ +\version "2.18.2" + +\paper {#(define page-breaking ly:minimal-breaking)} + + +%Scores +\include "/home/ericteunis/public/www/pipeband-drumming/music/4-4_marches/scotland_the_brave/full.ly" +\include "/home/ericteunis/public/www/pipeband-drumming/music/4-4_marches/wings/full.ly" +\include "/home/ericteunis/public/www/pipeband-drumming/music/4-4_marches/rowan_tree/full.ly" +\include "/home/ericteunis/public/www/pipeband-drumming/music/4-4_marches/scotland_the_brave/high-full.ly" diff --git a/sets/set_5.pipes.ly b/sets/set_5.pipes.ly new file mode 100644 index 0000000..0519d53 --- /dev/null +++ b/sets/set_5.pipes.ly @@ -0,0 +1,10 @@ +\version "2.18.2" + +\paper {#(define page-breaking ly:minimal-breaking)} + + +%Scores +\include "/home/ericteunis/public/www/pipeband-drumming/music/4-4_marches/scotland_the_brave/pipes.ly" +\include "/home/ericteunis/public/www/pipeband-drumming/music/4-4_marches/wings/pipes.ly" +\include "/home/ericteunis/public/www/pipeband-drumming/music/4-4_marches/rowan_tree/pipes.ly" +\include "/home/ericteunis/public/www/pipeband-drumming/music/4-4_marches/scotland_the_brave/pipes-high.ly" diff --git a/standards/24_44_standards.side.ly b/standards/24_44_standards.side.ly index 008d5a8..80d345f 100644 --- a/standards/24_44_standards.side.ly +++ b/standards/24_44_standards.side.ly @@ -1,4 +1,6 @@ \version "2.18.2" + +\include "lilydrum.ly" % Midparts midone = \drummode { d8:32( \dr | diff --git a/standards/34_standards.side.ly b/standards/34_standards.side.ly index 642be4e..fb38963 100644 --- a/standards/34_standards.side.ly +++ b/standards/34_standards.side.ly @@ -1,5 +1,6 @@ \version "2.18.2" +\include "lilydrum.ly" % Midparts midone = \drummode { \flamd d8 \dr d8:32( \tuplet 3/2 { g16) d16 g16 } \flamd d16. g32 \tuplet 3/2 { d16 g16 d16 } \flamg g8 \fr | diff --git a/standards/68_standards.side.ly b/standards/68_standards.side.ly index dd199a4..f165a26 100644 --- a/standards/68_standards.side.ly +++ b/standards/68_standards.side.ly @@ -1,5 +1,6 @@ \version "2.18.2" +\include "lilydrum.ly" % Midpart midone = \drummode { \flamd d8. \dr g16 d8 d4.:32( | diff --git a/standards/standards.bass.ly b/standards/standards.bass.ly index 8ffa155..697cd89 100644 --- a/standards/standards.bass.ly +++ b/standards/standards.bass.ly @@ -1,5 +1,6 @@ \version "2.18.2" +\include "lilydrum.ly" \header { title = "Standards" instrument = "Bass" diff --git a/standards/standards.tenor.ly b/standards/standards.tenor.ly index d68cd5c..4b630e0 100644 --- a/standards/standards.tenor.ly +++ b/standards/standards.tenor.ly @@ -1,5 +1,6 @@ \version "2.18.2" +\include "lilydrum.ly" \header { instrument = "Tenor" title = "Standards" diff --git a/template/bass.ly b/template/bass.ly index 8f9a0b4..190bdf6 100644 --- a/template/bass.ly +++ b/template/bass.ly @@ -24,5 +24,6 @@ meter = \meter instrument = \instrumentBass composer = \composerBass + arranger = \arrangerBass } } diff --git a/template/pipes.ly b/template/pipes.ly index 4d9c86c..514ff31 100644 --- a/template/pipes.ly +++ b/template/pipes.ly @@ -24,6 +24,7 @@ meter = \meter instrument = \instrumentPipes composer = \composerPipes + arranger = \arrangerPipes } } \score { @@ -37,5 +38,6 @@ meter = \meter instrument = \instrumentPipes composer = \composerPipes + arranger = \arrangerPipes } } diff --git a/template/pipes.seconds.ly b/template/pipes.seconds.ly index e8c3fce..d60f0b9 100644 --- a/template/pipes.seconds.ly +++ b/template/pipes.seconds.ly @@ -24,6 +24,7 @@ meter = \meter instrument = \instrumentSecnd composer = \composerPipesSecnd + arranger = \arrangerPipesSecnd } } \score { @@ -37,6 +38,7 @@ meter = \meter instrument = \instrumentSecnd composer = \composerPipesSecnd + arranger = \arrangerPipesSecnd } } diff --git a/template/pipes.thirds.ly b/template/pipes.thirds.ly index 7f7982f..aef2eab 100644 --- a/template/pipes.thirds.ly +++ b/template/pipes.thirds.ly @@ -24,6 +24,7 @@ meter = \meter instrument = \instrumentThrd composer = \composerPipesthrd + arranger = \arrangerPipesthrd } } \score { @@ -37,6 +38,7 @@ meter = \meter instrument = \instrumentThrd composer = \composerPipesthrd + arranger = \arrangerPipesthrd } } diff --git a/template/side.ly b/template/side.ly index 68a8753..6e1c046 100644 --- a/template/side.ly +++ b/template/side.ly @@ -24,5 +24,6 @@ meter = \meter instrument = \instrumentSide composer = \composerSide + arranger = \arrangerSide } } diff --git a/template/tenor.ly b/template/tenor.ly index 81a7d93..36cc23a 100644 --- a/template/tenor.ly +++ b/template/tenor.ly @@ -24,5 +24,6 @@ meter = \meter instrument = \instrumentTenor composer = \composerTenor + arranger = \arrangerTenor } }