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 c40ae01..0eb67e5 100644 --- a/2-4_marches/road_to_the_isles/notes.pipes.ily +++ b/2-4_marches/road_to_the_isles/notes.pipes.ily @@ -62,7 +62,7 @@ pipesCBB = { pipesDA = { \grg f16. g32 | A16. a32 \grg f16. e32 \grg d16. [ a32 \grg b16. c32 ] | - \thrwd d16. e32 \grg d16. c32 \grg b32 [ \grd G16. 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 diff --git a/4-4_marches/the_pikemans_march/notes.pipes.ily b/4-4_marches/the_pikemans_march/notes.pipes.ily index 470ca35..de60830 100644 --- a/4-4_marches/the_pikemans_march/notes.pipes.ily +++ b/4-4_marches/the_pikemans_march/notes.pipes.ily @@ -13,29 +13,29 @@ e8 | \grg G4 \grg b8 [ \grG a8 ] \grg b16 [ d8. ] \slurc d8 [ e8 ] | \dbld d8. [ b16 ] \grg G8 [ \grd b8 ] \thrwd d4 d8 [ G8 ] | - \grg a4 \grg b16 [ c16 d8 ] \grg e8 [ \gra e8~ ] e8 [ d8 ] | + \grg a4 \grg b16 [ c16 d8 ] \grg e8 [ \gra e8 ] e8 [ d8 ] | \dble e8. [ d16 ] \grg e8 [ f8 ] \grg e8 [ \gra e8 ] \grg a4 | - A8 [ \slurf g8~ ] g8 [ e8 ] \dbld d8 [ b8~ ] b8 [ G8 ] | + A8 [ \slurf g8 ] g8 [ e8 ] \dbld d8 [ b8 ] b8 [ G8 ] | \grg a8. [ \grd b16 ] \gre a8 [ \grd G8 ] \grg a4. } pipesBA = { e8 | - A8 [ \grg A8~ ] A8 [ g8 ] \hdble e8 [ d8~ ] d8 [ e8 ] | + A8 [ \grg A8 ] A8 [ g8 ] \hdble e8 [ d8 ] d8 [ e8 ] | \dblg g8. [ A16 ] g8 [ e8 ] \dbld d8 [ b8 ] \grg G4 | - A8 [ \grg A8~ ] A8 [ g8 ] \hdble e8 [ d8~ ] d8 [ e8 ] | - \dblg g8. [ A16 ] g8 [ e8 ] \dblg g4 A16 [ g16 e16 g16 ] | + A8 [ \grg A8 ] A8 [ g8 ] \hdble e8 [ d8 ] d8 [ e8 ] | + \dblg g8. [ A16 ] g8 [ e8 ] \dblg g4 A16 [ g16 e16 ] g16 ] | } pipesBB = { - A8 [ \grg A8~ ] A8 [ g8 ] \hdble e8 [ d8~ ] d8 [ e8 ] | + A8 [ \grg A8 ] A8 [ g8 ] \hdble e8 [ d8 ] d8 [ e8 ] | \dblg g8. [ A16 ] g8 [ e8 ] \dbld d8 [ b8 ] \grg G4 | \grg a8. [ \grd b16 ] \gre a8 [ \grd G8 ] \grg a16 [ e8. ] \dbld d8 [ b8 ] | \grG a4 \grg b16 [ c16 d8 ] \dble e2 | } pipesBC = { - A8 [ \grg A8~ ] A8 [ g8 ] \hdble e8 [ d8~ ] d8 [ e8 ] | + A8 [ \grg A8 ] A8 [ g8 ] \hdble e8 [ d8 ] d8 [ e8 ] | \dblg g8. [ A16 ] g8 [ e8 ] \dbld d8 [ b8 ] \grg G4 | \grg a8. [ \grd b16 ] \gre a8 [ \grd G8 ] \grg a16 [ e8. ] \dbld d8 [ b8 ] | \grG a4 \dblb b8 [ \gre G8 ] \grg a2 diff --git a/Makefile b/Makefile deleted file mode 100644 index 1e3499f..0000000 --- a/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -LILY := ./build - -AUX = README.md Makefile \ - build defs.ily \ - init-sets make-set \ - scores2json.py \ - tuneoverview shadowdir - #.git .gitignore - -SRCDIRS := 2-4_marches 3-4_marches 4-4_marches 5-4_marches \ - 6-8_marches 9-8_marches \ - standards template \ - airs hornpipes jigs reels strathspeys \ - other christmas sinterklaas suites - -LYSRCS := $(foreach dir,$(SRCDIRS),$(wildcard $(dir)/**/*.ly) $(wildcard $(dir)/*.ly)) -PDFOBJS = $(patsubst %.ly,%.pdf,$(LYSRCS)) - -.PHONY: all -all: $(PDFOBJS) - -# Pattern rules -%.pdf %.preview.pdf %.preview.png &: %.ly - $(LILY) $< - -.PHONY: dist -dist: $(LYSRCS) $(PDFOBJS) $(AUX) - @tar -zhvcf pipeband-music.tar.gz $(SRCDIRS) $(AUX) diff --git a/reels/piper_of_drummond/config.ily b/reels/piper_of_drummond/config.ily deleted file mode 100644 index 525fa7d..0000000 --- a/reels/piper_of_drummond/config.ily +++ /dev/null @@ -1,18 +0,0 @@ -\version "2.19.0" -%% Globals -global = { - \key d \major - \time 2/2 - } -confTempo = { - \tempo 2 = 70 - } -%% Format -part = { \partial 16 \grace{s4.} s16 } -measure = { \grace {s1} s1 | } -halfline = { \repeat unfold 2 \measure } -line = { \repeat unfold 2 { \halfline } } - -%% Headers -title = "The Piper of Drummond" -meter = "Reel" diff --git a/reels/piper_of_drummond/full.ly b/reels/piper_of_drummond/full.ly deleted file mode 100644 index e4eb349..0000000 --- a/reels/piper_of_drummond/full.ly +++ /dev/null @@ -1,130 +0,0 @@ -\version "2.19.0" - -\include "bagpipe.ly" -\include "lilydrum.ly" - -\include "./config.ily" -%\include "./notes.bass.ily" -%\include "./notes.tenor.ily" -\include "./notes.side.ily" -\include "./notes.pipes.ily" -%\include "./notes.pipes.seconds.ily" -%\include "./notes.lyrics.ily" - -\layout { - indent = 5.0 - short-indent = 2.0 -} - -\score { - \new StaffGroup << - \new Staff \with { - instrumentName = \markup{ \instrumentPipes } - shortInstrumentName = \markup{ \shortInstrumentPipes } - } { - \global - \pipeglobal - << - \new NullVoice = "format" { - %\repeat volta 2 { - % \part \line - %} - \part - \line - \break - \line - \section - \break - \part - \line - \break - \line - \fine - }%Format - \new Voice = "pipes" { - - \pipesA \pipesA s16 - - \pipesBA - \pipesBB s16 - - }%Pipes - >> - } -%{ \new Staff = "song" { - \lyricsglobal - \new Voice = "lyrics" { - - } - } -}% -%{ \new Lyrics = "verse1" { - \lyricsglobal - \lyricsto "lyrics" { - \verseA - } - } -%} -%{ \new Staff = "seconds" \with { - instrumentName = \markup{ \instrumentPipes \instrumentSecnd } - shortInstrumentName = \markup{ \shortInstrumentPipes \shortInstrumentSecnd } - } { - \pipessecndglobal - - } -%} - \new PipeBandDrumStaff = "side" \with { - instrumentName = \markup { \instrumentSide } - shortInstrumentName = \markup{ \shortInstrumentSide } - } { - \sideglobal - - s16 \snareAA \snareABA - \snareAA \snareABB | - - s16 \snareBA \snareBBA - \snareBA \snareBBB - } -%{ - \new PipeBandDrumStaff = "tenor" \with { - instrumentName = \markup{ \instrumentTenor } - shortInstrumentName = \markup{ \shortInstrumentTenor } - } { - \tenorglobal - - } -%} -%{ - \new PipeBandDrumStaff = "bass" \with { - instrumentName = \markup{ \instrumentBass } - shortInstrumentName = \markup{ \shortInstrumentBass } - } { - \bassglobal - - } -%} - >> - \header { - title = \title - subtitle = \subtitle - meter = \meter - composer = \markup \large { - \column \right-align { - $(if (not (string=? "" composerLyrics)) #{ \markup { \line { \composerLyrics ":" } } #} ) - $(if (not (string=? "" composerPipes)) #{ \markup {\line { \composerPipes ":" }} #} ) - $(if (not (string=? "" composerPipessecnd)) #{ \markup {\line { \composerPipessecnd ":" }} #} ) - $(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=? "" composerLyrics)) #{ \markup { \line { "Lyrics" } } #} ) - $(if (not (string=? "" composerPipes)) #{ \markup {\line { \instrumentPipes }}#} ) - $(if (not (string=? "" composerPipessecnd)) #{ \markup {\line { \instrumentPipessecnd }}#} ) - $(if (not (string=? "" composerSide)) #{ \markup {\line { \instrumentSide }}#} ) - $(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} ) - $(if (not (string=? "" composerBass)) #{ \markup {\line { \instrumentBass }}#} ) - } - } - } -} diff --git a/reels/piper_of_drummond/notes.pipes.ily b/reels/piper_of_drummond/notes.pipes.ily deleted file mode 100644 index aca4d87..0000000 --- a/reels/piper_of_drummond/notes.pipes.ily +++ /dev/null @@ -1,30 +0,0 @@ -% 2/2 Piper of Drummond -% Pipes -\version "2.24.1" -composerPipes = ""% Traditional -arrangerPipes = "" -pipeglobal = { - \key d \major -} -% Music -pipesA = { - b16 | - \thrwd d4 \grg f8. e16 \thrwd d4 \gre a8. b16 | - \thrwd d4 \grg f8. e16 \grg g8. b16 \grG b8. c16 | - \thrwd d4 \grg f8. e16 \thrwd d4 \grg a8. b16 | - \thrwd d4 \grg d8. b16 \grg a8. \grd a16 \gre a8. -} -pipesBA = { - b16 | - \thrwd d4 \grg f8. b16 \dblb b4 \grg f8. b16 | - \thrwd d4 \grg f8. e16 \grg f8. b16 \grG b8. c16 | - \thrwd d4 \grg f8. b16 \dblb b4 \grg f8. b16 | - \thrwd d4 \grg d8. b16 \grg a8. \grd a16 \gre a8. -} -pipesBB = { - b16 | - \thrwd d4 \grg f8. b16 \dblb b4 \grg f8. b16 | - \thrwd d4 \grg f8. e16 \grg f8. b16 \grG b8. c16 | - \thrwd d4 \grg f8. e16 \thrwd d4 \grg a8. b16 | - \thrwd d4 \grg d8. b16 \grg a8. \grd a16 \gre a8. -} diff --git a/reels/piper_of_drummond/notes.side.ily b/reels/piper_of_drummond/notes.side.ily deleted file mode 100644 index 6c28471..0000000 --- a/reels/piper_of_drummond/notes.side.ily +++ /dev/null @@ -1,62 +0,0 @@ -% 2/2 Piper of Drummond -% Side -\version "2.18.2" -composerSide = "E.T. de Boone, v0, 2023" % 2023-05-05 -arrangerSide = "" -sideglobal = { - \eighthReelBeaming -} -% Music -snareA = \drummode { -} - -snareAA = \drummode { - \flam d4-> d8. g16 - d4:32( g8.) d16:64( - | - \triplet { d8) g d } \flam g8. d16-> -} -snareABA = \drummode { - g8.[ \drag d16 d16\< g d g] - | - d8.\!\v g16 d8. \flam g16 - d8. \flam g16 d8. g16 - | - \flam d8.-> g16 \triplet { d8 d g } - d8. d16 \triplet { g8 g d } -} - -snareABB = \drummode { - g8. g16 \flam d8.-> g16 - | - d4:32( d8.) g16 - \flam d8. g16 d4:32(\< - | - d8.)->\! g16 d8. \flam g16 - d8. g16 d16 g d g - | -} - -snareBA = \drummode { - d4:32(-> g8.) g16 - d4:32(\< \triplet { g8)\!\staccato d g } - | - d8.-> g16 d8. g16:64( - d8.:32 d16)-> g8. g16 - | -} -snareBBA = \drummode { - d8. g16 \triplet { d8 g d } - \flam \triplet { g8 d g } \flam d8. g16 - | - \flam d8.-> g16 d8. \flam g16 - d4 d16 g d g - | -} -snareBBB = \drummode { - \flam d8.-> g16 d8. \flam g16 - d8. g16 \flam d8.\staccato g16 - | - \flam d8.-> g16 \triplet { d8 d \flam g } - \triplet { d8 g g } d4\staccato -} diff --git a/reels/piper_of_drummond/pipes.ly b/reels/piper_of_drummond/pipes.ly deleted file mode 100644 index 0c00724..0000000 --- a/reels/piper_of_drummond/pipes.ly +++ /dev/null @@ -1,62 +0,0 @@ -\version "2.24.1" - -\include "bagpipe.ly" - -\include "./config.ily" -\include "./notes.pipes.ily" - -\score { - \new Staff { - \global - \pipeglobal - << - \new NullVoice = "format" { - \repeat volta 2 { - \part \line - } - \break - \part - \line - \break - \line - \fine - }%Format - \new Voice = "pipes" { - \pipesA s16 - - \pipesBA - \pipesBB s16 - }%Pipes - >> - } - \header { - title = \title - subtitle = \subtitle - meter = \meter - instrument = \instrumentPipes - composer = \composerPipes - arranger = \arrangerPipes - } -} -\score { - \new Staff { \global \pipeglobal - \set Staff.midiInstrument = #"bagpipe" - %%Tune - - \partial 16 - \pipesA - \pipesA - \pipesBA - \pipesBB - - } - \midi { \confTempo } - \header { - title = \title - subtitle = \subtitle - meter = \meter - instrument = \instrumentPipes - composer = \composerPipes - arranger = \arrangerPipes - } -} diff --git a/reels/piper_of_drummond/side.ly b/reels/piper_of_drummond/side.ly deleted file mode 100644 index 88637a6..0000000 --- a/reels/piper_of_drummond/side.ly +++ /dev/null @@ -1,42 +0,0 @@ -\version "2.18.2" - -\include "lilydrum.ly" - -\include "./config.ily" -\include "./notes.side.ily" - -\score { - \new PipeBandDrumStaff { - \global - \unfoldRepeats \new DrumVoice = "side" { - \sideglobal - - \repeat volta 2 { - \snareAA - \alternative { - \snareABA - \snareABB - } - } - \break - \section - - \repeat volta 2 { - \snareBA - \alternative { - \snareBBA - \snareBBB - } - } - \fine - }%Side - } - \header { - title = \title - subtitle = \subtitle - meter = \meter - instrument = \instrumentSide - composer = \composerSide - arranger = \arrangerSide - } -} diff --git a/strathspeys/lady_mackenzie_of_fairburn/notes.pipes.ily b/strathspeys/lady_mackenzie_of_fairburn/notes.pipes.ily index a93eef0..0ded862 100644 --- a/strathspeys/lady_mackenzie_of_fairburn/notes.pipes.ily +++ b/strathspeys/lady_mackenzie_of_fairburn/notes.pipes.ily @@ -25,7 +25,7 @@ pipesA = { \thrwd d8. e16 \dblg g8. d16 \dblb b8. a16 - \grg G8. + \grg a8. } pipesBA = { d16 | @@ -57,13 +57,13 @@ pipesBB = { \dble e4 | \grg a8. \grd c16 - \dble e8. d16 + \dble d8. d16 \dblc c8. b16 \grg a16 A8. | a8. \grd c16 \grg e16 A8. - \hdblf f16 d8. + \hdblf g16 d8. \dble e8. c16 | \thrwd d8. e16